summaryrefslogtreecommitdiffstats
path: root/res/xml-ko
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-ko
parentf90682f4fb645ff45cbabcc0e7c3c26dc3cce599 (diff)
downloadpackages_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-ko')
-rw-r--r--res/xml-ko/timezones.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/res/xml-ko/timezones.xml b/res/xml-ko/timezones.xml
index fcc151975..6d62d0354 100644
--- a/res/xml-ko/timezones.xml
+++ b/res/xml-ko/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>