From 58d601794eaa8292ea19df8fc74f97c93d1d93c7 Mon Sep 17 00:00:00 2001 From: Xianzhu Wang Date: Fri, 10 Jul 2009 15:32:07 +0800 Subject: [PATCH] 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. --- res/xml-cs/timezones.xml | 3 ++- res/xml-de/timezones.xml | 1 + res/xml-es/timezones.xml | 3 ++- res/xml-fr/timezones.xml | 3 ++- res/xml-it/timezones.xml | 3 ++- res/xml-ja/timezones.xml | 3 ++- res/xml-ko/timezones.xml | 3 ++- res/xml-nl/timezones.xml | 3 ++- res/xml-no/timezones.xml | 1 + res/xml-pl/timezones.xml | 1 + res/xml-ru/timezones.xml | 1 + res/xml-zh/timezones.xml | 3 ++- res/xml/timezones.xml | 3 ++- 13 files changed, 22 insertions(+), 9 deletions(-) diff --git a/res/xml-cs/timezones.xml b/res/xml-cs/timezones.xml index a02d0d2a2c5..26a97156356 100644 --- a/res/xml-cs/timezones.xml +++ b/res/xml-cs/timezones.xml @@ -62,11 +62,12 @@ Rangún Krasnojarsk Bangkok + Čínský standardní čas (Peking) Hong Kong Irkutsk Kuala Lumpur Perth - Čínský standardní čas (Taipei) + Taipei Soul Japonský standardní čas (Tokio) Jakutsk diff --git a/res/xml-de/timezones.xml b/res/xml-de/timezones.xml index 39bedfebc67..50c6a85a98e 100644 --- a/res/xml-de/timezones.xml +++ b/res/xml-de/timezones.xml @@ -62,6 +62,7 @@ Rangoon Krasnojarsk Bangkok + Beijing Hongkong Irkutsk Kuala Lumpur diff --git a/res/xml-es/timezones.xml b/res/xml-es/timezones.xml index 674d55dfec2..d59aabe94ac 100644 --- a/res/xml-es/timezones.xml +++ b/res/xml-es/timezones.xml @@ -62,11 +62,12 @@ Rangún Krasnoyarsk Bangkok + Hora estándar de China (Beijing) Hong Kong Irkutsk Kuala Lumpur Hora de Australia (Perth) - Hora estándar de China (Taipei) + Taipei Seúl Hora estándar de Japón (Tokio) Yakutsk diff --git a/res/xml-fr/timezones.xml b/res/xml-fr/timezones.xml index 99673829bd5..6def4757728 100644 --- a/res/xml-fr/timezones.xml +++ b/res/xml-fr/timezones.xml @@ -62,11 +62,12 @@ Rangoon Heure de Krasnoïarsk (Krasnoïarsk) Heure d’Indochine (Bangkok) + Heure de Chine (Beijing) Heure de Hong Kong (Hong-Kong) Heure d’Irkoutsk (Irkoutsk) Kuala Lumpur Heure de l’Ouest australien (Perth) - Heure de Chine (Taipei) + Taipei Heure de Corée (Séoul) Heure du Japon (Tokyo) Iakoutsk diff --git a/res/xml-it/timezones.xml b/res/xml-it/timezones.xml index 50602021895..beefbf645e0 100644 --- a/res/xml-it/timezones.xml +++ b/res/xml-it/timezones.xml @@ -62,11 +62,12 @@ Rangoon Krasnoyarsk Bangkok + Ora Standard Cina (Pechino) Hong Kong Irkutsk Kuala Lumpur Perth - Ora Standard Cina (Taipei) + Taipei Seul Ora Standard Giappone (Tokyo) Yakutsk diff --git a/res/xml-ja/timezones.xml b/res/xml-ja/timezones.xml index 9a698cf606a..168ba049a4e 100644 --- a/res/xml-ja/timezones.xml +++ b/res/xml-ja/timezones.xml @@ -62,11 +62,12 @@ ラングーン クラスノヤルスク バンコク + 中国標準時 (北京) 香港 イルクーツク アジア/クアラルンプール パース - 中国標準時 (台北) + 台北 ソウル 日本標準時 (東京) ヤクーツク diff --git a/res/xml-ko/timezones.xml b/res/xml-ko/timezones.xml index fcc151975a5..6d62d035430 100644 --- a/res/xml-ko/timezones.xml +++ b/res/xml-ko/timezones.xml @@ -62,11 +62,12 @@ 랑군 크라스노야르스크 방콕 + 중국 표준시 (베이징) 홍콩 이르쿠츠크 쿠알라룸푸르 서부 오스트레일리아 시간 (퍼스) - 중국 표준시 (타이베이) + 타이베이 한국 표준시 (서울) 일본 표준시 (도쿄) 야쿠츠크 diff --git a/res/xml-nl/timezones.xml b/res/xml-nl/timezones.xml index 2b115b33550..e2315dfbc5a 100644 --- a/res/xml-nl/timezones.xml +++ b/res/xml-nl/timezones.xml @@ -62,11 +62,12 @@ Rangoon Krasnojarsk Bangkok + Chinese standaardtijd (Peking) Hongkong Irkoetsk Kuala Lumpur Perth - Chinese standaardtijd (Taipei) + Taipei Seoul Japanse standaardtijd (Tokio) Jakoetsk diff --git a/res/xml-no/timezones.xml b/res/xml-no/timezones.xml index d43a17b7639..85201b96e2a 100644 --- a/res/xml-no/timezones.xml +++ b/res/xml-no/timezones.xml @@ -62,6 +62,7 @@ Rangoon Krasnoyarsk Bangkok + Beijing Hong Kong Irkutsk Kuala Lumpur diff --git a/res/xml-pl/timezones.xml b/res/xml-pl/timezones.xml index 8693f21a285..ea0d72d9d94 100644 --- a/res/xml-pl/timezones.xml +++ b/res/xml-pl/timezones.xml @@ -62,6 +62,7 @@ Rangun Krasnojarsk Tajlandia + Pekin Hongkong Irkuck Kuala Lumpur diff --git a/res/xml-ru/timezones.xml b/res/xml-ru/timezones.xml index 2a60f8fd1d0..e21095f2d2a 100644 --- a/res/xml-ru/timezones.xml +++ b/res/xml-ru/timezones.xml @@ -62,6 +62,7 @@ Рангун Красноярск Бангкок + Пекин Гонконг Иркутск Куала-Лумпур diff --git a/res/xml-zh/timezones.xml b/res/xml-zh/timezones.xml index 0d61debb59f..7f852aa979d 100644 --- a/res/xml-zh/timezones.xml +++ b/res/xml-zh/timezones.xml @@ -62,11 +62,12 @@ 仰光 克拉斯诺亚尔斯克 曼谷 + 中国标准时间 (北京) 香港 伊尔库茨克 吉隆坡 佩思 - 中国标准时间 (台北) + 台北 首尔 日本标准时间 (东京) 雅库茨克 diff --git a/res/xml/timezones.xml b/res/xml/timezones.xml index e515f16b757..c9667b82f4e 100644 --- a/res/xml/timezones.xml +++ b/res/xml/timezones.xml @@ -62,7 +62,8 @@ Yangon Krasnoyarsk Bangkok - Beijing, Hong Kong + Beijing + Hong Kong Irkutsk Kuala Lumpur Perth