diff --git a/res/layout/pad_numeric.xml b/res/layout/pad_numeric.xml
index c03f58b..127f495 100644
--- a/res/layout/pad_numeric.xml
+++ b/res/layout/pad_numeric.xml
@@ -15,7 +15,7 @@
   limitations under the License.
   -->
 
-<com.android.calculator2.CalculatorPadLayout
+<com.android.calculator2.CalculatorNumericPadLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/pad_numeric"
     style="@style/PadLayoutStyle.Numeric"
@@ -26,68 +26,57 @@
     <Button
         android:id="@+id/digit_7"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
-        android:text="@string/digit_7" />
+        android:onClick="onButtonClick" />
 
     <Button
         android:id="@+id/digit_8"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
-        android:text="@string/digit_8" />
+        android:onClick="onButtonClick" />
 
     <Button
         android:id="@+id/digit_9"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
-        android:text="@string/digit_9" />
+        android:onClick="onButtonClick" />
 
     <Button
         android:id="@+id/digit_4"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
-        android:text="@string/digit_4" />
+        android:onClick="onButtonClick" />
 
     <Button
         android:id="@+id/digit_5"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
-        android:text="@string/digit_5" />
+        android:onClick="onButtonClick" />
 
     <Button
         android:id="@+id/digit_6"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
-        android:text="@string/digit_6" />
+        android:onClick="onButtonClick" />
 
     <Button
         android:id="@+id/digit_1"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
-        android:text="@string/digit_1" />
+        android:onClick="onButtonClick" />
 
     <Button
         android:id="@+id/digit_2"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
-        android:text="@string/digit_2" />
+        android:onClick="onButtonClick" />
 
     <Button
         android:id="@+id/digit_3"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
-        android:text="@string/digit_3" />
+        android:onClick="onButtonClick" />
 
     <Button
         android:id="@+id/dec_point"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
-        android:text="@string/dec_point" />
+        android:onClick="onButtonClick" />
 
     <Button
         android:id="@+id/digit_0"
         style="@style/PadButtonStyle.Numeric"
-        android:onClick="onButtonClick"
-        android:text="@string/digit_0" />
+        android:onClick="onButtonClick" />
 
     <Button
         android:id="@+id/eq"
@@ -96,4 +85,4 @@
         android:onClick="onButtonClick"
         android:text="@string/eq" />
 
-</com.android.calculator2.CalculatorPadLayout>
+</com.android.calculator2.CalculatorNumericPadLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index e5602b1..ebd3e68 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Sakrekenaar"</string>
     <string name="error_nan" msgid="4071578355972369426">"Nie getal nie"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Fout"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-am/strings.xml b/res/values-am/strings.xml
index aa7a789..c12fd37 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"ማስያ"</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>
-    <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-ar/strings.xml b/res/values-ar/strings.xml
index 754933a..57e2f64 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"الآلة الحاسبة"</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>
-    <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-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 8690819..ac7c08a 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -1,84 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
+<!-- 
+  Copyright (C) 2014 The Android Open Source Project
 
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
 
-          http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+   -->
 
 <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">"Kalkulyator"</string>
