Import translations. DO NOT MERGE am: 4874ade500  -s ours
am: 71d5b97aff  -s ours

* commit '71d5b97aff874e53da6f6de3f00205637ae59720':
  Import translations. DO NOT MERGE
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 8690819..ac7c08a 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -1,84 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
+<!-- 
+  Copyright (C) 2014 The Android Open Source Project
 
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
 
-          http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+   -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="8095131950334945205">"Kalkulyator"</string>
-    <string name="error" msgid="9197457880925804499">"Xəta"</string>
-    <string name="digit0" msgid="8069590963464434135">"0"</string>
-    <string name="digit1" msgid="8535041374797804029">"1"</string>
-    <string name="digit2" msgid="8977354203154316247">"2"</string>
-    <string name="digit3" msgid="148544090755132760">"3"</string>
-    <string name="digit4" msgid="2199490603838247678">"4"</string>
-    <string name="digit5" msgid="7568514524384173087">"5"</string>
-    <string name="digit6" msgid="6705952561049362551">"6"</string>
-    <string name="digit7" msgid="658125644218958447">"7"</string>
-    <string name="digit8" msgid="3134686906411558886">"8"</string>
-    <string name="digit9" msgid="765379157698748031">"9"</string>
-    <string name="del" msgid="6248896117422989693">"SİLİN"</string>
-    <string name="clear" msgid="8103610981407459768">"CLR"</string>
-    <string name="sin" msgid="6793866152659175277">"sin"</string>
-    <string name="cos" msgid="6901841853098114414">"kos"</string>
-    <string name="tan" msgid="7957459816738554960">"qaralt"</string>
-    <string name="e" msgid="1377847800971731483">"e"</string>
-    <string name="ln" msgid="6888500680285403344">"in"</string>
-    <string name="lg" msgid="873623857385418182">"qeydiyyat"</string>
-    <string name="leftParen" msgid="4850643713953092099">"("</string>
-    <string name="rightParen" msgid="3177971166159324016">")"</string>
-    <string name="basic" msgid="7691469861698059753">"Əsas panel"</string>
-    <string name="advanced" msgid="7122495413742976492">"Ətraflı panel"</string>
-    <string name="clear_history" msgid="8458043980601165012">"Tarixçəni silin"</string>
-    <string name="text_copied_toast" msgid="5801480710472541833">"Mətn kopyalandı."</string>
-    <string name="leftParenDesc" msgid="8446428211982811379">"sol mötərizə"</string>
-    <string name="rightParenDesc" msgid="9133691645148976523">"sağ mötərizə"</string>
-    <string name="factorialDesc" msgid="9217024218012761574">"faktorial"</string>
-    <string name="lnDesc" msgid="1052579286300842270">"təbii loqaritm"</string>
-    <string name="lgDesc" msgid="6490920451513731160">"loqaritm"</string>
-    <string name="sqrtDesc" msgid="2247252128762219267">"kvadrat kök"</string>
-    <string name="divDesc" msgid="7442623079124315427">"böl"</string>
-    <string name="mulDesc" msgid="9003016819648670694">"çoxaltmaq"</string>
-    <string name="plusDesc" msgid="3145322700823848264">"plus"</string>
-    <string name="minusDesc" msgid="5033462008907390900">"minus"</string>
-    <string name="dotDesc" msgid="5253752241630161722">"nöqtə"</string>
-    <string name="powerDesc" msgid="9034898318444176910">"güc"</string>
-    <string name="delDesc" msgid="8211175878012032240">"silin"</string>
-    <string name="clearDesc" msgid="8015748901120751476">"Təmizləyin"</string>
-    <string name="tanDesc" msgid="2055554933130702423">"toxunan"</string>
-    <string name="sinDesc" msgid="6563285042235077204">"sinus"</string>
-    <string name="cosDesc" msgid="4048942450207926538">"kosinus"</string>
-    <string name="eDesc" msgid="6709583372168924068">"Euler\'in nömrəsi"</string>
-    <string name="piDesc" msgid="8838151606775021517">"pi"</string>
-    <string name="equalDesc" msgid="4164435100263313101">"bərabərliklər"</string>
-  <string-array name="operatorDescs">
-    <item msgid="7903565108986789641">"sol mötərizə"</item>
-    <item msgid="1688156211934459752">"sağ mötərizə"</item>
-    <item msgid="6664829080840305856">"faktorial"</item>
-    <item msgid="2880199289575144121">"təbii loqaritm"</item>
-    <item msgid="4398774906998694599">"loqaritm"</item>
-    <item msgid="1791869359785943266">"kvadrat kök"</item>
-    <item msgid="6833720171974254459">"bölünmə"</item>
-    <item msgid="2646574635189709515">"vurma"</item>
-    <item msgid="3487936384379753697">"plus"</item>
-    <item msgid="8608534484562258856">"minus"</item>
-    <item msgid="3456824579675198186">" nöqtə "</item>
-    <item msgid="4528629783180278651">"güc"</item>
-    <item msgid="4050948027333760159">"toxunan"</item>
-    <item msgid="8716478860618683850">"sinus"</item>
-    <item msgid="3203211483560707480">"kosinus"</item>
-    <item msgid="8587490959348493065">"pi"</item>
-    <item msgid="8134315487552198394">"bərabərdir"</item>
-  </string-array>
+    <string name="error_nan" msgid="4071578355972369426">"Rəqəm deyil"</string>
+    <string name="error_syntax" msgid="6940043994468390738">"Xəta"</string>
+    <string name="fun_cos" msgid="7312559527731358211">"kos"</string>
+    <string name="fun_ln" msgid="6282013842946532944">"in"</string>
+    <string name="fun_log" msgid="6856905045055937519">"qeydiyyat"</string>
+    <string name="fun_sin" msgid="7136698561875496766">"günah"</string>
+    <string name="fun_tan" msgid="9116158377794370341">"qaralt"</string>
+    <string name="clr" msgid="3126239559646368205">"clr"</string>
+    <string name="del" msgid="6700172918709138470">"del"</string>
+    <string name="desc_const_e" msgid="7752508267661034194">"Euler\'in nömrəsi"</string>
+    <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
+    <string name="desc_dec_point" msgid="6211527612960070934">"nöqtə"</string>
+    <string name="desc_lparen" msgid="3319203240269597504">"sol mötərizə"</string>
+    <string name="desc_rparen" msgid="7629704943022422763">"sağ mötərizə"</string>
+    <string name="desc_fun_cos" msgid="3197307754450718348">"kosinus"</string>
+    <string name="desc_fun_ln" msgid="4943842219071979148">"təbii loqaritm"</string>
+    <string name="desc_fun_log" msgid="6163178034661345125">"loaritm"</string>
+    <string name="desc_fun_sin" msgid="4010564022860883142">"sinus"</string>
+    <string name="desc_fun_tan" msgid="8547330421304946587">"toxunan"</string>
+    <string name="desc_op_add" msgid="1174812755738083078">"plus"</string>
+    <string name="desc_op_div" msgid="8320455802423478031">"böl"</string>
+    <string name="desc_op_fact" msgid="5004950609277631750">"faktorial"</string>
+    <string name="desc_op_mul" msgid="978652245185868311">"dəfə"</string>
+    <string name="desc_op_pow" msgid="2620877401884059447">"güc"</string>
+    <string name="desc_op_sqrt" msgid="4405610392216554239">"kvadrat kök"</string>
+    <string name="desc_op_sub" msgid="2563060630032563021">"minus"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"Təmizləyin"</string>
+    <string name="desc_del" msgid="1866733601083210032">"silin"</string>
+    <string name="desc_eq" msgid="8068773095462472408">"bərabərliklər"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 502cc4a..03c5428 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="8095131950334945205">"Calculadora"</string>
-    <string name="error_nan" msgid="4071578355972369426">"No és número"</string>
+    <string name="error_nan" msgid="4071578355972369426">"No és una xifra"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Error"</string>
     <string name="fun_cos" msgid="7312559527731358211">"cos"</string>
     <string name="fun_ln" msgid="6282013842946532944">"ln"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b0fbce8..f97347e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -26,7 +26,7 @@
     <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
     <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
     <string name="clr" msgid="3126239559646368205">"clr"</string>
