From 4de1e2262e1d81f8d015a2ea3ccace35316308d0 Mon Sep 17 00:00:00 2001
From: Geoff Mendal <mendal@google.com>
Date: Wed, 11 Nov 2015 05:29:20 -0800
Subject: [PATCH] Import translations. DO NOT MERGE

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

diff --git a/java/res/values-da/strings-emoji-descriptions.xml b/java/res/values-da/strings-emoji-descriptions.xml
index afe0060af..8937ef459 100644
--- a/java/res/values-da/strings-emoji-descriptions.xml
+++ b/java/res/values-da/strings-emoji-descriptions.xml
@@ -26,7 +26,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="spoken_emoji_00A9" msgid="2859822817116803638">"Copyrighttegn"</string>
-    <string name="spoken_emoji_00AE" msgid="7708335454134589027">"Registreret varemærke-tegn"</string>
+    <string name="spoken_emoji_00AE" msgid="7708335454134589027">"Registreret brand-tegn"</string>
     <string name="spoken_emoji_203C" msgid="153340916701508663">"Dobbelt udråbstegn"</string>
     <string name="spoken_emoji_2049" msgid="4877256448299555371">"Udråbstegn spørgsmålstegn"</string>
     <string name="spoken_emoji_2122" msgid="9188440722954720429">"Varemærketegn"</string>
diff --git a/java/res/values-fa/strings-emoji-descriptions.xml b/java/res/values-fa/strings-emoji-descriptions.xml
index e10689dad..2959d3cd3 100644
--- a/java/res/values-fa/strings-emoji-descriptions.xml
+++ b/java/res/values-fa/strings-emoji-descriptions.xml
@@ -582,12 +582,12 @@
     <string name="spoken_emoji_1F4DC" msgid="5075845110932456783">"پیمایش"</string>
     <string name="spoken_emoji_1F4DD" msgid="2494006707147586786">"یادداشت"</string>
     <string name="spoken_emoji_1F4DE" msgid="7883008605002117671">"گوشی تلفن"</string>
-    <string name="spoken_emoji_1F4DF" msgid="3538610110623780465">"پیجر"</string>
+    <string name="spoken_emoji_1F4DF" msgid="3538610110623780465">"پی‌جو"</string>
     <string name="spoken_emoji_1F4E0" msgid="2960778342609543077">"دستگاه نمابر"</string>
     <string name="spoken_emoji_1F4E1" msgid="6269733703719242108">"آنتن ماهواره"</string>
     <string name="spoken_emoji_1F4E2" msgid="1987535386302883116">"بلندگوی جارچی"</string>
     <string name="spoken_emoji_1F4E3" msgid="5588916572878599224">"بلندگوی تشویق‌کننده"</string>
-    <string name="spoken_emoji_1F4E4" msgid="2063561529097749707">"سینی صندوق ارسال"</string>
+    <string name="spoken_emoji_1F4E4" msgid="2063561529097749707">"سینی صندوق خروجی"</string>
     <string name="spoken_emoji_1F4E5" msgid="3232462702926143576">"سینی صندوق ورودی"</string>
     <string name="spoken_emoji_1F4E6" msgid="3399454337197561635">"بسته‌بندی"</string>
     <string name="spoken_emoji_1F4E7" msgid="5557136988503873238">"نماد ایمیل"</string>