Import translations. DO NOT MERGE

Change-Id: I2b46430493b808229b23142f5bd435d7969d5a39
Auto-generated-cl: translation import
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 2fac1d6..7b551cc 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Sakrekenaar"</string>
-    <string name="error" msgid="9197457880925804499">"Fout"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Basiese paneel"</string>
-    <string name="advanced" msgid="7122495413742976492">"Gevorderde paneel"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Vee geskiedenis uit"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Teks gekopieer."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"begin-hakie"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"eind-hakie"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"faktoriaal"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"natuurlike logaritme"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritme"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"vierkantswortel"</string>
-    <string name="divDesc" msgid="7442623079124315427">"deel"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"vermenigvuldig"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"minus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"punt"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"mag"</string>
-    <string name="delDesc" msgid="8211175878012032240">"vee uit"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"vee uit"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangens"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sinus"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"kosinus"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Euler-nommer"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"gelyk aan"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"begin-hakie"</item>
-    <item msgid="1688156211934459752">"eind-hakie"</item>
-    <item msgid="6664829080840305856">"faktoriaal"</item>
-    <item msgid="2880199289575144121">"natuurlike logaritme"</item>
-    <item msgid="4398774906998694599">"logaritme"</item>
-    <item msgid="1791869359785943266">"vierkantswortel"</item>
-    <item msgid="6833720171974254459">"gedeel deur"</item>
-    <item msgid="2646574635189709515">"vermenigvuldig met"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"minus"</item>
-    <item msgid="3456824579675198186">" punt "</item>
-    <item msgid="4528629783180278651">"mag"</item>
-    <item msgid="4050948027333760159">"tangens"</item>
-    <item msgid="8716478860618683850">"sinus"</item>
-    <item msgid="3203211483560707480">"kosinus"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"gelyk aan"</item>
-  </string-array>
+    <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>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"vee"</string>
+    <string name="del" msgid="6700172918709138470">"wis"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"Euler-nommer"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"punt"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"beginhakie"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"eindhakie"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"kosinus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"natuurlike logaritme"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritme"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinus"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangens"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"plus"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"deel"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"fakulteit"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"maal"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"mag"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"vierkantswortel"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"minus"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"vee uit"</string>
+    <string name="desc_del" msgid="1866733601083210032">"wis uit"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"gelyk aan"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index c384bb2..c8e2248 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1,85 +1,61 @@
 <?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">"ማስያ"</string>
-    <string name="error" msgid="9197457880925804499">"ስህተት"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"አጽዳ"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"መሠረታዊ መደብ"</string>
-    <string name="advanced" msgid="7122495413742976492">"የላቀ ፓናል"</string>
-    <string name="clear_history" msgid="8458043980601165012">"ታሪክ አጽዳ"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"ፅሁፍ ተገልብጧል።"</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"የግራ ቅንፍ"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"የቀኝ ቅንፍ"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"ብዜት"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"ተፈጥሯዊ ሎጋሪዝም"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"ሎጋሪዝም"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"ስክዌር ሩት"</string>
-    <string name="divDesc" msgid="7442623079124315427">"አካፍል"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"አባዛ"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"ሲደመር"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"ሲቀነስ"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"ነጥብ"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"አርቢ"</string>
-    <string name="delDesc" msgid="8211175878012032240">"ሰርዝ"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"አጽዳ"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"ታንጀት"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"ሳይን"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"ኮሳይን"</string>
-    <string name="eDesc" msgid="6709583372168924068">"የዩለር ቁጥር"</string>
-    <string name="piDesc" msgid="8838151606775021517">"ፓይ"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"ይሆናል"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"የግራ ቅንፍ"</item>
-    <item msgid="1688156211934459752">"የቀኝ ቅንፍ"</item>
-    <item msgid="6664829080840305856">"ብዜት"</item>
-    <item msgid="2880199289575144121">"ተፈጥሯዊ ሎጋሪዝም"</item>
-    <item msgid="4398774906998694599">"ሎጋሪዝም"</item>
-    <item msgid="1791869359785943266">"ስክዌር ሩት"</item>
-    <item msgid="6833720171974254459">"ሲካፈል"</item>
-    <item msgid="2646574635189709515">"ሲባዛ"</item>
-    <item msgid="3487936384379753697">"ሲደመር"</item>
-    <item msgid="8608534484562258856">"ሲቀነስ"</item>
-    <item msgid="3456824579675198186">" ነጥብ "</item>
-    <item msgid="4528629783180278651">"አርቢ"</item>
-    <item msgid="4050948027333760159">"ታንጀት"</item>
-    <item msgid="8716478860618683850">"ሳይን"</item>
-    <item msgid="3203211483560707480">"ኮሳይን"</item>
-    <item msgid="8587490959348493065">"ፓይ"</item>
-    <item msgid="8134315487552198394">"ይሆናል"</item>
-  </string-array>
+    <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="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-ar/strings.xml b/res/values-ar/strings.xml
index 65d1939..4ec3b75 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1,85 +1,61 @@
 <?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">"الآلة الحاسبة"</string>
