diff options
author | Dan Pasanen <dan.pasanen@gmail.com> | 2017-04-05 07:26:20 -0500 |
---|---|---|
committer | Dan Pasanen <dan.pasanen@gmail.com> | 2017-04-05 07:26:20 -0500 |
commit | ebd3292c993bbe4f33c4278fcdf396fd206f990d (patch) | |
tree | b74f7d3d6e0e52f0553f7ab62693dd81a731c4f6 | |
parent | 64af1177e68c2c9464d91063b99ebbf56862a6e8 (diff) | |
parent | a7c62ac9fd0fd1c8800a4d9e597b515b93fa1ba5 (diff) | |
download | android_packages_apps_ExactCalculator-ebd3292c993bbe4f33c4278fcdf396fd206f990d.tar.gz android_packages_apps_ExactCalculator-ebd3292c993bbe4f33c4278fcdf396fd206f990d.tar.bz2 android_packages_apps_ExactCalculator-ebd3292c993bbe4f33c4278fcdf396fd206f990d.zip |
Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2
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
-rw-r--r-- | res/values-bn-rBD/strings.xml | 2 | ||||
-rw-r--r-- | res/values-ka-rGE/strings.xml | 2 | ||||
-rw-r--r-- | res/values-kn-rIN/strings.xml | 4 | ||||
-rw-r--r-- | res/values-ml-rIN/strings.xml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml index 95bcc1b..2742857 100644 --- a/res/values-bn-rBD/strings.xml +++ b/res/values-bn-rBD/strings.xml @@ -27,7 +27,7 @@ <string name="desc_const_e" msgid="1889187337970539507">"ইউলার সংখ্যা"</string> <string name="desc_const_pi" msgid="5430918714009441655">"পাই"</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_fun_cos" msgid="3787913784504974731">"কোসাইন"</string> <string name="desc_fun_ln" msgid="2505119732546227166">"স্বাভাবিক লগারিদম"</string> diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index 16febeb..ca9e157 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -58,7 +58,7 @@ <string name="desc_inv_off" msgid="3672218250519616068">"შებრუნებული ფუნქციების ჩვენება"</string> <string name="desc_inv_on" msgid="2515675590767677178">"შებრუნებული ფუნქციების დამალვა"</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_overflow" msgid="7800547394563434764">"განუსაზღვრელი?"</string> <string name="error_zero_divide" msgid="458040988686661801">"0-ზე გაყოფა შეუძლებელია"</string> diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml index 5d380f2..c8b9aab 100644 --- a/res/values-kn-rIN/strings.xml +++ b/res/values-kn-rIN/strings.xml @@ -69,7 +69,7 @@ <string name="dismiss" msgid="7872443888515066216">"ವಜಾಗೊಳಿಸು"</string> <string name="exact" msgid="2597237880041789948">"(ನಿಖರ)"</string> <string name="approximate" msgid="7117143366610670836">"(±1 ಕೊನೆಯ ಅಂಕಿಯಲ್ಲಿ)"</string> - <string name="menu_leading" msgid="2338520833272667740">"ಮೊದಲ ಅಂಕೆ ಜೊತೆ ಉತ್ತರಿಸು"</string> - <string name="menu_fraction" msgid="1247477377840252234">"ಭಾಗದಂತೆ ಉತ್ತರಿಸು"</string> + <string name="menu_leading" msgid="2338520833272667740">"ಮೊದಲ ಅಂಕೆ ಜೊತೆ ಉತ್ತರಿಸಿ"</string> + <string name="menu_fraction" msgid="1247477377840252234">"ಭಾಗದಂತೆ ಉತ್ತರಿಸಿ"</string> <string name="menu_licenses" msgid="1890541368064108592">"ಮುಕ್ತ ಮೂಲ ಪರವಾನಗಿಗಳು"</string> </resources> diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml index 7e87269..e21e42b 100644 --- a/res/values-ml-rIN/strings.xml +++ b/res/values-ml-rIN/strings.xml @@ -17,7 +17,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">"കാൽക്കുലേ."</string> + <string name="app_name" msgid="1756503303878374382">"കാൽക്കുലേറ്റർ"</string> <string name="dec_point" msgid="8920102493070918054">"."</string> <string name="mode_deg" msgid="1146123354434332479">"ഡിഗ്രി"</string> <string name="mode_rad" msgid="1434228830085760996">"rad"</string> |