-    <string name="error" msgid="9197457880925804499">"Xəta"</string>
-    <string name="digit0" msgid="8069590963464434135">"0"</string>
-    <string name="digit1" msgid="8535041374797804029">"1"</string>
-    <string name="digit2" msgid="8977354203154316247">"2"</string>
-    <string name="digit3" msgid="148544090755132760">"3"</string>
-    <string name="digit4" msgid="2199490603838247678">"4"</string>
-    <string name="digit5" msgid="7568514524384173087">"5"</string>
-    <string name="digit6" msgid="6705952561049362551">"6"</string>
-    <string name="digit7" msgid="658125644218958447">"7"</string>
-    <string name="digit8" msgid="3134686906411558886">"8"</string>
-    <string name="digit9" msgid="765379157698748031">"9"</string>
-    <string name="del" msgid="6248896117422989693">"SİLİN"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"kos"</string>
-    <string name="tan" msgid="7957459816738554960">"qaralt"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"in"</string>
-    <string name="lg" msgid="873623857385418182">"qeydiyyat"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Əsas panel"</string>
-    <string name="advanced" msgid="7122495413742976492">"Ətraflı panel"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Tarixçəni silin"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Mətn kopyalandı."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"sol mötərizə"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"sağ mötərizə"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"faktorial"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"təbii loqaritm"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"loqaritm"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"kvadrat kök"</string>
-    <string name="divDesc" msgid="7442623079124315427">"böl"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"çoxaltmaq"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"minus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"nöqtə"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"güc"</string>
-    <string name="delDesc" msgid="8211175878012032240">"silin"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"Təmizləyin"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"toxunan"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sinus"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"kosinus"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Euler\'in nömrəsi"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"bərabərliklər"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"sol mötərizə"</item>
-    <item msgid="1688156211934459752">"sağ mötərizə"</item>
-    <item msgid="6664829080840305856">"faktorial"</item>
-    <item msgid="2880199289575144121">"təbii loqaritm"</item>
-    <item msgid="4398774906998694599">"loqaritm"</item>
-    <item msgid="1791869359785943266">"kvadrat kök"</item>
-    <item msgid="6833720171974254459">"bölünmə"</item>
-    <item msgid="2646574635189709515">"vurma"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"minus"</item>
-    <item msgid="3456824579675198186">" nöqtə "</item>
-    <item msgid="4528629783180278651">"güc"</item>
-    <item msgid="4050948027333760159">"toxunan"</item>
-    <item msgid="8716478860618683850">"sinus"</item>
-    <item msgid="3203211483560707480">"kosinus"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"bərabərdir"</item>
-  </string-array>
+    <string name="error_nan" msgid="4071578355972369426">"Rəqəm deyil"</string>
+    <string name="error_syntax" msgid="6940043994468390738">"Xəta"</string>
+    <string name="fun_cos" msgid="7312559527731358211">"kos"</string>
+    <string name="fun_ln" msgid="6282013842946532944">"in"</string>
+    <string name="fun_log" msgid="6856905045055937519">"qeydiyyat"</string>
+    <string name="fun_sin" msgid="7136698561875496766">"günah"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"qaralt"</string>
+    <string name="clr" msgid="3126239559646368205">"clr"</string>
+    <string name="del" msgid="6700172918709138470">"del"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"Euler\'in nömrəsi"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"nöqtə"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"sol mötərizə"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"sağ mötərizə"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"kosinus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"təbii loqaritm"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"loaritm"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinus"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"toxunan"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"plus"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"böl"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"faktorial"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"dəfə"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"güc"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"kvadrat kök"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"minus"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"Təmizləyin"</string>
+    <string name="desc_del" msgid="1866733601083210032">"silin"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"bərabərliklər"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 6cb309e..65b08e2 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Калкулатор"</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>
-    <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-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index d32c575..27eb40d 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"ক্যালকুলেটর"</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">"০"</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="fun_cos" msgid="7312559527731358211">"cos"</string>
     <string name="fun_ln" msgid="6282013842946532944">"ইন"</string>
     <string name="fun_log" msgid="6856905045055937519">"log"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index af5b032..03c5428 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -18,19 +18,8 @@
 <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">"Calculadora"</string>
-    <string name="error_nan" msgid="4071578355972369426">"No és número"</string>
+    <string name="error_nan" msgid="4071578355972369426">"No és una xifra"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Error"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-cs/strings.xml b/res/values-cs/strings.xml
index ca732d4..98b74a5 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Kalkulačka"</string>
     <string name="error_nan" msgid="4071578355972369426">"Není číslo"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Chyba"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-da/strings.xml b/res/values-da/strings.xml
index ad8b241..1df7266 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Lommeregner"</string>
     <string name="error_nan" msgid="4071578355972369426">"Ikke et tal"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Fejl"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-de/strings.xml b/res/values-de/strings.xml
index 9674745..f97347e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -20,24 +20,13 @@
     <string name="app_name" msgid="8095131950334945205">"Rechner"</string>
     <string name="error_nan" msgid="4071578355972369426">"Keine Zahl"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Fehler"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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>
     <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
     <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
     <string name="clr" msgid="3126239559646368205">"clr"</string>
-    <string name="del" msgid="6700172918709138470">"del"</string>
+    <string name="del" msgid="6700172918709138470">"CE"</string>
     <string name="desc_const_e" msgid="7752508267661034194">"Eulersche Zahl"</string>
     <string name="desc_const_pi" msgid="5843835548313660468">"Pi"</string>
     <string name="desc_dec_point" msgid="6211527612960070934">"Dezimalzeichen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 92b57e0..f26176b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -18,19 +18,8 @@
 <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>
-    <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-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..92b9cf8
--- /dev/null
+++ b/res/values-en-rAU/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  Copyright (C) 2014 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+   -->
+
+<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="error_nan" msgid="4071578355972369426">"Not a number"</string>
+    <string name="error_syntax" msgid="6940043994468390738">"Error"</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>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"clr"</string>
+    <string name="del" msgid="6700172918709138470">"del"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"Euler\'s number"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"point"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"left parenthesis"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"right parenthesis"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"cosine"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"natural logarithm"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logarithm"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sine"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangent"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"plus"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"divide"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"factorial"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"times"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"power"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"square root"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"minus"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"clear"</string>
+    <string name="desc_del" msgid="1866733601083210032">"delete"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"equals"</string>
+</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 3dc4074..92b9cf8 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Calculator"</string>
     <string name="error_nan" msgid="4071578355972369426">"Not a number"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Error"</string>