-    <string name="del" msgid="6700172918709138470">"del"</string>
+    <string name="del" msgid="6700172918709138470">"CE"</string>
     <string name="desc_const_e" msgid="7752508267661034194">"Eulersche Zahl"</string>
     <string name="desc_const_pi" msgid="5843835548313660468">"Pi"</string>
     <string name="desc_dec_point" msgid="6211527612960070934">"Dezimalzeichen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 4ef7326..f26176b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="8095131950334945205">"Αριθμομηχ."</string>
-    <string name="error_nan" msgid="4071578355972369426">"Όχι αριθμό"</string>
+    <string name="error_nan" msgid="4071578355972369426">"Μη αριθμός"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Σφάλμα"</string>
     <string name="fun_cos" msgid="7312559527731358211">"cos"</string>
     <string name="fun_ln" msgid="6282013842946532944">"ln"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 0d0e611..dc0d496 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="8095131950334945205">"Calculadora"</string>
-    <string name="error_nan" msgid="4071578355972369426">"No es número."</string>
+    <string name="error_nan" msgid="4071578355972369426">"No es un número."</string>
     <string name="error_syntax" msgid="6940043994468390738">"Error"</string>
     <string name="fun_cos" msgid="7312559527731358211">"cos"</string>
     <string name="fun_ln" msgid="6282013842946532944">"ln"</string>
