summaryrefslogtreecommitdiffstats
path: root/res/xml-es
diff options
context:
space:
mode:
authorXianzhu Wang <wangxianzhu@google.com>2009-07-10 15:32:07 +0800
committerXianzhu Wang <wangxianzhu@google.com>2009-07-17 11:19:50 +0800
commit58d601794eaa8292ea19df8fc74f97c93d1d93c7 (patch)
treee12ae510c5aeca16251fd902b3db4c973aa68624 /res/xml-es
parentf90682f4fb645ff45cbabcc0e7c3c26dc3cce599 (diff)
downloadpackages_apps_settings-58d601794eaa8292ea19df8fc74f97c93d1d93c7.zip
packages_apps_settings-58d601794eaa8292ea19df8fc74f97c93d1d93c7.tar.gz
packages_apps_settings-58d601794eaa8292ea19df8fc74f97c93d1d93c7.tar.bz2
1. Added the missing timezone for mainland China "Asia/Shanghai".
In each localized version of timezones.xml, the name of this timezone is defined like "China Standard Time (Beijing)" if some other timezones are also in this format, or just "Beijing" if all of other timezones are of city names. 2. Changed time zone name of "Asia/Taipei" from "China Standard Time (Taipei)" to "Taipei" in some localized versions of timezones.xml. "China Standard Time" is for China mainland, and the timezone of Taipei is normally called "Taipei Standard Time" (or "Chungyuan Standard Time"). Though for now the offset of "Taipei Standard Time" and "China Standard Time" is the same, they were different during 1986-1991 because of daylight saving of China mainland.
Diffstat (limited to 'res/xml-es')
-rw-r--r--res/xml-es/timezones.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/res/xml-es/timezones.xml b/res/xml-es/timezones.xml
index 674d55d..d59aabe 100644
--- a/res/xml-es/timezones.xml
+++ b/res/xml-es/timezones.xml
@@ -62,11 +62,12 @@
<timezone id="Asia/Rangoon">Rangún</timezone>
<timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
<timezone id="Asia/Bangkok">Bangkok</timezone>
+ <timezone id="Asia/Shanghai">Hora estándar de China (Beijing)</timezone>
<timezone id="Asia/Hong_Kong">Hong Kong</timezone>
<timezone id="Asia/Irkutsk">Irkutsk</timezone>
<timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
<timezone id="Australia/Perth">Hora de Australia (Perth)</timezone>
- <timezone id="Asia/Taipei">Hora estándar de China (Taipei)</timezone>
+ <timezone id="Asia/Taipei">Taipei</timezone>
<timezone id="Asia/Seoul">Seúl</timezone>
<timezone id="Asia/Tokyo">Hora estándar de Japón (Tokio)</timezone>
<timezone id="Asia/Yakutsk">Yakutsk</timezone>