-    <string name="dec_point" msgid="6555721211126788808">"."</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-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 3dc4074..92b9cf8 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Calculator"</string>
     <string name="error_nan" msgid="4071578355972369426">"Not a number"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Error"</string>
-    <string name="dec_point" msgid="6555721211126788808">"."</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-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index fd87ca3..dc0d496 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -18,26 +18,15 @@
 <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">"Calculadora"</string>
-    <string name="error_nan" msgid="4071578355972369426">"No es número."</string>
+    <string name="error_nan" msgid="4071578355972369426">"No es un número."</string>
     <string name="error_syntax" msgid="6940043994468390738">"Error"</string>
-    <string name="dec_point" msgid="6555721211126788808">"."</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>
     <string name="fun_sin" msgid="7136698561875496766">"sen"</string>
     <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
     <string name="clr" msgid="3126239559646368205">"be"</string>
-    <string name="del" msgid="6700172918709138470">"del"</string>
+    <string name="del" msgid="6700172918709138470">"CE"</string>
     <string name="desc_const_e" msgid="7752508267661034194">"número de Euler"</string>
     <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
     <string name="desc_dec_point" msgid="6211527612960070934">"punto"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 73d3e08..bfe1d70 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -18,19 +18,8 @@
 <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">"Calculadora"</string>
-    <string name="error_nan" msgid="4071578355972369426">"No es número"</string>
+    <string name="error_nan" msgid="4071578355972369426">"No es un número"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Error"</string>
-    <string name="dec_point" msgid="6555721211126788808">"."</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-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 049a1f3..853c126 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Kalkulaator"</string>
     <string name="error_nan" msgid="4071578355972369426">"Pole number"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Viga"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 5d8ef4c..8cf7448 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Kalkulagailua"</string>
     <string name="error_nan" msgid="4071578355972369426">"Ez da zenbaki bat"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Errorea"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-fa/config.xml b/res/values-fa/config.xml
new file mode 100644
index 0000000..519cece
--- /dev/null
+++ b/res/values-fa/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2015 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<resources>
+    <!-- Whether to use localized digits in the numeric pad. -->
+    <bool name="use_localized_digits">true</bool>
+</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 9ecafc6..d315197 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"ماشین حساب"</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">"۰"</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="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-fi/strings.xml b/res/values-fi/strings.xml
index 0a040fb..7b904c4 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Laskin"</string>
     <string name="error_nan" msgid="4071578355972369426">"Ei ole numero"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Virhe"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index d5d7558..23c6656 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Calculatrice"</string>
     <string name="error_nan" msgid="4071578355972369426">"Pas un nombre"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Erreur"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-fr/strings.xml b/res/values-fr/strings.xml
index 96b04ee..b43dcb1 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Calculatrice"</string>
     <string name="error_nan" msgid="4071578355972369426">"Pas un nombre."</string>
     <string name="error_syntax" msgid="6940043994468390738">"Erreur"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index aa27c0a..cc38aa7 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Calculadora"</string>
     <string name="error_nan" msgid="4071578355972369426">"Non é número"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Erro"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
new file mode 100644
index 0000000..103d6ca
--- /dev/null
+++ b/res/values-gu-rIN/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  Copyright (C) 2014 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+   -->
+
+<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_syntax" msgid="6940043994468390738">"ભૂલ"</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">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"clr"</string>
+    <string name="del" msgid="6700172918709138470">"del"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"યુલરનો નંબર"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"પાઇ"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"પોઇન્ટ"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"ડાબો કૌંસ"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"જમણો કૌંસ"</string>
+    <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_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>
+    <string name="desc_op_mul" msgid="978652245185868311">"વાર"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"પાવર"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"વર્ગમૂળ"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"બાદબાકી"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"સાફ કરો"</string>
+    <string name="desc_del" msgid="1866733601083210032">"કાઢી નાખો"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"બરાબર"</string>
+</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 89f2733..d570dd7 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -20,24 +20,13 @@
     <string name="app_name" msgid="8095131950334945205">"कैल्क्युलेटर"</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>
-    <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>
     <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
     <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
     <string name="clr" msgid="3126239559646368205">"clr"</string>