-    <string name="error" msgid="9197457880925804499">"خطأ"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"محو"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"اللوحة الأساسية"</string>
-    <string name="advanced" msgid="7122495413742976492">"اللوحة المتقدمة"</string>
-    <string name="clear_history" msgid="8458043980601165012">"محو السجل"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"تم نسخ النص."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"قوس أيسر"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"قوس أيمن"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"العامل"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"اللوغاريتم الطبيعي"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"لوغاريتم"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"جذر تربيعي"</string>
-    <string name="divDesc" msgid="7442623079124315427">"قسمة"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"ضرب"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"علامة الجمع"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"علامة الطرح"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"نقطة"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"أس"</string>
-    <string name="delDesc" msgid="8211175878012032240">"حذف"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"محو"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"المماس"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"جيب الزاوية"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"جيب التمام"</string>
-    <string name="eDesc" msgid="6709583372168924068">"رقم إيولر"</string>
-    <string name="piDesc" msgid="8838151606775021517">"باي"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"تساوي"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"قوس أيسر"</item>
-    <item msgid="1688156211934459752">"قوس أيمن"</item>
-    <item msgid="6664829080840305856">"العامل"</item>
-    <item msgid="2880199289575144121">"اللوغاريتم الطبيعي"</item>
-    <item msgid="4398774906998694599">"لوغاريتم"</item>
-    <item msgid="1791869359785943266">"جذر تربيعي"</item>
-    <item msgid="6833720171974254459">"مقسومًا على"</item>
-    <item msgid="2646574635189709515">"مضروبًا في"</item>
-    <item msgid="3487936384379753697">"علامة الجمع"</item>
-    <item msgid="8608534484562258856">"علامة الطرح"</item>
-    <item msgid="3456824579675198186">" نقطة "</item>
-    <item msgid="4528629783180278651">"أس"</item>
-    <item msgid="4050948027333760159">"المماس"</item>
-    <item msgid="8716478860618683850">"جيب الزاوية"</item>
-    <item msgid="3203211483560707480">"جيب التمام"</item>
-    <item msgid="8587490959348493065">"باي"</item>
-    <item msgid="8134315487552198394">"تساوي"</item>
-  </string-array>
+    <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>
+    <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="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-bg/strings.xml b/res/values-bg/strings.xml
index d0c8d50..6cb309e 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Калкулатор"</string>
-    <string name="error" msgid="9197457880925804499">"Грешка"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Основен панел"</string>
-    <string name="advanced" msgid="7122495413742976492">"Разширен панел"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Изчистване на историята"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Текстът е копиран."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"лява кръгла скоба"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"дясна кръгла скоба"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"факториел"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"естествен логаритъм"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"логаритъм"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"корен квадратен"</string>
-    <string name="divDesc" msgid="7442623079124315427">"деление"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"умножение"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"плюс"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"минус"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"точка"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"степен"</string>
-    <string name="delDesc" msgid="8211175878012032240">"изтриване"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"изчистване"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"тангенс"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"синус"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"косинус"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Неперово число"</string>
-    <string name="piDesc" msgid="8838151606775021517">"пи"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"равно на"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"лява кръгла скоба"</item>
-    <item msgid="1688156211934459752">"дясна кръгла скоба"</item>
-    <item msgid="6664829080840305856">"факториел"</item>
-    <item msgid="2880199289575144121">"естествен логаритъм"</item>
-    <item msgid="4398774906998694599">"логаритъм"</item>
-    <item msgid="1791869359785943266">"корен квадратен"</item>
-    <item msgid="6833720171974254459">"делено на"</item>
-    <item msgid="2646574635189709515">"умножено по"</item>
-    <item msgid="3487936384379753697">"плюс"</item>
-    <item msgid="8608534484562258856">"минус"</item>
-    <item msgid="3456824579675198186">" запетая "</item>
-    <item msgid="4528629783180278651">"степен"</item>
-    <item msgid="4050948027333760159">"тангенс"</item>
-    <item msgid="8716478860618683850">"синус"</item>
-    <item msgid="3203211483560707480">"косинус"</item>
-    <item msgid="8587490959348493065">"пи"</item>
-    <item msgid="8134315487552198394">"равно на"</item>
-  </string-array>
+    <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="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-ca/strings.xml b/res/values-ca/strings.xml
index 712668b..ddcd720 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Calculadora"</string>
-    <string name="error" msgid="9197457880925804499">"Error"</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="2051454354221101970">"SUPR"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Tauler bàsic"</string>
-    <string name="advanced" msgid="7122495413742976492">"Tauler avançat"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Esborra l\'historial"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"S\'ha copiat el text."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"parèntesi esquerre"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"parèntesi dret"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"factorial"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"logaritme natural"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritme"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"arrel quadrada"</string>
-    <string name="divDesc" msgid="7442623079124315427">"divideix"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"multiplica"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"més"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"menys"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"punt"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"poder"</string>
-    <string name="delDesc" msgid="8211175878012032240">"suprimeix"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"esborra"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangent"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sinus"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"cosinus"</string>
-    <string name="eDesc" msgid="6709583372168924068">"nombre d\'Euler"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"és igual a"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"parèntesi esquerre"</item>
-    <item msgid="1688156211934459752">"parèntesi dret"</item>
-    <item msgid="6664829080840305856">"factorial"</item>
-    <item msgid="2880199289575144121">"logaritme natural"</item>
-    <item msgid="4398774906998694599">"logaritme"</item>
-    <item msgid="1791869359785943266">"arrel quadrada"</item>
-    <item msgid="6833720171974254459">"dividit per"</item>
-    <item msgid="2646574635189709515">"multiplicat per"</item>
-    <item msgid="3487936384379753697">"més"</item>
-    <item msgid="8608534484562258856">"menys"</item>
-    <item msgid="3456824579675198186">" punt "</item>
-    <item msgid="4528629783180278651">"potència"</item>
-    <item msgid="4050948027333760159">"tangent"</item>
-    <item msgid="8716478860618683850">"sinus"</item>
-    <item msgid="3203211483560707480">"cosinus"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"és igual a"</item>
-  </string-array>
+    <string name="error_nan" msgid="4071578355972369426">"No és 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">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"esb"</string>
+    <string name="del" msgid="6700172918709138470">"sup"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"nombre d\'Euler"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"punt"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"parèntesi esquerre"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"parèntesi dret"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"cosinus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"logaritme natural"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritme"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinus"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangent"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"més"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"divideix"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"factorial"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"vegades"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"accent circumflex"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"arrel quadrada"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"menys"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"esborra"</string>
+    <string name="desc_del" msgid="1866733601083210032">"suprimeix"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"és igual a"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 2b75652..59d06dc 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Kalkulačka"</string>
-    <string name="error" msgid="9197457880925804499">"Chyba"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Základní funkce"</string>
-    <string name="advanced" msgid="7122495413742976492">"Pokročilé funkce"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Vymazat historii"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Text zkopírován."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"levá závorka"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"pravá závorka"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"faktoriál"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"přirozený logaritmus"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritmus"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"druhá odmocnina"</string>
-    <string name="divDesc" msgid="7442623079124315427">"dělit"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"násobit"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"mínus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"desetinná čárka"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"mocnina"</string>
-    <string name="delDesc" msgid="8211175878012032240">"smazat"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"vymazat"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangens"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sinus"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"kosinus"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Eulerovo číslo"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pí"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"rovná se"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"levá závorka"</item>
-    <item msgid="1688156211934459752">"pravá závorka"</item>
-    <item msgid="6664829080840305856">"faktoriál"</item>
-    <item msgid="2880199289575144121">"přirozený logaritmus"</item>
-    <item msgid="4398774906998694599">"logaritmus"</item>
-    <item msgid="1791869359785943266">"druhá odmocnina"</item>
-    <item msgid="6833720171974254459">"děleno"</item>
-    <item msgid="2646574635189709515">"krát"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"mínus"</item>
-    <item msgid="3456824579675198186">" bod "</item>
-    <item msgid="4528629783180278651">"mocnina"</item>
-    <item msgid="4050948027333760159">"tangens"</item>
-    <item msgid="8716478860618683850">"sinus"</item>
-    <item msgid="3203211483560707480">"kosinus"</item>
-    <item msgid="8587490959348493065">"pí"</item>
-    <item msgid="8134315487552198394">"rovná se"</item>
-  </string-array>
+    <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>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"CE"</string>
+    <string name="del" msgid="6700172918709138470">"C"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"Eulerovo číslo"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pí"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"desetinná čárka"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"levá závorka"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"pravá závorka"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"kosinus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"přirozený logaritmus"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritmus"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinus"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangens"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"plus"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"děleno"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"faktoriál"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"krát"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"mocnina"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"druhá odmocnina"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"minus"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"smazat celý výraz"</string>
+    <string name="desc_del" msgid="1866733601083210032">"smazat"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"rovná se"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a8b3c59..521218a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Lommeregner"</string>
-    <string name="error" msgid="9197457880925804499">"Fejl"</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="2051454354221101970">"SLET"</string>
-    <string name="clear" msgid="8103610981407459768">"RYD"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Grundlæggende panel"</string>
-    <string name="advanced" msgid="7122495413742976492">"Avanceret panel"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Ryd historik"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Tekst er kopieret."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"venstre parentes"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"højre parentes"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"faktoriel"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"naturlig logaritme"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritme"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"kvadratrod"</string>
-    <string name="divDesc" msgid="7442623079124315427">"divider"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"gange"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"minus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"point"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"tænd/sluk"</string>
-    <string name="delDesc" msgid="8211175878012032240">"slet"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"ryd"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangent"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sinus"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"cosinus"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Eulers tal"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"lig med"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"venstre parentes"</item>
-    <item msgid="1688156211934459752">"højre parentes"</item>
-    <item msgid="6664829080840305856">"faktoriel"</item>
-    <item msgid="2880199289575144121">"naturlig logaritme"</item>
-    <item msgid="4398774906998694599">"logaritme"</item>
-    <item msgid="1791869359785943266">"kvadratrod"</item>
-    <item msgid="6833720171974254459">"divideret med"</item>
-    <item msgid="2646574635189709515">"ganget med"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"minus"</item>
-    <item msgid="3456824579675198186">" point "</item>
-    <item msgid="4528629783180278651">"tænd/sluk"</item>
-    <item msgid="4050948027333760159">"tangent"</item>
-    <item msgid="8716478860618683850">"sinus"</item>
-    <item msgid="3203211483560707480">"cosinus"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"lig med"</item>
-  </string-array>
+    <string name="error_nan" msgid="4071578355972369426">"Er 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>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"ryd"</string>
+    <string name="del" msgid="6700172918709138470">"slet"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"Eulers tal"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"punktum"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"venstre parentes"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"højre parentes"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"cosinus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"naturlig logaritme"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritme"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinus"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangens"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"plus"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"divider"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"fakultet"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"gange"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"potens"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"kvadratrod"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"minus"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"ryd"</string>
+    <string name="desc_del" msgid="1866733601083210032">"slet"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"lig med"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b7e4589..9674745 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Rechner"</string>
-    <string name="error" msgid="9197457880925804499">"Fehler"</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="2051454354221101970">"Entf"</string>
-    <string name="clear" msgid="8103610981407459768">"Löschen"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Grundfunktionen"</string>
-    <string name="advanced" msgid="7122495413742976492">"Erweiterte Funktionen"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Verlauf löschen"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Text kopiert"</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"Klammer auf"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"Klammer zu"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"Fakultät"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"natürlicher Logarithmus"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"Logarithmus"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"Quadratwurzel"</string>
-    <string name="divDesc" msgid="7442623079124315427">"dividieren"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"multiplizieren"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"minus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"Punkt"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"Potenz"</string>
-    <string name="delDesc" msgid="8211175878012032240">"löschen"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"löschen"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"Tangens"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"Sinus"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"Kosinus"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Eulersche Zahl"</string>
-    <string name="piDesc" msgid="8838151606775021517">"Pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"ist gleich"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"Klammer auf"</item>
-    <item msgid="1688156211934459752">"Klammer zu"</item>
-    <item msgid="6664829080840305856">"Fakultät"</item>
-    <item msgid="2880199289575144121">"natürlicher Logarithmus"</item>
-    <item msgid="4398774906998694599">"Logarithmus"</item>
-    <item msgid="1791869359785943266">"Quadratwurzel"</item>
-    <item msgid="6833720171974254459">"dividiert durch"</item>
-    <item msgid="2646574635189709515">"multipliziert mit"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"minus"</item>
-    <item msgid="3456824579675198186">" Punkt "</item>
-    <item msgid="4528629783180278651">"Potenz"</item>
-    <item msgid="4050948027333760159">"Tangens"</item>
-    <item msgid="8716478860618683850">"Sinus"</item>
-    <item msgid="3203211483560707480">"Kosinus"</item>
-    <item msgid="8587490959348493065">"Pi"</item>
-    <item msgid="8134315487552198394">"ist gleich"</item>
-  </string-array>
+    <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="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>
+    <string name="desc_lparen" msgid="3319203240269597504">"Klammer auf"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"Klammer zu"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"Kosinus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"natürlicher Logarithmus"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"Logarithmus"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"Sinus"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"Tangens"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"plus"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"dividieren"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"Fakultät"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"Mal"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"Potenz"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"Quadratwurzel"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"minus"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"löschen"</string>
+    <string name="desc_del" msgid="1866733601083210032">"löschen"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"ist gleich"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 22d10f0..92b57e0 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Αριθμομηχ."</string>
-    <string name="error" msgid="9197457880925804499">"Σφάλμα"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"ΔΙΑΓΡ."</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Πίνακας βασικών πράξεων"</string>
-    <string name="advanced" msgid="7122495413742976492">"Πίνακας σύνθετων συναρτήσεων"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Εκκαθάριση ιστορικού"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Το κείμενο αντιγράφηκε."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"αριστερή παρένθεση"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"δεξιά παρένθεση"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"παραγοντικό"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"φυσικός λογάριθμος"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"λογάριθμος"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"τετραγωνική ρίζα"</string>
-    <string name="divDesc" msgid="7442623079124315427">"διαίρεση"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"πολλαπλασιασμός"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"συν"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"μείον"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"κόμμα"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"υψωμένο στη δύναμη"</string>
-    <string name="delDesc" msgid="8211175878012032240">"διαγραφή"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"διαγραφή"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"εφαπτομένη"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"ημίτονο"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"συνημίτονο"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Αριθμός Euler"</string>
-    <string name="piDesc" msgid="8838151606775021517">"πι"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"ίσον"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"αριστερή παρένθεση"</item>
-    <item msgid="1688156211934459752">"δεξιά παρένθεση"</item>
-    <item msgid="6664829080840305856">"παραγοντικό"</item>
-    <item msgid="2880199289575144121">"φυσικός λογάριθμος"</item>
-    <item msgid="4398774906998694599">"λογάριθμος"</item>
-    <item msgid="1791869359785943266">"τετραγωνική ρίζα"</item>
-    <item msgid="6833720171974254459">"διαιρείται με"</item>
-    <item msgid="2646574635189709515">"πολλαπλασιάζεται επί"</item>
-    <item msgid="3487936384379753697">"συν"</item>
-    <item msgid="8608534484562258856">"μείον"</item>
-    <item msgid="3456824579675198186">" βαθμός "</item>
-    <item msgid="4528629783180278651">"υψωμένο στη δύναμη"</item>
-    <item msgid="4050948027333760159">"εφαπτομένη"</item>
-    <item msgid="8716478860618683850">"ημίτονο"</item>
-    <item msgid="3203211483560707480">"συνημίτονο"</item>
-    <item msgid="8587490959348493065">"πι"</item>
-    <item msgid="8134315487552198394">"ίσον"</item>
-  </string-array>
+    <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="desc_const_e" msgid="7752508267661034194">"Αριθμός Euler"</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-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 8fe689a..3dc4074 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Calculator"</string>
-    <string name="error" msgid="9197457880925804499">"Error"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Basic panel"</string>
-    <string name="advanced" msgid="7122495413742976492">"Advanced panel"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Clear history"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Text copied."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"left parenthesis"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"right parenthesis"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"factorial"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"natural logarithm"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logarithm"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"square root"</string>
-    <string name="divDesc" msgid="7442623079124315427">"divide"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"multiply"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"minus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"point"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"power"</string>
-    <string name="delDesc" msgid="8211175878012032240">"delete"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"clear"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangent"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sine"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"cosine"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Euler\'s number"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"equals"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"left parenthesis"</item>
-    <item msgid="1688156211934459752">"right parenthesis"</item>
-    <item msgid="6664829080840305856">"factorial"</item>
-    <item msgid="2880199289575144121">"natural logarithm"</item>
-    <item msgid="4398774906998694599">"logarithm"</item>
-    <item msgid="1791869359785943266">"square root"</item>
-    <item msgid="6833720171974254459">"divided by"</item>
-    <item msgid="2646574635189709515">"multiplied by"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"minus"</item>
-    <item msgid="3456824579675198186">" point "</item>
-    <item msgid="4528629783180278651">"power"</item>
-    <item msgid="4050948027333760159">"tangent"</item>
-    <item msgid="8716478860618683850">"sine"</item>
-    <item msgid="3203211483560707480">"cosine"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"equals"</item>
-  </string-array>
+    <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>
+    <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-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 8fe689a..3dc4074 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Calculator"</string>
-    <string name="error" msgid="9197457880925804499">"Error"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Basic panel"</string>
-    <string name="advanced" msgid="7122495413742976492">"Advanced panel"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Clear history"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Text copied."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"left parenthesis"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"right parenthesis"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"factorial"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"natural logarithm"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logarithm"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"square root"</string>
-    <string name="divDesc" msgid="7442623079124315427">"divide"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"multiply"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"minus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"point"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"power"</string>
-    <string name="delDesc" msgid="8211175878012032240">"delete"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"clear"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangent"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sine"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"cosine"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Euler\'s number"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"equals"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"left parenthesis"</item>
-    <item msgid="1688156211934459752">"right parenthesis"</item>
-    <item msgid="6664829080840305856">"factorial"</item>
-    <item msgid="2880199289575144121">"natural logarithm"</item>
-    <item msgid="4398774906998694599">"logarithm"</item>
-    <item msgid="1791869359785943266">"square root"</item>
-    <item msgid="6833720171974254459">"divided by"</item>
-    <item msgid="2646574635189709515">"multiplied by"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"minus"</item>
-    <item msgid="3456824579675198186">" point "</item>
-    <item msgid="4528629783180278651">"power"</item>
-    <item msgid="4050948027333760159">"tangent"</item>
-    <item msgid="8716478860618683850">"sine"</item>
-    <item msgid="3203211483560707480">"cosine"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"equals"</item>
-  </string-array>
+    <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>
+    <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-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 6d6f4df..fd87ca3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Calculadora"</string>
-    <string name="error" msgid="9197457880925804499">"Error"</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="2051454354221101970">"ELIMINAR"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sen"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Panel básico"</string>
-    <string name="advanced" msgid="7122495413742976492">"Panel avanzado"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Eliminar historial"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Se ha copiado el texto."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"paréntesis de apertura"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"paréntesis de cierre"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"factorial"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"logaritmo natural"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritmo"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"raíz cuadrada"</string>
-    <string name="divDesc" msgid="7442623079124315427">"dividir"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"multiplicar"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"más"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"menos"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"punto"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"potencia"</string>
-    <string name="delDesc" msgid="8211175878012032240">"eliminar"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"borrar"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangente"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"seno"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"coseno"</string>
-    <string name="eDesc" msgid="6709583372168924068">"número de Euler"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"igual a"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"paréntesis de apertura"</item>
-    <item msgid="1688156211934459752">"paréntesis de cierre"</item>
-    <item msgid="6664829080840305856">"factorial"</item>
-    <item msgid="2880199289575144121">"logaritmo natural"</item>
-    <item msgid="4398774906998694599">"logaritmo"</item>
-    <item msgid="1791869359785943266">"raíz cuadrada"</item>
-    <item msgid="6833720171974254459">"dividido por"</item>
-    <item msgid="2646574635189709515">"multiplicado por"</item>
-    <item msgid="3487936384379753697">"más"</item>
-    <item msgid="8608534484562258856">"menos"</item>
-    <item msgid="3456824579675198186">" Punto "</item>
-    <item msgid="4528629783180278651">"potencia"</item>
-    <item msgid="4050948027333760159">"tangente"</item>
-    <item msgid="8716478860618683850">"seno"</item>
-    <item msgid="3203211483560707480">"coseno"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"igual a"</item>
-  </string-array>
+    <string name="error_nan" msgid="4071578355972369426">"No es 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="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>
+    <string name="desc_lparen" msgid="3319203240269597504">"paréntesis de apertura"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"paréntesis de cierre"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"coseno"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"logaritmo natural"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritmo"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"seno"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangente"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"más"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"división"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"factorial"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"multiplicación"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"potencia"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"raíz cuadrada"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"menos"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"borrar"</string>
+    <string name="desc_del" msgid="1866733601083210032">"eliminar"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"igual a"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f62832e..2a0882d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Calculadora"</string>
-    <string name="error" msgid="9197457880925804499">"Error"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"BORRAR"</string>
-    <string name="sin" msgid="6793866152659175277">"sen"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Funciones básicas"</string>
-    <string name="advanced" msgid="7122495413742976492">"Funciones avanzadas"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Borrar historial"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Texto copiado"</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"paréntesis de apertura"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"paréntesis de cierre"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"factorial"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"logaritmo natural"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritmo"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"raíz cuadrada"</string>
-    <string name="divDesc" msgid="7442623079124315427">"dividir"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"multiplicar"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"más"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"menos"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"punto"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"potencia"</string>
-    <string name="delDesc" msgid="8211175878012032240">"eliminar"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"borrar"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangente"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"seno"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"coseno"</string>
-    <string name="eDesc" msgid="6709583372168924068">"número de Euler"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"igual a"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"paréntesis de apertura"</item>
-    <item msgid="1688156211934459752">"paréntesis de cierre"</item>
-    <item msgid="6664829080840305856">"factorial"</item>
-    <item msgid="2880199289575144121">"logaritmo natural"</item>
-    <item msgid="4398774906998694599">"logaritmo"</item>
-    <item msgid="1791869359785943266">"raíz cuadrada"</item>
-    <item msgid="6833720171974254459">"dividido por"</item>
-    <item msgid="2646574635189709515">"multiplicado por"</item>
-    <item msgid="3487936384379753697">"más"</item>
-    <item msgid="8608534484562258856">"menos"</item>
-    <item msgid="3456824579675198186">" punto "</item>
-    <item msgid="4528629783180278651">"potencia"</item>
-    <item msgid="4050948027333760159">"tangente"</item>
-    <item msgid="8716478860618683850">"seno"</item>
-    <item msgid="3203211483560707480">"coseno"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"igual a"</item>
-  </string-array>
+    <string name="error_nan" msgid="4071578355972369426">"No es 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">"ce"</string>
+    <string name="del" msgid="6700172918709138470">"del"</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>
+    <string name="desc_lparen" msgid="3319203240269597504">"paréntesis de apertura"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"paréntesis de cierre"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"coseno"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"logaritmo natural"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritmo"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"seno"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangente"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"más"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"dividir"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"factorial"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"veces"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"potencia"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"raíz cuadrada"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"menos"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"borrar"</string>
+    <string name="desc_del" msgid="1866733601083210032">"eliminar"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"igual a"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 6f57aa4..912dc96 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Kalkulaator"</string>
-    <string name="error" msgid="9197457880925804499">"Viga"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Põhipaneel"</string>
-    <string name="advanced" msgid="7122495413742976492">"Täpsem paneel"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Kustuta ajalugu"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Tekst on kopeeritud."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"Vasaksulg"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"Paremsulg"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"Faktoriaal"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"Naturaallogaritm"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"Logaritm"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"Ruutjuur"</string>
-    <string name="divDesc" msgid="7442623079124315427">"Jaga"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"Korruta"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"Pluss"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"Miinus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"Koma"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"Aste"</string>
-    <string name="delDesc" msgid="8211175878012032240">"Kustuta"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"Tühjenda"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"Tangens"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"Siinus"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"Koosinus"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Euleri arv"</string>
-    <string name="piDesc" msgid="8838151606775021517">"Pii"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"Võrdub"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"Vasaksulg"</item>
-    <item msgid="1688156211934459752">"Paremsulg"</item>
-    <item msgid="6664829080840305856">"Faktoriaal"</item>
-    <item msgid="2880199289575144121">"Naturaallogaritm"</item>
-    <item msgid="4398774906998694599">"Logaritm"</item>
-    <item msgid="1791869359785943266">"Ruutjuur"</item>
-    <item msgid="6833720171974254459">"Jagaja"</item>
-    <item msgid="2646574635189709515">"Korrutaja"</item>
-    <item msgid="3487936384379753697">"Pluss"</item>
-    <item msgid="8608534484562258856">"Miinus"</item>
-    <item msgid="3456824579675198186">" koma "</item>
-    <item msgid="4528629783180278651">"Aste"</item>
-    <item msgid="4050948027333760159">"Tangens"</item>
-    <item msgid="8716478860618683850">"Siinus"</item>
-    <item msgid="3203211483560707480">"Koosinus"</item>
-    <item msgid="8587490959348493065">"Pii"</item>
-    <item msgid="8134315487552198394">"Võrdub"</item>
-  </string-array>
+    <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>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"tühj."</string>
+    <string name="del" msgid="6700172918709138470">"kust."</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"Euleri arv"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pii"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"punkt"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"vasaksulg"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"paremsulg"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"koosinus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"naturaallogaritm"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritm"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"siinus"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangens"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"pluss"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"jaga"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"faktoriaal"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"ajad"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"aste"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"ruutjuur"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"miinus"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"tühjenda"</string>
+    <string name="desc_del" msgid="1866733601083210032">"kustuta"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"võrdub"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index b77cb39..5696d25 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1,85 +1,61 @@
 <?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">"ماشین حساب"</string>
