diff options
| author | Eric Fischer <enf@google.com> | 2011-09-23 15:45:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-23 15:45:27 -0700 |
| commit | b8c7826264816492ff91a27b1eb2d0d1454053e1 (patch) | |
| tree | eb2e8552fa1685a9761d071b9b431b805ca435ae /core | |
| parent | 90bf47658855c2ab0d85933d2fc7925ec3de6bf4 (diff) | |
| parent | 9bb4a78190830b8402c8640f4b48399317c2cf95 (diff) | |
| download | frameworks_base-b8c7826264816492ff91a27b1eb2d0d1454053e1.zip frameworks_base-b8c7826264816492ff91a27b1eb2d0d1454053e1.tar.gz frameworks_base-b8c7826264816492ff91a27b1eb2d0d1454053e1.tar.bz2 | |
Merge "Mark MCC locale replacement strings not translatable." into ics-factoryrom
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values-mcc204/strings.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values-mcc230/strings.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values-mcc232/strings.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values-mcc234/strings.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values-mcc260/strings.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values-mcc262/strings.xml | 2 |
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 c3fff3d..134e9d2 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 559b858..3078bf8 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 494770f..809e4a0 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 2e6a3f3..676defe 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 20c19dd..90f2521 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 8ca0e31..ae323b8 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> |