-    <string name="del" msgid="6700172918709138470">"del"</string>
+    <string name="del" msgid="6700172918709138470">"CE"</string>
     <string name="desc_const_e" msgid="7752508267661034194">"यूलर की संख्या"</string>
     <string name="desc_const_pi" msgid="5843835548313660468">"पाई"</string>
     <string name="desc_dec_point" msgid="6211527612960070934">"दशमलव"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 710ca59..0675d32 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Kalkulator"</string>
     <string name="error_nan" msgid="4071578355972369426">"Nije broj"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Pogreška"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-hu/strings.xml b/res/values-hu/strings.xml
index bebbd89..4cad9c1 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Számológép"</string>
     <string name="error_nan" msgid="4071578355972369426">"Nem egy szám"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Hiba"</string>
-    <string name="dec_point" msgid="6555721211126788808">"."</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-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 855fa20..e8b30f4 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Հաշվիչ"</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>
-    <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 0afa128..94c3421 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -20,17 +20,6 @@
     <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>
-    <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-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 50f03d8..8137b21 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Reiknivél"</string>
     <string name="error_nan" msgid="4071578355972369426">"Ekki tala"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Villa"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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">"kós"</string>
     <string name="fun_ln" msgid="6282013842946532944">"ln"</string>
     <string name="fun_log" msgid="6856905045055937519">"log"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5811d78..1842cb4 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -18,19 +18,8 @@
 <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">"Calcolatrice"</string>
-    <string name="error_nan" msgid="4071578355972369426">"Non un numero"</string>
+    <string name="error_nan" msgid="4071578355972369426">"Non è un numero"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Errore"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-iw/strings.xml b/res/values-iw/strings.xml
index 17b05cf..b159846 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"מחשבון"</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>
-    <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-ja/strings.xml b/res/values-ja/strings.xml
index 002a511..2b02d56 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"電卓"</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>
-    <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-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 4f241b2..fc6fa36 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"კალკულატორი"</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>
-    <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-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index b0f9688..99eb76c 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -20,24 +20,13 @@
     <string name="app_name" msgid="8095131950334945205">"Калькулятор"</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>
-    <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">"кос"</string>
     <string name="fun_ln" msgid="6282013842946532944">"нл"</string>
     <string name="fun_log" msgid="6856905045055937519">"лог"</string>
     <string name="fun_sin" msgid="7136698561875496766">"син"</string>
     <string name="fun_tan" msgid="9116158377794370341">"тан"</string>
     <string name="clr" msgid="3126239559646368205">"тзл"</string>
-    <string name="del" msgid="6700172918709138470">"жою"</string>
+    <string name="del" msgid="6700172918709138470">"del"</string>
     <string name="desc_const_e" msgid="7752508267661034194">"Эйлер саны"</string>
     <string name="desc_const_pi" msgid="5843835548313660468">"пи"</string>
     <string name="desc_dec_point" msgid="6211527612960070934">"нүкте"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index f4b237b..c2ca4cf 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -18,19 +18,8 @@
 <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>
-    <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">"កូស៊ីនុស"</string>
     <string name="fun_ln" msgid="6282013842946532944">"ln"</string>
     <string name="fun_log" msgid="6856905045055937519">"log"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index a2e3b5d..30cbb3b 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -20,18 +20,7 @@
     <string name="app_name" msgid="8095131950334945205">"ಕ್ಯಾಲ್ಕುಲೇಟರ್"</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>
-    <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">"ಕೊಸ್"</string>
+    <string name="fun_cos" msgid="7312559527731358211">"cos"</string>
     <string name="fun_ln" msgid="6282013842946532944">"ಇನ್"</string>
     <string name="fun_log" msgid="6856905045055937519">"ಲಾ."</string>
     <string name="fun_sin" msgid="7136698561875496766">"ಸೈನ್"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 68fb663..e39fb8d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"계산기"</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>
-    <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-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 30962eb..2c35ac1 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -21,17 +21,6 @@
     <skip />
     <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>
-    <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-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 6e65a5f..ce551e2 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"ຈັກຄິດໄລ່"</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>
-    <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-lt/strings.xml b/res/values-lt/strings.xml
index 4dc6165..242342f 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Skaičiuotuvas"</string>
     <string name="error_nan" msgid="4071578355972369426">"Ne skaičius"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Klaida"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-lv/strings.xml b/res/values-lv/strings.xml
index 6763071..375c77c 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Kalkulators"</string>
     <string name="error_nan" msgid="4071578355972369426">"Nav skaitlis"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Kļūda"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index cff0f33..07ce565 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Калкулатор"</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>
-    <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-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 5fea821..5a323e7 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -20,24 +20,13 @@
     <string name="app_name" msgid="8095131950334945205">"കാൽക്കുലേറ്റർ"</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>
