summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Fischer <enf@google.com> 2011-09-23 15:46:56 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-09-23 15:46:56 -0700
commitbcbe34c7a43adb7f8a45296e210f5028ed0042e4 (patch)
treed62bf91bf1c6f1de9e20311bf0010817685ec1dd
parent68c1497b7a3f4a3a7771ee0f5987b6b1fe9cdd77 (diff)
parentb8c7826264816492ff91a27b1eb2d0d1454053e1 (diff)
am b8c78262: Merge "Mark MCC locale replacement strings not translatable." into ics-factoryrom
* commit 'b8c7826264816492ff91a27b1eb2d0d1454053e1': Mark MCC locale replacement strings not translatable.
-rw-r--r--core/res/res/values-mcc204/strings.xml2
-rw-r--r--core/res/res/values-mcc230/strings.xml2
-rw-r--r--core/res/res/values-mcc232/strings.xml2
-rw-r--r--core/res/res/values-mcc234/strings.xml2
-rw-r--r--core/res/res/values-mcc260/strings.xml2
-rw-r--r--core/res/res/values-mcc262/strings.xml2
6 files changed, 6 insertions, 6 deletions
diff --git a/core/res/res/values-mcc204/strings.xml b/core/res/res/values-mcc204/strings.xml
index c3fff3d6df81..134e9d2007cb 100644
--- a/core/res/res/values-mcc204/strings.xml
+++ b/core/res/res/values-mcc204/strings.xml
@@ -20,6 +20,6 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- A string used to replace %s in a URL to fill in the locale for countries -->
- <!-- whose locale we don't natively support. A 0 length string triggers no replacement -->
+ <!-- whose locale we don't natively support. A 0 length string triggers no replacement. Do not translate -->
<string name="locale_replacement">nl_nl</string>
</resources>
diff --git a/core/res/res/values-mcc230/strings.xml b/core/res/res/values-mcc230/strings.xml
index 559b858cbde0..3078bf8cf1cd 100644
--- a/core/res/res/values-mcc230/strings.xml
+++ b/core/res/res/values-mcc230/strings.xml
@@ -20,6 +20,6 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- A string used to replace %s in a URL to fill in the locale for countries -->
- <!-- whose locale we don't natively support. A 0 length string triggers no replacement -->
+ <!-- whose locale we don't natively support. A 0 length string triggers no replacement. Do not translate -->
<string name="locale_replacement">cs_cz</string>
</resources>
diff --git a/core/res/res/values-mcc232/strings.xml b/core/res/res/values-mcc232/strings.xml
index 494770f213dd..809e4a08be4a 100644
--- a/core/res/res/values-mcc232/strings.xml
+++ b/core/res/res/values-mcc232/strings.xml
@@ -20,6 +20,6 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- A string used to replace %s in a URL to fill in the locale for countries -->
- <!-- whose locale we don't natively support. A 0 length string triggers no replacement -->
+ <!-- whose locale we don't natively support. A 0 length string triggers no replacement. Do not translate -->
<string name="locale_replacement">de_at</string>
</resources>
diff --git a/core/res/res/values-mcc234/strings.xml b/core/res/res/values-mcc234/strings.xml
index 2e6a3f327528..676defee3001 100644
--- a/core/res/res/values-mcc234/strings.xml
+++ b/core/res/res/values-mcc234/strings.xml
@@ -20,6 +20,6 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- A string used to replace %s in a URL to fill in the locale for countries -->
- <!-- whose locale we don't natively support. A 0 length string triggers no replacement -->
+ <!-- whose locale we don't natively support. A 0 length string triggers no replacement. Do not translate -->
<string name="locale_replacement">en_gb</string>
</resources>
diff --git a/core/res/res/values-mcc260/strings.xml b/core/res/res/values-mcc260/strings.xml
index 20c19ddb0f7e..90f25218fe30 100644
--- a/core/res/res/values-mcc260/strings.xml
+++ b/core/res/res/values-mcc260/strings.xml
@@ -20,6 +20,6 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- A string used to replace %s in a URL to fill in the locale for countries -->
- <!-- whose locale we don't natively support. A 0 length string triggers no replacement -->
+ <!-- whose locale we don't natively support. A 0 length string triggers no replacement. Do not translate -->
<string name="locale_replacement">pl_pl</string>
</resources>
diff --git a/core/res/res/values-mcc262/strings.xml b/core/res/res/values-mcc262/strings.xml
index 8ca0e31e603a..ae323b85533f 100644
--- a/core/res/res/values-mcc262/strings.xml
+++ b/core/res/res/values-mcc262/strings.xml
@@ -20,6 +20,6 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- A string used to replace %s in a URL to fill in the locale for countries -->
- <!-- whose locale we don't natively support. A 0 length string triggers no replacement -->
+ <!-- whose locale we don't natively support. A 0 length string triggers no replacement. Do not translate -->
<string name="locale_replacement">de_de</string>
</resources>