-    <string name="error" msgid="9197457880925804499">"خطا"</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="2051454354221101970">"حذف"</string>
-    <string name="clear" msgid="8103610981407459768">"پاک"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"پانل اصلی"</string>
-    <string name="advanced" msgid="7122495413742976492">"پانل پیشرفته"</string>
-    <string name="clear_history" msgid="8458043980601165012">"پاک کردن سابقه"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"نوشتار کپی شد."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"پرانتز چپ"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"پرانتز راست"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"فاکتوریل"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"لگاریتم طبیعی"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"لگاریتم"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"ریشه دوم"</string>
-    <string name="divDesc" msgid="7442623079124315427">"تقسیم"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"ضرب"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"جمع"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"منها"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"نقطه"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"توان"</string>
-    <string name="delDesc" msgid="8211175878012032240">"حذف"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"پاک کردن"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"تانژانت"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"سینوس"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"کسینوس"</string>
-    <string name="eDesc" msgid="6709583372168924068">"عدد اولر"</string>
-    <string name="piDesc" msgid="8838151606775021517">"پی"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"مساوی"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"پرانتز چپ"</item>
-    <item msgid="1688156211934459752">"پرانتز راست"</item>
-    <item msgid="6664829080840305856">"فاکتوریل"</item>
-    <item msgid="2880199289575144121">"لگاریتم طبیعی"</item>
-    <item msgid="4398774906998694599">"لگاریتم"</item>
-    <item msgid="1791869359785943266">"ریشه دوم"</item>
-    <item msgid="6833720171974254459">"تقسیم بر"</item>
-    <item msgid="2646574635189709515">"ضرب در"</item>
-    <item msgid="3487936384379753697">"جمع"</item>
-    <item msgid="8608534484562258856">"منها"</item>
-    <item msgid="3456824579675198186">" امتیاز "</item>
-    <item msgid="4528629783180278651">"توان"</item>
-    <item msgid="4050948027333760159">"تانژانت"</item>
-    <item msgid="8716478860618683850">"سینوس"</item>
-    <item msgid="3203211483560707480">"کسینوس"</item>
-    <item msgid="8587490959348493065">"پی"</item>
-    <item msgid="8134315487552198394">"مساوی است با"</item>
-  </string-array>
+    <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>
+    <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="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-fi/strings.xml b/res/values-fi/strings.xml
index c19e57a..0a040fb 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Laskin"</string>
-    <string name="error" msgid="9197457880925804499">"Virhe"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Perustoiminnot"</string>
-    <string name="advanced" msgid="7122495413742976492">"Lisätoiminnot"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Tyhjennä historia"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Teksti kopioitu."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"vasen sulkumerkki"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"oikea sulkumerkki"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"kertoma"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"luonnollinen logaritmi"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritmi"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"neliöjuuri"</string>
-    <string name="divDesc" msgid="7442623079124315427">"jakaa"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"kertoa"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"miinus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"piste"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"potenssi"</string>
-    <string name="delDesc" msgid="8211175878012032240">"poista"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"tyhjennä"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangentti"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sini"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"kosini"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Eulerin luku"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pii"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"on yhtä kuin"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"vasen sulkumerkki"</item>
-    <item msgid="1688156211934459752">"oikea sulkumerkki"</item>
-    <item msgid="6664829080840305856">"kertoma"</item>
-    <item msgid="2880199289575144121">"luonnollinen logaritmi"</item>
-    <item msgid="4398774906998694599">"logaritmi"</item>
-    <item msgid="1791869359785943266">"neliöjuuri"</item>
-    <item msgid="6833720171974254459">"jaettuna"</item>
-    <item msgid="2646574635189709515">"kertaa"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"miinus"</item>
-    <item msgid="3456824579675198186">" piste "</item>
-    <item msgid="4528629783180278651">"potenssi"</item>
-    <item msgid="4050948027333760159">"tangentti"</item>
-    <item msgid="8716478860618683850">"sini"</item>
-    <item msgid="3203211483560707480">"kosini"</item>
-    <item msgid="8587490959348493065">"pii"</item>
-    <item msgid="8134315487552198394">"on yhtä kuin"</item>
-  </string-array>
+    <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>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"thj"</string>
+    <string name="del" msgid="6700172918709138470">"pst"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"Eulerin luku"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pii"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">" piste "</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"vasen sulkumerkki"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"oikea sulkumerkki"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"kosini"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"luonnollinen logaritmi"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritmi"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sini"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangentti"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"plus"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"jakaa"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"kertoma"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"kertaa"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"potenssi"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"neliöjuuri"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"miinus"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"tyhjennä"</string>
+    <string name="desc_del" msgid="1866733601083210032">"poista"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"on yhtä kuin"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 6e8a029..3ec0786 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Calculatrice"</string>
-    <string name="error" msgid="9197457880925804499">"Erreur"</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="2051454354221101970">"SUPPR."</string>
-    <string name="clear" msgid="8103610981407459768">"EFF."</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Panneau de base"</string>
-    <string name="advanced" msgid="7122495413742976492">"Fonctions avancées"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Effacer l\'historique"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Texte copié."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"parenthèse gauche"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"parenthèse droite"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"factoriel"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"logarithme naturel"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logarithme"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"racine carrée"</string>
-    <string name="divDesc" msgid="7442623079124315427">"diviser"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"multiplier"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"moins"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"point"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"puissance"</string>
-    <string name="delDesc" msgid="8211175878012032240">"Supprimer"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"effacer"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangeante"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sinus"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"cosinus"</string>
-    <string name="eDesc" msgid="6709583372168924068">"nombre d\'Euler"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"signe égal"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"parenthèse gauche"</item>
-    <item msgid="1688156211934459752">"parenthèse droite"</item>
-    <item msgid="6664829080840305856">"factoriel"</item>
-    <item msgid="2880199289575144121">"logarithme naturel"</item>
-    <item msgid="4398774906998694599">"logarithme"</item>
-    <item msgid="1791869359785943266">"racine carrée"</item>
-    <item msgid="6833720171974254459">"divisé par"</item>
-    <item msgid="2646574635189709515">"multiplié par"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"moins"</item>
-    <item msgid="3456824579675198186">" point "</item>
-    <item msgid="4528629783180278651">"puissance"</item>
-    <item msgid="4050948027333760159">"tangeante"</item>
-    <item msgid="8716478860618683850">"sinus"</item>
-    <item msgid="3203211483560707480">"cosinus"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"signe égal"</item>
-  </string-array>
+    <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>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"eff"</string>
+    <string name="del" msgid="6700172918709138470">"sup"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"nombre d\'Euler"</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">"parenthèse gauche"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"parenthèse droite"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"cosinus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"logarithme naturel"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logarithme"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinus"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangente"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"plus"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"diviser"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"factoriel"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"fois"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"puissance"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"racine carrée"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"moins"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"effacer"</string>
+    <string name="desc_del" msgid="1866733601083210032">"Supprimer"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"égal"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 70e4a32..daa4db0 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Calculatrice"</string>
-    <string name="error" msgid="9197457880925804499">"Erreur"</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="2051454354221101970">"SUPPR."</string>
-    <string name="clear" msgid="8103610981407459768">"EFF."</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"E"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Panneau de base"</string>
-    <string name="advanced" msgid="7122495413742976492">"Fonctions avancées"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Effacer l\'historique"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Texte copié."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"parenthèse gauche"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"parenthèse droite"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"factoriel"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"logarithme naturel"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logarithme"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"racine carrée"</string>
-    <string name="divDesc" msgid="7442623079124315427">"diviser"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"multiplier"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"moins"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"point"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"puissance"</string>
-    <string name="delDesc" msgid="8211175878012032240">"supprimer"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"effacer"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangeante"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sinus"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"cosinus"</string>
-    <string name="eDesc" msgid="6709583372168924068">"nombre d\'Euler"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"égale"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"parenthèse gauche"</item>
-    <item msgid="1688156211934459752">"parenthèse droite"</item>
-    <item msgid="6664829080840305856">"factoriel"</item>
-    <item msgid="2880199289575144121">"logarithme naturel"</item>
-    <item msgid="4398774906998694599">"logarithme"</item>
-    <item msgid="1791869359785943266">"racine carrée"</item>
-    <item msgid="6833720171974254459">"divisé par"</item>
-    <item msgid="2646574635189709515">"multiplié par"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"moins"</item>
-    <item msgid="3456824579675198186">" point "</item>
-    <item msgid="4528629783180278651">"puissance"</item>
-    <item msgid="4050948027333760159">"tangeante"</item>
-    <item msgid="8716478860618683850">"sinus"</item>
-    <item msgid="3203211483560707480">"cosinus"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"égale"</item>
-  </string-array>
+    <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>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"eff"</string>
+    <string name="del" msgid="6700172918709138470">"sup"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"nombre d\'Euler"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"virgule"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"parenthèse gauche"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"parenthèse droite"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"cosinus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"logarithme naturel"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logarithme"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinus"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangente"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"plus"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"diviser"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"factoriel"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"fois"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"puissance"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"racine carrée"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"moins"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"effacer"</string>
+    <string name="desc_del" msgid="1866733601083210032">"supprimer"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"égal"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 5f0f0db..977f19d 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1,85 +1,61 @@
 <?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">"कैल्क्युलेटर"</string>
-    <string name="error" msgid="9197457880925804499">"त्रुटि"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"मूल पैनल"</string>
-    <string name="advanced" msgid="7122495413742976492">"अतिरिक्त पैनल"</string>
-    <string name="clear_history" msgid="8458043980601165012">"इतिहास साफ़ करें"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"पाठ की प्रतिलिपि बनाई गई."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"बायां कोष्ठक"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"दायां कोष्ठक"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"क्रमगुणित"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"प्राकृतिक लघुगणक"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"लघुगणक"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"वर्गमूल"</string>
-    <string name="divDesc" msgid="7442623079124315427">"विभाजन"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"गुणा"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"योग"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"ऋण"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"बिंदु"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"घात"</string>
-    <string name="delDesc" msgid="8211175878012032240">"हटाएं"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"साफ़ करें"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"स्पर्शज्या"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"ज्या"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"कोज्या"</string>
-    <string name="eDesc" msgid="6709583372168924068">"यूलर संख्या"</string>
-    <string name="piDesc" msgid="8838151606775021517">"पाई"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"बराबर है"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"बायां कोष्ठक"</item>
-    <item msgid="1688156211934459752">"दायां कोष्ठक"</item>
-    <item msgid="6664829080840305856">"क्रमगुणित"</item>
-    <item msgid="2880199289575144121">"प्राकृतिक लघुगणक"</item>
-    <item msgid="4398774906998694599">"लघुगणक"</item>
-    <item msgid="1791869359785943266">"वर्गमूल"</item>
-    <item msgid="6833720171974254459">"इसके द्वारा विभाजित"</item>
-    <item msgid="2646574635189709515">"इससे गुणित"</item>
-    <item msgid="3487936384379753697">"योग"</item>
-    <item msgid="8608534484562258856">"ऋण"</item>
-    <item msgid="3456824579675198186">" अंक "</item>
-    <item msgid="4528629783180278651">"घात"</item>
-    <item msgid="4050948027333760159">"स्पर्शज्या"</item>
-    <item msgid="8716478860618683850">"ज्या"</item>
-    <item msgid="3203211483560707480">"कोज्या"</item>
-    <item msgid="8587490959348493065">"पाई"</item>
-    <item msgid="8134315487552198394">"बराबर है"</item>
-  </string-array>
+    <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="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-hr/strings.xml b/res/values-hr/strings.xml
index ee3a503..710ca59 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Kalkulator"</string>
-    <string name="error" msgid="9197457880925804499">"Pogreška"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"Briši"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Ploča Osnovno"</string>
-    <string name="advanced" msgid="7122495413742976492">"Ploča Napredno"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Izbriši povijest"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Tekst kopiran."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"lijeva zagrada"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"desna zagrada"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"faktorijel"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"prirodni logaritam"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritam"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"drugi korijen"</string>
-    <string name="divDesc" msgid="7442623079124315427">"podijeli"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"pomnoži"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"minus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"točka"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"snaga"</string>
-    <string name="delDesc" msgid="8211175878012032240">"izbriši"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"obriši"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangenta"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sinus"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"kosinus"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Eulerov broj"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"jednako"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"lijeva zagrada"</item>
-    <item msgid="1688156211934459752">"desna zagrada"</item>
-    <item msgid="6664829080840305856">"faktorijel"</item>
-    <item msgid="2880199289575144121">"prirodni logaritam"</item>
-    <item msgid="4398774906998694599">"logaritam"</item>
-    <item msgid="1791869359785943266">"drugi korijen"</item>
-    <item msgid="6833720171974254459">"podijeljeno s"</item>
-    <item msgid="2646574635189709515">"pomnoženo s"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"minus"</item>
-    <item msgid="3456824579675198186">" bod "</item>
-    <item msgid="4528629783180278651">"snaga"</item>
-    <item msgid="4050948027333760159">"tangenta"</item>
-    <item msgid="8716478860618683850">"sinus"</item>
-    <item msgid="3203211483560707480">"kosinus"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"jednako"</item>
-  </string-array>
+    <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>
+    <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">"Eulerov broj"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"decimalni zarez"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"lijeva zagrada"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"desna zagrada"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"kosinus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"prirodni logaritam"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritam"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinus"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangenta"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"plus"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"dijeljeno"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"faktorijel"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"puta"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"potencija"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"drugi korijen"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"minus"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"obriši"</string>
+    <string name="desc_del" msgid="1866733601083210032">"izbriši"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"jednako"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1e1b89c..bebbd89 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Számológép"</string>
-    <string name="error" msgid="9197457880925804499">"Hiba"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"Törlés"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Alappanel"</string>
-    <string name="advanced" msgid="7122495413742976492">"Speciális panel"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Előzmények törlése"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Szöveg átmásolva."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"nyitó zárójel"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"berekesztő zárójel"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"faktoriális"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"természetes logaritmus"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritmus"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"négyzetgyök"</string>
-    <string name="divDesc" msgid="7442623079124315427">"osztás"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"szorzás"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plusz"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"mínusz"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"tizedesvessző"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"hatvány"</string>
-    <string name="delDesc" msgid="8211175878012032240">"törlés"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"törlés"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangens"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"szinusz"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"koszinusz"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Euler-féle szám"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"egyenlő"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"nyitó zárójel"</item>
-    <item msgid="1688156211934459752">"berekesztő zárójel"</item>
-    <item msgid="6664829080840305856">"faktoriális"</item>
-    <item msgid="2880199289575144121">"természetes logaritmus"</item>
-    <item msgid="4398774906998694599">"logaritmus"</item>
-    <item msgid="1791869359785943266">"négyzetgyök"</item>
-    <item msgid="6833720171974254459">"osztva"</item>
-    <item msgid="2646574635189709515">"szorozva"</item>
-    <item msgid="3487936384379753697">"plusz"</item>
-    <item msgid="8608534484562258856">"mínusz"</item>
-    <item msgid="3456824579675198186">" pont "</item>
-    <item msgid="4528629783180278651">"hatvány"</item>
-    <item msgid="4050948027333760159">"tangens"</item>
-    <item msgid="8716478860618683850">"szinusz"</item>
-    <item msgid="3203211483560707480">"koszinusz"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"egyenlő"</item>
-  </string-array>
+    <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>
+    <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-féle szám"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"pont "</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"nyitó zárójel"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"berekesztő zárójel"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"koszinusz"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"természetes logaritmus"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritmus"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"szinusz"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangens"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"plusz"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"osztás"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"faktoriális"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"szorzás"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"hatvány"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"négyzetgyök"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"mínusz"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"törlés"</string>
+    <string name="desc_del" msgid="1866733601083210032">"törlés"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"egyenlő"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 9874152..855fa20 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Հաշվիչ"</string>
-    <string name="error" msgid="9197457880925804499">"Սխալ"</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="2051454354221101970">"ՋՆՋ"</string>
-    <string name="clear" msgid="8103610981407459768">"Մքր"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tg"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Հիմնական վահանակ"</string>
-    <string name="advanced" msgid="7122495413742976492">"Ընդլայնված վահանակ"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Մաքրել պատմությունը"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Տեսքտը պատճենվեց:"</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"ձախ փակագիծ"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"աջ փակագիծ"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"ֆակտորիալ"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"բնական լոգարիթմ"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"լոգարիթմ"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"քառակուսի արմատ"</string>
-    <string name="divDesc" msgid="7442623079124315427">"բաժանում"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"բազմապատկում"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"գումարում"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"հանում"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"կետ"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"աստիճան"</string>
-    <string name="delDesc" msgid="8211175878012032240">"ջնջել"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"մաքրել"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"տանգենս"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"սինուս"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"կոսինուս"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Էյլերյան թիվ"</string>
-    <string name="piDesc" msgid="8838151606775021517">"պի"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"հավասար"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"ձախ փակագիծ"</item>
-    <item msgid="1688156211934459752">"աջ փակագիծ"</item>
-    <item msgid="6664829080840305856">"ֆակտորիալ"</item>
-    <item msgid="2880199289575144121">"բնական լոգարիթմ"</item>
-    <item msgid="4398774906998694599">"լոգարիթմ"</item>
-    <item msgid="1791869359785943266">"քառակուսի արմատ"</item>
-    <item msgid="6833720171974254459">"բաժանում"</item>
-    <item msgid="2646574635189709515">"բազմապատկում"</item>
-    <item msgid="3487936384379753697">"գումարում"</item>
-    <item msgid="8608534484562258856">"հանում"</item>
-    <item msgid="3456824579675198186">" կետ "</item>
-    <item msgid="4528629783180278651">"աստիճան"</item>
-    <item msgid="4050948027333760159">"տանգենս"</item>
-    <item msgid="8716478860618683850">"սինուս"</item>
-    <item msgid="3203211483560707480">"կոսինուս"</item>
-    <item msgid="8587490959348493065">"պի"</item>
-    <item msgid="8134315487552198394">"հավասար"</item>
-  </string-array>
+    <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">"tg"</string>
+    <string name="clr" msgid="3126239559646368205">"մքր"</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>
+    <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-in/strings.xml b/res/values-in/strings.xml
index 3d555cc..d6b7cbb 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Calculator"</string>
-    <string name="error" msgid="9197457880925804499">"Kesalahan"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"HAPUS"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Panel dasar"</string>
-    <string name="advanced" msgid="7122495413742976492">"Panel lanjutan"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Hapus riwayat"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Teks disalin."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"kurung buka"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"kurung tutup"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"faktorial"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"logaritma alami"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritme"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"akar pangkat dua"</string>
-    <string name="divDesc" msgid="7442623079124315427">"bagi"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"kali"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"minus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"titik"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"pangkat"</string>
-    <string name="delDesc" msgid="8211175878012032240">"hapus"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"hapus"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangen"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sinus"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"kosinus"</string>
-    <string name="eDesc" msgid="6709583372168924068">"bilangan Euler"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"sama dengan"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"kurung buka"</item>
-    <item msgid="1688156211934459752">"kurung tutup"</item>
-    <item msgid="6664829080840305856">"faktorial"</item>
-    <item msgid="2880199289575144121">"logaritma alami"</item>
-    <item msgid="4398774906998694599">"logaritme"</item>
-    <item msgid="1791869359785943266">"akar pangkat dua"</item>
-    <item msgid="6833720171974254459">"dibagi dengan"</item>
-    <item msgid="2646574635189709515">"dikalikan dengan"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"minus"</item>
-    <item msgid="3456824579675198186">" poin "</item>
-    <item msgid="4528629783180278651">"pangkat"</item>
-    <item msgid="4050948027333760159">"tangen"</item>
-    <item msgid="8716478860618683850">"sinus"</item>
-    <item msgid="3203211483560707480">"kosinus"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"sama dengan"</item>
-  </string-array>
+    <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>
+    <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">"bilangan Euler"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"koma"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"kurung buka"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"kurung tutup"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"kosinus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"logaritma alami"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritme"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinus"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangen"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"tambah"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"bagi"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"faktorial"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"kali"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"pangkat"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"akar pangkat dua"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"kurang"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"hapus"</string>
+    <string name="desc_del" msgid="1866733601083210032">"hapus"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"sama dengan"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 70528b7..213b565 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Calcolatrice"</string>
-    <string name="error" msgid="9197457880925804499">"Errore"</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="2051454354221101970">"CANC"</string>
-    <string name="clear" msgid="8103610981407459768">"CANC"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"E"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Pannello base"</string>
-    <string name="advanced" msgid="7122495413742976492">"Pannello avanzato"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Cancella cronologia"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Testo copiato."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"parentesi aperta"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"parentesi chiusa"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"fattoriale"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"logaritmo naturale"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritmo"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"radice quadrata"</string>
-    <string name="divDesc" msgid="7442623079124315427">"divisione"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"moltiplicazione"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"più"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"meno"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"punto"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"potenza"</string>
-    <string name="delDesc" msgid="8211175878012032240">"elimina"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"azzera"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangente"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"seno"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"coseno"</string>
-    <string name="eDesc" msgid="6709583372168924068">"numero di Eulero"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"uguale a"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"parentesi aperta"</item>
-    <item msgid="1688156211934459752">"parentesi chiusa"</item>
-    <item msgid="6664829080840305856">"fattoriale"</item>
-    <item msgid="2880199289575144121">"logaritmo naturale"</item>
-    <item msgid="4398774906998694599">"logaritmo"</item>
-    <item msgid="1791869359785943266">"radice quadrata"</item>
-    <item msgid="6833720171974254459">"diviso per"</item>
-    <item msgid="2646574635189709515">"moltiplicato per"</item>
-    <item msgid="3487936384379753697">"più"</item>
-    <item msgid="8608534484562258856">"meno"</item>
-    <item msgid="3456824579675198186">" punto "</item>
-    <item msgid="4528629783180278651">"potenza"</item>
-    <item msgid="4050948027333760159">"tangente"</item>
-    <item msgid="8716478860618683850">"seno"</item>
-    <item msgid="3203211483560707480">"coseno"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"uguale a"</item>
-  </string-array>
+    <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>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"canc"</string>
+    <string name="del" msgid="6700172918709138470">"canc"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"numero di Eulero"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"punto"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"parentesi aperta"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"parentesi chiusa"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"coseno"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"logaritmo naturale"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritmo"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"seno"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangente"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"più"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"diviso"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"fattoriale"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"per"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"potenza"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"radice quadrata"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"meno"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"cancella"</string>
+    <string name="desc_del" msgid="1866733601083210032">"elimina"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"uguale"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 09b35fb..78793fc 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1,85 +1,61 @@
 <?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">"מחשבון"</string>
