From 1045ec515849774434744bd9a45e535cf6081b76 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 10 May 2017 11:57:01 -0700
Subject: [PATCH] Import translations. DO NOT MERGE

Change-Id: Id738f4b110ee27a2c18cf8ade15afe67e5b150f8
Auto-generated-cl: translation import
---
 java/res/values-fa/strings-talkback-descriptions.xml | 2 +-
 java/res/values-gl/strings-talkback-descriptions.xml | 2 +-
 java/res/values-pa/strings-talkback-descriptions.xml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/res/values-fa/strings-talkback-descriptions.xml b/java/res/values-fa/strings-talkback-descriptions.xml
index 049cff918..12b55be65 100644
--- a/java/res/values-fa/strings-talkback-descriptions.xml
+++ b/java/res/values-fa/strings-talkback-descriptions.xml
@@ -74,7 +74,7 @@
     <string name="spoken_descrption_emoji_category_flags" msgid="5971573825866381472">"پرچم‌ها"</string>
     <string name="spoken_descrption_emoji_category_eight_smiley_people" msgid="5682663819532433464">"شکلک و مردم"</string>
     <string name="spoken_descrption_emoji_category_eight_animals_nature" msgid="5844950234883716704">"حیوانات و طبیعت"</string>
-    <string name="spoken_descrption_emoji_category_eight_food_drink" msgid="6196944764485349650">"خوردنی‌ها و آشامیدنی‌ها"</string>
+    <string name="spoken_descrption_emoji_category_eight_food_drink" msgid="6196944764485349650">"‏غذا و نوشیدنی"</string>
     <string name="spoken_descrption_emoji_category_eight_travel_places" msgid="3834085499381434611">"سفر و مکان‌ها"</string>
     <string name="spoken_descrption_emoji_category_eight_activity" msgid="4795281669042975993">"فعالیت"</string>
     <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"شکلک‌ها"</string>
diff --git a/java/res/values-gl/strings-talkback-descriptions.xml b/java/res/values-gl/strings-talkback-descriptions.xml
index 179eb8da5..0d28d03e8 100644
--- a/java/res/values-gl/strings-talkback-descriptions.xml
+++ b/java/res/values-gl/strings-talkback-descriptions.xml
@@ -59,7 +59,7 @@
     <string name="keyboard_mode_date" msgid="6597407244976713364">"data"</string>
     <string name="keyboard_mode_date_time" msgid="3642804408726668808">"data e hora"</string>
     <string name="keyboard_mode_email" msgid="1239682082047693644">"correo electrónico"</string>
-    <string name="keyboard_mode_im" msgid="3812086215529493501">"mensaxería"</string>
+    <string name="keyboard_mode_im" msgid="3812086215529493501">"mensaxaría"</string>
     <string name="keyboard_mode_number" msgid="5395042245837996809">"número"</string>
     <string name="keyboard_mode_phone" msgid="2486230278064523665">"teléfono"</string>
     <string name="keyboard_mode_text" msgid="9138789594969187494">"texto"</string>
diff --git a/java/res/values-pa/strings-talkback-descriptions.xml b/java/res/values-pa/strings-talkback-descriptions.xml
index 1956d326a..7a24f0cc1 100644
--- a/java/res/values-pa/strings-talkback-descriptions.xml
+++ b/java/res/values-pa/strings-talkback-descriptions.xml
@@ -69,13 +69,13 @@
     <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"ਲੋਕ"</string>
     <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"ਵਸਤਾਂ"</string>
     <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"ਕੁਦਰਤ"</string>
-    <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"ਥਾਵਾਂ"</string>
+    <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"ਥਾਂਵਾਂ"</string>
     <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"ਚਿੰਨ੍ਹ"</string>
     <string name="spoken_descrption_emoji_category_flags" msgid="5971573825866381472">"ਫਲੈਗ"</string>
     <string name="spoken_descrption_emoji_category_eight_smiley_people" msgid="5682663819532433464">"ਸਮਾਈਲੀ &amp; ਲੋਕ"</string>
     <string name="spoken_descrption_emoji_category_eight_animals_nature" msgid="5844950234883716704">"ਜਾਨਵਰ &amp; ਕੁਦਰਤ"</string>
     <string name="spoken_descrption_emoji_category_eight_food_drink" msgid="6196944764485349650">"ਖਾਣਾ &amp; ਪੀਣਾ"</string>
-    <string name="spoken_descrption_emoji_category_eight_travel_places" msgid="3834085499381434611">"ਯਾਤਰਾ &amp; ਥਾਵਾਂ"</string>
+    <string name="spoken_descrption_emoji_category_eight_travel_places" msgid="3834085499381434611">"ਯਾਤਰਾ &amp; ਥਾਂਵਾਂ"</string>
     <string name="spoken_descrption_emoji_category_eight_activity" msgid="4795281669042975993">"ਸਰਗਰਮੀ"</string>
     <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"ਇਮੋਟੀਕੋਨਸ"</string>
     <string name="spoken_description_upper_case" msgid="4904835255229433916">"ਕੈਪੀਟਲ <xliff:g id="LOWER_LETTER">%s</xliff:g>"</string>