-    <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>
     <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="del" msgid="6700172918709138470">"മായ്ക്കൂ"</string>
     <string name="desc_const_e" msgid="7752508267661034194">"യൂളറിന്റെ നമ്പർ"</string>
     <string name="desc_const_pi" msgid="5843835548313660468">"പൈ"</string>
     <string name="desc_dec_point" msgid="6211527612960070934">"പോയിന്റ്"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 2ef7fea..68f5d3b 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Тооны машин"</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>
-    <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-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 8d12255..c1431d0 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"कॅलक्युलेटर"</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>
-    <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">"कॉस"</string>
     <string name="fun_ln" msgid="6282013842946532944">"इन"</string>
     <string name="fun_log" msgid="6856905045055937519">"लॉग"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index a21a20b..edb94c2 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Kalkulator"</string>
     <string name="error_nan" msgid="4071578355972369426">"Bukan nombor"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Ralat"</string>
-    <string name="dec_point" msgid="6555721211126788808">"."</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">"kos"</string>
     <string name="fun_ln" msgid="6282013842946532944">"ln"</string>
     <string name="fun_log" msgid="6856905045055937519">"log"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 2bad3e3..ff44a5d 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"ဂဏန်းတွက်စက်"</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">"၀"</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="fun_cos" msgid="7312559527731358211">"cos"</string>
     <string name="fun_ln" msgid="6282013842946532944">"ln"</string>
     <string name="fun_log" msgid="6856905045055937519">"log"</string>
@@ -47,7 +36,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>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index cfbf682..1ac81ba 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Kalkulator"</string>
     <string name="error_nan" msgid="4071578355972369426">"Ikke et tall"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Feil"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index a5f1e29..76774f6 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"क्यालकुलेटर"</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">"०"</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="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-nl/strings.xml b/res/values-nl/strings.xml
index 2dd17fb..7cae889 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Calculator"</string>
     <string name="error_nan" msgid="4071578355972369426">"Is geen getal"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Fout"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
new file mode 100644
index 0000000..58c1f13
--- /dev/null
+++ b/res/values-pa-rIN/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  Copyright (C) 2014 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+   -->
+
+<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_syntax" msgid="6940043994468390738">"ਅਸ਼ੁੱਧੀ"</string>
+    <string name="fun_cos" msgid="7312559527731358211">"cos"</string>
+    <string name="fun_ln" msgid="6282013842946532944">"ਇਨ"</string>
+    <string name="fun_log" msgid="6856905045055937519">"ਲੌਗ"</string>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"clr"</string>
+    <string name="del" msgid="6700172918709138470">"ਮਿਟਾਓ"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"Euler ਦੀ ਸੰਖਿਆ"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"ਬਿੰਦੂ"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"ਖੱਬੀਆਂ ਬਰੈਕਟਾਂ"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"ਸੱਜੀਆਂ ਬਰੈਕਟਾਂ"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"cosine"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"ਨੈਚੁਰਲ ਲਾਗਰਿਥਮ"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"ਲਾਗਰਿਥਮ"</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>
+    <string name="desc_op_fact" msgid="5004950609277631750">"ਫੈਕਟੋਰੀਅਲ"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"ਵਾਰ"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"ਪਾਵਰ"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"ਵਰਗ਼ ਮੂਲ"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"ਘਟਾ"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"ਹਟਾਓ"</string>
+    <string name="desc_del" msgid="1866733601083210032">"ਮਿਟਾਓ"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"ਬਰਾਬਰ"</string>
+</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c1e7989..29adf24 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Kalkulator"</string>
     <string name="error_nan" msgid="4071578355972369426">"To nie liczba"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Błąd"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 27ce078..f66a61c 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Calculadora"</string>
     <string name="error_nan" msgid="4071578355972369426">"Não é um núm."</string>
     <string name="error_syntax" msgid="6940043994468390738">"Erro"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-pt/strings.xml b/res/values-pt/strings.xml
index 6fa5bf7..75bebba 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Calculadora"</string>
     <string name="error_nan" msgid="4071578355972369426">"Não é número"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Erro"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-ro/strings.xml b/res/values-ro/strings.xml
index 92817b1..2ea69e5 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Calculator"</string>
     <string name="error_nan" msgid="4071578355972369426">"Nu este număr"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Eroare"</string>
-    <string name="dec_point" msgid="6555721211126788808">"."</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>
@@ -55,7 +44,7 @@
     <string name="desc_op_pow" msgid="2620877401884059447">"putere"</string>
     <string name="desc_op_sqrt" msgid="4405610392216554239">"rădăcină pătrată"</string>
     <string name="desc_op_sub" msgid="2563060630032563021">"minus"</string>