@@ -26,7 +26,7 @@
     <string name="fun_sin" msgid="7136698561875496766">"sen"</string>
     <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
     <string name="clr" msgid="3126239559646368205">"be"</string>
-    <string name="del" msgid="6700172918709138470">"del"</string>
+    <string name="del" msgid="6700172918709138470">"CE"</string>
     <string name="desc_const_e" msgid="7752508267661034194">"número de Euler"</string>
     <string name="desc_const_pi" msgid="5843835548313660468">"pi"</string>
     <string name="desc_dec_point" msgid="6211527612960070934">"punto"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d245636..bfe1d70 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="8095131950334945205">"Calculadora"</string>
-    <string name="error_nan" msgid="4071578355972369426">"No es número"</string>
+    <string name="error_nan" msgid="4071578355972369426">"No es un número"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Error"</string>
     <string name="fun_cos" msgid="7312559527731358211">"cos"</string>
     <string name="fun_ln" msgid="6282013842946532944">"ln"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 4d354e9..d570dd7 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -26,7 +26,7 @@
     <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
     <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
     <string name="clr" msgid="3126239559646368205">"clr"</string>
-    <string name="del" msgid="6700172918709138470">"del"</string>
+    <string name="del" msgid="6700172918709138470">"CE"</string>
     <string name="desc_const_e" msgid="7752508267661034194">"यूलर की संख्या"</string>
     <string name="desc_const_pi" msgid="5843835548313660468">"पाई"</string>
     <string name="desc_dec_point" msgid="6211527612960070934">"दशमलव"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f348b86..1842cb4 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="8095131950334945205">"Calcolatrice"</string>
-    <string name="error_nan" msgid="4071578355972369426">"Non un numero"</string>
+    <string name="error_nan" msgid="4071578355972369426">"Non è un numero"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Errore"</string>
     <string name="fun_cos" msgid="7312559527731358211">"cos"</string>
     <string name="fun_ln" msgid="6282013842946532944">"ln"</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index f2eefa5..99eb76c 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -26,7 +26,7 @@
     <string name="fun_sin" msgid="7136698561875496766">"син"</string>
     <string name="fun_tan" msgid="9116158377794370341">"тан"</string>
     <string name="clr" msgid="3126239559646368205">"тзл"</string>
