summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-07-14 14:44:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-07-14 14:44:18 +0000
commitc5999bd8d7a5f21d52c25c5fdc2438b4da229eaf (patch)
treefc060d094fb9208acb3466a04aefe274425f7335
parentd61e6b5090f9e31524193fbd4bc7ddb40bf4c2d6 (diff)
parent0e8ed52d25040b39a18cd3a7e9c4f2bbb6957206 (diff)
downloadandroid_packages_inputmethods_LatinIME-c5999bd8d7a5f21d52c25c5fdc2438b4da229eaf.tar.gz
android_packages_inputmethods_LatinIME-c5999bd8d7a5f21d52c25c5fdc2438b4da229eaf.tar.bz2
android_packages_inputmethods_LatinIME-c5999bd8d7a5f21d52c25c5fdc2438b4da229eaf.zip
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
-rw-r--r--java/res/values-de/strings-emoji-descriptions.xml2
-rw-r--r--java/res/values-fa/strings-emoji-descriptions.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/java/res/values-de/strings-emoji-descriptions.xml b/java/res/values-de/strings-emoji-descriptions.xml
index 75c8efae7..59f2196d6 100644
--- a/java/res/values-de/strings-emoji-descriptions.xml
+++ b/java/res/values-de/strings-emoji-descriptions.xml
@@ -1081,7 +1081,7 @@
<skip />
<!-- no translation found for spoken_emoji_1F644 (446284817942609022) -->
<skip />
- <string name="spoken_emoji_1F645" msgid="5202090629227587076">"Gesicht mit Nicht in Ordnung-Geste"</string>
+ <string name="spoken_emoji_1F645" msgid="5202090629227587076">"Gesicht mit Nicht-in-Ordnung-Geste"</string>
<string name="spoken_emoji_1F646" msgid="6734425134415138134">"Gesicht mit Ok-Geste"</string>
<string name="spoken_emoji_1F647" msgid="1090285518444205483">"Sich tief verneigende Person"</string>
<string name="spoken_emoji_1F648" msgid="8978535230610522356">"Nichts-Sehen-Affe"</string>
diff --git a/java/res/values-fa/strings-emoji-descriptions.xml b/java/res/values-fa/strings-emoji-descriptions.xml
index 35139efb7..cce120201 100644
--- a/java/res/values-fa/strings-emoji-descriptions.xml
+++ b/java/res/values-fa/strings-emoji-descriptions.xml
@@ -541,7 +541,7 @@
<string name="spoken_emoji_1F3E7" msgid="6322352038284944265">"دستگاه خودپرداز"</string>
<string name="spoken_emoji_1F3E8" msgid="5864918444350599907">"هتل"</string>
<string name="spoken_emoji_1F3E9" msgid="7830416185375326938">"هتل عشاق"</string>
- <string name="spoken_emoji_1F3EA" msgid="5081084413084360479">"خواروبار فروشی"</string>
+ <string name="spoken_emoji_1F3EA" msgid="5081084413084360479">"دکه بقالی"</string>
<string name="spoken_emoji_1F3EB" msgid="7010966528205150525">"مدرسه"</string>
<string name="spoken_emoji_1F3EC" msgid="4845978861878295154">"فروشگاه بزرگ"</string>
<string name="spoken_emoji_1F3ED" msgid="3980316226665215370">"کارخانه"</string>