Merge "Fix the typo error of the smiley text"android-sdk-adt_r20tools_r20

12 files changed, 25 insertions, 25 deletions

diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index e58bfbcd..443ae79a 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -30,7 +30,7 @@
     <item msgid="6236841507652113784">":-$"</item>
     <item msgid="9041518876704445176">":-!"</item>
     <item msgid="5938573563873054892">":-["</item>
-    <item msgid="662834190186827918">"O :-)"</item>
+    <item msgid="662834190186827918">"O:-)"</item>
     <item msgid="8667007781479284572">":-\\"</item>
     <item msgid="6895634303037073990">":\'("</item>
     <item msgid="3660685022708121640">":-X"</item>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 01b51f01..ba93afcd 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -34,7 +34,7 @@
     <item msgid="8667007781479284572">":-\\"</item>
     <item msgid="6895634303037073990">":\'("</item>
     <item msgid="3660685022708121640">":-X"</item>
-    <item msgid="2893940139682468617">":-О"</item>
+    <item msgid="2893940139682468617">":-D"</item>
     <item msgid="4888792634429693183">"o_O"</item>
     <item msgid="1585296316137615252">"&lt;3"</item>
     <item msgid="5254456916552252873">"x-("</item>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 77e00b24..08f5954c 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -22,15 +22,15 @@
     <item msgid="6418813270603201918">":-)"</item>
     <item msgid="5037069969500587717">":-("</item>
     <item msgid="1706022067142803863">";-)"</item>
-    <item msgid="1248733150365342132">":-T"</item>
-    <item msgid="817475806953665071">"=-A"</item>
+    <item msgid="1248733150365342132">":-P"</item>
+    <item msgid="817475806953665071">"=-O"</item>
     <item msgid="2791428909459014455">":-*"</item>
-    <item msgid="3521914049512875091">":A"</item>
-    <item msgid="1245726345240784103">"O-)"</item>
+    <item msgid="3521914049512875091">":O"</item>
+    <item msgid="1245726345240784103">"B-)"</item>
     <item msgid="6236841507652113784">":-$"</item>
     <item msgid="9041518876704445176">":-!"</item>
     <item msgid="5938573563873054892">":-["</item>
-    <item msgid="662834190186827918">"A:-)"</item>
+    <item msgid="662834190186827918">"O:-)"</item>
     <item msgid="8667007781479284572">":-\\"</item>
     <item msgid="6895634303037073990">":\'("</item>
     <item msgid="3660685022708121640">":-X"</item>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index b6cf2272..7e2e9393 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -22,7 +22,7 @@
     <item msgid="6418813270603201918">":-)"</item>
     <item msgid="5037069969500587717">":-("</item>
     <item msgid="1706022067142803863">";-)"</item>
-    <item msgid="1248733150365342132">":-p"</item>
+    <item msgid="1248733150365342132">":-P"</item>
     <item msgid="817475806953665071">"=-O"</item>
     <item msgid="2791428909459014455">":-*"</item>
     <item msgid="3521914049512875091">":O"</item>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 15933659..be4eb274 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -22,7 +22,7 @@
     <item msgid="6418813270603201918">":-)"</item>
     <item msgid="5037069969500587717">":-("</item>
     <item msgid="1706022067142803863">";-)"</item>
-    <item msgid="1248733150365342132">":-p"</item>
+    <item msgid="1248733150365342132">":-P"</item>
     <item msgid="817475806953665071">"=-O"</item>
     <item msgid="2791428909459014455">":-*"</item>
     <item msgid="3521914049512875091">":O"</item>
@@ -33,7 +33,7 @@
     <item msgid="662834190186827918">"O:-)"</item>
     <item msgid="8667007781479284572">":-\\"</item>
     <item msgid="6895634303037073990">":\'("</item>
-    <item msgid="3660685022708121640">":-x"</item>
+    <item msgid="3660685022708121640">":-X"</item>
     <item msgid="2893940139682468617">":-D"</item>
     <item msgid="4888792634429693183">"o_O"</item>
     <item msgid="1585296316137615252">"&lt;3"</item>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index f4cbf8c8..bf68a05a 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -34,7 +34,7 @@
     <item msgid="8667007781479284572">":-\\"</item>
     <item msgid="6895634303037073990">":\'("</item>
     <item msgid="3660685022708121640">":-X"</item>
-    <item msgid="2893940139682468617">":-Di"</item>
+    <item msgid="2893940139682468617">":-D"</item>
     <item msgid="4888792634429693183">"o_O"</item>
     <item msgid="1585296316137615252">"&lt;3"</item>
     <item msgid="5254456916552252873">"x-("</item>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index f881e9ef..a1522707 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -33,7 +33,7 @@
     <item msgid="662834190186827918">"O:-)"</item>
     <item msgid="8667007781479284572">":-\\"</item>
     <item msgid="6895634303037073990">":\'("</item>
