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

Commit ebd3292c authored by Dan Pasanen's avatar Dan Pasanen
Browse files

Merge tag 'android-7.1.2_r2' into cm-14.1 

Android 7.1.2 Release 2 (N2G47E)

# gpg: Signature made Mon 03 Apr 2017 01:41:49 AM CDT
# gpg:                using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
parents 64af1177 a7c62ac9

res/values-bn-rBD/strings.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ 
    <string name="desc_const_e" msgid="1889187337970539507">"ইউলার সংখ্যা"</string>

    <string name="desc_const_e" msgid="1889187337970539507">"ইউলার সংখ্যা"</string>

    <string name="desc_const_pi" msgid="5430918714009441655">"পাই"</string>

    <string name="desc_const_pi" msgid="5430918714009441655">"পাই"</string>

    <string name="desc_dec_point" msgid="5725254504360445023">"পয়েন্ট"</string>

    <string name="desc_dec_point" msgid="5725254504360445023">"পয়েন্ট"</string>

    <string name="desc_lparen" msgid="8688758170211924916">"বাম লঘুবন্ধনী"</string>

    <string name="desc_lparen" msgid="8688758170211924916">"বাঁ লঘুবন্ধনী"</string>

    <string name="desc_rparen" msgid="7920608385146151731">"ডান লঘুবন্ধনী"</string>

    <string name="desc_rparen" msgid="7920608385146151731">"ডান লঘুবন্ধনী"</string>

    <string name="desc_fun_cos" msgid="3787913784504974731">"কোসাইন"</string>

    <string name="desc_fun_cos" msgid="3787913784504974731">"কোসাইন"</string>

    <string name="desc_fun_ln" msgid="2505119732546227166">"স্বাভাবিক লগারিদম"</string>

    <string name="desc_fun_ln" msgid="2505119732546227166">"স্বাভাবিক লগারিদম"</string>

res/values-ka-rGE/strings.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ 
    <string name="desc_inv_off" msgid="3672218250519616068">"შებრუნებული ფუნქციების ჩვენება"</string>

    <string name="desc_inv_off" msgid="3672218250519616068">"შებრუნებული ფუნქციების ჩვენება"</string>

    <string name="desc_inv_on" msgid="2515675590767677178">"შებრუნებული ფუნქციების დამალვა"</string>

    <string name="desc_inv_on" msgid="2515675590767677178">"შებრუნებული ფუნქციების დამალვა"</string>

    <string name="error_nan" msgid="5674077944929888710">"არ არის რიცხვი"</string>

    <string name="error_nan" msgid="5674077944929888710">"არ არის რიცხვი"</string>

    <string name="error_syntax" msgid="4786987111228645602">"არასწორი ფრაზა"</string>

    <string name="error_syntax" msgid="4786987111228645602">"არასწორი გამოსახულება"</string>

    <string name="error_aborted" msgid="3402238176316342537">"შეწყვეტილია"</string>

    <string name="error_aborted" msgid="3402238176316342537">"შეწყვეტილია"</string>

    <string name="error_overflow" msgid="7800547394563434764">"განუსაზღვრელი?"</string>

    <string name="error_overflow" msgid="7800547394563434764">"განუსაზღვრელი?"</string>

    <string name="error_zero_divide" msgid="458040988686661801">"0-ზე გაყოფა შეუძლებელია"</string>

    <string name="error_zero_divide" msgid="458040988686661801">"0-ზე გაყოფა შეუძლებელია"</string>

res/values-kn-rIN/strings.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -69,7 +69,7 @@ 
    <string name="dismiss" msgid="7872443888515066216">"ವಜಾಗೊಳಿಸು"</string>

    <string name="dismiss" msgid="7872443888515066216">"ವಜಾಗೊಳಿಸು"</string>

    <string name="exact" msgid="2597237880041789948">"(ನಿಖರ)"</string>

    <string name="exact" msgid="2597237880041789948">"(ನಿಖರ)"</string>

    <string name="approximate" msgid="7117143366610670836">"(±1 ಕೊನೆಯ ಅಂಕಿಯಲ್ಲಿ)"</string>

    <string name="approximate" msgid="7117143366610670836">"(±1 ಕೊನೆಯ ಅಂಕಿಯಲ್ಲಿ)"</string>

    <string name="menu_leading" msgid="2338520833272667740">"ಮೊದಲ ಅಂಕೆ ಜೊತೆ ಉತ್ತರಿಸು"</string>

    <string name="menu_leading" msgid="2338520833272667740">"ಮೊದಲ ಅಂಕೆ ಜೊತೆ ಉತ್ತರಿಸಿ"</string>

    <string name="menu_fraction" msgid="1247477377840252234">"ಭಾಗದಂತೆ ಉತ್ತರಿಸು"</string>

    <string name="menu_fraction" msgid="1247477377840252234">"ಭಾಗದಂತೆ ಉತ್ತರಿಸಿ"</string>

    <string name="menu_licenses" msgid="1890541368064108592">"ಮುಕ್ತ ಮೂಲ ಪರವಾನಗಿಗಳು"</string>

    <string name="menu_licenses" msgid="1890541368064108592">"ಮುಕ್ತ ಮೂಲ ಪರವಾನಗಿಗಳು"</string>

</resources>
 
</resources>

res/values-ml-rIN/strings.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 




<resources xmlns:android="http://schemas.android.com/apk/res/android"

<resources xmlns:android="http://schemas.android.com/apk/res/android"

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

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

    <string name="app_name" msgid="1756503303878374382">"കാൽക്കുലേ."</string>

    <string name="app_name" msgid="1756503303878374382">"കാൽക്കുലേറ്റർ"</string>

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

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

    <string name="mode_deg" msgid="1146123354434332479">"ഡിഗ്രി"</string>

    <string name="mode_deg" msgid="1146123354434332479">"ഡിഗ്രി"</string>

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

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