commit 33d34b89d11c65db2891dc8fd9a6d0fb95b5f4d2
author Baligh Uddin <baligh@google.com> Sun Sep 21 18:07:49 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Sep 21 18:07:51 2014 +0000
tree 0faf4bebde32252759b1dcd09c262de9f6fd2c8b
parent 650d7d9dd27adb7fc700e99bb5167fe697785c61
parent b1b8fa00dee4ea22452014e22443df9cda9fcc43

Merge "Import translations. DO NOT MERGE" into lmp-dev

packages/SettingsProvider/res/values-ms-rMY/defaults.xml

diff --git a/packages/SettingsProvider/res/values-ms-rMY/defaults.xml b/packages/SettingsProvider/res/values-ms-rMY/defaults.xml
index 012a65f..22443a5 100644
--- a/packages/SettingsProvider/res/values-ms-rMY/defaults.xml
+++ b/packages/SettingsProvider/res/values-ms-rMY/defaults.xml
@@ -20,7 +20,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for def_device_name_simple (9037785625140748221) -->
-    <skip />
+    <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string>
 </resources>

packages/SettingsProvider/res/values-zh-rCN/defaults.xml

diff --git a/packages/SettingsProvider/res/values-zh-rCN/defaults.xml b/packages/SettingsProvider/res/values-zh-rCN/defaults.xml
index 3627c9b..22443a5 100644
--- a/packages/SettingsProvider/res/values-zh-rCN/defaults.xml
+++ b/packages/SettingsProvider/res/values-zh-rCN/defaults.xml
@@ -20,6 +20,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string>
-    <!-- no translation found for def_device_name_simple (9037785625140748221) -->
-    <skip />
+    <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string>
 </resources>