diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-21 14:38:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-21 14:38:09 -0700 |
| commit | c4bd101e211e92ba2c22e25bcff218a4cc57a3e7 (patch) | |
| tree | 0e656aaf517fafcfb65a31088b63af6228ef8e07 /res/values | |
| parent | 41b5321e8b8e795941156ff2c8127d34e2dfe1e7 (diff) | |
| parent | 8d4faa9ec3e29695b8d5d039bc8ac12d9bd655a8 (diff) | |
| download | packages_apps_Settings-c4bd101e211e92ba2c22e25bcff218a4cc57a3e7.zip packages_apps_Settings-c4bd101e211e92ba2c22e25bcff218a4cc57a3e7.tar.gz packages_apps_Settings-c4bd101e211e92ba2c22e25bcff218a4cc57a3e7.tar.bz2 | |
am 8d4faa9e: Merge change 7977 into donut
Merge commit '8d4faa9ec3e29695b8d5d039bc8ac12d9bd655a8'
* commit '8d4faa9ec3e29695b8d5d039bc8ac12d9bd655a8':
Add a way to override the display names for locales in the locale picker.
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index a470acc..6ec90ca 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -255,4 +255,17 @@ <item>2</item> </string-array> + <!-- Locales in this list are displayed with the corresponding + name from special_locale_names instead of using the name + from Locale.getDisplayName(). --> + <string-array translatable="false" name="special_locale_codes"> + <item>zh_CN</item> + <item>zh_TW</item> + </string-array> + + <string-array translatable="false" name="special_locale_names"> + <item>中文（简体）</item> + <item>中文 (繁體)</item> + </string-array> + </resources> |