-    <string name="desc_clr" msgid="8357371663749541924">"goliţi"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"goliți"</string>
     <string name="desc_del" msgid="1866733601083210032">"ștergeți"</string>
     <string name="desc_eq" msgid="8068773095462472408">"este egal cu"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ee4de2f..a5ba949 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Калькулятор"</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>
-    <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-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 1c0d9ee..0cc0069 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"ගණක යන්ත්‍රය"</string>
     <string name="error_nan" msgid="4071578355972369426">"Not a number"</string>
     <string name="error_syntax" msgid="6940043994468390738">"දෝෂය"</string>
-    <string name="dec_point" msgid="6555721211126788808">"."</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">"කොස්"</string>
     <string name="fun_ln" msgid="6282013842946532944">"ශ්‍රිතයක් ලෙස"</string>
     <string name="fun_log" msgid="6856905045055937519">"ලොගය"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 2934546..e45ead6 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Kalkulačka"</string>
     <string name="error_nan" msgid="4071578355972369426">"Nie je číslo"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Chyba"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-sl/strings.xml b/res/values-sl/strings.xml
index 8289bd2..cfadaf1 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Računalo"</string>
     <string name="error_nan" msgid="4071578355972369426">"Ni število"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Napaka"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
new file mode 100644
index 0000000..b277102
--- /dev/null
+++ b/res/values-sq-rAL/strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  Copyright (C) 2014 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+   -->
+
+<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">"Makina llogaritëse"</string>
+    <string name="error_nan" msgid="4071578355972369426">"s\'është numër"</string>
+    <string name="error_syntax" msgid="6940043994468390738">"Gabim"</string>
+    <string name="fun_cos" msgid="7312559527731358211">"kos"</string>
+    <string name="fun_ln" msgid="6282013842946532944">"ln"</string>
+    <string name="fun_log" msgid="6856905045055937519">"log"</string>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"pst"</string>
+    <string name="del" msgid="6700172918709138470">"fsh"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"konstante matematikore"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"pikë"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"kllapa e majtë"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"kllapa e djathtë"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"kosinus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"logaritmi natyror"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritmi"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinus"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangjente"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"plus"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"pjesëto"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"faktoriali"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"herë"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"në fuqi"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"rrënja katrore"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"minus"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"pastro"</string>
+    <string name="desc_del" msgid="1866733601083210032">"fshi"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"e barabartë me"</string>
+</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index d33dd8b..4cd6e03 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Калкулатор"</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>
-    <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-sv/strings.xml b/res/values-sv/strings.xml
index 318d225..11c63f9 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Kalkylator"</string>
     <string name="error_nan" msgid="4071578355972369426">"Inte ett tal"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Fel"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-sw/strings.xml b/res/values-sw/strings.xml
index a951039..2ef4118 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Kikokotoo"</string>
     <string name="error_nan" msgid="4071578355972369426">"Si nambari"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Hitilafu"</string>
-    <string name="dec_point" msgid="6555721211126788808">"."</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">"In"</string>
     <string name="fun_log" msgid="6856905045055937519">"log"</string>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index e2ad3c8..b4f9b7e 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"கணிப்பான்"</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>
-    <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">"காஸ்"</string>
     <string name="fun_ln" msgid="6282013842946532944">"ln"</string>
     <string name="fun_log" msgid="6856905045055937519">"மடக்கை"</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index d86688e..a982eb5 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"గణనయంత్రం"</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>
-    <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-th/strings.xml b/res/values-th/strings.xml
index b934494..7cc94eb 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"คิดเลข"</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>
-    <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-tl/strings.xml b/res/values-tl/strings.xml
index d549d57..4b3ba68 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Calculator"</string>
     <string name="error_nan" msgid="4071578355972369426">"Hindi isang numero"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Error"</string>
-    <string name="dec_point" msgid="6555721211126788808">"."</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-tr/strings.xml b/res/values-tr/strings.xml
index aaa5659..af65842 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Hesap Makinesi"</string>
     <string name="error_nan" msgid="4071578355972369426">"Sayı değil"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Hata"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-uk/strings.xml b/res/values-uk/strings.xml
index bee1bd9..0b7f6e7 100755
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Калькулятор"</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>
-    <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-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 8e92795..9aba674 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"کیلکولیٹر"</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>
-    <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-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 1c297dd..a47890e 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -18,19 +18,8 @@
 <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">"Kalkulator"</string>
