diff options
| author | 2014-09-21 18:07:49 +0000 | |
|---|---|---|
| committer | 2014-09-21 18:07:51 +0000 | |
| commit | 33d34b89d11c65db2891dc8fd9a6d0fb95b5f4d2 (patch) | |
| tree | 0faf4bebde32252759b1dcd09c262de9f6fd2c8b | |
| parent | 650d7d9dd27adb7fc700e99bb5167fe697785c61 (diff) | |
| parent | b1b8fa00dee4ea22452014e22443df9cda9fcc43 (diff) | |
Merge "Import translations. DO NOT MERGE" into lmp-dev
| -rw-r--r-- | packages/SettingsProvider/res/values-ms-rMY/defaults.xml | 4 | ||||
| -rw-r--r-- | packages/SettingsProvider/res/values-zh-rCN/defaults.xml | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/packages/SettingsProvider/res/values-ms-rMY/defaults.xml b/packages/SettingsProvider/res/values-ms-rMY/defaults.xml index 012a65ff1ab3..22443a5673ea 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> diff --git a/packages/SettingsProvider/res/values-zh-rCN/defaults.xml b/packages/SettingsProvider/res/values-zh-rCN/defaults.xml index 3627c9b0c196..22443a5673ea 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> |