summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-07-25 00:09:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-07-25 00:09:22 +0000
commitcd953116747c80389bc7cab648f7c3700b49e671 (patch)
tree69bc30597eba261f5d799a459466acf386485012
parentce1f65074a1afc43f3be433b04a7ebc574ac2224 (diff)
parent0a5d01f5b1a05836c1f8f820f20768b81a447c2f (diff)
downloadandroid_packages_inputmethods_LatinIME-cd953116747c80389bc7cab648f7c3700b49e671.tar.gz
android_packages_inputmethods_LatinIME-cd953116747c80389bc7cab648f7c3700b49e671.tar.bz2
android_packages_inputmethods_LatinIME-cd953116747c80389bc7cab648f7c3700b49e671.zip
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
-rw-r--r--java/res/values-eu/strings-emoji-descriptions.xml2
-rw-r--r--java/res/values-ru/strings-emoji-descriptions.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/java/res/values-eu/strings-emoji-descriptions.xml b/java/res/values-eu/strings-emoji-descriptions.xml
index c4a788a0c..3b4c29e80 100644
--- a/java/res/values-eu/strings-emoji-descriptions.xml
+++ b/java/res/values-eu/strings-emoji-descriptions.xml
@@ -1100,7 +1100,7 @@
<string name="spoken_emoji_1F685" msgid="1237059817190832730">"Abiadura handiko trena mutur borobilduarekin"</string>
<string name="spoken_emoji_1F686" msgid="3525197227223620343">"Trena"</string>
<string name="spoken_emoji_1F687" msgid="5110143437960392837">"Metroa"</string>
- <string name="spoken_emoji_1F688" msgid="4702085029871797965">"Burdinbide arina"</string>
+ <string name="spoken_emoji_1F688" msgid="4702085029871797965">"Tren arina"</string>
<string name="spoken_emoji_1F689" msgid="2375851019798817094">"Geltokia"</string>
<string name="spoken_emoji_1F68A" msgid="6368370859718717198">"Tranbia"</string>
<string name="spoken_emoji_1F68B" msgid="2920160427117436633">"Tranbia-bagoia"</string>
diff --git a/java/res/values-ru/strings-emoji-descriptions.xml b/java/res/values-ru/strings-emoji-descriptions.xml
index 1c6f4e07a..2d1ee4d7b 100644
--- a/java/res/values-ru/strings-emoji-descriptions.xml
+++ b/java/res/values-ru/strings-emoji-descriptions.xml
@@ -539,7 +539,7 @@
<string name="spoken_emoji_1F3E5" msgid="1350532500431776780">"Больница."</string>
<string name="spoken_emoji_1F3E6" msgid="342132788513806214">"Банк."</string>
<string name="spoken_emoji_1F3E7" msgid="6322352038284944265">"Банкомат."</string>
- <string name="spoken_emoji_1F3E8" msgid="5864918444350599907">"Отель."</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_1F3EB" msgid="7010966528205150525">"Школа."</string>