diff options
| author | Xianzhu Wang <wangxianzhu@google.com> | 2009-07-10 15:32:07 +0800 |
|---|---|---|
| committer | Xianzhu Wang <wangxianzhu@google.com> | 2009-07-17 11:19:50 +0800 |
| commit | 58d601794eaa8292ea19df8fc74f97c93d1d93c7 (patch) | |
| tree | e12ae510c5aeca16251fd902b3db4c973aa68624 /res/xml-ja | |
| parent | f90682f4fb645ff45cbabcc0e7c3c26dc3cce599 (diff) | |
| download | packages_apps_Settings-58d601794eaa8292ea19df8fc74f97c93d1d93c7.tar.gz packages_apps_Settings-58d601794eaa8292ea19df8fc74f97c93d1d93c7.tar.bz2 packages_apps_Settings-58d601794eaa8292ea19df8fc74f97c93d1d93c7.zip | |
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-ja')
| -rw-r--r-- | res/xml-ja/timezones.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/res/xml-ja/timezones.xml b/res/xml-ja/timezones.xml index 9a698cf60..168ba049a 100644 --- a/res/xml-ja/timezones.xml +++ b/res/xml-ja/timezones.xml @@ -62,11 +62,12 @@ <timezone id="Asia/Rangoon">ラングーン</timezone> <timezone id="Asia/Krasnoyarsk">クラスノヤルスク</timezone> <timezone id="Asia/Bangkok">バンコク</timezone> + <timezone id="Asia/Shanghai">中国標準時 (北京)</timezone> <timezone id="Asia/Hong_Kong">香港</timezone> <timezone id="Asia/Irkutsk">イルクーツク</timezone> <timezone id="Asia/Kuala_Lumpur">アジア/クアラルンプール</timezone> <timezone id="Australia/Perth">パース</timezone> - <timezone id="Asia/Taipei">中国標準時 (台北)</timezone> + <timezone id="Asia/Taipei">台北</timezone> <timezone id="Asia/Seoul">ソウル</timezone> <timezone id="Asia/Tokyo">日本標準時 (東京)</timezone> <timezone id="Asia/Yakutsk">ヤクーツク</timezone> |