Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 140eeb29 authored by Dan Pasanen's avatar Dan Pasanen
Browse files

Merge tag 'android-7.1.1_r4' into cm-14.1 

Android 7.1.1 release 4

# gpg: Signature made Thu Dec  1 13:07:05 2016 CST
# gpg:                using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
parents 677ff236 d38c3074

res/values-pt-rBR/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name" msgid="1756503303878374382">"Calculadora"</string>

    <string name="dec_point" msgid="8920102493070918054">"."</string>

    <string name="dec_point" msgid="8920102493070918054">","</string>

    <string name="mode_deg" msgid="1146123354434332479">"graus"</string>

    <string name="mode_rad" msgid="1434228830085760996">"rad"</string>

    <string name="clr" msgid="6730945431543327337">"limp"</string>

res/values-pt/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name" msgid="1756503303878374382">"Calculadora"</string>

    <string name="dec_point" msgid="8920102493070918054">"."</string>

    <string name="dec_point" msgid="8920102493070918054">","</string>

    <string name="mode_deg" msgid="1146123354434332479">"graus"</string>

    <string name="mode_rad" msgid="1434228830085760996">"rad"</string>

    <string name="clr" msgid="6730945431543327337">"limp"</string>