Skip to content

Commit bcbe34c

Browse files
Eric FischerAndroid Git Automerger
authored andcommitted
am b8c7826: Merge "Mark MCC locale replacement strings not translatable." into ics-factoryrom
* commit 'b8c7826264816492ff91a27b1eb2d0d1454053e1': Mark MCC locale replacement strings not translatable.
2 parents 68c1497 + b8c7826 commit bcbe34c

6 files changed

Lines changed: 6 additions & 6 deletions

File tree

core/res/res/values-mcc204/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
2121

2222
<!-- A string used to replace %s in a URL to fill in the locale for countries -->
23-
<!-- whose locale we don't natively support. A 0 length string triggers no replacement -->
23+
<!-- whose locale we don't natively support. A 0 length string triggers no replacement. Do not translate -->
2424
<string name="locale_replacement">nl_nl</string>
2525
</resources>

core/res/res/values-mcc230/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
2121

2222
<!-- A string used to replace %s in a URL to fill in the locale for countries -->
23-
<!-- whose locale we don't natively support. A 0 length string triggers no replacement -->
23+
<!-- whose locale we don't natively support. A 0 length string triggers no replacement. Do not translate -->
2424
<string name="locale_replacement">cs_cz</string>
2525
</resources>

core/res/res/values-mcc232/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
2121

2222
<!-- A string used to replace %s in a URL to fill in the locale for countries -->
23-
<!-- whose locale we don't natively support. A 0 length string triggers no replacement -->
23+
<!-- whose locale we don't natively support. A 0 length string triggers no replacement. Do not translate -->
2424
<string name="locale_replacement">de_at</string>
2525
</resources>

core/res/res/values-mcc234/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
2121

2222
<!-- A string used to replace %s in a URL to fill in the locale for countries -->
23-
<!-- whose locale we don't natively support. A 0 length string triggers no replacement -->
23+
<!-- whose locale we don't natively support. A 0 length string triggers no replacement. Do not translate -->
2424
<string name="locale_replacement">en_gb</string>
2525
</resources>

core/res/res/values-mcc260/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
2121

2222
<!-- A string used to replace %s in a URL to fill in the locale for countries -->
23-
<!-- whose locale we don't natively support. A 0 length string triggers no replacement -->
23+
<!-- whose locale we don't natively support. A 0 length string triggers no replacement. Do not translate -->
2424
<string name="locale_replacement">pl_pl</string>
2525
</resources>

core/res/res/values-mcc262/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
2121

2222
<!-- A string used to replace %s in a URL to fill in the locale for countries -->
23-
<!-- whose locale we don't natively support. A 0 length string triggers no replacement -->
23+
<!-- whose locale we don't natively support. A 0 length string triggers no replacement. Do not translate -->
2424
<string name="locale_replacement">de_de</string>
2525
</resources>

0 commit comments

Comments
 (0)