commit 09585f2d4fba5c3ffdafe223b4f7ebf285d98715
author Geoff Mendal <mendal@google.com> Wed Nov 04 14:03:46 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 04 14:03:46 2015 +0000
tree 217b411e6a90a6c79c1a90bda12786077bf6796d
parent 02ebfb1d28d408d53bc95b7e8de7b88d56954873
parent 1ebb70ca7743297425e31019e5f7ba5380baa9f4

Merge "Import translations. DO NOT MERGE"

java/res/values-da/strings-emoji-descriptions.xml

diff --git a/java/res/values-da/strings-emoji-descriptions.xml b/java/res/values-da/strings-emoji-descriptions.xml
index afe0060..8937ef4 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>

java/res/values-fa/strings-appname.xml

diff --git a/java/res/values-fa/strings-appname.xml b/java/res/values-fa/strings-appname.xml
index f6c9f54..e505187 100644
--- a/java/res/values-fa/strings-appname.xml
+++ b/java/res/values-fa/strings-appname.xml
@@ -20,8 +20,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="english_ime_name" msgid="5940510615957428904">"‏صفحه کلید Android ‏(AOSP)"</string>
+    <string name="english_ime_name" msgid="5940510615957428904">"‏صفحه‌کلید Android ‏(AOSP)"</string>
     <string name="spell_checker_service_name" msgid="1254221805440242662">"‏غلط‌گیر Android ‏(AOSP)"</string>
-    <string name="english_ime_settings" msgid="5760361067176802794">"‏تنظیمات صفحه کلید Android ‏(AOSP)"</string>
+    <string name="english_ime_settings" msgid="5760361067176802794">"‏تنظیمات صفحه‌کلید Android ‏(AOSP)"</string>
     <string name="android_spell_checker_settings" msgid="6123949487832861885">"‏تنظیمات غلط‌گیر Android ‏(AOSP)"</string>
 </resources>