-    <string name="error" msgid="9197457880925804499">"שגיאה"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"חלונית בסיסית"</string>
-    <string name="advanced" msgid="7122495413742976492">"מתקדם"</string>
-    <string name="clear_history" msgid="8458043980601165012">"נקה היסטוריה"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"טקסט הועתק."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"סוגר שמאלי"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"סוגר ימני"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"עצרת"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"לוגריתם טבעי"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"לוגריתם"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"שורש ריבועי"</string>
-    <string name="divDesc" msgid="7442623079124315427">"חילוק"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"כפל"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"פלוס"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"מינוס"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"נקודה"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"חזקה"</string>
-    <string name="delDesc" msgid="8211175878012032240">"מחק"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"נקה"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"טנגנס"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"סינוס"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"קוסינוס"</string>
-    <string name="eDesc" msgid="6709583372168924068">"‏המספר e"</string>
-    <string name="piDesc" msgid="8838151606775021517">"פאי"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"שווה"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"סוגר שמאלי"</item>
-    <item msgid="1688156211934459752">"סוגר ימני"</item>
-    <item msgid="6664829080840305856">"עצרת"</item>
-    <item msgid="2880199289575144121">"לוגריתם טבעי"</item>
-    <item msgid="4398774906998694599">"לוגריתם"</item>
-    <item msgid="1791869359785943266">"שורש ריבועי"</item>
-    <item msgid="6833720171974254459">"חלקי"</item>
-    <item msgid="2646574635189709515">"כפול"</item>
-    <item msgid="3487936384379753697">"פלוס"</item>
-    <item msgid="8608534484562258856">"מינוס"</item>
-    <item msgid="3456824579675198186">" נקודה "</item>
-    <item msgid="4528629783180278651">"בחזקת"</item>
-    <item msgid="4050948027333760159">"טנגנס"</item>
-    <item msgid="8716478860618683850">"סינוס"</item>
-    <item msgid="3203211483560707480">"קוסינוס"</item>
-    <item msgid="8587490959348493065">"פאי"</item>
-    <item msgid="8134315487552198394">"שווה"</item>
-  </string-array>
+    <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="desc_const_e" msgid="7752508267661034194">"‏הקבוע e"</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-ja/strings.xml b/res/values-ja/strings.xml
index ede9033..002a511 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1,85 +1,61 @@
 <?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">"電卓"</string>
-    <string name="error" msgid="9197457880925804499">"エラー"</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="2051454354221101970">"Del"</string>
-    <string name="clear" msgid="8103610981407459768">"消去"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"標準機能"</string>
-    <string name="advanced" msgid="7122495413742976492">"関数機能"</string>
-    <string name="clear_history" msgid="8458043980601165012">"履歴消去"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"テキストをコピーしました。"</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"左かっこ"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"右かっこ"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"階乗"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"自然対数"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"対数"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"平方根"</string>
-    <string name="divDesc" msgid="7442623079124315427">"除算"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"乗算"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"足す"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"引く"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"小数点"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"累乗"</string>
-    <string name="delDesc" msgid="8211175878012032240">"削除"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"クリア"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"タンジェント"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"サイン"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"コサイン"</string>
-    <string name="eDesc" msgid="6709583372168924068">"自然対数の底"</string>
-    <string name="piDesc" msgid="8838151606775021517">"パイ"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"イコール"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"左かっこ"</item>
-    <item msgid="1688156211934459752">"右かっこ"</item>
-    <item msgid="6664829080840305856">"階乗"</item>
-    <item msgid="2880199289575144121">"自然対数"</item>
-    <item msgid="4398774906998694599">"対数"</item>
-    <item msgid="1791869359785943266">"平方根"</item>
-    <item msgid="6833720171974254459">"割る"</item>
-    <item msgid="2646574635189709515">"掛ける"</item>
-    <item msgid="3487936384379753697">"足す"</item>
-    <item msgid="8608534484562258856">"引く"</item>
-    <item msgid="3456824579675198186">"ポイント"</item>
-    <item msgid="4528629783180278651">"累乗"</item>
-    <item msgid="4050948027333760159">"タンジェント"</item>
-    <item msgid="8716478860618683850">"サイン"</item>
-    <item msgid="3203211483560707480">"コサイン"</item>
-    <item msgid="8587490959348493065">"パイ"</item>
-    <item msgid="8134315487552198394">"イコール"</item>
-  </string-array>
+    <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="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-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index b7f0fe4..4f241b2 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -1,85 +1,61 @@
 <?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">"კალკულატორი"</string>
-    <string name="error" msgid="9197457880925804499">"შეცდომა"</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="2051454354221101970">"წაშლა"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"ძირითადი პანელი"</string>
-    <string name="advanced" msgid="7122495413742976492">"დამატებითი ფუნქციების პანელი"</string>
-    <string name="clear_history" msgid="8458043980601165012">"ისტორიის წაშლა"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"ტექსტი დაკოპირდა."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"მარცხენა ფრჩხილი"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"მარჯვენა ფრჩხილი"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"ფაქტორიალი"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"ნატურალური ლოგარითმი"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"ლოგარითმი"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"კვადრატული ფესვი"</string>
-    <string name="divDesc" msgid="7442623079124315427">"გაყოფა"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"გამრავლება"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"პლუსი"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"მინუსი"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"ათობითი გამყოფი"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"ხარისხში აყვანა"</string>
-    <string name="delDesc" msgid="8211175878012032240">"წაშლა"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"გასუფთავება"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"ტანგენსი"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"სინუსი"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"კოსინუსი"</string>
-    <string name="eDesc" msgid="6709583372168924068">"ეილერის რიცხვი"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"ტოლია"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"მარცხენა ფრჩხილი"</item>
-    <item msgid="1688156211934459752">"მარჯვენა ფრჩხილი"</item>
-    <item msgid="6664829080840305856">"ფაქტორიალი"</item>
-    <item msgid="2880199289575144121">"ნატურალური ლოგარითმი"</item>
-    <item msgid="4398774906998694599">"ლოგარითმი"</item>
-    <item msgid="1791869359785943266">"კვადრატული ფესვი"</item>
-    <item msgid="6833720171974254459">"გაყოფილი"</item>
-    <item msgid="2646574635189709515">"გამრავლებული"</item>
-    <item msgid="3487936384379753697">"პლუს"</item>
-    <item msgid="8608534484562258856">"მინუს"</item>
-    <item msgid="3456824579675198186">" ათობითი გამყოფი "</item>
-    <item msgid="4528629783180278651">"ხარისხში აყვანილი"</item>
-    <item msgid="4050948027333760159">"ტანგენსი"</item>
-    <item msgid="8716478860618683850">"სინუსი"</item>
-    <item msgid="3203211483560707480">"კოსინუსი"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"ტოლია"</item>
-  </string-array>
+    <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="desc_const_e" msgid="7752508267661034194">"ეილერის რიცხვი"</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">"კოსინუსი"</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-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 4f1b6ec..2abef2f 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -1,85 +1,61 @@
 <?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">"ម៉ាស៊ីន​គិត​លេខ"</string>
-    <string name="error" msgid="9197457880925804499">"កំហុស"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"បន្ទះ​មូលដ្ឋាន"</string>
-    <string name="advanced" msgid="7122495413742976492">"បន្ទះ​កម្រិត​ខ្ពស់"</string>
-    <string name="clear_history" msgid="8458043980601165012">"សម្អាត​ប្រវត្តិ"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"បាន​ចម្លង​អត្ថបទ។"</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"left parenthesis"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"right parenthesis"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"factorial"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"natural logarithm"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logarithm"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"square root"</string>
-    <string name="divDesc" msgid="7442623079124315427">"divide"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"multiply"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"minus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"point"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"power"</string>
-    <string name="delDesc" msgid="8211175878012032240">"លុប​"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"សម្អាត"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangent"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sine"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"cosine"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Euler\'s number"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"equals"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"left parenthesis"</item>
-    <item msgid="1688156211934459752">"right parenthesis"</item>
-    <item msgid="6664829080840305856">"factorial"</item>
-    <item msgid="2880199289575144121">"natural logarithm"</item>
-    <item msgid="4398774906998694599">"logarithm"</item>
-    <item msgid="1791869359785943266">"square root"</item>
-    <item msgid="6833720171974254459">"divided by"</item>
-    <item msgid="2646574635189709515">"multiplied by"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"minus"</item>
-    <item msgid="3456824579675198186">" point "</item>
-    <item msgid="4528629783180278651">"power"</item>
-    <item msgid="4050948027333760159">"tangent"</item>
-    <item msgid="8716478860618683850">"sine"</item>
-    <item msgid="3203211483560707480">"cosine"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"equals"</item>
-  </string-array>
+    <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>
+    <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"</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">"កូស៊ីនុស"</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-ko/strings.xml b/res/values-ko/strings.xml
index 9408e1c..a678c1e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1,85 +1,61 @@
 <?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">"계산기"</string>
-    <string name="error" msgid="9197457880925804499">"오류"</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="2051454354221101970">"삭제"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"기본 패널"</string>
-    <string name="advanced" msgid="7122495413742976492">"고급 패널"</string>
-    <string name="clear_history" msgid="8458043980601165012">"기록 지우기"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"텍스트를 복사했습니다."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"왼쪽 괄호"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"오른쪽 괄호"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"계승"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"자연 대수"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"대수"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"제곱근"</string>
-    <string name="divDesc" msgid="7442623079124315427">"나누다"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"곱하다"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"더하기"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"빼기"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"점"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"거듭제곱"</string>
-    <string name="delDesc" msgid="8211175878012032240">"삭제"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"지우기"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"탄젠트(Tangent)"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"사인(sine)"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"코사인(cosine)"</string>
-    <string name="eDesc" msgid="6709583372168924068">"오일러의 수(Euler\'s number)"</string>
-    <string name="piDesc" msgid="8838151606775021517">"파이"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"같음"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"왼쪽 괄호"</item>
-    <item msgid="1688156211934459752">"오른쪽 괄호"</item>
-    <item msgid="6664829080840305856">"계승"</item>
-    <item msgid="2880199289575144121">"자연 대수"</item>
-    <item msgid="4398774906998694599">"대수"</item>
-    <item msgid="1791869359785943266">"제곱근"</item>
-    <item msgid="6833720171974254459">"나누기"</item>
-    <item msgid="2646574635189709515">"곱하기"</item>
-    <item msgid="3487936384379753697">"더하기"</item>
-    <item msgid="8608534484562258856">"빼기"</item>
-    <item msgid="3456824579675198186">" 점 "</item>
-    <item msgid="4528629783180278651">"거듭제곱"</item>
-    <item msgid="4050948027333760159">"탄젠트(Tangent)"</item>
-    <item msgid="8716478860618683850">"사인(sine)"</item>
-    <item msgid="3203211483560707480">"코사인(cosine)"</item>
-    <item msgid="8587490959348493065">"파이"</item>
-    <item msgid="8134315487552198394">"같음"</item>
-  </string-array>
+    <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">"C"</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">"코사인(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">"탄젠트(tangent)"</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-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 6580ba0..6e65a5f 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -1,85 +1,61 @@
 <?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">"ຈັກຄິດໄລ່"</string>