-    <string name="del" msgid="6700172918709138470">"жою"</string>
+    <string name="del" msgid="6700172918709138470">"del"</string>
     <string name="desc_const_e" msgid="7752508267661034194">"Эйлер саны"</string>
     <string name="desc_const_pi" msgid="5843835548313660468">"пи"</string>
     <string name="desc_dec_point" msgid="6211527612960070934">"нүкте"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index c6f8dad..30cbb3b 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -20,7 +20,7 @@
     <string name="app_name" msgid="8095131950334945205">"ಕ್ಯಾಲ್ಕುಲೇಟರ್"</string>
     <string name="error_nan" msgid="4071578355972369426">"ಸಂಖ್ಯೆಯಲ್ಲ"</string>
     <string name="error_syntax" msgid="6940043994468390738">"ದೋಷ"</string>
-    <string name="fun_cos" msgid="7312559527731358211">"ಕೊಸ್"</string>
+    <string name="fun_cos" msgid="7312559527731358211">"cos"</string>
     <string name="fun_ln" msgid="6282013842946532944">"ಇನ್"</string>
     <string name="fun_log" msgid="6856905045055937519">"ಲಾ."</string>
     <string name="fun_sin" msgid="7136698561875496766">"ಸೈನ್"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index eddde82..5a323e7 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -26,7 +26,7 @@
     <string name="fun_sin" msgid="7136698561875496766">"sine"</string>
     <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
     <string name="clr" msgid="3126239559646368205">"മായ്‌ക്കുക"</string>
-    <string name="del" msgid="6700172918709138470">"ഇല്ലാതാക്കുക"</string>
+    <string name="del" msgid="6700172918709138470">"മായ്ക്കൂ"</string>
     <string name="desc_const_e" msgid="7752508267661034194">"യൂളറിന്റെ നമ്പർ"</string>
     <string name="desc_const_pi" msgid="5843835548313660468">"പൈ"</string>
     <string name="desc_dec_point" msgid="6211527612960070934">"പോയിന്റ്"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index a40357f..2ea69e5 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -44,7 +44,7 @@
     <string name="desc_op_pow" msgid="2620877401884059447">"putere"</string>
     <string name="desc_op_sqrt" msgid="4405610392216554239">"rădăcină pătrată"</string>
     <string name="desc_op_sub" msgid="2563060630032563021">"minus"</string>
-    <string name="desc_clr" msgid="8357371663749541924">"goliţi"</string>
+    <string name="desc_clr" msgid="8357371663749541924">"goliți"</string>
     <string name="desc_del" msgid="1866733601083210032">"ștergeți"</string>
     <string name="desc_eq" msgid="8068773095462472408">"este egal cu"</string>
 </resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 4ce212d..b277102 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="8095131950334945205">"Makina llogaritëse"</string>
-    <string name="error_nan" msgid="4071578355972369426">"S\'është numër"</string>
+    <string name="error_nan" msgid="4071578355972369426">"s\'është numër"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Gabim"</string>
     <string name="fun_cos" msgid="7312559527731358211">"kos"</string>
     <string name="fun_ln" msgid="6282013842946532944">"ln"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 49364e4..a47890e 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="8095131950334945205">"Kalkulator"</string>
-    <string name="error_nan" msgid="4071578355972369426">"Son emas"</string>
+    <string name="error_nan" msgid="4071578355972369426">"Haqiqiy son emas"</string>
     <string name="error_syntax" msgid="6940043994468390738">"Xato"</string>
     <string name="fun_cos" msgid="7312559527731358211">"cos"</string>
     <string name="fun_ln" msgid="6282013842946532944">"ln"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index fc342a2..38e7d70 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -26,7 +26,7 @@
     <string name="fun_sin" msgid="7136698561875496766">"sin"</string>
     <string name="fun_tan" msgid="9116158377794370341">"tan"</string>
     <string name="clr" msgid="3126239559646368205">"清除"</string>
-    <string name="del" msgid="6700172918709138470">"删除"</string>
+    <string name="del" msgid="6700172918709138470">"del"</string>
     <string name="desc_const_e" msgid="7752508267661034194">"欧拉数"</string>
     <string name="desc_const_pi" msgid="5843835548313660468">"圆周率"</string>
     <string name="desc_dec_point" msgid="6211527612960070934">"点"</string>