-    <string name="error_nan" msgid="4071578355972369426">"Son emas"</string>
+    <string name="error_nan" msgid="4071578355972369426">"Haqiqiy son emas"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Xato"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-vi/strings.xml b/res/values-vi/strings.xml
index 638bc67..eb9fd54 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Máy tính"</string>
     <string name="error_nan" msgid="4071578355972369426">"Không phải số"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Lỗi"</string>
-    <string name="dec_point" msgid="6555721211126788808">","</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-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a30962b..38e7d70 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -20,24 +20,13 @@
     <string name="app_name" msgid="8095131950334945205">"计算器"</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>
-    <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>
     <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
     <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
     <string name="clr" msgid="3126239559646368205">"清除"</string>
-    <string name="del" msgid="6700172918709138470">"删除"</string>
+    <string name="del" msgid="6700172918709138470">"del"</string>
     <string name="desc_const_e" msgid="7752508267661034194">"欧拉数"</string>
     <string name="desc_const_pi" msgid="5843835548313660468">"圆周率"</string>
     <string name="desc_dec_point" msgid="6211527612960070934">"点"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index d9a87fb..d22e7ab 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"計算機"</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>
-    <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-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 262c98d..d2364a6 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"計算機"</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>
-    <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-zu/strings.xml b/res/values-zu/strings.xml
index 14b01c8..5ca6861 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -20,17 +20,6 @@
     <string name="app_name" msgid="8095131950334945205">"Isibali"</string>
     <string name="error_nan" msgid="4071578355972369426">"Akuyona inombolo"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Iphutha"</string>
-    <string name="dec_point" msgid="6555721211126788808">"."</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">"In"</string>
     <string name="fun_log" msgid="6856905045055937519">"log"</string>
diff --git a/res/values/config.xml b/res/values/config.xml
new file mode 100644
index 0000000..94bdfde
--- /dev/null
+++ b/res/values/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2015 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<resources>
+    <!-- Whether to use localized digits in the numeric pad. -->
+    <bool name="use_localized_digits">false</bool>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bcdd55e..11d4469 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -25,30 +25,6 @@
     <!-- Error displayed when expression contains a syntax error. [CHAR_LIMIT=14] -->
     <string name="error_syntax">Error</string>
 