-    <string name="error" msgid="9197457880925804499">"ຜິດພາດ"</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="2051454354221101970">"ລຶບ"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"ແຜງຄວບຄຸມພື້ນຖານ"</string>
-    <string name="advanced" msgid="7122495413742976492">"ແຜງຄວບຄຸມພິເສດ"</string>
-    <string name="clear_history" msgid="8458043980601165012">"ລ້າງປະຫວັດ"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"ຂໍ້ຄວາມຖືກຄັດລອກ."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"ວົງເລັບຊ້າຍ"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"ວົງເລັບຂວາ"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"ແຟັກໂຕຣຽວ"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"ໂລກາຣິດທຳມະຊາດ"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"ໂລກາຣິດ"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"ຮາກ"</string>
-    <string name="divDesc" msgid="7442623079124315427">"ຫານ"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"ຄູນ"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"ບວກ"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"ລົບ"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"ຈຸດ"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"ຂຶ້ນກຳລັງ"</string>
-    <string name="delDesc" msgid="8211175878012032240">"ລຶບ"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"ເຄລຍ"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"ຕັງ"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"ຊີນ"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"ໂກຊິນ"</string>
-    <string name="eDesc" msgid="6709583372168924068">"ຈຳນວນອອຍເລີ"</string>
-    <string name="piDesc" msgid="8838151606775021517">"ປີ້"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"ເທົ່າກັບ"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"ວົງເລັບຊ້າຍ"</item>
-    <item msgid="1688156211934459752">"ວົງເລັບຂວາ"</item>
-    <item msgid="6664829080840305856">"ແຟັກໂຕຣຽວ"</item>
-    <item msgid="2880199289575144121">"ໂລກາຣິດທຳມະຊາດ"</item>
-    <item msgid="4398774906998694599">"ໂລກາຣິດ"</item>
-    <item msgid="1791869359785943266">"ຮາກ"</item>
-    <item msgid="6833720171974254459">"ຫານກັບ"</item>
-    <item msgid="2646574635189709515">"ຄູນກັບ"</item>
-    <item msgid="3487936384379753697">"ບວກ"</item>
-    <item msgid="8608534484562258856">"ລົບ"</item>
-    <item msgid="3456824579675198186">" ຈຸດ "</item>
-    <item msgid="4528629783180278651">"ຂຶ້ນກຳລັງ"</item>
-    <item msgid="4050948027333760159">"ຕັງ"</item>
-    <item msgid="8716478860618683850">"ຊິນ"</item>
-    <item msgid="3203211483560707480">"ໂກຊິນ"</item>
-    <item msgid="8587490959348493065">"ປີ້"</item>
-    <item msgid="8134315487552198394">"ເທົ່າກັບ"</item>
-  </string-array>
+    <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="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-lt/strings.xml b/res/values-lt/strings.xml
index 9decfb2..4dc6165 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Skaičiuotuvas"</string>
-    <string name="error" msgid="9197457880925804499">"Klaida"</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="2051454354221101970">"IŠTR."</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Pagrindinis skydelis"</string>
-    <string name="advanced" msgid="7122495413742976492">"Išplėstinis skydelis"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Išvalyti istoriją"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Tekstas nukopijuotas."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"kairysis skliaustas"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"dešinysis skliaustas"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"faktorialas"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"natūralusis logaritmas"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritmas"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"kvadratinė šaknis"</string>
-    <string name="divDesc" msgid="7442623079124315427">"dalyti"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"dauginti"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"pliusas"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"minusas"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"taškas"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"laipsnis"</string>
-    <string name="delDesc" msgid="8211175878012032240">"ištrinti"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"išvalyti"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangentas"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sinusas"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"kosinusas"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Eulerio skaičius"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"atitinka"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"kairysis skliaustas"</item>
-    <item msgid="1688156211934459752">"dešinysis skliaustas"</item>
-    <item msgid="6664829080840305856">"faktorialas"</item>
-    <item msgid="2880199289575144121">"natūralusis logaritmas"</item>
-    <item msgid="4398774906998694599">"logaritmas"</item>
-    <item msgid="1791869359785943266">"kvadratinė šaknis"</item>
-    <item msgid="6833720171974254459">"padalyta iš"</item>
-    <item msgid="2646574635189709515">"padauginta iš"</item>
-    <item msgid="3487936384379753697">"pliusas"</item>
-    <item msgid="8608534484562258856">"minusas"</item>
-    <item msgid="3456824579675198186">" taškas "</item>
-    <item msgid="4528629783180278651">"laipsnis"</item>
-    <item msgid="4050948027333760159">"tangentas"</item>
-    <item msgid="8716478860618683850">"sinusas"</item>
-    <item msgid="3203211483560707480">"kosinusas"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"atitinka"</item>
-  </string-array>
+    <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>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"išv."</string>
+    <string name="del" msgid="6700172918709138470">"ištr."</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"Eulerio skaičius"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"kablelis"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"kairysis skliaustas"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"dešinysis skliaustas"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"kosinusas"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"natūralusis logaritmas"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritmas"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinusas"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangentas"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"sudėties ženklas"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"dalybos ženklas"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"faktorialas"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"daugybos ženklas"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"laipsnis"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"kvadratinė šaknis"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"atimties ženklas"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"išvalyti"</string>
+    <string name="desc_del" msgid="1866733601083210032">"ištrinti"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"lygybės ženklas"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index e4224e4..d7b3fac 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Kalkulators"</string>
-    <string name="error" msgid="9197457880925804499">"Kļūda"</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="2051454354221101970">"DZĒST"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Pamata panelis"</string>
-    <string name="advanced" msgid="7122495413742976492">"Izvērsts panelis"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Notīrīt vēsturi"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Teksts ir nokopēts."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"kreisā iekava"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"labā iekava"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"faktoriāls"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"naturālais logaritms"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritms"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"kvadrātsakne"</string>
-    <string name="divDesc" msgid="7442623079124315427">"dalīt"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"reizināt"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"mīnus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"komats"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"pakāpe"</string>
-    <string name="delDesc" msgid="8211175878012032240">"dzēst"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"dzēst"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangenss"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sinuss"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"kosinuss"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Eilera skaitlis"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pī"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"vienāds ar"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"kreisā iekava"</item>
-    <item msgid="1688156211934459752">"labā iekava"</item>
-    <item msgid="6664829080840305856">"faktoriāls"</item>
-    <item msgid="2880199289575144121">"naturālais logaritms"</item>
-    <item msgid="4398774906998694599">"logaritms"</item>
-    <item msgid="1791869359785943266">"kvadrātsakne"</item>
-    <item msgid="6833720171974254459">"dalīts ar"</item>
-    <item msgid="2646574635189709515">"reizināts ar"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"mīnus"</item>
-    <item msgid="3456824579675198186">" komats "</item>
-    <item msgid="4528629783180278651">"pakāpe"</item>
-    <item msgid="4050948027333760159">"tangenss"</item>
-    <item msgid="8716478860618683850">"sinuss"</item>
-    <item msgid="3203211483560707480">"kosinuss"</item>
-    <item msgid="8587490959348493065">"pī"</item>
-    <item msgid="8134315487552198394">"vienāds ar"</item>
-  </string-array>
+    <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>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"notīrīt"</string>
+    <string name="del" msgid="6700172918709138470">"dzēst"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"Eilera skaitlis"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pī"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"komats"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"kreisā iekava"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"labā iekava"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"kosinuss"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"naturālais logaritms"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritms"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinuss"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangenss"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"plus"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"dalīt"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"faktoriāls"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"reizināt"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"pakāpe"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"kvadrātsakne"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"mīnus"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"noņemt"</string>
+    <string name="desc_del" msgid="1866733601083210032">"dzēst"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"vienāds ar"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index b74c5ae..2ef7fea 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Тооны машин"</string>
-    <string name="error" msgid="9197457880925804499">"Алдаа"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Үндсэн самбар"</string>
-    <string name="advanced" msgid="7122495413742976492">"Дэлгэрэнгүй самбар"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Түүх цэвэрлэх"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Текст хуулагдав."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"зүүн хаалт"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"баруун хаалт"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"факториал"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"натурал логарифм"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"логарифм"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"язгуур"</string>
-    <string name="divDesc" msgid="7442623079124315427">"хуваах"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"үржүүлэх"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"нэмэх"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"хасах"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"цэг"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"зэрэг"</string>
-    <string name="delDesc" msgid="8211175878012032240">"Устгах"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"цэвэрлэх"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"тангенс"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"синус"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"косинус"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Эйлерийн тоо"</string>
-    <string name="piDesc" msgid="8838151606775021517">"пи"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"тэнцүү"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"зүүн хаалт"</item>
-    <item msgid="1688156211934459752">"баруун хаалт"</item>
-    <item msgid="6664829080840305856">"факториал"</item>
-    <item msgid="2880199289575144121">"натурал логарифм"</item>
-    <item msgid="4398774906998694599">"логарифм"</item>
-    <item msgid="1791869359785943266">"язгуур"</item>
-    <item msgid="6833720171974254459">"хуваагч"</item>
-    <item msgid="2646574635189709515">"үржүүлэгч"</item>
-    <item msgid="3487936384379753697">"нэмэх"</item>
-    <item msgid="8608534484562258856">"хасах"</item>
-    <item msgid="3456824579675198186">" цэг "</item>
-    <item msgid="4528629783180278651">"зэрэг"</item>
-    <item msgid="4050948027333760159">"тангенс"</item>
-    <item msgid="8716478860618683850">"синус"</item>
-    <item msgid="3203211483560707480">"косинус"</item>
-    <item msgid="8587490959348493065">"пи"</item>
-    <item msgid="8134315487552198394">"тэнцүү"</item>
-  </string-array>
+    <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="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-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index f0e7158..a21a20b 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Kalkulator"</string>
-    <string name="error" msgid="9197457880925804499">"Ralat"</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="2051454354221101970">"PADAM"</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">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Panel asas"</string>
-    <string name="advanced" msgid="7122495413742976492">"Panel lanjutan"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Padam bersih sejarah"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Teks disalin."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"tanda kurung kiri"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"tanda kurung kanan"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"faktorial"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"logaritma asli"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritma"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"kuasa dua"</string>
-    <string name="divDesc" msgid="7442623079124315427">"bahagi"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"darab"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"tanda campur"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"tolak"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"mata"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"kuasa"</string>
-    <string name="delDesc" msgid="8211175878012032240">"padam"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"kosongkan"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangen"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sinus"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"kosinus"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Nombor Euler"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"sama dengan"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"tanda kurung kiri"</item>
-    <item msgid="1688156211934459752">"tanda kurung kanan"</item>
-    <item msgid="6664829080840305856">"faktorial"</item>
-    <item msgid="2880199289575144121">"logaritma asli"</item>
-    <item msgid="4398774906998694599">"logaritma"</item>
-    <item msgid="1791869359785943266">"punca kuasa dua"</item>
-    <item msgid="6833720171974254459">"dibahagi dengan"</item>
-    <item msgid="2646574635189709515">"didarab dengan"</item>
-    <item msgid="3487936384379753697">"tanda campur"</item>
-    <item msgid="8608534484562258856">"tolak"</item>
-    <item msgid="3456824579675198186">" mata "</item>
-    <item msgid="4528629783180278651">"kuasa"</item>
-    <item msgid="4050948027333760159">"tangen"</item>
-    <item msgid="8716478860618683850">"sinus"</item>
-    <item msgid="3203211483560707480">"kosinus"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"sama dengan"</item>
-  </string-array>
+    <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>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"ksg"</string>
+    <string name="del" msgid="6700172918709138470">"pdm"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"Nombor Euler"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"mata"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"tanda kurung kiri"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"tanda kurung kanan"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"kosinus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"logaritma asli"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritma"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinus"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangen"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"tambah"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"bahagi"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"faktorial"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"kali"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"kuasa"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"kuasa dua"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"tolak"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"kosongkan"</string>
+    <string name="desc_del" msgid="1866733601083210032">"padam"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"sama dengan"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index aceb510..f4b6e3b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Kalkulator"</string>
-    <string name="error" msgid="9197457880925804499">"Feil"</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="2051454354221101970">"SLETT"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Grunnleggende panel"</string>
-    <string name="advanced" msgid="7122495413742976492">"Avansert panel"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Tøm logg"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Tekst er kopiert."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"venstre parentes"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"høyre parentes"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"fakultet"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"naturlig logaritme"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritme"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"kvadratrot"</string>
-    <string name="divDesc" msgid="7442623079124315427">"dele"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"multiplisere"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"pluss"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"minus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"komma"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"potens"</string>
-    <string name="delDesc" msgid="8211175878012032240">"slett"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"slett"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangent"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sinus"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"cosinus"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Eulers tall"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"er lik"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"venstre parentes"</item>
-    <item msgid="1688156211934459752">"høyre parentes"</item>
-    <item msgid="6664829080840305856">"fakultet"</item>
-    <item msgid="2880199289575144121">"naturlig logaritme"</item>
-    <item msgid="4398774906998694599">"logaritme"</item>
-    <item msgid="1791869359785943266">"kvadratrot"</item>
-    <item msgid="6833720171974254459">"delt på"</item>
-    <item msgid="2646574635189709515">"multiplisert med"</item>
-    <item msgid="3487936384379753697">"pluss"</item>
-    <item msgid="8608534484562258856">"minus"</item>
-    <item msgid="3456824579675198186">" komma "</item>
-    <item msgid="4528629783180278651">"potens"</item>
-    <item msgid="4050948027333760159">"tangent"</item>
-    <item msgid="8716478860618683850">"sinus"</item>
-    <item msgid="3203211483560707480">"cosinus"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"er lik"</item>
-  </string-array>
+    <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>
+    <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">"Eulers tall"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"komma "</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"venstre parentes"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"høyre parentes"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"cosinus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"naturlig logaritme"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritme"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinus"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangent"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"pluss"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"dele"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"fakultet"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"ganger"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"potens"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"kvadratrot"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"minusknapp"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"slett"</string>
+    <string name="desc_del" msgid="1866733601083210032">"slett"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"er lik"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 3839c4a..82fe079 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Calculator"</string>
-    <string name="error" msgid="9197457880925804499">"Fout"</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="2051454354221101970">"WIS"</string>
-    <string name="clear" msgid="8103610981407459768">"WISSEN"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Basis"</string>
-    <string name="advanced" msgid="7122495413742976492">"Geavanceerd"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Geschiedenis wissen"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Tekst is gekopieerd."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"linkerhaakje"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"rechterhaakje"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"faculteit"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"natuurlijk logaritme"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritme"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"vierkantswortel"</string>
-    <string name="divDesc" msgid="7442623079124315427">"delen"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"vermenigvuldigen"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"min"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"punt"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"macht"</string>
-    <string name="delDesc" msgid="8211175878012032240">"verwijderen"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"wissen"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangens"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sinus"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"cosinus"</string>
-    <string name="eDesc" msgid="6709583372168924068">"constante van Neper"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"is gelijk aan"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"linkerhaakje"</item>
-    <item msgid="1688156211934459752">"rechterhaakje"</item>
-    <item msgid="6664829080840305856">"faculteit"</item>
-    <item msgid="2880199289575144121">"natuurlijk logaritme"</item>
-    <item msgid="4398774906998694599">"logaritme"</item>
-    <item msgid="1791869359785943266">"vierkantswortel"</item>
-    <item msgid="6833720171974254459">"gedeeld door"</item>
-    <item msgid="2646574635189709515">"vermenigvuldigd met"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"min"</item>
-    <item msgid="3456824579675198186">" punt "</item>
-    <item msgid="4528629783180278651">"macht"</item>
-    <item msgid="4050948027333760159">"tangens"</item>
-    <item msgid="8716478860618683850">"sinus"</item>
-    <item msgid="3203211483560707480">"cosinus"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"is gelijk aan"</item>
-  </string-array>
+    <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>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"wis"</string>
+    <string name="del" msgid="6700172918709138470">"vwd"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"constante van Neper"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"punt"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"linkerhaakje"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"rechterhaakje"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"cosinus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"natuurlijk logaritme"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritme"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinus"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangens"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"plus"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"delen"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"faculteit"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"keer"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"macht"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"vierkantswortel"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"min"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"wissen"</string>
+    <string name="desc_del" msgid="1866733601083210032">"verwijderen"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"is gelijk aan"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 1611c6b..bd903e9 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Kalkulator"</string>
-    <string name="error" msgid="9197457880925804499">"Błąd"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"CZYŚĆ"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tg"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Panel podstawowy"</string>
-    <string name="advanced" msgid="7122495413742976492">"Panel zaawansowany"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Wyczyść historię"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Tekst został skopiowany."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"nawias otwierający"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"nawias zamykający"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"silnia"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"logarytm naturalny"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logarytm"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"pierwiastek kwadratowy"</string>
-    <string name="divDesc" msgid="7442623079124315427">"podzielić"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"pomnożyć"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"minus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"przecinek"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"potęga"</string>
-    <string name="delDesc" msgid="8211175878012032240">"usuń"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"wyczyść"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangens"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sinus"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"cosinus"</string>
-    <string name="eDesc" msgid="6709583372168924068">"liczba Eulera"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"równa się"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"nawias otwierający"</item>
-    <item msgid="1688156211934459752">"nawias zamykający"</item>
-    <item msgid="6664829080840305856">"silnia"</item>
-    <item msgid="2880199289575144121">"logarytm naturalny"</item>
-    <item msgid="4398774906998694599">"logarytm"</item>
-    <item msgid="1791869359785943266">"pierwiastek kwadratowy"</item>
-    <item msgid="6833720171974254459">"dzielone przez"</item>
-    <item msgid="2646574635189709515">"mnożone przez"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"minus"</item>
-    <item msgid="3456824579675198186">" przecinek "</item>
-    <item msgid="4528629783180278651">"do potęgi"</item>
-    <item msgid="4050948027333760159">"tangens"</item>
-    <item msgid="8716478860618683850">"sinus"</item>
-    <item msgid="3203211483560707480">"cosinus"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"równa się"</item>
-  </string-array>
+    <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>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tg"</string>
+    <string name="clr" msgid="3126239559646368205">"wyc"</string>
+    <string name="del" msgid="6700172918709138470">"usu"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"liczba Eulera"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"przecinek"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"nawias otwierający"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"nawias zamykający"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"cosinus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"logarytm naturalny"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logarytm"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinus"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangens"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"plus"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"podziel"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"silnia"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"pomnóż"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"potęga"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"pierwiastek kwadratowy"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"minus"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"wyczyść"</string>
+    <string name="desc_del" msgid="1866733601083210032">"usuń"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"równa się"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index ee1f45e..27ce078 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Calculadora"</string>
-    <string name="error" msgid="9197457880925804499">"Erro"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"LIMPAR"</string>
-    <string name="sin" msgid="6793866152659175277">"sen"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"reg."</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Painel básico"</string>
-    <string name="advanced" msgid="7122495413742976492">"Painel avançado"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Limpar histórico"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Texto copiado."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"parêntese esquerdo"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"parêntese direito"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"fatorial"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"logaritmo natural"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritmo"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"raiz quadrada"</string>
-    <string name="divDesc" msgid="7442623079124315427">"dividir"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"multiplicar"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"mais"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"menos"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"ponto"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"expoente"</string>
-    <string name="delDesc" msgid="8211175878012032240">"eliminar"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"limpar"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangente"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"seno"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"cosseno"</string>
-    <string name="eDesc" msgid="6709583372168924068">"número de Euler"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"igual a"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"parêntese esquerdo"</item>
-    <item msgid="1688156211934459752">"parêntese direito"</item>
-    <item msgid="6664829080840305856">"fatorial"</item>
-    <item msgid="2880199289575144121">"logaritmo natural"</item>
-    <item msgid="4398774906998694599">"logaritmo"</item>
-    <item msgid="1791869359785943266">"raiz quadrada"</item>
-    <item msgid="6833720171974254459">"dividido por"</item>
-    <item msgid="2646574635189709515">"multiplicado por"</item>
-    <item msgid="3487936384379753697">"mais"</item>
-    <item msgid="8608534484562258856">"menos"</item>
-    <item msgid="3456824579675198186">" ponto "</item>
-    <item msgid="4528629783180278651">"expoente"</item>
-    <item msgid="4050948027333760159">"tangente"</item>
-    <item msgid="8716478860618683850">"seno"</item>
-    <item msgid="3203211483560707480">"cosseno"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"igual a"</item>
-  </string-array>
+    <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>
+    <string name="fun_sin" msgid="7136698561875496766">"sen"</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">"Número de Euler"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"ponto"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"parêntese esquerdo"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"parêntese direito"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"cosseno"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"logaritmo natural"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritmo"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"seno"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangente"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"mais"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"dividir"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"fatorial"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"vezes"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"expoente"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"raiz quadrada"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"menos"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"limpar"</string>
+    <string name="desc_del" msgid="1866733601083210032">"eliminar"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"igual"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index f46710b..cb4ba1f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Calculadora"</string>
-    <string name="error" msgid="9197457880925804499">"Erro"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Painel básico"</string>
-    <string name="advanced" msgid="7122495413742976492">"Painel avançado"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Limpar histórico"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Texto copiado."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"parêntese esquerdo"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"parêntese direito"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"fatorial"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"logaritmo natural"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritmo"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"raiz quadrada"</string>
-    <string name="divDesc" msgid="7442623079124315427">"dividir"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"multiplicar"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"mais"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"menos"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"ponto"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"potência"</string>
-    <string name="delDesc" msgid="8211175878012032240">"excluir"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"limpar"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangente"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"seno"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"cosseno"</string>
-    <string name="eDesc" msgid="6709583372168924068">"número de Euler"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"igual a"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"parêntese esquerdo"</item>
-    <item msgid="1688156211934459752">"parêntese direito"</item>
-    <item msgid="6664829080840305856">"fatorial"</item>
-    <item msgid="2880199289575144121">"logaritmo natural"</item>
-    <item msgid="4398774906998694599">"logaritmo"</item>
-    <item msgid="1791869359785943266">"raiz quadrada"</item>
-    <item msgid="6833720171974254459">"dividido por"</item>
-    <item msgid="2646574635189709515">"multiplicado por"</item>
-    <item msgid="3487936384379753697">"mais"</item>
-    <item msgid="8608534484562258856">"menos"</item>
-    <item msgid="3456824579675198186">" ponto "</item>
-    <item msgid="4528629783180278651">"potência"</item>
-    <item msgid="4050948027333760159">"tangente"</item>
-    <item msgid="8716478860618683850">"seno"</item>
-    <item msgid="3203211483560707480">"cosseno"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"igual a"</item>
-  </string-array>
+    <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>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"ce"</string>
+    <string name="del" msgid="6700172918709138470">"del"</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">"vírgula"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"parêntese esquerdo"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"parêntese direito"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"cosseno"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"logaritmo natural"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritmo"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"seno"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangente"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"mais"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"dividir"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"fatorial"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"vezes"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"potência"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"raiz quadrada"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"menos"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"limpar"</string>
+    <string name="desc_del" msgid="1866733601083210032">"excluir"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"igual"</string>
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 9fb8287..e654947 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -1,106 +1,101 @@
 <?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">"Calculatur"</string>