-    <item msgid="3660685022708121640">":-x"</item>
+    <item msgid="3660685022708121640">":-X"</item>
     <item msgid="2893940139682468617">":-D"</item>
     <item msgid="4888792634429693183">"o_O"</item>
     <item msgid="1585296316137615252">"&lt;3"</item>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 3061264b..1a0cfd74 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -39,7 +39,7 @@
     <item msgid="1585296316137615252">"&lt;3"</item>
     <item msgid="5254456916552252873">"x-("</item>
     <item msgid="6605652107194120777">":-/"</item>
-    <item msgid="5729958058423636943">":-|"</item>
+    <item msgid="5729958058423636943">":-I"</item>
   </string-array>
   <string-array name="default_smiley_names">
     <item msgid="1831934949361041701">"Gembira"</item>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index e4a977de..5d211314 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -23,7 +23,7 @@
     <item msgid="5037069969500587717">":-("</item>
     <item msgid="1706022067142803863">";-)"</item>
     <item msgid="1248733150365342132">":-P"</item>
-    <item msgid="817475806953665071">"Err:502"</item>
+    <item msgid="817475806953665071">"=-O"</item>
     <item msgid="2791428909459014455">":-*"</item>
     <item msgid="3521914049512875091">":O"</item>
     <item msgid="1245726345240784103">"B-)"</item>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index e77799a2..970fbbdb 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -22,15 +22,15 @@
     <item msgid="6418813270603201918">":-)"</item>
     <item msgid="5037069969500587717">":-("</item>
     <item msgid="1706022067142803863">";-)"</item>
-    <item msgid="1248733150365342132">":-Ç"</item>
-    <item msgid="817475806953665071">"=-D"</item>
+    <item msgid="1248733150365342132">":-P"</item>
+    <item msgid="817475806953665071">"=-O"</item>
     <item msgid="2791428909459014455">":-*"</item>
-    <item msgid="3521914049512875091">":D"</item>
+    <item msgid="3521914049512875091">":O"</item>
     <item msgid="1245726345240784103">"B-)"</item>
     <item msgid="6236841507652113784">":-$"</item>
     <item msgid="9041518876704445176">":-!"</item>
     <item msgid="5938573563873054892">":-["</item>
-    <item msgid="662834190186827918">"D:-)"</item>
+    <item msgid="662834190186827918">"O:-)"</item>
     <item msgid="8667007781479284572">":-\\"</item>
     <item msgid="6895634303037073990">":\'("</item>
     <item msgid="3660685022708121640">":-X"</item>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 6fe7b7fc..58fd9687 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -22,15 +22,15 @@
     <item msgid="6418813270603201918">":-)"</item>
     <item msgid="5037069969500587717">":-("</item>
     <item msgid="1706022067142803863">";-)"</item>
-    <item msgid="1248733150365342132">":-寻呼"</item>
-    <item msgid="817475806953665071">"=-其他"</item>
+    <item msgid="1248733150365342132">":-P"</item>
+    <item msgid="817475806953665071">"=-O"</item>
     <item msgid="2791428909459014455">":-*"</item>
-    <item msgid="3521914049512875091">":其他"</item>
+    <item msgid="3521914049512875091">":O"</item>
     <item msgid="1245726345240784103">"B-)"</item>
     <item msgid="6236841507652113784">":-$"</item>
     <item msgid="9041518876704445176">":-!"</item>
     <item msgid="5938573563873054892">":-["</item>
-    <item msgid="662834190186827918">"其他:-)"</item>
+    <item msgid="662834190186827918">"O:-)"</item>
     <item msgid="8667007781479284572">":-\\"</item>
     <item msgid="6895634303037073990">":\'("</item>
     <item msgid="3660685022708121640">":-X"</item>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 37686196..4f2a70ed 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -36,10 +36,10 @@
     <item msgid="3660685022708121640">":-X"</item>
     <item msgid="2893940139682468617">":-D"</item>
     <item msgid="4888792634429693183">"o_O"</item>
-    <item msgid="1585296316137615252">"3"</item>
-    <item msgid="5254456916552252873">":-X"</item>
+    <item msgid="1585296316137615252">"&lt;3"</item>
+    <item msgid="5254456916552252873">"x-("</item>
     <item msgid="6605652107194120777">":-/"</item>
-    <item msgid="5729958058423636943">"i"</item>
+    <item msgid="5729958058423636943">":-I"</item>
   </string-array>
   <string-array name="default_smiley_names">
     <item msgid="1831934949361041701">"Jabulile"</item>