-    <!-- Decimal separator (e.g. "1.23"). [CHAR_LIMIT=1] -->
-    <string name="dec_point">.</string>
-
-    <!-- Decimal representation of zero (e.g. "0", "10", "1.0", "1e0"). [CHAR_LIMIT=1] -->
-    <string name="digit_0">0</string>
-    <!-- Decimal representation of one (e.g. "1", "11", "1.1", "1e1"). [CHAR_LIMIT=1] -->
-    <string name="digit_1">1</string>
-    <!-- Decimal representation of two (e.g. "2", "22", "2.2", "2e2"). [CHAR_LIMIT=1] -->
-    <string name="digit_2">2</string>
-    <!-- Decimal representation of three (e.g. "3", "33", "3.3", "3e3"). [CHAR_LIMIT=1] -->
-    <string name="digit_3">3</string>
-    <!-- Decimal representation of four (e.g. "4", "44", "4.4", "4e4"). [CHAR_LIMIT=1] -->
-    <string name="digit_4">4</string>
-    <!-- Decimal representation of five (e.g. "5", "55", "5.5", "5e5"). [CHAR_LIMIT=1] -->
-    <string name="digit_5">5</string>
-    <!-- Decimal representation of six (e.g. "6", "66", "6.6", "6e6"). [CHAR_LIMIT=1] -->
-    <string name="digit_6">6</string>
-    <!-- Decimal representation of seven (e.g. "7", "77", "7.7", "7e7"). [CHAR_LIMIT=1] -->
-    <string name="digit_7">7</string>
-    <!-- Decimal representation of eight (e.g. "8", "88", "8.8", "8e8"). [CHAR_LIMIT=1] -->
-    <string name="digit_8">8</string>
-    <!-- Decimal representation of eight (e.g. "9", "99", "9.9", "9e9"). [CHAR_LIMIT=1] -->
-    <string name="digit_9">9</string>
-
     <!-- Abbrev. name of cosine function (e.g. "cos(π)". [CHAR_LIMIT=3] -->
     <string name="fun_cos">cos</string>
     <!-- Natural logarithm function (e.g. "ln(2)"). [CHAR_LIMIT=3] -->
diff --git a/src/com/android/calculator2/CalculatorExpressionTokenizer.java b/src/com/android/calculator2/CalculatorExpressionTokenizer.java
index b9c91e2..7145fa8 100644
--- a/src/com/android/calculator2/CalculatorExpressionTokenizer.java
+++ b/src/com/android/calculator2/CalculatorExpressionTokenizer.java
@@ -18,7 +18,11 @@
 
 import android.content.Context;
 
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -29,18 +33,22 @@
     public CalculatorExpressionTokenizer(Context context) {
         mReplacementMap = new HashMap<>();
 
-        mReplacementMap.put(".", context.getString(R.string.dec_point));
+        Locale locale = context.getResources().getConfiguration().locale;
+        if (!context.getResources().getBoolean(R.bool.use_localized_digits)) {
+            locale = new Locale.Builder()
+                .setLocale(locale)
+                .setUnicodeLocaleKeyword("nu", "latn")
+                .build();
+        }
 
-        mReplacementMap.put("0", context.getString(R.string.digit_0));
-        mReplacementMap.put("1", context.getString(R.string.digit_1));
-        mReplacementMap.put("2", context.getString(R.string.digit_2));
-        mReplacementMap.put("3", context.getString(R.string.digit_3));
-        mReplacementMap.put("4", context.getString(R.string.digit_4));
-        mReplacementMap.put("5", context.getString(R.string.digit_5));
-        mReplacementMap.put("6", context.getString(R.string.digit_6));
-        mReplacementMap.put("7", context.getString(R.string.digit_7));
-        mReplacementMap.put("8", context.getString(R.string.digit_8));
-        mReplacementMap.put("9", context.getString(R.string.digit_9));
+        final DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale);
+        final char zeroDigit = symbols.getZeroDigit();
+
+        mReplacementMap.put(".", String.valueOf(symbols.getDecimalSeparator()));
+
+        for (int i = 0; i <= 9; ++i) {
+            mReplacementMap.put(Integer.toString(i), String.valueOf((char) (i + zeroDigit)));
+        }
 
         mReplacementMap.put("/", context.getString(R.string.op_div));
         mReplacementMap.put("*", context.getString(R.string.op_mul));
diff --git a/src/com/android/calculator2/CalculatorNumericPadLayout.java b/src/com/android/calculator2/CalculatorNumericPadLayout.java
new file mode 100644
index 0000000..ece0433
--- /dev/null
+++ b/src/com/android/calculator2/CalculatorNumericPadLayout.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.calculator2;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.Button;
+import android.view.View;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
+import java.util.Locale;
+
+public class CalculatorNumericPadLayout extends CalculatorPadLayout {
+
+    public CalculatorNumericPadLayout(Context context) {
+        this(context, null);
+    }
+
+    public CalculatorNumericPadLayout(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public CalculatorNumericPadLayout(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public void onFinishInflate() {
+        super.onFinishInflate();
+
+        Locale locale = getResources().getConfiguration().locale;
+        if (!getResources().getBoolean(R.bool.use_localized_digits)) {
+            locale = new Locale.Builder()
+                .setLocale(locale)
+                .setUnicodeLocaleKeyword("nu", "latn")
+                .build();
+        }
+
+        final DecimalFormatSymbols symbols = DecimalFormatSymbols.getInstance(locale);
+        final char zeroDigit = symbols.getZeroDigit();
+        for (int childIndex = getChildCount() - 1; childIndex >= 0; --childIndex) {
+            final View v = getChildAt(childIndex);
+            if (v instanceof Button) {
+                final Button b = (Button) v;
+                switch (b.getId()) {
+                    case R.id.digit_0:
+                        b.setText(String.valueOf(zeroDigit));
+                        break;
+                    case R.id.digit_1:
+                        b.setText(String.valueOf((char) (zeroDigit + 1)));
+                        break;
+                    case R.id.digit_2:
+                        b.setText(String.valueOf((char) (zeroDigit + 2)));
+                        break;
+                    case R.id.digit_3:
+                        b.setText(String.valueOf((char) (zeroDigit + 3)));
+                        break;
+                    case R.id.digit_4:
+                        b.setText(String.valueOf((char) (zeroDigit + 4)));
+                        break;
+                    case R.id.digit_5:
+                        b.setText(String.valueOf((char) (zeroDigit + 5)));
+                        break;
+                    case R.id.digit_6:
+                        b.setText(String.valueOf((char) (zeroDigit + 6)));
+                        break;
+                    case R.id.digit_7:
+                        b.setText(String.valueOf((char) (zeroDigit + 7)));
+                        break;
+                    case R.id.digit_8:
+                        b.setText(String.valueOf((char) (zeroDigit + 8)));
+                        break;
+                    case R.id.digit_9:
+                        b.setText(String.valueOf((char) (zeroDigit + 9)));
+                        break;
+                    case R.id.dec_point:
+                        b.setText(String.valueOf(symbols.getDecimalSeparator()));
+                        break;
+                }
+            }
+        }
+    }
+}
+