-    <string name="error" msgid="9197457880925804499">"Errur"</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>
-    <!-- no translation found for del (2051454354221101970) -->
+    <!-- no translation found for error_nan (4071578355972369426) -->
     <skip />
-    <!-- no translation found for clear (8103610981407459768) -->
+    <!-- no translation found for error_syntax (6940043994468390738) -->
     <skip />
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Funcziuns da basa"</string>
-    <string name="advanced" msgid="7122495413742976492">"Funcziuns avanzadas"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Stizzar la cronologia"</string>
-    <!-- no translation found for text_copied_toast (5801480710472541833) -->
+    <!-- no translation found for dec_point (6555721211126788808) -->
     <skip />
-    <!-- no translation found for leftParenDesc (8446428211982811379) -->
+    <!-- no translation found for digit_0 (697966218778843272) -->
     <skip />
-    <!-- no translation found for rightParenDesc (9133691645148976523) -->
+    <!-- no translation found for digit_1 (9009337429640544205) -->
     <skip />
-    <!-- no translation found for factorialDesc (9217024218012761574) -->
+    <!-- no translation found for digit_2 (7722707864768133877) -->
     <skip />
-    <!-- no translation found for lnDesc (1052579286300842270) -->
+    <!-- no translation found for digit_3 (5813321444694024561) -->
     <skip />
-    <!-- no translation found for lgDesc (6490920451513731160) -->
+    <!-- no translation found for digit_4 (4768173444612236144) -->
     <skip />
-    <!-- no translation found for sqrtDesc (2247252128762219267) -->
+    <!-- no translation found for digit_5 (2015349411036328271) -->
     <skip />
-    <!-- no translation found for divDesc (7442623079124315427) -->
+    <!-- no translation found for digit_6 (7350999202882497047) -->
     <skip />
-    <!-- no translation found for mulDesc (9003016819648670694) -->
+    <!-- no translation found for digit_7 (2386463125354638611) -->
     <skip />
-    <!-- no translation found for plusDesc (3145322700823848264) -->
+    <!-- no translation found for digit_8 (6298159258090202166) -->
     <skip />
-    <!-- no translation found for minusDesc (5033462008907390900) -->
+    <!-- no translation found for digit_9 (1221342734731110246) -->
     <skip />
-    <!-- no translation found for dotDesc (5253752241630161722) -->
+    <!-- no translation found for fun_cos (7312559527731358211) -->
     <skip />
-    <!-- no translation found for powerDesc (9034898318444176910) -->
+    <!-- no translation found for fun_ln (6282013842946532944) -->
     <skip />
-    <!-- no translation found for delDesc (8211175878012032240) -->
+    <!-- no translation found for fun_log (6856905045055937519) -->
     <skip />
-    <!-- no translation found for clearDesc (8015748901120751476) -->
+    <!-- no translation found for fun_sin (7136698561875496766) -->
     <skip />
-    <!-- no translation found for tanDesc (2055554933130702423) -->
+    <!-- no translation found for fun_tan (9116158377794370341) -->
     <skip />
-    <!-- no translation found for sinDesc (6563285042235077204) -->
+    <!-- no translation found for clr (3126239559646368205) -->
     <skip />
-    <!-- no translation found for cosDesc (4048942450207926538) -->
+    <!-- no translation found for del (6700172918709138470) -->
     <skip />
-    <!-- no translation found for eDesc (6709583372168924068) -->
+    <!-- no translation found for desc_const_e (7752508267661034194) -->
     <skip />
-    <!-- no translation found for piDesc (8838151606775021517) -->
+    <!-- no translation found for desc_const_pi (5843835548313660468) -->
     <skip />
-    <!-- no translation found for equalDesc (4164435100263313101) -->
+    <!-- no translation found for desc_dec_point (6211527612960070934) -->
     <skip />
