summaryrefslogtreecommitdiffstats
path: root/res/xml-id
diff options
context:
space:
mode:
authorXianzhu Wang <wangxianzhu@google.com>2009-09-11 14:41:05 +0800
committerXianzhu Wang <wangxianzhu@google.com>2009-09-11 14:41:05 +0800
commit88651a0b2a7a7038c8befb321100a64aec9933b8 (patch)
treebed616200209eaeff98b49f206d8c8865f04c1ec /res/xml-id
parent16cc86315d7a8e1f6a0f3083d0a810a7cb097832 (diff)
downloadpackages_apps_Settings-88651a0b2a7a7038c8befb321100a64aec9933b8.tar.gz
packages_apps_Settings-88651a0b2a7a7038c8befb321100a64aec9933b8.tar.bz2
packages_apps_Settings-88651a0b2a7a7038c8befb321100a64aec9933b8.zip
Regenerate timezones.xml after adding Asia/Shanghai timezone for
mainland China, using cldr 1.7.1 and merging translations for "Beijing". Remove unused localized timezone "xml-no/timezones.xml". "nb" is now used instead of the deprecated "no".
Diffstat (limited to 'res/xml-id')
-rw-r--r--res/xml-id/timezones.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/res/xml-id/timezones.xml b/res/xml-id/timezones.xml
index c1db8374a..ee625b0b5 100644
--- a/res/xml-id/timezones.xml
+++ b/res/xml-id/timezones.xml
@@ -62,6 +62,7 @@
<timezone id="Asia/Rangoon">Rangoon</timezone>
<timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
<timezone id="Asia/Bangkok">Bangkok</timezone>
+ <timezone id="Asia/Shanghai">Beijing</timezone>
<timezone id="Asia/Hong_Kong">Hongkong</timezone>
<timezone id="Asia/Irkutsk">Irkutsk</timezone>
<timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>