From a8335b5ec3027362e85e1cd59abef2a5f5c3554c Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 1 Jun 2016 02:19:58 -0700
Subject: [PATCH] Import translations. DO NOT MERGE

Change-Id: I764ac22a2f9398e02cc956738ed2e817f8a07c94
Auto-generated-cl: translation import
---
 java/res/values-fa/strings-talkback-descriptions.xml     | 6 +++---
 java/res/values-uz-rUZ/strings-talkback-descriptions.xml | 2 +-
 2 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 81e7540a2..049cff918 100644
--- a/java/res/values-fa/strings-talkback-descriptions.xml
+++ b/java/res/values-fa/strings-talkback-descriptions.xml
@@ -40,7 +40,7 @@
     <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
     <string name="spoken_description_space" msgid="5908716896642059145">"فاصله"</string>
     <string name="spoken_description_mic" msgid="6153138783813452464">"ورودی گفتاری"</string>
-    <string name="spoken_description_emoji" msgid="7990051553008088470">"‏شکلک Emoji"</string>
+    <string name="spoken_description_emoji" msgid="7990051553008088470">"اموجی"</string>
     <string name="spoken_description_return" msgid="3183692287397645708">"بازگشت"</string>
     <string name="spoken_description_search" msgid="5099937658231911288">"جستجو"</string>
     <string name="spoken_description_dot" msgid="5644176501632325560">"نقطه"</string>
@@ -58,7 +58,7 @@
     <string name="announce_keyboard_mode" msgid="6698257917367823205">"در حال نمایش صفحه‌کلید <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
     <string name="keyboard_mode_date" msgid="6597407244976713364">"تاریخ"</string>
     <string name="keyboard_mode_date_time" msgid="3642804408726668808">"تاریخ و زمان"</string>
-    <string name="keyboard_mode_email" msgid="1239682082047693644">"ایمیل"</string>
+    <string name="keyboard_mode_email" msgid="1239682082047693644">"رایانامه"</string>
     <string name="keyboard_mode_im" msgid="3812086215529493501">"پیام‌رسانی"</string>
     <string name="keyboard_mode_number" msgid="5395042245837996809">"عدد"</string>
     <string name="keyboard_mode_phone" msgid="2486230278064523665">"تلفن"</string>
@@ -82,7 +82,7 @@
     <string name="spoken_letter_0049" msgid="4743162182646977944">"‏I بزرگ"</string>
     <string name="spoken_letter_0130" msgid="4766619646231612274">"‏I بزرگ با نقطه بالایی"</string>
     <string name="spoken_symbol_unknown" msgid="717298227061173706">"نماد نامشخص"</string>
-    <string name="spoken_emoji_unknown" msgid="5981009928135394306">"‏شکلک emoji نامشخص"</string>
+    <string name="spoken_emoji_unknown" msgid="5981009928135394306">"اموجی ناشناس"</string>
     <string name="spoken_emoticon_3A_2D_21_20" msgid="2410905667389534573">"صورتک بی‌حوصله"</string>
     <string name="spoken_emoticon_3A_2D_24_20" msgid="2481260475945560438">"صورتک شرمنده"</string>
     <string name="spoken_emoticon_42_2D_29_20" msgid="1063205250387128068">"صورتک با عینک آفتابی"</string>
diff --git a/java/res/values-uz-rUZ/strings-talkback-descriptions.xml b/java/res/values-uz-rUZ/strings-talkback-descriptions.xml
index b6e5f52b1..4f6907ceb 100644
--- a/java/res/values-uz-rUZ/strings-talkback-descriptions.xml
+++ b/java/res/values-uz-rUZ/strings-talkback-descriptions.xml
@@ -45,7 +45,7 @@
     <string name="spoken_description_search" msgid="5099937658231911288">"Qidiruv"</string>
     <string name="spoken_description_dot" msgid="5644176501632325560">"Qora nuqta"</string>
     <string name="spoken_description_language_switch" msgid="6818666779313544553">"Tilni o‘zgartirish"</string>
-    <string name="spoken_description_action_next" msgid="431761808119616962">"Keyingi"</string>
+    <string name="spoken_description_action_next" msgid="431761808119616962">"Keyingisi"</string>
     <string name="spoken_description_action_previous" msgid="2919072174697865110">"Avvalgi"</string>
     <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Yuqori registr yoqildi"</string>
     <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps Lock yoqildi"</string>