-    <!-- no translation found for operatorDescs:0 (7903565108986789641) -->
-    <!-- no translation found for operatorDescs:1 (1688156211934459752) -->
-    <!-- no translation found for operatorDescs:2 (6664829080840305856) -->
-    <!-- no translation found for operatorDescs:3 (2880199289575144121) -->
-    <!-- no translation found for operatorDescs:4 (4398774906998694599) -->
-    <!-- no translation found for operatorDescs:5 (1791869359785943266) -->
-    <!-- no translation found for operatorDescs:6 (6833720171974254459) -->
-    <!-- no translation found for operatorDescs:7 (2646574635189709515) -->
-    <!-- no translation found for operatorDescs:8 (3487936384379753697) -->
-    <!-- no translation found for operatorDescs:9 (8608534484562258856) -->
-    <!-- no translation found for operatorDescs:10 (3456824579675198186) -->
-    <!-- no translation found for operatorDescs:11 (4528629783180278651) -->
-    <!-- no translation found for operatorDescs:12 (4050948027333760159) -->
-    <!-- no translation found for operatorDescs:13 (8716478860618683850) -->
-    <!-- no translation found for operatorDescs:14 (3203211483560707480) -->
-    <!-- no translation found for operatorDescs:15 (8587490959348493065) -->
-    <!-- no translation found for operatorDescs:16 (8134315487552198394) -->
+    <!-- no translation found for desc_lparen (3319203240269597504) -->
+    <skip />
+    <!-- no translation found for desc_rparen (7629704943022422763) -->
+    <skip />
+    <!-- no translation found for desc_fun_cos (3197307754450718348) -->
+    <skip />
+    <!-- no translation found for desc_fun_ln (4943842219071979148) -->
+    <skip />
+    <!-- no translation found for desc_fun_log (6163178034661345125) -->
+    <skip />
+    <!-- no translation found for desc_fun_sin (4010564022860883142) -->
+    <skip />
+    <!-- no translation found for desc_fun_tan (8547330421304946587) -->
+    <skip />
+    <!-- no translation found for desc_op_add (1174812755738083078) -->
+    <skip />
+    <!-- no translation found for desc_op_div (8320455802423478031) -->
+    <skip />
+    <!-- no translation found for desc_op_fact (5004950609277631750) -->
+    <skip />
+    <!-- no translation found for desc_op_mul (978652245185868311) -->
+    <skip />
+    <!-- no translation found for desc_op_pow (2620877401884059447) -->
+    <skip />
+    <!-- no translation found for desc_op_sqrt (4405610392216554239) -->
+    <skip />
+    <!-- no translation found for desc_op_sub (2563060630032563021) -->
+    <skip />
+    <!-- no translation found for desc_clr (8357371663749541924) -->
+    <skip />
+    <!-- no translation found for desc_del (1866733601083210032) -->
+    <skip />
+    <!-- no translation found for desc_eq (8068773095462472408) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 8ebc33e..fd3c4f2 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Calculator"</string>
-    <string name="error" msgid="9197457880925804499">"Eroare"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"ȘTERGE"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tg"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Panou de bază"</string>
-    <string name="advanced" msgid="7122495413742976492">"Panou avansat"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Ștergeţi istoricul"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Textul a fost copiat."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"paranteză stânga"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"paranteză dreapta"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"factorial"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"logaritm natural"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritm"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"rădăcină pătrată"</string>
-    <string name="divDesc" msgid="7442623079124315427">"împărţiţi"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"înmulţiţi"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"minus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"virgulă"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"putere"</string>
-    <string name="delDesc" msgid="8211175878012032240">"ştergeţi"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"goliţi"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangentă"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sinus"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"cosinus"</string>
-    <string name="eDesc" msgid="6709583372168924068">"numărul lui Euler"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"este egal cu"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"paranteză stânga"</item>
-    <item msgid="1688156211934459752">"paranteză dreapta"</item>
-    <item msgid="6664829080840305856">"factorial"</item>
-    <item msgid="2880199289575144121">"logaritm natural"</item>
-    <item msgid="4398774906998694599">"logaritm"</item>
-    <item msgid="1791869359785943266">"rădăcină pătrată"</item>
-    <item msgid="6833720171974254459">"împărţit la"</item>
-    <item msgid="2646574635189709515">"înmulţit cu"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"minus"</item>
-    <item msgid="3456824579675198186">" punct "</item>
-    <item msgid="4528629783180278651">"putere"</item>
-    <item msgid="4050948027333760159">"tangentă"</item>
-    <item msgid="8716478860618683850">"sinus"</item>
-    <item msgid="3203211483560707480">"cosinus"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"este egal cu"</item>
-  </string-array>
+    <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>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tg"</string>
+    <string name="clr" msgid="3126239559646368205">"gol."</string>
+    <string name="del" msgid="6700172918709138470">"ștrg"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"numărul lui Euler"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">" punct "</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"paranteză stânga"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"paranteză dreapta"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"cosinus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"logaritm natural"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritm"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinus"</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">"împărțit"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"factorial"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"ori"</string>
+    <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_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 d59030d..2429abf 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Калькулятор"</string>
-    <string name="error" msgid="9197457880925804499">"Ошибка"</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="2051454354221101970">"Удалить"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Основная панель"</string>
-    <string name="advanced" msgid="7122495413742976492">"Дополнительная панель"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Очистить историю"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Текст скопирован."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"открывающая скобка"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"закрывающая скобка"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"факториал числа"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"натуральный логарифм числа"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"логарифм числа"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"квадратный корень из числа"</string>
-    <string name="divDesc" msgid="7442623079124315427">"деление"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"умножение"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"плюс"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"минус"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"десятичный разделитель"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"в степени"</string>
-    <string name="delDesc" msgid="8211175878012032240">"удаление"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"сброс"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"тангенс"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"синус"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"косинус"</string>
-    <string name="eDesc" msgid="6709583372168924068">"число Эйлера"</string>
-    <string name="piDesc" msgid="8838151606775021517">"число \"пи\""</string>
-    <string name="equalDesc" msgid="4164435100263313101">"равно"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"открывающая скобка"</item>
-    <item msgid="1688156211934459752">"закрывающая скобка"</item>
-    <item msgid="6664829080840305856">"факториал числа"</item>
-    <item msgid="2880199289575144121">"натуральный логарифм числа"</item>
-    <item msgid="4398774906998694599">"логарифм числа"</item>
-    <item msgid="1791869359785943266">"квадратный корень из числа"</item>
-    <item msgid="6833720171974254459">"разделить на"</item>
-    <item msgid="2646574635189709515">"умножить на"</item>
-    <item msgid="3487936384379753697">"плюс"</item>
-    <item msgid="8608534484562258856">"минус"</item>
-    <item msgid="3456824579675198186">" десятичный разделитель "</item>
-    <item msgid="4528629783180278651">"в степени"</item>
-    <item msgid="4050948027333760159">"тангенс"</item>
-    <item msgid="8716478860618683850">"синус"</item>
-    <item msgid="3203211483560707480">"косинус"</item>
-    <item msgid="8587490959348493065">"число \"пи\""</item>
-    <item msgid="8134315487552198394">"равно"</item>
-  </string-array>
+    <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="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-sk/strings.xml b/res/values-sk/strings.xml
index 772f3bf..b1d3eca 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Kalkulačka"</string>
-    <string name="error" msgid="9197457880925804499">"Chyba"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"Vymaz."</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Základné funkcie"</string>
-    <string name="advanced" msgid="7122495413742976492">"Rozšírené funkcie"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Vymazať históriu"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Text bol skopírovaný."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"ľavá zátvorka"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"pravá zátvorka"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"faktoriál"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"prirodzený logaritmus"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritmus"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"druhá odmocnina"</string>
-    <string name="divDesc" msgid="7442623079124315427">"deliť"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"vynásobiť"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"mínus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"desatinná čiarka"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"umocniť"</string>
-    <string name="delDesc" msgid="8211175878012032240">"odstrániť"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"vymazať"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangens"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sínus"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"kosínus"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Eulerovo číslo"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pí"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"sa rovná"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"ľavá zátvorka"</item>
-    <item msgid="1688156211934459752">"pravá zátvorka"</item>
-    <item msgid="6664829080840305856">"faktoriál"</item>
-    <item msgid="2880199289575144121">"prirodzený logaritmus"</item>
-    <item msgid="4398774906998694599">"logaritmus"</item>
-    <item msgid="1791869359785943266">"druhá odmocnina"</item>
-    <item msgid="6833720171974254459">"deleno"</item>
-    <item msgid="2646574635189709515">"krát"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"mínus"</item>
-    <item msgid="3456824579675198186">" bod "</item>
-    <item msgid="4528629783180278651">"mocnina"</item>
-    <item msgid="4050948027333760159">"tangens"</item>
-    <item msgid="8716478860618683850">"sínus"</item>
-    <item msgid="3203211483560707480">"kosínus"</item>
-    <item msgid="8587490959348493065">"pí"</item>
-    <item msgid="8134315487552198394">"sa rovná"</item>
-  </string-array>
+    <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>
+    <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">"Eulerovo číslo"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pí"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"bod"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"ľavá zátvorka"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"pravá zátvorka"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"kosínus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"prirodzený logaritmus"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritmus"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sínus"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangens"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"plus"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"deliť"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"faktoriál"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"násobiť"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"umocniť"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"druhá odmocnina"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"mínus"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"vymazať"</string>
+    <string name="desc_del" msgid="1866733601083210032">"odstrániť"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"sa rovná"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index fb12274..c419aad 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Računalo"</string>
-    <string name="error" msgid="9197457880925804499">"Napaka"</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="2051454354221101970">"IZB"</string>
-    <string name="clear" msgid="8103610981407459768">"IZBRIS"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Osnovna plošča"</string>
-    <string name="advanced" msgid="7122495413742976492">"Plošča z dodatnimi nastavitvami"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Počisti zgodovino"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Besedilo je bilo kopirano."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"oklepaj"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"zaklepaj"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"fakulteta"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"naravni logaritem"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritem"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"kvadratni koren"</string>
-    <string name="divDesc" msgid="7442623079124315427">"deli"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"pomnoži"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"minus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"decimalna vejica"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"potenca"</string>
-    <string name="delDesc" msgid="8211175878012032240">"izbriši"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"počisti"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangens"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sinus"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"kosinus"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Eulerjevo število"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"je enako"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"oklepaj"</item>
-    <item msgid="1688156211934459752">"zaklepaj"</item>
-    <item msgid="6664829080840305856">"fakulteta"</item>
-    <item msgid="2880199289575144121">"naravni logaritem"</item>
-    <item msgid="4398774906998694599">"logaritem"</item>
-    <item msgid="1791869359785943266">"kvadratni koren"</item>
-    <item msgid="6833720171974254459">"deljeno s"</item>
-    <item msgid="2646574635189709515">"pomnoženo s"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"minus"</item>
-    <item msgid="3456824579675198186">" točka "</item>
-    <item msgid="4528629783180278651">"potenca"</item>
-    <item msgid="4050948027333760159">"tangens"</item>
-    <item msgid="8716478860618683850">"sinus"</item>
-    <item msgid="3203211483560707480">"kosinus"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"je enako"</item>
-  </string-array>
+    <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>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"poč"</string>
+    <string name="del" msgid="6700172918709138470">"izb"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"Eulerjevo število"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"pika"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"oklepaj"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"zaklepaj"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"kosinus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"naravni logaritem"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritem"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinus"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tangens"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"plus"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"deli"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"fakulteta"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"krat"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"potenca"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"kvadratni koren"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"minus"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"počisti"</string>
+    <string name="desc_del" msgid="1866733601083210032">"izbriši"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"je enako"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 0d30dcd..6c56d19 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Калкулатор"</string>
-    <string name="error" msgid="9197457880925804499">"Грешка"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"ОБРИШИ"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"У"</string>
-    <string name="lg" msgid="873623857385418182">"евиденција"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Основна табла"</string>
-    <string name="advanced" msgid="7122495413742976492">"Напредна табла"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Обриши историју"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Текст је копиран."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"отворена заграда"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"затворена заграда"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"факторијел"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"природни логаритам"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"логаритам"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"квадратни корен"</string>
-    <string name="divDesc" msgid="7442623079124315427">"подели"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"помножи"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"плус"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"минус"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"зарез"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"степен"</string>
-    <string name="delDesc" msgid="8211175878012032240">"избриши"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"обриши"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"тангенс"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"синус"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"косинус"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Ојлеров број"</string>
-    <string name="piDesc" msgid="8838151606775021517">"пи"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"једнако"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"отворена заграда"</item>
-    <item msgid="1688156211934459752">"затворена заграда"</item>
-    <item msgid="6664829080840305856">"факторијел"</item>
-    <item msgid="2880199289575144121">"природни логаритам"</item>
-    <item msgid="4398774906998694599">"логаритам"</item>
-    <item msgid="1791869359785943266">"квадратни корен"</item>
-    <item msgid="6833720171974254459">"подељено са"</item>
-    <item msgid="2646574635189709515">"пута"</item>
-    <item msgid="3487936384379753697">"плус"</item>
-    <item msgid="8608534484562258856">"минус"</item>
-    <item msgid="3456824579675198186">" зарез "</item>
-    <item msgid="4528629783180278651">"степен"</item>
-    <item msgid="4050948027333760159">"тангенс"</item>
-    <item msgid="8716478860618683850">"синус"</item>
-    <item msgid="3203211483560707480">"косинус"</item>
-    <item msgid="8587490959348493065">"пи"</item>
-    <item msgid="8134315487552198394">"једнако"</item>
-  </string-array>
+    <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">"tg"</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-sv/strings.xml b/res/values-sv/strings.xml
index 1a7741d..075f197 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Kalkylator"</string>
-    <string name="error" msgid="9197457880925804499">"Fel"</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="2051454354221101970">"RADERA"</string>
-    <string name="clear" msgid="8103610981407459768">"Rensa"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Standardpanel"</string>
-    <string name="advanced" msgid="7122495413742976492">"Avancerad panel"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Rensa historik"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Texten har kopierats."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"vänsterparentes"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"högerparentes"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"fakultet"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"naturlig logaritm"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritm"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"kvadratrot"</string>
-    <string name="divDesc" msgid="7442623079124315427">"dividera"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"multiplicera"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"minus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"punkt"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"exponent"</string>
-    <string name="delDesc" msgid="8211175878012032240">"ta bort"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"rensa"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangent"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sinus"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"cosinus"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Eulers tal"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"är lika med"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"vänsterparentes"</item>
-    <item msgid="1688156211934459752">"högerparentes"</item>
-    <item msgid="6664829080840305856">"fakultet"</item>
-    <item msgid="2880199289575144121">"naturlig logaritm"</item>
-    <item msgid="4398774906998694599">"logaritm"</item>
-    <item msgid="1791869359785943266">"kvadratrot"</item>
-    <item msgid="6833720171974254459">"dividerat med"</item>
-    <item msgid="2646574635189709515">"multiplicerat med"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"minus"</item>
-    <item msgid="3456824579675198186">" komma "</item>
-    <item msgid="4528629783180278651">"exponent"</item>
-    <item msgid="4050948027333760159">"tangent"</item>
-    <item msgid="8716478860618683850">"sinus"</item>
-    <item msgid="3203211483560707480">"cosinus"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"är lika med"</item>
-  </string-array>
+    <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>
+    <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">"Eulers tal"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"komma "</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"vänsterparentes"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"högerparentes"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"cosinus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"naturlig logaritm"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritm"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinus"</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">"delat med"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"fakultet"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"gånger"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"exponent"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"kvadratrot"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"minus"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"rensa"</string>
+    <string name="desc_del" msgid="1866733601083210032">"radera"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"är lika med"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d4c5bb8..ee343fb 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Kikokotoo"</string>
-    <string name="error" msgid="9197457880925804499">"Hitilafu"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"FUT"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"Kwenye"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Paneli msingi"</string>
-    <string name="advanced" msgid="7122495413742976492">"Paneli pevu"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Futa historia"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Maandishi yamenakiliwa."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"mabano ya kushoto"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"mabano ya kulia"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"kiwanda"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"logi asili"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logi"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"Kipeo cha pili"</string>
-    <string name="divDesc" msgid="7442623079124315427">"gawanya"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"zidisha"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"jumlisha"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"kutoa"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"nukta"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"nguvu"</string>
-    <string name="delDesc" msgid="8211175878012032240">"futa"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"futa"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"mstari"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sine"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"kosi"</string>
-    <string name="eDesc" msgid="6709583372168924068">"namba ya Euler"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"sawa na"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"Mabano ya kushoto"</item>
-    <item msgid="1688156211934459752">"mabano ya kulia"</item>
-    <item msgid="6664829080840305856">"kiwanda"</item>
-    <item msgid="2880199289575144121">"logi asili"</item>
-    <item msgid="4398774906998694599">"logi"</item>
-    <item msgid="1791869359785943266">"Kipeo cha pili"</item>
-    <item msgid="6833720171974254459">"imegawanywa na"</item>
-    <item msgid="2646574635189709515">"imezidishwa na"</item>
-    <item msgid="3487936384379753697">"jumlisha"</item>
-    <item msgid="8608534484562258856">"kutoa"</item>
-    <item msgid="3456824579675198186">" mahali "</item>
-    <item msgid="4528629783180278651">"nguvu"</item>
-    <item msgid="4050948027333760159">"mstari"</item>
-    <item msgid="8716478860618683850">"sine"</item>
-    <item msgid="3203211483560707480">"kosi"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"sawa na"</item>
-  </string-array>
+    <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">"2"</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>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"futa"</string>
+    <string name="del" msgid="6700172918709138470">"futa"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"Nambari ya Euler"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pai"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"nukta"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"mabano ya kushoto"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"mabano ya kulia"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"kosini"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"logi asili"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logi"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sini"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tanjenti"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"jumlisha"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"gawanya"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"zao mtiririko"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"mara"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"mara"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"kipeo cha pili"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"kutoa"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"futa"</string>
+    <string name="desc_del" msgid="1866733601083210032">"futa"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"sawa na"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 20f8d6b..1f65e31 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -1,85 +1,61 @@
 <?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">"คิดเลข"</string>
