merge in lmp-mr1-release history after reset to lmp-mr1-dev
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 4ec3b75..754933a 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -21,16 +21,16 @@
     <string name="error_nan" msgid="4071578355972369426">"ليس رقمًا"</string>
     <string name="error_syntax" msgid="6940043994468390738">"خطأ"</string>
     <string name="dec_point" msgid="6555721211126788808">"."</string>
-    <string name="digit_0" msgid="697966218778843272">"٠"</string>
-    <string name="digit_1" msgid="9009337429640544205">"١"</string>
-    <string name="digit_2" msgid="7722707864768133877">"٢"</string>
-    <string name="digit_3" msgid="5813321444694024561">"٣"</string>
-    <string name="digit_4" msgid="4768173444612236144">"٤"</string>
-    <string name="digit_5" msgid="2015349411036328271">"٥"</string>
-    <string name="digit_6" msgid="7350999202882497047">"٦"</string>
-    <string name="digit_7" msgid="2386463125354638611">"٧"</string>
-    <string name="digit_8" msgid="6298159258090202166">"٨"</string>
-    <string name="digit_9" msgid="1221342734731110246">"٩"</string>
+    <string name="digit_0" msgid="697966218778843272">"0"</string>
+    <string name="digit_1" msgid="9009337429640544205">"1"</string>
+    <string name="digit_2" msgid="7722707864768133877">"2"</string>
+    <string name="digit_3" msgid="5813321444694024561">"3"</string>
+    <string name="digit_4" msgid="4768173444612236144">"4"</string>
+    <string name="digit_5" msgid="2015349411036328271">"5"</string>
+    <string name="digit_6" msgid="7350999202882497047">"6"</string>
+    <string name="digit_7" msgid="2386463125354638611">"7"</string>
+    <string name="digit_8" msgid="6298159258090202166">"8"</string>
+    <string name="digit_9" msgid="1221342734731110246">"9"</string>
     <string name="fun_cos" msgid="7312559527731358211">"cos"</string>
     <string name="fun_ln" msgid="6282013842946532944">"ln"</string>
     <string name="fun_log" msgid="6856905045055937519">"log"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d6b7cbb..0afa128 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/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="8095131950334945205">"Calculator"</string>
+    <string name="app_name" msgid="8095131950334945205">"Kalkulator"</string>
     <string name="error_nan" msgid="4071578355972369426">"Bukan angka"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Kesalahan"</string>
     <string name="dec_point" msgid="6555721211126788808">"."</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 2abef2f..f4b237b 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -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="8095131950334945205">"ម៉ាស៊ីន​គិត​លេខ"</string>
-    <string name="error_nan" msgid="4071578355972369426">"មិនមែន​ជា​លេខ​"</string>
+    <string name="error_nan" msgid="4071578355972369426">"មិនមែន​ជា​លេខ"</string>
     <string name="error_syntax" msgid="6940043994468390738">"កំហុស"</string>
     <string name="dec_point" msgid="6555721211126788808">"."</string>
     <string name="digit_0" msgid="697966218778843272">"0"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index cf07ff0..5fea821 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -33,9 +33,9 @@
     <string name="digit_9" msgid="1221342734731110246">"9"</string>
     <string name="fun_cos" msgid="7312559527731358211">"cos"</string>
     <string name="fun_ln" msgid="6282013842946532944">"ln"</string>
-    <string name="fun_log" msgid="6856905045055937519">"ലോഗ്"</string>
-    <string name="fun_sin" msgid="7136698561875496766">"സൈൻ"</string>
-    <string name="fun_tan" msgid="9116158377794370341">"ടാൻ"</string>
+    <string name="fun_log" msgid="6856905045055937519">"log"</string>
+    <string name="fun_sin" msgid="7136698561875496766">"sine"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
     <string name="clr" msgid="3126239559646368205">"മായ്‌ക്കുക"</string>
     <string name="del" msgid="6700172918709138470">"ഇല്ലാതാക്കുക"</string>
     <string name="desc_const_e" msgid="7752508267661034194">"യൂളറിന്റെ നമ്പർ"</string>
@@ -46,7 +46,7 @@
     <string name="desc_fun_cos" msgid="3197307754450718348">"കസൈൻ"</string>
     <string name="desc_fun_ln" msgid="4943842219071979148">"നാച്ചുറൽ ലോഗരിതം"</string>
     <string name="desc_fun_log" msgid="6163178034661345125">"ലോഗരിതം"</string>
-    <string name="desc_fun_sin" msgid="4010564022860883142">"സൈൻ"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sine"</string>
     <string name="desc_fun_tan" msgid="8547330421304946587">"ടാൻജെന്റ്"</string>
     <string name="desc_op_add" msgid="1174812755738083078">"പ്ലസ്"</string>
     <string name="desc_op_div" msgid="8320455802423478031">"ഭാഗിക്കുക"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index af6df36..2bad3e3 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -47,7 +47,7 @@
     <string name="desc_fun_ln" msgid="4943842219071979148">"သဘာဝ လော်ဂရစ်သမ်"</string>
     <string name="desc_fun_log" msgid="6163178034661345125">"လော်ဂရစ်သမ်"</string>
     <string name="desc_fun_sin" msgid="4010564022860883142">"ဆိုင်း"</string>
-    <string name="desc_fun_tan" msgid="8547330421304946587">"တန်းဂျင့်"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"တန်းဂျင့်"</string>
     <string name="desc_op_add" msgid="1174812755738083078">"အပေါင်း လက္ခဏာ"</string>
     <string name="desc_op_div" msgid="8320455802423478031">"စားရန်"</string>
     <string name="desc_op_fact" msgid="5004950609277631750">"မြှောက်ကိန်း"</string>