-    <string name="error" msgid="9197457880925804499">"ข้อผิดพลาด"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"แผงควบคุมพื้นฐาน"</string>
-    <string name="advanced" msgid="7122495413742976492">"แผงควบคุมขั้นสูง"</string>
-    <string name="clear_history" msgid="8458043980601165012">"ล้างประวัติ"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"คัดลอกข้อความแล้ว"</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"วงเล็บซ้าย"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"วงเล็บขวา"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"แฟกทอเรียล"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"ลอการิทึมธรรมชาติ"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"ลอการิทึม"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"รากที่สอง"</string>
-    <string name="divDesc" msgid="7442623079124315427">"หาร"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"คูณ"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"บวก"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"ลบ"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"จุด"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"ยกกำลัง"</string>
-    <string name="delDesc" msgid="8211175878012032240">"ลบ"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"ล้าง"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"แทนเจนต์"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"ไซน์"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"โคไซน์"</string>
-    <string name="eDesc" msgid="6709583372168924068">"จำนวนออยเลอร์"</string>
-    <string name="piDesc" msgid="8838151606775021517">"พาย"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"เท่ากับ"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"วงเล็บซ้าย"</item>
-    <item msgid="1688156211934459752">"วงเล็บขวา"</item>
-    <item msgid="6664829080840305856">"แฟกทอเรียล"</item>
-    <item msgid="2880199289575144121">"ลอการิทึมธรรมชาติ"</item>
-    <item msgid="4398774906998694599">"ลอการิทึม"</item>
-    <item msgid="1791869359785943266">"รากที่สอง"</item>
-    <item msgid="6833720171974254459">"หารด้วย"</item>
-    <item msgid="2646574635189709515">"คูณด้วย"</item>
-    <item msgid="3487936384379753697">"บวก"</item>
-    <item msgid="8608534484562258856">"ลบ"</item>
-    <item msgid="3456824579675198186">" จุด "</item>
-    <item msgid="4528629783180278651">"ยกกำลัง"</item>
-    <item msgid="4050948027333760159">"แทนเจนต์"</item>
-    <item msgid="8716478860618683850">"ไซน์"</item>
-    <item msgid="3203211483560707480">"โคไซน์"</item>
-    <item msgid="8587490959348493065">"พาย"</item>
-    <item msgid="8134315487552198394">"เท่ากับ"</item>
-  </string-array>
+    <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="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-tl/strings.xml b/res/values-tl/strings.xml
index afd9c33..d549d57 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Calculator"</string>
-    <string name="error" msgid="9197457880925804499">"Error"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Pangunahing panel"</string>
-    <string name="advanced" msgid="7122495413742976492">"Advanced na panel"</string>
-    <string name="clear_history" msgid="8458043980601165012">"I-clear ang kasaysayan"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Nakopya ang teksto."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"kaliwang panaklong"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"kanang panaklong"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"factorial"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"natural na logarithm"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logarithm"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"square root"</string>
-    <string name="divDesc" msgid="7442623079124315427">"hatiin"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"paramihin"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"dagdagan ng"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"minus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"tuldok"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"power"</string>
-    <string name="delDesc" msgid="8211175878012032240">"tanggalin"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"i-clear"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tangent"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sine"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"cosine"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Euler\'s number"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"katumbas ng"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"kaliwang panaklong"</item>
-    <item msgid="1688156211934459752">"kanang panaklong"</item>
-    <item msgid="6664829080840305856">"factorial"</item>
-    <item msgid="2880199289575144121">"natural na logarithm"</item>
-    <item msgid="4398774906998694599">"logarithm"</item>
-    <item msgid="1791869359785943266">"square root"</item>
-    <item msgid="6833720171974254459">"hinati ng"</item>
-    <item msgid="2646574635189709515">"pinarami ng"</item>
-    <item msgid="3487936384379753697">"dagdagan ng"</item>
-    <item msgid="8608534484562258856">"minus"</item>
-    <item msgid="3456824579675198186">" point "</item>
-    <item msgid="4528629783180278651">"power"</item>
-    <item msgid="4050948027333760159">"tangent"</item>
-    <item msgid="8716478860618683850">"sine"</item>
-    <item msgid="3203211483560707480">"cosine"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"katumbas ng"</item>
-  </string-array>
+    <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>
+    <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">"tuldok"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"kaliwang panaklong"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"kanang panaklong"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"cosine"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"natural na 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">"dagdagan ng"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"hatiin"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"factorial"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"beses"</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">"i-clear"</string>
+    <string name="desc_del" msgid="1866733601083210032">"tanggalin"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"katumbas ng"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d810a56..78f2faf 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Hesap Makinesi"</string>
-    <string name="error" msgid="9197457880925804499">"Hata"</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="2051454354221101970">"SİL"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Ana panel"</string>
-    <string name="advanced" msgid="7122495413742976492">"Gelişmiş panel"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Geçmişi temizle"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Metin kopyalandı."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"sol parantez"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"sağ parantez"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"faktöryel"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"doğal logaritma"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logaritma"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"karekök"</string>
-    <string name="divDesc" msgid="7442623079124315427">"böl"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"çarpı"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"artı"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"eksi"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"virgül"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"üstü"</string>
-    <string name="delDesc" msgid="8211175878012032240">"sil"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"temizle"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tanjant"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sinüs"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"kosinüs"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Euler sayısı"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"eşittir"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"sol parantez"</item>
-    <item msgid="1688156211934459752">"sağ parantez"</item>
-    <item msgid="6664829080840305856">"faktöryel"</item>
-    <item msgid="2880199289575144121">"doğal logaritma"</item>
-    <item msgid="4398774906998694599">"logaritma"</item>
-    <item msgid="1791869359785943266">"karekök"</item>
-    <item msgid="6833720171974254459">"bölü"</item>
-    <item msgid="2646574635189709515">"çarpı"</item>
-    <item msgid="3487936384379753697">"artı"</item>
-    <item msgid="8608534484562258856">"eksi"</item>
-    <item msgid="3456824579675198186">" nokta "</item>
-    <item msgid="4528629783180278651">"üstü"</item>
-    <item msgid="4050948027333760159">"tanjant"</item>
-    <item msgid="8716478860618683850">"sinüs"</item>
-    <item msgid="3203211483560707480">"kosinüs"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"eşittir"</item>
-  </string-array>
+    <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>
+    <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
+    <string name="clr" msgid="3126239559646368205">"tmzl"</string>
+    <string name="del" msgid="6700172918709138470">"sil"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"Euler sayısı"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"nokta"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"sol parantez"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"sağ parantez"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"kosinüs"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"doğal logaritma"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logaritma"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinüs"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tanjant"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"artı"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"bölü"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"faktöryel"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"çarpı"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"üstü"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"karekök"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"eksi"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"temizle"</string>
+    <string name="desc_del" msgid="1866733601083210032">"sil"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"eşittir"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b547b66..5ab4f0d 100755
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Калькулятор"</string>
-    <string name="error" msgid="9197457880925804499">"Помилка"</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="2051454354221101970">"ВИДАЛИТИ"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tg"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Основна панель"</string>
-    <string name="advanced" msgid="7122495413742976492">"Розширена панель"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Очистити історію"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Текст скопійовано."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"ліва дужка"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"права дужка"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"факторіал"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"натуральний логарифм"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"логарифм"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"квадратний корінь"</string>
-    <string name="divDesc" msgid="7442623079124315427">"ділення"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"множення"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"плюс"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"мінус"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"крапка"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"показник ступеня"</string>
-    <string name="delDesc" msgid="8211175878012032240">"видалити"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"очистити"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"тангенс"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"синус"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"косинус"</string>
-    <string name="eDesc" msgid="6709583372168924068">"число Ейлера"</string>
-    <string name="piDesc" msgid="8838151606775021517">"пі"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"дорівнює"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"ліва дужка"</item>
-    <item msgid="1688156211934459752">"права дужка"</item>
-    <item msgid="6664829080840305856">"факторіал"</item>
-    <item msgid="2880199289575144121">"натуральний логарифм"</item>
-    <item msgid="4398774906998694599">"логарифм"</item>
-    <item msgid="1791869359785943266">"квадратний корінь"</item>
-    <item msgid="6833720171974254459">"поділити на"</item>
-    <item msgid="2646574635189709515">"помножити на"</item>
-    <item msgid="3487936384379753697">"плюс"</item>
-    <item msgid="8608534484562258856">"мінус"</item>
-    <item msgid="3456824579675198186">" крапка "</item>
-    <item msgid="4528629783180278651">"показник ступеня"</item>
-    <item msgid="4050948027333760159">"тангенс"</item>
-    <item msgid="8716478860618683850">"синус"</item>
-    <item msgid="3203211483560707480">"косинус"</item>
-    <item msgid="8587490959348493065">"пі"</item>
-    <item msgid="8134315487552198394">"дорівнює"</item>
-  </string-array>
+    <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="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-vi/strings.xml b/res/values-vi/strings.xml
index 9a627d1..0c0dc7a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Máy tính"</string>
-    <string name="error" msgid="9197457880925804499">"Lỗi"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"ghi"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Bảng điều khiển cơ bản"</string>
-    <string name="advanced" msgid="7122495413742976492">"Bảng điều khiển nâng cao"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Xóa lịch sử"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Đã sao chép văn bản."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"dấu ngoặc trái"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"dấu ngoặc phải"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"giai thừa"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"logarit tự nhiên"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"logarit"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"dấu khai căn"</string>
-    <string name="divDesc" msgid="7442623079124315427">"chia"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"nhân"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"cộng"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"trừ"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"điểm"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"lũy thừa"</string>
-    <string name="delDesc" msgid="8211175878012032240">"xóa"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"xóa"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"tiếp tuyến"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sin"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"cosin"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Số Euler"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"bằng"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"dấu ngoặc trái"</item>
-    <item msgid="1688156211934459752">"dấu ngoặc phải"</item>
-    <item msgid="6664829080840305856">"giai thừa"</item>
-    <item msgid="2880199289575144121">"logarit tự nhiên"</item>
-    <item msgid="4398774906998694599">"logarit"</item>
-    <item msgid="1791869359785943266">"dấu khai căn"</item>
-    <item msgid="6833720171974254459">"chia cho"</item>
-    <item msgid="2646574635189709515">"nhân với"</item>
-    <item msgid="3487936384379753697">"cộng"</item>
-    <item msgid="8608534484562258856">"trừ"</item>
-    <item msgid="3456824579675198186">" điểm "</item>
-    <item msgid="4528629783180278651">"lũy thừa"</item>
-    <item msgid="4050948027333760159">"tiếp tuyến"</item>
-    <item msgid="8716478860618683850">"sin"</item>
-    <item msgid="3203211483560707480">"cosin"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"bằng"</item>
-  </string-array>
+    <string name="error_nan" msgid="4071578355972369426">"Không phải là một 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>
+    <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">"Số Euler"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"dấu chấm"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"dấu ngoặc trái"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"dấu ngoặc phải"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"cosin"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"logarit tự nhiên"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"logarit"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sin"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"tiếp tuyến"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"cộng"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"chia"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"giai thừa"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"nhân"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"lũy thừa"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"dấu khai căn"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"trừ"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"xóa"</string>
+    <string name="desc_del" msgid="1866733601083210032">"xóa"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"bằng"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 561b02f..a30962b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1,85 +1,61 @@
 <?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">"计算器"</string>
-    <string name="error" msgid="9197457880925804499">"出错"</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="2051454354221101970">"删除"</string>
-    <string name="clear" msgid="8103610981407459768">"清除"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"基本面板"</string>
-    <string name="advanced" msgid="7122495413742976492">"高级面板"</string>
-    <string name="clear_history" msgid="8458043980601165012">"清除历史记录"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"文本已复制。"</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"左括号"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"右括号"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"阶乘"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"自然对数"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"对数"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"平方根"</string>
-    <string name="divDesc" msgid="7442623079124315427">"除"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"乘"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"加"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"减"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"小数点"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"幂"</string>
-    <string name="delDesc" msgid="8211175878012032240">"删除"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"清除"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"正切"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"正弦"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"余弦"</string>
-    <string name="eDesc" msgid="6709583372168924068">"欧拉数"</string>
-    <string name="piDesc" msgid="8838151606775021517">"圆周率"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"等于"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"左括号"</item>
-    <item msgid="1688156211934459752">"右括号"</item>
-    <item msgid="6664829080840305856">"阶乘"</item>
-    <item msgid="2880199289575144121">"自然对数"</item>
-    <item msgid="4398774906998694599">"对数"</item>
-    <item msgid="1791869359785943266">"平方根"</item>
-    <item msgid="6833720171974254459">"除以"</item>
-    <item msgid="2646574635189709515">"乘"</item>
-    <item msgid="3487936384379753697">"加"</item>
-    <item msgid="8608534484562258856">"减"</item>
-    <item msgid="3456824579675198186">"点"</item>
-    <item msgid="4528629783180278651">"幂"</item>
-    <item msgid="4050948027333760159">"正切"</item>
-    <item msgid="8716478860618683850">"正弦"</item>
-    <item msgid="3203211483560707480">"余弦"</item>
-    <item msgid="8587490959348493065">"圆周率"</item>
-    <item msgid="8134315487552198394">"等于"</item>
-  </string-array>
+    <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="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-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 3785ce9..d9a87fb 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -1,85 +1,61 @@
 <?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">"計算機"</string>
-    <string name="error" msgid="9197457880925804499">"發生錯誤"</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="2051454354221101970">"刪除"</string>
-    <string name="clear" msgid="8103610981407459768">"清除"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"Tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"LN"</string>
-    <string name="lg" msgid="873623857385418182">"記錄"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"基本面板"</string>
-    <string name="advanced" msgid="7122495413742976492">"進階面板"</string>
-    <string name="clear_history" msgid="8458043980601165012">"清除記錄"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"文字已複製。"</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"左括弧"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"右括弧"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"階乘"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"自然對數"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"對數"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"平方根"</string>
-    <string name="divDesc" msgid="7442623079124315427">"除"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"乘"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"加"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"減"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"點"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"指數"</string>
-    <string name="delDesc" msgid="8211175878012032240">"刪除"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"清除"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"正切"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"正弦"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"餘弦"</string>
-    <string name="eDesc" msgid="6709583372168924068">"歐拉數"</string>
-    <string name="piDesc" msgid="8838151606775021517">"圓周率"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"等於"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"左括弧"</item>
-    <item msgid="1688156211934459752">"右括弧"</item>
-    <item msgid="6664829080840305856">"階乘"</item>
-    <item msgid="2880199289575144121">"自然對數"</item>
-    <item msgid="4398774906998694599">"對數"</item>
-    <item msgid="1791869359785943266">"平方根"</item>
-    <item msgid="6833720171974254459">"除以"</item>
-    <item msgid="2646574635189709515">"乘以"</item>
-    <item msgid="3487936384379753697">"加"</item>
-    <item msgid="8608534484562258856">"減"</item>
-    <item msgid="3456824579675198186">"點"</item>
-    <item msgid="4528629783180278651">"指數"</item>
-    <item msgid="4050948027333760159">"正切"</item>
-    <item msgid="8716478860618683850">"正弦"</item>
-    <item msgid="3203211483560707480">"餘弦"</item>
-    <item msgid="8587490959348493065">"圓周率"</item>
-    <item msgid="8134315487552198394">"等於"</item>
-  </string-array>
+    <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="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-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 9213b5a..ad70dab 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1,85 +1,61 @@
 <?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">"計算機"</string>
-    <string name="error" msgid="9197457880925804499">"錯誤"</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="2051454354221101970">"DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"清除"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"ln"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"基本面板"</string>
-    <string name="advanced" msgid="7122495413742976492">"進階面板"</string>
-    <string name="clear_history" msgid="8458043980601165012">"清除紀錄"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"文字已複製。"</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"左括弧"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"右括弧"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"階乘"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"自然對數"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"對數"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"平方根號"</string>
-    <string name="divDesc" msgid="7442623079124315427">"除號"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"乘號"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"加號"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"減號"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"點"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"指數"</string>
-    <string name="delDesc" msgid="8211175878012032240">"刪除"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"清除"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"正切函數"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"正弦函數"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"餘弦函數"</string>
-    <string name="eDesc" msgid="6709583372168924068">"尤拉數"</string>
-    <string name="piDesc" msgid="8838151606775021517">"圓周率符號"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"等於"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"左括弧"</item>
-    <item msgid="1688156211934459752">"右括弧"</item>
-    <item msgid="6664829080840305856">"階乘"</item>
-    <item msgid="2880199289575144121">"自然對數"</item>
-    <item msgid="4398774906998694599">"對數"</item>
-    <item msgid="1791869359785943266">"平方根號"</item>
-    <item msgid="6833720171974254459">"除以"</item>
-    <item msgid="2646574635189709515">"乘以"</item>
-    <item msgid="3487936384379753697">"加"</item>
-    <item msgid="8608534484562258856">"減"</item>
-    <item msgid="3456824579675198186">" 點 "</item>
-    <item msgid="4528629783180278651">"指數"</item>
-    <item msgid="4050948027333760159">"正切函數"</item>
-    <item msgid="8716478860618683850">"正弦函數"</item>
-    <item msgid="3203211483560707480">"餘弦函數"</item>
-    <item msgid="8587490959348493065">"圓周率"</item>
-    <item msgid="8134315487552198394">"等於"</item>
-  </string-array>
+    <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="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">"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">"Tangent"</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-zu/strings.xml b/res/values-zu/strings.xml
index def24fc..6265dc5 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1,85 +1,61 @@
 <?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">"Isibali"</string>
-    <string name="error" msgid="9197457880925804499">"Iphutha"</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="2051454354221101970">"I-DEL"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"cos"</string>
-    <string name="tan" msgid="7957459816738554960">"tan"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"In"</string>
-    <string name="lg" msgid="873623857385418182">"log"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Iphaneli eyisisekelo"</string>
-    <string name="advanced" msgid="7122495413742976492">"Iphaneli ethuthukisiwe"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Sula umlando"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Umbhalo okopishiwe."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"ama-parenthesis esobunxele"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"I-parenthesis yesokudla"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"ngokwesimo"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"i-logarithm yemvelo"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"i-logarithm"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"Impande yesikwele"</string>
-    <string name="divDesc" msgid="7442623079124315427">"hlukanisa"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"phindaphinda"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"kuhlanganise"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"susa"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"iphoyinti"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"Amandla"</string>
-    <string name="delDesc" msgid="8211175878012032240">"susa"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"SULA"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"i-tangent"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"i-sine"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"i-cosine"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Inombolo ka-Euler"</string>
-    <string name="piDesc" msgid="8838151606775021517">"i-Pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"okulinganayo"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"ama-parenthesis esobunxele"</item>
-    <item msgid="1688156211934459752">"I-parenthesis yesokudla"</item>
-    <item msgid="6664829080840305856">"ngokwesimo"</item>
-    <item msgid="2880199289575144121">"i-logarithm yemvelo"</item>
-    <item msgid="4398774906998694599">"i-logarithm"</item>
-    <item msgid="1791869359785943266">"Impande yesikwele"</item>
-    <item msgid="6833720171974254459">"ihlukaniswe nge"</item>
-    <item msgid="2646574635189709515">"kuphindaphindwa ngo"</item>
-    <item msgid="3487936384379753697">"kuhlanganise"</item>
-    <item msgid="8608534484562258856">"susa"</item>
-    <item msgid="3456824579675198186">" iphoyinti "</item>
-    <item msgid="4528629783180278651">"Amandla"</item>
-    <item msgid="4050948027333760159">"i-tangent"</item>
-    <item msgid="8716478860618683850">"i-sine"</item>
-    <item msgid="3203211483560707480">"i-cosine"</item>
-    <item msgid="8587490959348493065">"i-Pi"</item>
-    <item msgid="8134315487552198394">"okulinganayo"</item>
-  </string-array>
+    <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">"i-cos"</string>
+    <string name="fun_ln" msgid="6282013842946532944">"i-In"</string>
+    <string name="fun_log" msgid="6856905045055937519">"i-log"</string>
+    <string name="fun_sin" msgid="7136698561875496766">"i-sin"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"i-tan"</string>
+    <string name="clr" msgid="3126239559646368205">"i-clr"</string>
+    <string name="del" msgid="6700172918709138470">"i-del"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"Inombolo ye-Euler"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"i-pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"iphoyinti"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"abakaki abakwesokunxele"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"abakaki abakwesokudla"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"i-cosine"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"i-logarithm yemvelo"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"i-logarithm"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"i-sine"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"i-tangent"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"hlanganisa"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"hlukanisa"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"ngokwesimo"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"izikhathi"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"amandla"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"impande yesikwele"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"susa"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"sula"</string>
+    <string name="desc_del" msgid="1866733601083210032">"susa"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"okulinganayo"</string>
 </resources>