aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2014-10-17 13:00:20 +0800
committerjkim <jkim@FreeBSD.org>2014-10-17 13:00:20 +0800
commitd5c22041f12c9cd5e2d75e6fb8bcd3bbad0a0b97 (patch)
tree6e6a1013f3ec3bf08deaeb7a9e8c3cb13b9c3125 /java
parent235144ca8f870f562037e89508e93ddea228f91d (diff)
downloadfreebsd-ports-gnome-d5c22041f12c9cd5e2d75e6fb8bcd3bbad0a0b97.tar.gz
freebsd-ports-gnome-d5c22041f12c9cd5e2d75e6fb8bcd3bbad0a0b97.tar.zst
freebsd-ports-gnome-d5c22041f12c9cd5e2d75e6fb8bcd3bbad0a0b97.zip
- Update to b33.
- Update TimeZoneNames to tzdata2014g.
Diffstat (limited to 'java')
-rw-r--r--java/openjdk6/Makefile22
-rw-r--r--java/openjdk6/distinfo4
-rw-r--r--java/openjdk6/files/patch-TimeZoneNames2144
-rw-r--r--java/openjdk6/files/patch-set30
4 files changed, 1485 insertions, 715 deletions
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile
index 0c95637b1b34..908b96a2527a 100644
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= openjdk6
-PORTVERSION= b32
+PORTVERSION= b33
PORTREVISION?= 0
PORTEPOCH= 1
CATEGORIES= java devel
@@ -30,7 +30,7 @@ LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \
${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
-OPENJDK_BUILDDATE= 15_jul_2014
+OPENJDK_BUILDDATE= 14_oct_2014
OPTIONS_DEFINE= ICEDTEA IPV6 POLICY SOUND TZUPDATE
OPTIONS_DEFAULT=ICEDTEA IPV6 TZUPDATE
@@ -326,11 +326,7 @@ do-install:
${SED} -e 's,^\./,openjdk6-jre/,' >> ${TMPPLIST}
@cd ${STAGEDIR}${PREFIX}/openjdk6-jre && \
${FIND} -s . -type d -empty | \
- ${SED} 's,^\./,@exec ${MKDIR} %D/openjdk6-jre/,' >> ${TMPPLIST}
- @cd ${STAGEDIR}${PREFIX}/openjdk6-jre && \
- ${FIND} . -type d -not -depth 0 | ${SORT} -r | \
- ${SED} 's,^\.,@dirrm openjdk6-jre/,' >> ${TMPPLIST}
- @${ECHO_CMD} "@dirrm openjdk6-jre" >> ${TMPPLIST}
+ ${SED} 's,^\./,@dir openjdk6-jre/,' >> ${TMPPLIST}
@${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-jre/bin/java' >> ${PKGDEINSTALL}
@${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6-jre/bin/java # OpenJDK6 JRE"' >> ${PKGINSTALL}
.else
@@ -339,11 +335,7 @@ do-install:
${SED} -e 's,^\./,openjdk6/,' >> ${TMPPLIST}
@cd ${STAGEDIR}${PREFIX}/openjdk6 && \
${FIND} -s . -type d -empty | \
- ${SED} 's,^\./,@exec ${MKDIR} %D/openjdk6/,' >> ${TMPPLIST}
- @cd ${STAGEDIR}${PREFIX}/openjdk6 && \
- ${FIND} . -type d -not -depth 0 | ${SORT} -r | \
- ${SED} 's,^\./,@dirrm openjdk6/,' >> ${TMPPLIST}
- @${ECHO_CMD} "@dirrm openjdk6" >> ${TMPPLIST}
+ ${SED} 's,^\./,@dir openjdk6/,' >> ${TMPPLIST}
@${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6/bin/java' >> ${PKGDEINSTALL}
@${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6/bin/java # OpenJDK6"' >> ${PKGINSTALL}
.if ${PORT_OPTIONS:MFASTDEBUG}
@@ -352,11 +344,7 @@ do-install:
${SED} -e 's,^\./,openjdk6-fastdebug/,' >> ${TMPPLIST}
@cd ${STAGEDIR}${PREFIX}/openjdk6-fastdebug && \
${FIND} -s . -type d -empty | \
- ${SED} 's,^\./,@exec ${MKDIR} %D/openjdk6-fastdebug/,' >> ${TMPPLIST}
- @cd ${STAGEDIR}${PREFIX}/openjdk6-fastdebug && \
- ${FIND} . -type d -not -depth 0 | ${SORT} -r | \
- ${SED} 's,^\./,@dirrm openjdk6-fastdebug/,' >> ${TMPPLIST}
- @${ECHO_CMD} "@dirrm openjdk6-fastdebug" >> ${TMPPLIST}
+ ${SED} 's,^\./,@dir openjdk6-fastdebug/,' >> ${TMPPLIST}
@${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-fastdebug/bin/java' >> ${PKGDEINSTALL}
@${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6-fastdebug/bin/java # OpenJDK6"' >> ${PKGINSTALL}
.endif
diff --git a/java/openjdk6/distinfo b/java/openjdk6/distinfo
index 28201929eb5a..ef3edbb352bc 100644
--- a/java/openjdk6/distinfo
+++ b/java/openjdk6/distinfo
@@ -1,6 +1,6 @@
SHA256 (apache-ant-1.9.4-bin.tar.bz2) = 20c16575684b8869dd9d19abe0fb504566adefb5d397881e70a417886e0088cf
SIZE (apache-ant-1.9.4-bin.tar.bz2) = 4351965
-SHA256 (openjdk-6-src-b32-15_jul_2014.tar.xz) = 9a5ad1b599953baac1b6b34189b9487ac5dcdb367aac5cc0aa5aa49700e73871
-SIZE (openjdk-6-src-b32-15_jul_2014.tar.xz) = 33267124
+SHA256 (openjdk-6-src-b33-14_oct_2014.tar.xz) = cabc35587a90fa81edd8ba8537c0454348c37456de27e407bbb66d52031a1293
+SIZE (openjdk-6-src-b33-14_oct_2014.tar.xz) = 33476800
SHA256 (jtreg-4.1-bin-b05_29_nov_2012.zip) = 9291eb4a14501232b35614e88686ff66ad8b69d0098dbd4322b28f97b672653d
SIZE (jtreg-4.1-bin-b05_29_nov_2012.zip) = 5993382
diff --git a/java/openjdk6/files/patch-TimeZoneNames b/java/openjdk6/files/patch-TimeZoneNames
index e99993cee4aa..612168d157a7 100644
--- a/java/openjdk6/files/patch-TimeZoneNames
+++ b/java/openjdk6/files/patch-TimeZoneNames
@@ -7,6 +7,32 @@
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
+@@ -45,8 +45,8 @@
+ protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Acre Time", "ACT",
+ "Acre Summer Time", "ACST"};
+- String ADELAIDE[] = new String[] {"Central Standard Time (South Australia)", "CST",
+- "Central Summer Time (South Australia)", "CST"};
++ String ADELAIDE[] = new String[] {"Australian Central Standard Time (South Australia)", "ACST",
++ "Australian Central Daylight Time (South Australia)", "ACDT"};
+ String AGT[] = new String[] {"Argentine Time", "ART",
+ "Argentine Summer Time", "ARST"};
+ String AKST[] = new String[] {"Alaska Standard Time", "AKST",
+@@ -61,10 +61,10 @@
+ "Atlantic Daylight Time", "ADT"};
+ String BDT[] = new String[] {"Bangladesh Time", "BDT",
+ "Bangladesh Summer Time", "BDST"};
+- String BRISBANE[] = new String[] {"Eastern Standard Time (Queensland)", "EST",
+- "Eastern Summer Time (Queensland)", "EST"};
+- String BROKEN_HILL[] = new String[] {"Central Standard Time (South Australia/New South Wales)", "CST",
+- "Central Summer Time (South Australia/New South Wales)", "CST"};
++ String BRISBANE[] = new String[] {"Australian Eastern Standard Time (Queensland)", "AEST",
++ "Australian Eastern Daylight Time (Queensland)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"Australian Central Standard Time (South Australia/New South Wales)", "ACST",
++ "Australian Central Daylight Time (South Australia/New South Wales)", "ACDT"};
+ String BRT[] = new String[] {"Brasilia Time", "BRT",
+ "Brasilia Summer Time", "BRST"};
+ String BTT[] = new String[] {"Bhutan Time", "BTT",
@@ -75,7 +75,11 @@
"Central European Summer Time", "CEST"};
String CHAST[] = new String[] {"Chatham Standard Time", "CHAST",
@@ -20,16 +46,45 @@
"Central Indonesia Summer Time", "CIST"};
String CLT[] = new String[] {"Chile Time", "CLT",
"Chile Summer Time", "CLST"};
-@@ -101,6 +105,8 @@
+@@ -85,8 +89,8 @@
+ "China Daylight Time", "CDT"};
+ String CUBA[] = new String[] {"Cuba Standard Time", "CST",
+ "Cuba Daylight Time", "CDT"};
+- String DARWIN[] = new String[] {"Central Standard Time (Northern Territory)", "CST",
+- "Central Summer Time (Northern Territory)", "CST"};
++ String DARWIN[] = new String[] {"Australian Central Standard Time (Northern Territory)", "ACST",
++ "Australian Central Daylight Time (Northern Territory)", "ACDT"};
+ String DUBLIN[] = new String[] {"Greenwich Mean Time", "GMT",
+ "Irish Summer Time", "IST"};
+ String EAT[] = new String[] {"Eastern African Time", "EAT",
+@@ -99,8 +103,10 @@
+ "Eastern Greenland Summer Time", "EGST"};
+ String EST[] = new String[] {"Eastern Standard Time", "EST",
"Eastern Daylight Time", "EDT"};
- String EST_NSW[] = new String[] {"Eastern Standard Time (New South Wales)", "EST",
- "Eastern Summer Time (New South Wales)", "EST"};
+- String EST_NSW[] = new String[] {"Eastern Standard Time (New South Wales)", "EST",
+- "Eastern Summer Time (New South Wales)", "EST"};
++ String EST_NSW[] = new String[] {"Australian Eastern Standard Time (New South Wales)", "AEST",
++ "Australian Eastern Daylight Time (New South Wales)", "AEDT"};
+ String FET[] = new String[] {"Further-eastern European Time", "FET",
+ "Further-eastern European Summer Time", "FEST"};
String GHMT[] = new String[] {"Ghana Mean Time", "GMT",
"Ghana Summer Time", "GHST"};
String GAMBIER[] = new String[] {"Gambier Time", "GAMT",
-@@ -153,10 +159,12 @@
+@@ -127,10 +133,12 @@
+ "India Daylight Time", "IDT"};
+ String JST[] = new String[] {"Japan Standard Time", "JST",
+ "Japan Daylight Time", "JDT"};
++ String KRAT[] = new String[] {"Krasnoyarsk Time", "KRAT",
++ "Krasnoyarsk Summer Time", "KRAST"};
+ String KST[] = new String[] {"Korea Standard Time", "KST",
+ "Korea Daylight Time", "KDT"};
+ String LORD_HOWE[] = new String[] {"Lord Howe Standard Time", "LHST",
+- "Lord Howe Summer Time", "LHST"};
++ "Lord Howe Daylight Time", "LHDT"};
+ String MHT[] = new String[] {"Marshall Islands Time", "MHT",
+ "Marshall Islands Summer Time", "MHST"};
+ String MSK[] = new String[] {"Moscow Standard Time", "MSK",
+@@ -153,48 +161,48 @@
"Pitcairn Daylight Time", "PDT"};
String PKT[] = new String[] {"Pakistan Time", "PKT",
"Pakistan Summer Time", "PKST"};
@@ -43,25 +98,34 @@
+ "Samoa Daylight Time", "SDT"};
String SAST[] = new String[] {"South Africa Standard Time", "SAST",
"South Africa Summer Time", "SAST"};
++ String IRKT[] = new String[] {"Irkutsk Time", "IRKT",
++ "Irkutsk Summer Time", "IRKST"};
String SBT[] = new String[] {"Solomon Is. Time", "SBT",
-@@ -169,32 +177,30 @@
- "Eastern Summer Time (Tasmania)", "EST"};
+ "Solomon Is. Summer Time", "SBST"};
+ String SGT[] = new String[] {"Singapore Time", "SGT",
+ "Singapore Summer Time", "SGST"};
+- String SLST[] = new String[] {"Greenwich Mean Time", "GMT",
+- "Sierra Leone Summer Time", "SLST"};
+- String TASMANIA[] = new String[] {"Eastern Standard Time (Tasmania)", "EST",
+- "Eastern Summer Time (Tasmania)", "EST"};
++ String TASMANIA[] = new String[] {"Australian Eastern Standard Time (Tasmania)", "AEST",
++ "Australian Eastern Daylight Time (Tasmania)", "AEDT"};
String TMT[] = new String[] {"Turkmenistan Time", "TMT",
"Turkmenistan Summer Time", "TMST"};
- String TRUT[] = new String[] {"Truk Time", "TRUT",
- "Truk Summer Time", "TRUST"};
String ULAT[]= new String[] {"Ulaanbaatar Time", "ULAT",
"Ulaanbaatar Summer Time", "ULAST"};
+- String WART[] = new String[] {"Western Argentine Time", "WART",
+- "Western Argentine Summer Time", "WARST"};
+ String UTC[] = new String[] {"Coordinated Universal Time", "UTC",
+ "Coordinated Universal Time", "UTC"};
+ String UZT[] = new String[] {"Uzbekistan Time", "UZT",
+ "Uzbekistan Summer Time", "UZST"};
-+ String VICTORIA[] = new String[] {"Eastern Standard Time (Victoria)", "EST",
-+ "Eastern Summer Time (Victoria)", "EST"};
++ String VICTORIA[] = new String[] {"Australian Eastern Standard Time (Victoria)", "AEST",
++ "Australian Eastern Daylight Time (Victoria)", "AEDT"};
+ String VLAT[] = new String[] {"Vladivostok Time", "VLAT",
+ "Vladivostok Summer Time", "VLAST"};
- String WART[] = new String[] {"Western Argentine Time", "WART",
- "Western Argentine Summer Time", "WARST"};
String WAT[] = new String[] {"Western African Time", "WAT",
"Western African Summer Time", "WAST"};
String WET[] = new String[] {"Western European Time", "WET",
@@ -69,11 +133,11 @@
- String WIT[] = new String[] {"West Indonesia Time", "WIT",
+ String WIT[] = new String[] {"West Indonesia Time", "WIB",
"West Indonesia Summer Time", "WIST"};
- String WST_AUS[] = new String[] {"Western Standard Time (Australia)", "WST",
- "Western Summer Time (Australia)", "WST"};
+- String WST_AUS[] = new String[] {"Western Standard Time (Australia)", "WST",
+- "Western Summer Time (Australia)", "WST"};
- String SAMOA[] = new String[] {"Samoa Standard Time", "SST",
- "Samoa Daylight Time", "SDT"};
- String WST_SAMOA[] = new String[] {"West Samoa Time", "WST",
+- String WST_SAMOA[] = new String[] {"West Samoa Time", "WST",
- "West Samoa Summer Time", "WSST"};
- String ChST[] = new String[] {"Chamorro Standard Time", "ChST",
- "Chamorro Daylight Time", "ChDT"};
@@ -83,13 +147,18 @@
- "Coordinated Universal Time", "UTC"};
- String UZT[] = new String[] {"Uzbekistan Time", "UZT",
- "Uzbekistan Summer Time", "UZST"};
++ String WST_AUS[] = new String[] {"Australian Western Standard Time", "AWST",
++ "Australian Western Daylight Time", "AWDT"};
++ String WST_SAMOA[] = new String[] {"West Samoa Standard Time", "WSST",
+ "West Samoa Daylight Time", "WSDT"};
++ String XJT[] = new String[] {"Xinjiang Standard Time", "XJT",
++ "Xinjiang Daylight Time", "XJDT"};
+ String YAKT[] = new String[] {"Yakutsk Time", "YAKT",
+ "Yakutsk Summer Time", "YAKST"};
return new Object[][] {
{"America/Los_Angeles", PST},
-@@ -214,6 +220,7 @@
+@@ -214,6 +222,7 @@
{"America/Anchorage", AKST},
{"AST", AKST},
{"America/Halifax", AST},
@@ -97,7 +166,12 @@
{"America/St_Johns", NST},
{"CNT", NST},
{"Europe/Paris", CET},
-@@ -259,6 +266,7 @@
+@@ -255,10 +264,11 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT},
{"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST},
@@ -105,7 +179,7 @@
{"Africa/Kampala", EAT},
{"Africa/Khartoum", EAT},
{"Africa/Kigali", CAT},
-@@ -300,7 +308,7 @@
+@@ -300,7 +310,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
@@ -114,7 +188,7 @@
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
-@@ -309,6 +317,7 @@
+@@ -309,6 +319,7 @@
{"America/Atikokan", EST},
{"America/Atka", HAST},
{"America/Bahia", BRT},
@@ -122,7 +196,7 @@
{"America/Barbados", AST},
{"America/Belem", BRT},
{"America/Belize", CST},
-@@ -328,6 +337,7 @@
+@@ -328,6 +339,7 @@
"French Guiana Summer Time", "GFST"}},
{"America/Cayman", EST},
{"America/Chihuahua", MST},
@@ -130,7 +204,7 @@
{"America/Coral_Harbour", EST},
{"America/Cordoba", AGT},
{"America/Costa_Rica", CST},
-@@ -339,7 +349,7 @@
+@@ -339,7 +351,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
@@ -139,7 +213,16 @@
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
-@@ -361,10 +371,10 @@
+@@ -348,7 +360,7 @@
+ {"America/Godthab", new String[] {"Western Greenland Time", "WGT",
+ "Western Greenland Summer Time", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -361,10 +373,10 @@
{"America/Indiana/Indianapolis", EST},
{"America/Indiana/Knox", CST},
{"America/Indiana/Marengo", EST},
@@ -153,7 +236,7 @@
{"America/Indiana/Winamac", EST},
{"America/Inuvik", MST},
{"America/Iqaluit", EST},
-@@ -374,21 +384,25 @@
+@@ -374,21 +386,24 @@
{"America/Kentucky/Louisville", EST},
{"America/Kentucky/Monticello", EST},
{"America/Knox_IN", CST},
@@ -175,12 +258,11 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
-+ {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
-+ "Metlakatla Daylight Time", "MeDT"}},
++ {"America/Metlakatla", PST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Pierre & Miquelon Standard Time", "PMST",
"Pierre & Miquelon Daylight Time", "PMDT"}},
-@@ -402,6 +416,7 @@
+@@ -402,6 +417,7 @@
{"America/Nipigon", EST},
{"America/Nome", AKST},
{"America/Noronha", NORONHA},
@@ -188,7 +270,7 @@
{"America/North_Dakota/Center", CST},
{"America/North_Dakota/New_Salem", CST},
{"America/Ojinaga", MST},
-@@ -411,15 +426,15 @@
+@@ -411,15 +427,15 @@
"Suriname Summer Time", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
@@ -207,7 +289,7 @@
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
-@@ -428,7 +443,7 @@
+@@ -428,7 +444,7 @@
{"America/Sao_Paulo", BRT},
{"America/Scoresbysund", EGT},
{"America/Shiprock", MST},
@@ -216,7 +298,18 @@
{"America/St_Kitts", AST},
{"America/St_Lucia", AST},
{"America/St_Thomas", AST},
-@@ -462,6 +477,8 @@
+@@ -451,8 +467,8 @@
+ "Davis Summer Time", "DAVST"}},
+ {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville Time", "DDUT",
+ "Dumont-d'Urville Summer Time", "DDUST"}},
+- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
+- "Macquarie Island Summer Time", "MIST"}},
++ {"Antarctica/Macquarie", new String[] {"Macquarie Island Standard Time", "MIST",
++ "Macquarie Island Daylight Time", "MIDT"}},
+ {"Antarctica/Mawson", new String[] {"Mawson Time", "MAWT",
+ "Mawson Summer Time", "MAWST"}},
+ {"Antarctica/McMurdo", NZST},
+@@ -462,6 +478,8 @@
{"Antarctica/South_Pole", NZST},
{"Antarctica/Syowa", new String[] {"Syowa Time", "SYOT",
"Syowa Summer Time", "SYOST"}},
@@ -225,7 +318,15 @@
{"Antarctica/Vostok", new String[] {"Vostok Time", "VOST",
"Vostok Summer Time", "VOSST"}},
{"Arctic/Longyearbyen", CET},
-@@ -503,6 +520,7 @@
+@@ -488,6 +506,7 @@
+ {"Asia/Brunei", new String[] {"Brunei Time", "BNT",
+ "Brunei Summer Time", "BNST"}},
+ {"Asia/Calcutta", IST},
++ {"Asia/Chita", IRKT},
+ {"Asia/Choibalsan", new String[] {"Choibalsan Time", "CHOT",
+ "Choibalsan Summer Time", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+@@ -503,27 +522,28 @@
"Tajikistan Summer Time", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
@@ -233,8 +334,10 @@
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Hovd Time", "HOVT",
-@@ -511,7 +529,7 @@
- "Irkutsk Summer Time", "IRKST"}},
+ "Hovd Summer Time", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"Irkutsk Time", "IRKT",
+- "Irkutsk Summer Time", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"East Indonesia Time", "EIT",
@@ -242,19 +345,46 @@
"East Indonesia Summer Time", "EIST"}},
{"Asia/Kabul", new String[] {"Afghanistan Time", "AFT",
"Afghanistan Summer Time", "AFST"}},
-@@ -521,6 +539,8 @@
- {"Asia/Kashgar", CTT},
+ {"Asia/Kamchatka", new String[] {"Petropavlovsk-Kamchatski Time", "PETT",
+ "Petropavlovsk-Kamchatski Summer Time", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT",
+ "Khandyga Summer Time", "YAKST"}},
{"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"Krasnoyarsk Time", "KRAT",
- "Krasnoyarsk Summer Time", "KRAST"}},
-@@ -569,11 +589,11 @@
+- {"Asia/Krasnoyarsk", new String[] {"Krasnoyarsk Time", "KRAT",
+- "Krasnoyarsk Summer Time", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -536,7 +556,7 @@
+ "Philippines Summer Time", "PHST"}},
+ {"Asia/Muscat", GST},
+ {"Asia/Nicosia", EET},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
+ {"Asia/Novosibirsk", NOVT},
+ {"Asia/Oral", new String[] {"Oral Time", "ORAT",
+ "Oral Summer Time", "ORAST"}},
+@@ -557,6 +577,8 @@
+ {"Asia/Samarkand", UZT},
+ {"Asia/Seoul", KST},
+ {"Asia/Singapore", SGT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", CTT},
+ {"Asia/Tel_Aviv", ISRAEL},
+ {"Asia/Tashkent", UZT},
+@@ -568,12 +590,12 @@
+ {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"Ust-Nera Time", "VLAT",
+ "Ust-Nera Summer Time", "VLAST"}},
{"Asia/Vientiane", ICT},
@@ -267,7 +397,18 @@
{"Asia/Yekaterinburg", new String[] {"Yekaterinburg Time", "YEKT",
"Yekaterinburg Summer Time", "YEKST"}},
{"Asia/Yerevan", ARMT},
-@@ -619,7 +639,7 @@
+@@ -600,8 +622,8 @@
+ {"Australia/Canberra", EST_NSW},
+ {"Australia/Currie", EST_NSW},
+ {"Australia/Darwin", DARWIN},
+- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST",
+- "Central Western Summer Time (Australia)", "CWST"}},
++ {"Australia/Eucla", new String[] {"Australian Central Western Standard Time", "ACWST",
++ "Australian Central Western Daylight Time", "ACWDT"}},
+ {"Australia/Hobart", TASMANIA},
+ {"Australia/LHI", LORD_HOWE},
+ {"Australia/Lindeman", BRISBANE},
+@@ -619,7 +641,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
@@ -276,7 +417,7 @@
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
-@@ -657,6 +677,7 @@
+@@ -657,6 +679,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
@@ -284,16 +425,7 @@
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
-@@ -666,7 +687,7 @@
- {"Europe/Isle_of_Man", GMTBST},
- {"Europe/Istanbul", EET},
- {"Europe/Jersey", GMTBST},
-- {"Europe/Kaliningrad", EET},
-+ {"Europe/Kaliningrad", FET},
- {"Europe/Kiev", EET},
- {"Europe/Lisbon", WET},
- {"Europe/Ljubljana", CET},
-@@ -675,7 +696,7 @@
+@@ -675,7 +698,7 @@
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
@@ -302,7 +434,7 @@
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
-@@ -688,7 +709,7 @@
+@@ -688,7 +711,7 @@
"Samara Summer Time", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
@@ -311,7 +443,17 @@
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
-@@ -755,6 +776,7 @@
+@@ -700,8 +723,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"Volgograd Time", "VOLT",
+- "Volgograd Summer Time", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -755,6 +777,7 @@
{"Pacific/Apia", WST_SAMOA},
{"Pacific/Auckland", NZST},
{"Pacific/Chatham", CHAST},
@@ -319,7 +461,7 @@
{"Pacific/Easter", EASTER},
{"Pacific/Efate", new String[] {"Vanuatu Time", "VUT",
"Vanuatu Summer Time", "VUST"}},
-@@ -793,8 +815,8 @@
+@@ -793,8 +816,8 @@
{"Pacific/Palau", new String[] {"Palau Time", "PWT",
"Palau Summer Time", "PWST"}},
{"Pacific/Pitcairn", PITCAIRN},
@@ -330,7 +472,7 @@
{"Pacific/Port_Moresby", new String[] {"Papua New Guinea Time", "PGT",
"Papua New Guinea Summer Time", "PGST"}},
{"Pacific/Rarotonga", new String[] {"Cook Is. Time", "CKT",
-@@ -807,12 +829,12 @@
+@@ -807,12 +830,12 @@
"Gilbert Is. Summer Time", "GILST"}},
{"Pacific/Tongatapu", new String[] {"Tonga Time", "TOT",
"Tonga Summer Time", "TOST"}},
@@ -360,8 +502,8 @@
"Acre Sommerzeit", "ACST"};
- String ADELAIDE[] = new String[] {"Zentrale Normalzeit (S\u00fcdaustralien)", "CST",
- "Zentrale Sommerzeit (S\u00fcdaustralien)", "CST"};
-+ String ADELAIDE[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien)", "CST",
-+ "Zentrale Sommerzeit (S\u00FCdaustralien)", "CST"};
++ String ADELAIDE[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien)", "ACST",
++ "Zentrale Sommerzeit (S\u00FCdaustralien)", "ACDT"};
String AGT[] = new String[] {"Argentinische Zeit", "ART",
"Argentinische Sommerzeit", "ARST"};
String AKST[] = new String[] {"Alaska Normalzeit", "AKST",
@@ -373,10 +515,10 @@
- "\u00d6stliche Sommerzeit (Queensland)", "EST"};
- String BROKEN_HILL[] = new String[] {"Zentrale Normalzeit (S\u00fcdaustralien/New South Wales)", "CST",
- "Zentrale Sommerzeit (S\u00fcdaustralien/New South Wales)", "CST"};
-+ String BRISBANE[] = new String[] {"\u00D6stliche Normalzeit (Queensland)", "EST",
-+ "\u00D6stliche Sommerzeit (Queensland)", "EST"};
-+ String BROKEN_HILL[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien/New South Wales)", "CST",
-+ "Zentrale Sommerzeit (S\u00FCdaustralien/New South Wales)", "CST"};
++ String BRISBANE[] = new String[] {"\u00D6stliche Normalzeit (Queensland)", "AEST",
++ "\u00D6stliche Sommerzeit (Queensland)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien/New South Wales)", "ACST",
++ "Zentrale Sommerzeit (S\u00FCdaustralien/New South Wales)", "ACDT"};
String BRT[] = new String[] {"Brasilianische Zeit", "BRT",
"Brasilianische Sommerzeit", "BRST"};
String BTT[] = new String[] {"Bhutanische Zeit", "BTT",
@@ -393,33 +535,49 @@
"Zentralindonesische Sommerzeit", "CIST"};
String CLT[] = new String[] {"Chilenische Zeit", "CLT",
"Chilenische Sommerzeit", "CLST"};
-@@ -83,9 +87,9 @@
+@@ -83,10 +87,10 @@
"Zentrale Sommerzeit", "CDT"};
String CTT[] = new String[] {"Chinesische Normalzeit", "CST",
"Chinesische Sommerzeit", "CDT"};
- String CUBA[] = new String[] {"Cuba Standard Time", "CST",
- "Cuba Daylight Time", "CDT"};
- String DARWIN[] = new String[] {"Zentrale Normalzeit (Northern Territory)", "CST",
+- "Zentrale Sommerzeit (Northern Territory)", "CST"};
+ String CUBA[] = new String[] {"Kubanische Normalzeit", "CST",
+ "Kubanische Sommerzeit", "CDT"};
-+ String DARWIN[] = new String[] {"Central Normalzeit (Northern Territory)", "CST",
- "Zentrale Sommerzeit (Northern Territory)", "CST"};
++ String DARWIN[] = new String[] {"Zentrale Normalzeit (Northern Territory)", "ACST",
++ "Zentrale Sommerzeit (Northern Territory)", "ACDT"};
String DUBLIN[] = new String[] {"Greenwich Zeit", "GMT",
"Irische Sommerzeit", "IST"};
+ String EAT[] = new String[] {"Ostafrikanische Zeit", "EAT",
@@ -99,8 +103,10 @@
"Ostgr\u00f6nl\u00e4ndische Sommerzeit", "EGST"};
String EST[] = new String[] {"\u00d6stliche Normalzeit", "EST",
"\u00d6stliche Sommerzeit", "EDT"};
- String EST_NSW[] = new String[] {"\u00d6stliche Normalzeit (New South Wales)", "EST",
- "\u00d6stliche Sommerzeit (New South Wales)", "EST"};
-+ String EST_NSW[] = new String[] {"Eastern Normalzeit (Neus\u00FCdwales)", "EST",
-+ "\u00D6stliche Sommerzeit (New South Wales)", "EST"};
++ String EST_NSW[] = new String[] {"\u00D6stliche Normalzeit (New South Wales)", "AEST",
++ "\u00D6stliche Sommerzeit (New South Wales)", "AEDT"};
+ String FET[] = new String[] {"Kaliningrader Zeit", "FET",
+ "Kaliningrader Sommerzeit", "FEST"};
String GHMT[] = new String[] {"Ghanaische Normalzeit", "GMT",
"Ghanaische Sommerzeit", "GHST"};
String GAMBIER[] = new String[] {"Gambier Zeit", "GAMT",
-@@ -153,10 +159,12 @@
+@@ -127,10 +133,12 @@
+ "Indische Sommerzeit", "IDT"};
+ String JST[] = new String[] {"Japanische Normalzeit", "JST",
+ "Japanische Sommerzeit", "JDT"};
++ String KRAT[] = new String[] {"Krasnojarsker Zeit", "KRAT",
++ "Krasnojarsker Sommerzeit", "KRAST"};
+ String KST[] = new String[] {"Koreanische Normalzeit", "KST",
+ "Koreanische Sommerzeit", "KDT"};
+ String LORD_HOWE[] = new String[] {"Lord Howe Normalzeit", "LHST",
+- "Lord Howe Sommerzeit", "LHST"};
++ "Lord Howe Sommerzeit", "LHDT"};
+ String MHT[] = new String[] {"Marshallinseln Zeit", "MHT",
+ "Marshallinseln Sommerzeit", "MHST"};
+ String MSK[] = new String[] {"Moskauer Normalzeit", "MSK",
+@@ -153,48 +161,48 @@
"Pitcairn Sommerzeit", "PDT"};
String PKT[] = new String[] {"Pakistanische Zeit", "PKT",
"Pakistanische Sommerzeit", "PKST"};
@@ -431,17 +589,20 @@
- "Zentrale Sommerzeit", "CDT"};
+ String SAMOA[] = new String[] {"Samoa Normalzeit", "SST",
+ "Samoa Sommerzeit", "SDT"};
++ String IRKT[] = new String[] {"Irkutsk Zeit", "IRKT",
++ "Irkutsk Sommerzeit", "IRKST"};
String SAST[] = new String[] {"S\u00fcdafrikanische Normalzeit", "SAST",
"S\u00fcdafrikanische Sommerzeit", "SAST"};
String SBT[] = new String[] {"Salomoninseln Zeit", "SBT",
-@@ -165,36 +173,34 @@
+ "Salomoninseln Sommerzeit", "SBST"};
+ String SGT[] = new String[] {"Singapur Zeit", "SGT",
"Singapur Sommerzeit", "SGST"};
- String SLST[] = new String[] {"Greenwich Normalzeit", "GMT",
- "Sierra Leone Sommerzeit", "SLST"};
+- String SLST[] = new String[] {"Greenwich Normalzeit", "GMT",
+- "Sierra Leone Sommerzeit", "SLST"};
- String TASMANIA[] = new String[] {"\u00d6stliche Normalzeit (Tasmanien)", "EST",
- "\u00d6stliche Sommerzeit (Tasmanien)", "EST"};
-+ String TASMANIA[] = new String[] {"\u00D6stliche Normalzeit (Tasmanien)", "EST",
-+ "\u00D6stliche Sommerzeit (Tasmanien)", "EST"};
++ String TASMANIA[] = new String[] {"\u00D6stliche Normalzeit (Tasmanien)", "AEST",
++ "\u00D6stliche Sommerzeit (Tasmanien)", "AEDT"};
String TMT[] = new String[] {"Turkmenische Zeit", "TMT",
"Turkmenische Sommerzeit", "TMST"};
- String TRUT[] = new String[] {"Truk Zeit", "TRUT",
@@ -454,12 +615,10 @@
+ "Koordinierte Universalzeit", "UTC"};
+ String UZT[] = new String[] {"Usbekistan Zeit", "UZT",
+ "Usbekistan Sommerzeit", "UZST"};
-+ String VICTORIA[] = new String[] {"\u00D6stliche Normalzeit (Victoria)", "EST",
-+ "\u00D6stliche Sommerzeit (Victoria)", "EST"};
++ String VICTORIA[] = new String[] {"\u00D6stliche Normalzeit (Victoria)", "AEST",
++ "\u00D6stliche Sommerzeit (Victoria)", "AEDT"};
+ String VLAT[] = new String[] {"Wladiwostok Zeit", "VLAT",
+ "Wladiwostok Sommerzeit", "VLAST"};
-+ String WART[] = new String[] {"Westargentinische Zeit", "WART",
-+ "Westargentinische Sommerzeit", "WARST"};
String WAT[] = new String[] {"Westafrikanische Zeit", "WAT",
"Westafrikanische Sommerzeit", "WAST"};
String WET[] = new String[] {"Westeurop\u00e4ische Zeit", "WEZ",
@@ -467,11 +626,11 @@
- String WIT[] = new String[] {"Westindonesische Zeit", "WIT",
+ String WIT[] = new String[] {"Westindonesische Zeit", "WIB",
"Westindonesische Sommerzeit", "WIST"};
- String WST_AUS[] = new String[] {"Westliche Normalzeit (Australien)", "WST",
- "Westliche Sommerzeit (Australien)", "WST"};
+- String WST_AUS[] = new String[] {"Westliche Normalzeit (Australien)", "WST",
+- "Westliche Sommerzeit (Australien)", "WST"};
- String SAMOA[] = new String[] {"Samoa Normalzeit", "SST",
- "Samoa Sommerzeit", "SDT"};
- String WST_SAMOA[] = new String[] {"West Samoa Zeit", "WST",
+- String WST_SAMOA[] = new String[] {"West Samoa Zeit", "WST",
- "West Samoa Sommerzeit", "WSST"};
- String ChST[] = new String[] {"Chamorro Normalzeit", "ChST",
- "Chamorro Sommerzeit", "ChDT"};
@@ -481,13 +640,18 @@
- "Koordinierte Universalzeit", "UTC"};
- String UZT[] = new String[] {"Usbekistan Zeit", "UZT",
- "Usbekistan Sommerzeit", "UZST"};
++ String WST_AUS[] = new String[] {"Westliche Normalzeit (Australien)", "AWST",
++ "Westliche Sommerzeit (Australien)", "AWDT"};
++ String WST_SAMOA[] = new String[] {"West Samoa Zeit", "WSST",
+ "West Samoa Sommerzeit", "WSDT"};
++ String XJT[] = new String[] {"Chinesische Normalzeit", "XJT",
++ "Chinesische Sommerzeit", "XJDT"};
+ String YAKT[] = new String[] {"Jakutsk Zeit", "YAKT",
+ "Jakutsk Sommerzeit", "YAKST"};
return new Object[][] {
{"America/Los_Angeles", PST},
-@@ -214,6 +220,7 @@
+@@ -214,6 +222,7 @@
{"America/Anchorage", AKST},
{"AST", AKST},
{"America/Halifax", AST},
@@ -495,7 +659,12 @@
{"America/St_Johns", NST},
{"CNT", NST},
{"Europe/Paris", CET},
-@@ -259,6 +266,7 @@
+@@ -255,10 +264,11 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT},
{"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST},
@@ -503,7 +672,7 @@
{"Africa/Kampala", EAT},
{"Africa/Khartoum", EAT},
{"Africa/Kigali", CAT},
-@@ -300,7 +308,7 @@
+@@ -300,7 +310,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
@@ -512,7 +681,7 @@
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
-@@ -309,6 +317,7 @@
+@@ -309,6 +319,7 @@
{"America/Atikokan", EST},
{"America/Atka", HAST},
{"America/Bahia", BRT},
@@ -520,7 +689,7 @@
{"America/Barbados", AST},
{"America/Belem", BRT},
{"America/Belize", CST},
-@@ -328,6 +337,7 @@
+@@ -328,6 +339,7 @@
"Franz\u00f6sisch-Guiana Sommerzeit", "GFST"}},
{"America/Cayman", EST},
{"America/Chihuahua", MST},
@@ -528,7 +697,7 @@
{"America/Coral_Harbour", EST},
{"America/Cordoba", AGT},
{"America/Costa_Rica", CST},
-@@ -339,7 +349,7 @@
+@@ -339,7 +351,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
@@ -537,7 +706,16 @@
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
-@@ -361,10 +371,10 @@
+@@ -348,7 +360,7 @@
+ {"America/Godthab", new String[] {"Westgr\u00f6nl\u00e4ndische Zeit", "WGT",
+ "Westgr\u00f6nl\u00e4ndische Sommerzeit", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -361,10 +373,10 @@
{"America/Indiana/Indianapolis", EST},
{"America/Indiana/Knox", CST},
{"America/Indiana/Marengo", EST},
@@ -551,7 +729,7 @@
{"America/Indiana/Winamac", EST},
{"America/Inuvik", MST},
{"America/Iqaluit", EST},
-@@ -374,21 +384,25 @@
+@@ -374,21 +386,24 @@
{"America/Kentucky/Louisville", EST},
{"America/Kentucky/Monticello", EST},
{"America/Knox_IN", CST},
@@ -573,12 +751,11 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
-+ {"America/Metlakatla", new String[] {"Metlakatla Normalzeit", "MeST",
-+ "Metlakatla Sommerzeit", "MeDT"}},
++ {"America/Metlakatla", PST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Pierre & Miquelon Normalzeit", "PMST",
"Pierre & Miquelon Sommerzeit", "PMDT"}},
-@@ -402,6 +416,7 @@
+@@ -402,6 +417,7 @@
{"America/Nipigon", EST},
{"America/Nome", AKST},
{"America/Noronha", NORONHA},
@@ -586,7 +763,7 @@
{"America/North_Dakota/Center", CST},
{"America/North_Dakota/New_Salem", CST},
{"America/Ojinaga", MST},
-@@ -411,15 +426,15 @@
+@@ -411,15 +427,15 @@
"Suriname Sommerzeit", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
@@ -605,7 +782,7 @@
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
-@@ -428,7 +443,7 @@
+@@ -428,7 +444,7 @@
{"America/Sao_Paulo", BRT},
{"America/Scoresbysund", EGT},
{"America/Shiprock", MST},
@@ -614,7 +791,7 @@
{"America/St_Kitts", AST},
{"America/St_Lucia", AST},
{"America/St_Thomas", AST},
-@@ -446,10 +461,13 @@
+@@ -446,10 +462,13 @@
{"America/Winnipeg", CST},
{"America/Yakutat", AKST},
{"America/Yellowknife", MST},
@@ -624,11 +801,11 @@
{"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville Zeit", "DDUT",
"Dumont-d'Urville Sommerzeit", "DDUST"}},
+ {"Antarctica/Macquarie", new String[] {"Macquarieinsel Zeit", "MIST",
-+ "Macquarieinsel Sommerzeit", "MIST"}},
++ "Macquarieinsel Sommerzeit", "MIDT"}},
{"Antarctica/Mawson", new String[] {"Mawson Zeit", "MAWT",
"Mawson Sommerzeit", "MAWST"}},
{"Antarctica/McMurdo", NZST},
-@@ -459,6 +477,8 @@
+@@ -459,6 +478,8 @@
{"Antarctica/South_Pole", NZST},
{"Antarctica/Syowa", new String[] {"Syowa Zeit", "SYOT",
"Syowa Sommerzeit", "SYOST"}},
@@ -637,7 +814,15 @@
{"Antarctica/Vostok", new String[] {"Vostok Zeit", "VOST",
"Vostok Sommerzeit", "VOSST"}},
{"Arctic/Longyearbyen", CET},
-@@ -500,6 +520,7 @@
+@@ -485,6 +506,7 @@
+ {"Asia/Brunei", new String[] {"Brunei Zeit", "BNT",
+ "Brunei Sommerzeit", "BNST"}},
+ {"Asia/Calcutta", IST},
++ {"Asia/Chita", IRKT},
+ {"Asia/Choibalsan", new String[] {"Choibalsan Zeit", "CHOT",
+ "Choibalsan Sommerzeit", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+@@ -500,27 +522,28 @@
"Tadschikische Sommerzeit", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
@@ -645,8 +830,10 @@
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Hovd Zeit", "HOVT",
-@@ -508,7 +529,7 @@
- "Irkutsk Sommerzeit", "IRKST"}},
+ "Hovd Sommerzeit", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"Irkutsk Zeit", "IRKT",
+- "Irkutsk Sommerzeit", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"Ostindonesische Zeit", "EIT",
@@ -654,19 +841,46 @@
"Ostindonesische Sommerzeit", "EIST"}},
{"Asia/Kabul", new String[] {"Afghanistanische Zeit", "AFT",
"Afghanistanische Sommerzeit", "AFST"}},
-@@ -518,6 +539,8 @@
- {"Asia/Kashgar", CTT},
+ {"Asia/Kamchatka", new String[] {"Petropawlowsk-Kamtschatkische Zeit", "PETT",
+ "Petropawlowsk-Kamtschatkische Sommerzeit", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"Chandyga Zeit", "YAKT",
+ "Chandyga Sommerzeit", "YAKST"}},
{"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"Krasnojarsker Zeit", "KRAT",
- "Krasnojarsker Sommerzeit", "KRAST"}},
-@@ -566,11 +589,11 @@
+- {"Asia/Krasnoyarsk", new String[] {"Krasnojarsker Zeit", "KRAT",
+- "Krasnojarsker Sommerzeit", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -533,7 +556,7 @@
+ "Philippinische Sommerzeit", "PHST"}},
+ {"Asia/Muscat", GST},
+ {"Asia/Nicosia", EET},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
+ {"Asia/Novosibirsk", NOVT},
+ {"Asia/Oral", new String[] {"Oral Zeit", "ORAT",
+ "Oral Sommerzeit", "ORAST"}},
+@@ -554,6 +577,8 @@
+ {"Asia/Samarkand", UZT},
+ {"Asia/Seoul", KST},
+ {"Asia/Singapore", SGT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", CTT},
+ {"Asia/Tel_Aviv", ISRAEL},
+ {"Asia/Tashkent", UZT},
+@@ -565,12 +590,12 @@
+ {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"Ust-Nera Zeit", "VLAT",
+ "Ust-Nera Sommerzeit", "VLAST"}},
{"Asia/Vientiane", ICT},
@@ -679,18 +893,18 @@
{"Asia/Yekaterinburg", new String[] {"Jekaterinburger Zeit", "YEKT",
"Jekaterinburger Sommerzeit", "YEKST"}},
{"Asia/Yerevan", ARMT},
-@@ -597,8 +620,8 @@
+@@ -597,8 +622,8 @@
{"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN},
- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST",
- "Central Western Summer Time (Australia)", "CWST"}},
-+ {"Australia/Eucla", new String[] {"Zentral-Westliche Normalzeit (Australien)", "CWST",
-+ "Zentral-Westliche Sommerzeit (Australien)", "CWST"}},
++ {"Australia/Eucla", new String[] {"Zentral-Westliche Normalzeit (Australien)", "ACWST",
++ "Zentral-Westliche Sommerzeit (Australien)", "ACWDT"}},
{"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE},
-@@ -616,7 +639,7 @@
+@@ -616,7 +641,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
@@ -699,7 +913,7 @@
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
-@@ -654,6 +677,7 @@
+@@ -654,6 +679,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
@@ -707,16 +921,7 @@
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
-@@ -663,7 +687,7 @@
- {"Europe/Isle_of_Man", GMTBST},
- {"Europe/Istanbul", EET},
- {"Europe/Jersey", GMTBST},
-- {"Europe/Kaliningrad", EET},
-+ {"Europe/Kaliningrad", FET},
- {"Europe/Kiev", EET},
- {"Europe/Lisbon", WET},
- {"Europe/Ljubljana", CET},
-@@ -672,7 +696,7 @@
+@@ -672,7 +698,7 @@
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
@@ -725,7 +930,7 @@
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
-@@ -685,7 +709,7 @@
+@@ -685,7 +711,7 @@
"Samarische Sommerzeit", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
@@ -734,7 +939,17 @@
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
-@@ -752,6 +776,7 @@
+@@ -697,8 +723,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"Wolgograder Zeit", "VOLT",
+- "Wolgograder Sommerzeit", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -752,6 +777,7 @@
{"Pacific/Apia", WST_SAMOA},
{"Pacific/Auckland", NZST},
{"Pacific/Chatham", CHAST},
@@ -742,7 +957,7 @@
{"Pacific/Easter", EASTER},
{"Pacific/Efate", new String[] {"Vanuatu Zeit", "VUT",
"Vanuatu Sommerzeit", "VUST"}},
-@@ -790,8 +815,8 @@
+@@ -790,8 +816,8 @@
{"Pacific/Palau", new String[] {"Palau Zeit", "PWT",
"Palau Sommerzeit", "PWST"}},
{"Pacific/Pitcairn", PITCAIRN},
@@ -753,7 +968,7 @@
{"Pacific/Port_Moresby", new String[] {"Papua-Neuguinea Zeit", "PGT",
"Papua-Neuguinea Sommerzeit", "PGST"}},
{"Pacific/Rarotonga", new String[] {"Cook-Inseln Zeit", "CKT",
-@@ -804,12 +829,12 @@
+@@ -804,12 +830,12 @@
"Gilbert-Inseln Sommerzeit", "GILST"}},
{"Pacific/Tongatapu", new String[] {"Tonga Zeit", "TOT",
"Tonga Sommerzeit", "TOST"}},
@@ -777,28 +992,32 @@
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
-@@ -45,7 +45,7 @@
+@@ -45,8 +45,8 @@
protected final Object[][] getContents() {
String ACT[] = new String[] {"Hora de Acre", "ACT",
"Hora de verano de Acre", "ACST"};
- String ADELAIDE[] = new String[] {"Hora est\u00e1ndar Central (Sur de Australia)", "CST",
-+ String ADELAIDE[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia)", "CST",
- "Hora de verano Central (Sur de Australia)", "CST"};
+- "Hora de verano Central (Sur de Australia)", "CST"};
++ String ADELAIDE[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia)", "ACST",
++ "Hora de verano Central (Sur de Australia)", "ACDT"};
String AGT[] = new String[] {"Hora de Argentina", "ART",
"Hora de verano de Argentina", "ARST"};
-@@ -61,9 +61,9 @@
+ String AKST[] = new String[] {"Hora est\u00e1ndar de Alaska", "AKST",
+@@ -61,10 +61,10 @@
"Hora de verano Atl\u00e1ntico", "ADT"};
String BDT[] = new String[] {"Hora de Bangladesh", "BDT",
"Hora de verano de Bangladesh", "BDST"};
- String BRISBANE[] = new String[] {"Hora est\u00e1ndar del Este (Queensland)", "EST",
- "Hora de verano del Este (Queensland)", "EST"};
- String BROKEN_HILL[] = new String[] {"Hora est\u00e1ndar Central (Sur de Australia/Nueva Gales del Sur)", "CST",
-+ String BRISBANE[] = new String[] {"Hora est\u00E1ndar del Este (Queensland)", "EST",
-+ "Hora est\u00E1ndar de verano del Este (Queensland)", "EST"};
-+ String BROKEN_HILL[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia/Nueva Gales del Sur)", "CST",
- "Hora de verano Central (Sur de Australia/Nueva Gales del Sur)", "CST"};
+- "Hora de verano Central (Sur de Australia/Nueva Gales del Sur)", "CST"};
++ String BRISBANE[] = new String[] {"Hora est\u00E1ndar del Este (Queensland)", "AEST",
++ "Hora est\u00E1ndar de verano del Este (Queensland)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia/Nueva Gales del Sur)", "ACST",
++ "Hora de verano Central (Sur de Australia/Nueva Gales del Sur)", "ACDT"};
String BRT[] = new String[] {"Hora de Brasil", "BRT",
"Hora de verano de Brasil", "BRST"};
+ String BTT[] = new String[] {"Hora de But\u00e1n", "BTT",
@@ -75,7 +75,11 @@
"Hora de verano de Europa Central", "CEST"};
String CHAST[] = new String[] {"Hora est\u00e1ndar de Chatham", "CHAST",
@@ -806,59 +1025,80 @@
- String CIT[] = new String[] {"Hora de Indonesia Central", "CIT",
+ String ChST[] = new String[] {"Hora est\u00e1ndar de Chamorro", "ChST",
+ "Hora de verano de Chamorro", "ChDT"};
-+ String CHUT[] = new String[] {"Chuuk Time", "CHUT",
-+ "Chuuk Summer Time", "CHUST"};
++ String CHUT[] = new String[] {"Hora de Chuuk", "CHUT",
++ "Hora de verano de Chuuk", "CHUST"};
+ String CIT[] = new String[] {"Hora de Indonesia Central", "WITA",
"Hora de verano de Indonesia Central", "CIST"};
String CLT[] = new String[] {"Hora de Chile", "CLT",
"Hora de verano de Chile", "CLST"};
-@@ -83,9 +87,9 @@
+@@ -83,10 +87,10 @@
"Hora de verano Central", "CDT"};
String CTT[] = new String[] {"Hora est\u00e1ndar de China", "CST",
"Hora de verano de China", "CDT"};
- String CUBA[] = new String[] {"Cuba Standard Time", "CST",
- "Cuba Daylight Time", "CDT"};
- String DARWIN[] = new String[] {"Hora est\u00e1ndar Central (territorio del Norte)", "CST",
+- "Hora de verano Central (territorio del Norte)", "CST"};
+ String CUBA[] = new String[] {"Hora est\u00e1ndar de Cuba", "CST",
+ "Hora de verano de Cuba", "CDT"};
-+ String DARWIN[] = new String[] {"Hora est\u00E1ndar Central (territorio del Norte)", "CST",
- "Hora de verano Central (territorio del Norte)", "CST"};
++ String DARWIN[] = new String[] {"Hora est\u00E1ndar Central (territorio del Norte)", "ACST",
++ "Hora de verano Central (territorio del Norte)", "ACDT"};
String DUBLIN[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
"Hora de verano de Irlanda", "IST"};
+ String EAT[] = new String[] {"Hora de \u00c1frica Oriental", "EAT",
@@ -99,8 +103,10 @@
"Hora de verano de Groenlandia Oriental", "EGST"};
String EST[] = new String[] {"Hora est\u00e1ndar Oriental", "EST",
"Hora de verano Oriental", "EDT"};
- String EST_NSW[] = new String[] {"Hora est\u00e1ndar Oriental (Nueva Gales del Sur)", "EST",
-+ String EST_NSW[] = new String[] {"Hora est\u00E1ndar Oriental (Nueva Gales del Sur)", "EST",
- "Hora de verano Oriental (Nueva Gales del Sur)", "EST"};
+- "Hora de verano Oriental (Nueva Gales del Sur)", "EST"};
++ String EST_NSW[] = new String[] {"Hora est\u00E1ndar Oriental (Nueva Gales del Sur)", "AEST",
++ "Hora de verano Oriental (Nueva Gales del Sur)", "AEDT"};
+ String FET[] = new String[] {"Hora de Europa m\u00E1s Oriental", "FET",
+ "Hora de verano de Europa m\u00E1s Oriental", "FEST"};
String GHMT[] = new String[] {"Hora central de Ghana", "GMT",
"Hora de verano de Ghana", "GHST"};
String GAMBIER[] = new String[] {"Hora de Gambier", "GAMT",
-@@ -153,10 +159,12 @@
+@@ -127,10 +133,12 @@
+ "Hora de verano de India", "IDT"};
+ String JST[] = new String[] {"Hora est\u00e1ndar de Jap\u00f3n", "JST",
+ "Hora de verano de Jap\u00f3n", "JDT"};
++ String KRAT[] = new String[] {"Hora de Krasnoyarsk", "KRAT",
++ "Hora de verano de Krasnoyarsk", "KRAST"};
+ String KST[] = new String[] {"Hora est\u00e1ndar de Corea", "KST",
+ "Hora de verano de Corea", "KDT"};
+ String LORD_HOWE[] = new String[] {"Hora est\u00e1ndar de Lord Howe", "LHST",
+- "Hora de verano de Lord Howe", "LHST"};
++ "Hora de verano de Lord Howe", "LHDT"};
+ String MHT[] = new String[] {"Hora de las Islas Marshall", "MHT",
+ "Hora de verano de las Islas Marshall", "MHST"};
+ String MSK[] = new String[] {"Hora est\u00e1ndar de Mosc\u00fa", "MSK",
+@@ -153,48 +161,48 @@
"Hora de verano de Pitcairn", "PDT"};
String PKT[] = new String[] {"Hora de Pakist\u00e1n", "PKT",
"Hora de verano de Pakist\u00e1n", "PKST"};
-+ String PONT[] = new String[] {"Pohnpei Time", "PONT",
-+ "Pohnpei Summer Time", "PONST"};
++ String PONT[] = new String[] {"Hora de Pohnpei", "PONT",
++ "Hora de verano de Pohnpei", "PONST"};
String PST[] = new String[] {"Hora est\u00e1ndar del Pac\u00edfico", "PST",
"Hora de verano del Pac\u00edfico", "PDT"};
- String RST[] = new String[] {"Hora est\u00e1ndar Oriental", "EST",
- "Hora de verano Central", "CDT"};
+ String SAMOA[] = new String[] {"Hora est\u00e1ndar de Samoa", "SST",
+ "Hora de verano de Samoa", "SDT"};
++ String IRKT[] = new String[] {"Hora de Irkutsk", "IRKT",
++ "Hora de verano de Irkutsk", "IRKST"};
String SAST[] = new String[] {"Hora est\u00e1ndar de Sud\u00e1frica", "SAST",
"Hora de verano de Sud\u00e1frica", "SAST"};
String SBT[] = new String[] {"Hora de las Islas Solomon", "SBT",
-@@ -165,36 +173,34 @@
+ "Hora de verano de las Islas Solomon", "SBST"};
+ String SGT[] = new String[] {"Hora de Singapur", "SGT",
"Hora de verano de Singapur", "SGST"};
- String SLST[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
- "Hora de verano de Sierra Leona", "SLST"};
+- String SLST[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
+- "Hora de verano de Sierra Leona", "SLST"};
- String TASMANIA[] = new String[] {"Hora est\u00e1ndar del Este (Tasmania)", "EST",
-+ String TASMANIA[] = new String[] {"Hora est\u00E1ndar del Este (Tasmania)", "EST",
- "Hora de verano del Este (Tasmania)", "EST"};
+- "Hora de verano del Este (Tasmania)", "EST"};
++ String TASMANIA[] = new String[] {"Hora est\u00E1ndar del Este (Tasmania)", "AEST",
++ "Hora de verano del Este (Tasmania)", "AEDT"};
String TMT[] = new String[] {"Hora de Turkmenist\u00e1n", "TMT",
"Hora de verano de Turkmenist\u00e1n", "TMST"};
- String TRUT[] =new String[] {"Hora de Truk", "TRUT",
@@ -871,12 +1111,10 @@
+ "Hora Universal Coordinada", "UTC"};
+ String UZT[] = new String[] {"Hora de Uzbekist\u00e1n", "UZT",
+ "Hora de verano de Uzbekist\u00e1n", "UZST"};
-+ String VICTORIA[] = new String[] {"Hora est\u00E1ndar del Este (Victoria)", "EST",
-+ "Hora de verano del Este (Victoria)", "EST"};
++ String VICTORIA[] = new String[] {"Hora est\u00E1ndar del Este (Victoria)", "AEST",
++ "Hora de verano del Este (Victoria)", "AEDT"};
+ String VLAT[] = new String[] {"Hora de Vladivostok", "VLAT",
+ "Hora de verano de Vladivostok", "VLAST"};
-+ String WART[] = new String[] {"Hora de Argentina Occidental", "WART",
-+ "Hora de verano de Argentina Occidental", "WARST"};
String WAT[] = new String[] {"Hora de \u00c1frica Occidental", "WAT",
"Hora de verano de \u00c1frica Occidental", "WAST"};
String WET[] = new String[] {"Hora de Europa Occidental", "WET",
@@ -885,11 +1123,10 @@
+ String WIT[] = new String[] {"Hora de Indonesia Occidental", "WIB",
"Indonesia Hora de verano de Indonesia Occidental", "WIST"};
- String WST_AUS[] = new String[] {"Hora est\u00e1ndar Occidental (Australia)", "WST",
-+ String WST_AUS[] = new String[] {"Hora est\u00E1ndar Occidental (Australia)", "WST",
- "Hora de verano Occidental (Australia)", "WST"};
+- "Hora de verano Occidental (Australia)", "WST"};
- String SAMOA[] = new String[] {"Hora est\u00e1ndar de Samoa", "SST",
- "Hora de verano de Samoa", "SDT"};
- String WST_SAMOA[] = new String[] {"Hora de Samoa Occidental", "WST",
+- String WST_SAMOA[] = new String[] {"Hora de Samoa Occidental", "WST",
- "Hora de verano de Samoa Occidental", "WSST"};
- String ChST[] = new String[] {"Hora est\u00e1ndar de Chamorro", "ChST",
- "Hora de verano de Chamorro", "ChDT"};
@@ -899,13 +1136,18 @@
- "Hora Universal Coordinada", "UTC"};
- String UZT[] = new String[] {"Hora de Uzbekist\u00e1n", "UZT",
- "Hora de verano de Uzbekist\u00e1n", "UZST"};
++ String WST_AUS[] = new String[] {"Hora est\u00E1ndar Occidental (Australia)", "AWST",
++ "Hora de verano Occidental (Australia)", "AWDT"};
++ String WST_SAMOA[] = new String[] {"Hora de Samoa Occidental", "WSST",
+ "Hora de verano de Samoa Occidental", "WSDT"};
++ String XJT[] = new String[] {"Hora est\u00e1ndar de China", "XJT",
++ "Hora de verano de China", "XJDT"};
+ String YAKT[] = new String[] {"Hora de Yakutsk", "YAKT",
+ "Hora de verano de Yakutsk", "YAKST"};
return new Object[][] {
{"America/Los_Angeles", PST},
-@@ -214,6 +220,7 @@
+@@ -214,6 +222,7 @@
{"America/Anchorage", AKST},
{"AST", AKST},
{"America/Halifax", AST},
@@ -913,7 +1155,12 @@
{"America/St_Johns", NST},
{"CNT", NST},
{"Europe/Paris", CET},
-@@ -259,6 +266,7 @@
+@@ -255,10 +264,11 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT},
{"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST},
@@ -921,7 +1168,7 @@
{"Africa/Kampala", EAT},
{"Africa/Khartoum", EAT},
{"Africa/Kigali", CAT},
-@@ -300,7 +308,7 @@
+@@ -300,7 +310,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
@@ -930,7 +1177,7 @@
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
-@@ -309,6 +317,7 @@
+@@ -309,6 +319,7 @@
{"America/Atikokan", EST},
{"America/Atka", HAST},
{"America/Bahia", BRT},
@@ -938,7 +1185,7 @@
{"America/Barbados", AST},
{"America/Belem", BRT},
{"America/Belize", CST},
-@@ -328,6 +337,7 @@
+@@ -328,6 +339,7 @@
"Hora de verano de la Guayana Francesa", "GFST"}},
{"America/Cayman", EST},
{"America/Chihuahua", MST},
@@ -946,7 +1193,7 @@
{"America/Coral_Harbour", EST},
{"America/Cordoba", AGT},
{"America/Costa_Rica", CST},
-@@ -339,7 +349,7 @@
+@@ -339,7 +351,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
@@ -955,7 +1202,16 @@
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
-@@ -361,10 +371,10 @@
+@@ -348,7 +360,7 @@
+ {"America/Godthab", new String[] {"Hora de Groenlandia Occidental", "WGT",
+ "Hora de verano de Groenlandia Occidental", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -361,10 +373,10 @@
{"America/Indiana/Indianapolis", EST},
{"America/Indiana/Knox", CST},
{"America/Indiana/Marengo", EST},
@@ -969,7 +1225,7 @@
{"America/Indiana/Winamac", EST},
{"America/Inuvik", MST},
{"America/Iqaluit", EST},
-@@ -374,21 +384,25 @@
+@@ -374,21 +386,24 @@
{"America/Kentucky/Louisville", EST},
{"America/Kentucky/Monticello", EST},
{"America/Knox_IN", CST},
@@ -991,12 +1247,11 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
-+ {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
-+ "Metlakatla Daylight Time", "MeDT"}},
++ {"America/Metlakatla", PST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Hora est\u00e1ndar de Pierre & Miquelon", "PMST",
"Hora de verano de Pierre & Miquelon", "PMDT"}},
-@@ -402,6 +416,7 @@
+@@ -402,6 +417,7 @@
{"America/Nipigon", EST},
{"America/Nome", AKST},
{"America/Noronha", NORONHA},
@@ -1004,7 +1259,7 @@
{"America/North_Dakota/Center", CST},
{"America/North_Dakota/New_Salem", CST},
{"America/Ojinaga", MST},
-@@ -411,15 +426,15 @@
+@@ -411,15 +427,15 @@
"Hora de verano de Surinam", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
@@ -1023,7 +1278,7 @@
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
-@@ -428,7 +443,7 @@
+@@ -428,7 +444,7 @@
{"America/Sao_Paulo", BRT},
{"America/Scoresbysund", EGT},
{"America/Shiprock", MST},
@@ -1032,7 +1287,7 @@
{"America/St_Kitts", AST},
{"America/St_Lucia", AST},
{"America/St_Thomas", AST},
-@@ -446,10 +461,13 @@
+@@ -446,10 +462,13 @@
{"America/Winnipeg", CST},
{"America/Yakutat", AKST},
{"America/Yellowknife", MST},
@@ -1041,12 +1296,12 @@
"Hora de verano de Davis", "DAVST"}},
{"Antarctica/DumontDUrville", new String[] {"Hora de Dumont-d'Urville", "DDUT",
"Hora de verano de Dumont-d'Urville", "DDUST"}},
-+ {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
-+ "Macquarie Island Summer Time", "MIST"}},
++ {"Antarctica/Macquarie", new String[] {"Hora de Isla Macquarie", "MIST",
++ "Hora de verano de Isla Macquarie", "MIDT"}},
{"Antarctica/Mawson", new String[] {"Hora de Mawson", "MAWT",
"Hora de verano de Mawson", "MAWST"}},
{"Antarctica/McMurdo", NZST},
-@@ -459,6 +477,8 @@
+@@ -459,6 +478,8 @@
{"Antarctica/South_Pole", NZST},
{"Antarctica/Syowa", new String[] {"Hora de Syowa", "SYOT",
"Hora de verano de Syowa", "SYOST"}},
@@ -1055,7 +1310,15 @@
{"Antarctica/Vostok", new String[] {"Hora de Vostok", "VOST",
"Hora de verano de Vostok", "VOSST"}},
{"Arctic/Longyearbyen", CET},
-@@ -500,6 +520,7 @@
+@@ -485,6 +506,7 @@
+ {"Asia/Brunei", new String[] {"Hora de Brunei", "BNT",
+ "Hora de verano de Brunei", "BNST"}},
+ {"Asia/Calcutta", IST},
++ {"Asia/Chita", IRKT},
+ {"Asia/Choibalsan", new String[] {"Hora de Choibalsan", "CHOT",
+ "Hora de verano de Choibalsan", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+@@ -500,27 +522,28 @@
"Hora de verano de Tajikist\u00e1n", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
@@ -1063,8 +1326,10 @@
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Hora de Hovd", "HOVT",
-@@ -508,7 +529,7 @@
- "Hora de verano de Irkutsk", "IRKST"}},
+ "Hora de verano de Hovd", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"Hora de Irkutsk", "IRKT",
+- "Hora de verano de Irkutsk", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"Hora de Indonesia Oriental", "EIT",
@@ -1072,27 +1337,47 @@
"Hora de verano de Indonesia Oriental", "EIST"}},
{"Asia/Kabul", new String[] {"Hora de Afganist\u00e1n", "AFT",
"Hora de verano de Afganist\u00e1n", "AFST"}},
-@@ -518,6 +539,8 @@
- {"Asia/Kashgar", CTT},
+ {"Asia/Kamchatka", new String[] {"Hora de Petropavlovsk-Kamchatski", "PETT",
+ "Hora de verano de Petropavlovsk-Kamchatski", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"Hora de Khandyga", "YAKT",
+ "Hora de verano de Khandyga", "YAKST"}},
{"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"Hora de Krasnoyarsk", "KRAT",
- "Hora de verano de Krasnoyarsk", "KRAST"}},
-@@ -533,7 +556,6 @@
+- {"Asia/Krasnoyarsk", new String[] {"Hora de Krasnoyarsk", "KRAT",
+- "Hora de verano de Krasnoyarsk", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -533,8 +556,7 @@
"Hora de verano de Filipinas", "PHST"}},
{"Asia/Muscat", GST},
{"Asia/Nicosia", EET},
-
- {"Asia/Novokuznetsk", NOVT},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
{"Asia/Novosibirsk", NOVT},
{"Asia/Oral", new String[] {"Hora de Uralsk", "ORAT",
-@@ -567,11 +589,11 @@
+ "Hora de verano de Uralsk", "ORAST"}},
+@@ -555,6 +577,8 @@
+ {"Asia/Samarkand", UZT},
+ {"Asia/Seoul", KST},
+ {"Asia/Singapore", SGT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", CTT},
+ {"Asia/Tel_Aviv", ISRAEL},
+ {"Asia/Tashkent", UZT},
+@@ -566,12 +590,12 @@
+ {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"Hora de Ust-Nera", "VLAT",
+ "Hora de verano de Ust-Nera", "VLAST"}},
{"Asia/Vientiane", ICT},
@@ -1105,18 +1390,18 @@
{"Asia/Yekaterinburg", new String[] {"Hora de Ekaterinburgo", "YEKT",
"Hora de verano de Ekaterinburgo", "YEKST"}},
{"Asia/Yerevan", ARMT},
-@@ -598,8 +620,8 @@
+@@ -598,8 +622,8 @@
{"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN},
- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST",
- "Central Western Summer Time (Australia)", "CWST"}},
-+ {"Australia/Eucla", new String[] {"Hora est\u00E1ndar de Australia Central y Occidental", "CWST",
-+ "Hora est\u00E1ndar de verano de Australia Central y Occidental", "CWST"}},
++ {"Australia/Eucla", new String[] {"Hora est\u00E1ndar de Australia Central y Occidental", "ACWST",
++ "Hora est\u00E1ndar de verano de Australia Central y Occidental", "ACWDT"}},
{"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE},
-@@ -617,7 +639,7 @@
+@@ -617,7 +641,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
@@ -1125,7 +1410,7 @@
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
-@@ -655,6 +677,7 @@
+@@ -655,6 +679,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
@@ -1133,16 +1418,7 @@
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
-@@ -664,7 +687,7 @@
- {"Europe/Isle_of_Man", GMTBST},
- {"Europe/Istanbul", EET},
- {"Europe/Jersey", GMTBST},
-- {"Europe/Kaliningrad", EET},
-+ {"Europe/Kaliningrad", FET},
- {"Europe/Kiev", EET},
- {"Europe/Lisbon", WET},
- {"Europe/Ljubljana", CET},
-@@ -673,7 +696,7 @@
+@@ -673,7 +698,7 @@
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
@@ -1151,7 +1427,7 @@
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
-@@ -686,7 +709,7 @@
+@@ -686,7 +711,7 @@
"Hora de verano de Samara", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
@@ -1160,7 +1436,17 @@
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
-@@ -753,6 +776,7 @@
+@@ -698,8 +723,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"Hora de Volgogrado", "VOLT",
+- "Hora de verano de Volgogrado", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -753,6 +777,7 @@
{"Pacific/Apia", WST_SAMOA},
{"Pacific/Auckland", NZST},
{"Pacific/Chatham", CHAST},
@@ -1168,7 +1454,7 @@
{"Pacific/Easter", EASTER},
{"Pacific/Efate", new String[] {"Hora de Vanuatu", "VUT",
"Hora de verano de Vanuatu", "VUST"}},
-@@ -791,8 +815,8 @@
+@@ -791,8 +816,8 @@
{"Pacific/Palau", new String[] {"Hora de Palau", "PWT",
"Hora de verano de Palau", "PWST"}},
{"Pacific/Pitcairn", PITCAIRN},
@@ -1179,7 +1465,7 @@
{"Pacific/Port_Moresby", new String[] {"Hora de Pap\u00faa-Nueva Guinea", "PGT",
"Hora de verano de Pap\u00faa-Nueva Guinea", "PGST"}},
{"Pacific/Rarotonga", new String[] {"Hora de las islas Cook", "CKT",
-@@ -805,12 +829,12 @@
+@@ -805,12 +830,12 @@
"Hora de verano de las islas Gilbert", "GILST"}},
{"Pacific/Tongatapu", new String[] {"Hora de Tonga", "TOT",
"Hora de verano de Tonga", "TOST"}},
@@ -1203,12 +1489,14 @@
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
-@@ -46,89 +46,95 @@
+@@ -45,98 +45,106 @@
+ protected final Object[][] getContents() {
String ACT[] = new String[] {"Heure de l'Acre", "ACT",
"Heure d'\u00e9t\u00e9 de l'Acre", "ACST"};
- String ADELAIDE[] = new String[] {"Heure standard d'Australie centrale (Australie du sud)", "CST",
+- String ADELAIDE[] = new String[] {"Heure standard d'Australie centrale (Australie du sud)", "CST",
- "Heure d'\u00e9t\u00e9 d'Australie centrale (Australie du sud)", "CST"};
-+ "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud)", "CST"};
++ String ADELAIDE[] = new String[] {"Heure standard d'Australie centrale (Australie du sud)", "ACST",
++ "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud)", "ACDT"};
String AGT[] = new String[] {"Heure D'Argentine", "ART",
- "Heure d'\u00e9t\u00e9 D'Argentine", "ARST"} ;
+ "Heure d'\u00e9t\u00e9 D'Argentine", "ARST"};
@@ -1229,13 +1517,15 @@
+ "Heure avanc\u00e9e de l'Atlantique", "ADT"};
String BDT[] = new String[] {"Heure du Bangladesh", "BDT",
- "Heure d'\u00e9t\u00e9 du Bangladesh", "BDST"} ;
-+ "Heure d'\u00e9t\u00e9 du Bangladesh", "BDST"};
- String BRISBANE[] = new String[] {"Heure standard d'Australie orientale (Queensland)", "EST",
+- String BRISBANE[] = new String[] {"Heure standard d'Australie orientale (Queensland)", "EST",
- "Heure d'\u00e9t\u00e9 d'Australie orientale (Queensland)", "EST"};
-+ "Heure d'\u00E9t\u00E9 d'Australie orientale (Queensland)", "EST"};
- String BROKEN_HILL[] = new String[] {"Heure standard d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "CST",
+- String BROKEN_HILL[] = new String[] {"Heure standard d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "CST",
- "Heure d'\u00e9t\u00e9 d'Australie centrale(Australie du sud/Nouvelle-Galles du sud)", "CST"};
-+ "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "CST"};
++ "Heure d'\u00e9t\u00e9 du Bangladesh", "BDST"};
++ String BRISBANE[] = new String[] {"Heure standard d'Australie orientale (Queensland)", "AEST",
++ "Heure d'\u00E9t\u00E9 d'Australie orientale (Queensland)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"Heure standard d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "ACST",
++ "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "ACDT"};
String BRT[] = new String[] {"Heure du Br\u00e9sil", "BRT",
- "Heure d'\u00e9t\u00e9 du Br\u00e9sil", "BRST"} ;
+ "Heure d'\u00e9t\u00e9 du Br\u00e9sil", "BRST"};
@@ -1267,12 +1557,13 @@
- "Heure avanc\u00e9e de Chine", "CDT"} ;
- String CUBA[] = new String[] {"Cuba Standard Time", "CST",
- "Cuba Daylight Time", "CDT"};
+- String DARWIN[] = new String[] {"Heure standard d'Australie centrale (Territoire du Nord)", "CST",
+- "Heure d'\u00e9t\u00e9 d'Australie centrale (Territoire du Nord)", "CST"};
+ "Heure avanc\u00e9e de Chine", "CDT"};
+ String CUBA[] = new String[] {"Heure standard de Cuba", "CST",
+ "Heure d'\u00e9t\u00e9 de Cuba", "CDT"};
- String DARWIN[] = new String[] {"Heure standard d'Australie centrale (Territoire du Nord)", "CST",
-- "Heure d'\u00e9t\u00e9 d'Australie centrale (Territoire du Nord)", "CST"};
-+ "Heure d'\u00E9t\u00E9 d'Australie centrale (Territoire du Nord)", "CST"};
++ String DARWIN[] = new String[] {"Heure standard d'Australie centrale (Territoire du Nord)", "ACST",
++ "Heure d'\u00E9t\u00E9 d'Australie centrale (Territoire du Nord)", "ACDT"};
String DUBLIN[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT",
"Heure d'\u00e9t\u00e9 irlandaise", "IST"};
String EAT[] = new String[] {"Heure d'Afrique de l'Est", "EAT",
@@ -1288,10 +1579,11 @@
+ "Heure d'\u00e9t\u00e9 du Groenland de l'Est", "EGST"};
String EST[] = new String[] {"Heure normale de l'Est", "EST",
- "Heure avanc\u00e9e de l'Est", "EDT"} ;
-+ "Heure avanc\u00e9e de l'Est", "EDT"};
- String EST_NSW[] = new String[] {"Heure normale de l'Est (Nouvelle-Galles du Sud)", "EST",
+- String EST_NSW[] = new String[] {"Heure normale de l'Est (Nouvelle-Galles du Sud)", "EST",
- "Heure d'\u00e9t\u00e9 de l'Est (Nouvelle-Galles du Sud)", "EST"} ;
-+ "Heure d'\u00E9t\u00E9 de l'Est (Nouvelle-Galles du Sud)", "EST"};
++ "Heure avanc\u00e9e de l'Est", "EDT"};
++ String EST_NSW[] = new String[] {"Heure normale de l'Est (Nouvelle-Galles du Sud)", "AEST",
++ "Heure d'\u00E9t\u00E9 de l'Est (Nouvelle-Galles du Sud)", "AEDT"};
+ String FET[] = new String[] {"Heure d'Europe de l'Est UTC+3", "FET",
+ "Heure d'\u00E9t\u00E9 d'Europe de l'Est UTC+3", "FEST"};
String GHMT[] = new String[] {"Heure du Ghana", "GMT",
@@ -1328,13 +1620,16 @@
String JST[] = new String[] {"Heure normale du Japon", "JST",
- "Heure avanc\u00e9e du Japon", "JDT"} ;
+ "Heure avanc\u00e9e du Japon", "JDT"};
++ String KRAT[] = new String[] {"Heure de Krasno\u00efarsk", "KRAT",
++ "Heure d'\u00e9t\u00e9 de Krasno\u00efarsk", "KRAST"};
String KST[] = new String[] {"Heure normale de Cor\u00e9e", "KST",
- "Heure avanc\u00e9e de Cor\u00e9e", "KDT"} ;
+ "Heure avanc\u00e9e de Cor\u00e9e", "KDT"};
String LORD_HOWE[] = new String[] {"Heure standard de Lord Howe", "LHST",
- "Heure d'\u00e9t\u00e9 de Lord Howe", "LHST"};
+- "Heure d'\u00e9t\u00e9 de Lord Howe", "LHST"};
++ "Heure d'\u00e9t\u00e9 de Lord Howe", "LHDT"};
String MHT[] = new String[] {"Heure des Iles Marshall", "MHT",
-@@ -136,7 +142,7 @@
+ "Heure d'\u00e9t\u00e9 des Iles Marshall", "MHST"};
String MSK[] = new String[] {"Heure standard de Moscou", "MSK",
"Heure avanc\u00e9e de Moscou", "MSD"};
String MST[] = new String[] {"Heure normale des Rocheuses", "MST",
@@ -1343,7 +1638,7 @@
String MYT[] = new String[] {"Heure de Malaisie", "MYT",
"Heure d'\u00e9t\u00e9 de Malaisie", "MYST"};
String NORONHA[] = new String[] {"Heure de Fernando de Noronha", "FNT",
-@@ -146,55 +152,55 @@
+@@ -146,55 +154,55 @@
String NPT[] = new String[] {"Heure du N\u00e9pal", "NPT",
"Heure d'\u00e9t\u00e9 du N\u00e9pal", "NPST"};
String NST[] = new String[] {"Heure normale de Terre-Neuve", "NST",
@@ -1366,6 +1661,8 @@
+ "Heure avanc\u00e9e du Pacifique", "PDT"};
+ String SAMOA[] = new String[] {"Heure standard de Samoa", "SST",
+ "Heure avanc\u00e9e de Samoa", "SDT"};
++ String IRKT[] = new String[] {"Heure d'Irkutsk", "IRKT",
++ "Heure d'\u00e9t\u00e9 d'Irkutsk", "IRKST"};
String SAST[] = new String[] {"Heure normale d'Afrique du Sud", "SAST",
- "Heure d'\u00e9t\u00e9 d'Afrique du Sud", "SAST"} ;
+ "Heure d'\u00e9t\u00e9 d'Afrique du Sud", "SAST"};
@@ -1374,11 +1671,12 @@
+ "Heure d'\u00e9t\u00e9 des \u00celes Salomon", "SBST"};
String SGT[] = new String[] {"Heure de Singapour", "SGT",
"Heure d'\u00e9t\u00e9 de Singapour", "SGST"};
- String SLST[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT",
- "Heure d'\u00e9t\u00e9 de Sierra Leone", "SLST"};
- String TASMANIA[] = new String[] {"Heure standard d'Australie orientale (Tasmanie)", "EST",
+- String SLST[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT",
+- "Heure d'\u00e9t\u00e9 de Sierra Leone", "SLST"};
+- String TASMANIA[] = new String[] {"Heure standard d'Australie orientale (Tasmanie)", "EST",
- "Heure d'\u00e9t\u00e9 d'Australie orientale (Tasmanie)", "EST"};
-+ "Heure d'\u00E9t\u00E9 d'Australie orientale (Tasmanie)", "EST"};
++ String TASMANIA[] = new String[] {"Heure standard d'Australie orientale (Tasmanie)", "AEST",
++ "Heure d'\u00E9t\u00E9 d'Australie orientale (Tasmanie)", "AEDT"};
String TMT[] = new String[] {"Heure du Turkm\u00e9nistan", "TMT",
- "Heure d'\u00e9t\u00e9 du Turkm\u00e9nistan", "TMST"} ;
- String TRUT[] = new String[] {"Heure de Truk", "TRUT",
@@ -1388,48 +1686,49 @@
- "Heure d'\u00e9t\u00e9 de l'Ulaanbaatar", "ULAST"} ;
- String WART[] = new String[] {"Heure D'Argentine", "WART",
- "Heure d'\u00e9t\u00e9 D'Argentine", "WARST"} ;
-+ "Heure d'\u00e9t\u00e9 de l'Ulaanbaatar", "ULAST"};
-+ String UTC[] = new String[] {"Temps universel coordonn\u00e9", "UTC",
-+ "Temps universel coordonn\u00e9", "UTC"};
-+ String UZT[] = new String[] {"Heure de l'Ouzb\u00e9kistan", "UZT",
-+ "Heure d'\u00e9t\u00e9 de l'Ouzb\u00e9kistan", "UZST"};
-+ String VICTORIA[] = new String[] {"Heure standard d'Australie orientale (Victoria)", "EST",
-+ "Heure d'\u00E9t\u00E9 d'Australie orientale (Victoria)", "EST"};
-+ String VLAT[] = new String[] {"Heure de Vladivostok", "VLAT",
-+ "Heure d'\u00e9t\u00e9 de Vladivostok", "VLAST"};
-+ String WART[] = new String[] {"Heure D'Argentine de l'Ouest", "WART",
-+ "Heure d'\u00e9t\u00e9 D'Argentine de l'Ouest", "WARST"};
- String WAT[] = new String[] {"Heure d'Afrique de l'Ouest", "WAT",
+- String WAT[] = new String[] {"Heure d'Afrique de l'Ouest", "WAT",
- "Heure d'\u00e9t\u00e9 d'Afrique de l'Ouest", "WAST"} ;
-+ "Heure d'\u00e9t\u00e9 d'Afrique de l'Ouest", "WAST"};
- String WET[] = new String[] {"Heure d'Europe de l'Ouest", "WET",
+- String WET[] = new String[] {"Heure d'Europe de l'Ouest", "WET",
- "Heure d'\u00e9t\u00e9 d'Europe de l'Ouest", "WEST"} ;
- String WIT[] = new String[] {"Heure de l'Indon\u00e9sie occidentale", "WIT",
-+ "Heure d'\u00e9t\u00e9 d'Europe de l'Ouest", "WEST"};
-+ String WIT[] = new String[] {"Heure de l'Indon\u00e9sie occidentale", "WIB",
- "Heure d'\u00e9t\u00e9 de l'Indon\u00e9sie occidentale", "WIST"};
- String WST_AUS[] = new String[] {"Heure normale de l'Ouest (Australie)", "WST",
+- "Heure d'\u00e9t\u00e9 de l'Indon\u00e9sie occidentale", "WIST"};
+- String WST_AUS[] = new String[] {"Heure normale de l'Ouest (Australie)", "WST",
- "Heure d'\u00e9t\u00e9 de l'Ouest (Australie)", "WST"} ;
- String SAMOA[] = new String[] {"Heure standard de Samoa", "SST",
- "Heure avanc\u00e9e de Samoa", "SDT"};
-+ "Heure d'\u00E9t\u00E9 de l'Ouest (Australie)", "WST"};
- String WST_SAMOA[] = new String[] {"Heure des Samoas occidentales", "WST",
+- String WST_SAMOA[] = new String[] {"Heure des Samoas occidentales", "WST",
- "Heure d'\u00e9t\u00e9 des Samoas occidentales", "WSST"} ;
- String ChST[] = new String[] {"Heure normale des \u00eeles Mariannes", "ChST",
- "Heure d'\u00e9t\u00e9 des \u00eeles Mariannes", "ChDT"};
- String VICTORIA[] = new String[] {"Heure standard d'Australie orientale (Victoria)", "EST",
- "Heure d'\u00e9t\u00e9 d'Australie orientale (Victoria)", "EST"};
-- String UTC[] = new String[] {"Temps universel coordonn\u00e9", "UTC",
-- "Temps universel coordonn\u00e9", "UTC"};
-- String UZT[] = new String[] {"Heure de l'Ouzb\u00e9kistan", "UZT",
-- "Heure d'\u00e9t\u00e9 de l'Ouzb\u00e9kistan", "UZST"};
++ "Heure d'\u00e9t\u00e9 de l'Ulaanbaatar", "ULAST"};
+ String UTC[] = new String[] {"Temps universel coordonn\u00e9", "UTC",
+ "Temps universel coordonn\u00e9", "UTC"};
+ String UZT[] = new String[] {"Heure de l'Ouzb\u00e9kistan", "UZT",
+ "Heure d'\u00e9t\u00e9 de l'Ouzb\u00e9kistan", "UZST"};
++ String VICTORIA[] = new String[] {"Heure standard d'Australie orientale (Victoria)", "AEST",
++ "Heure d'\u00E9t\u00E9 d'Australie orientale (Victoria)", "AEDT"};
++ String VLAT[] = new String[] {"Heure de Vladivostok", "VLAT",
++ "Heure d'\u00e9t\u00e9 de Vladivostok", "VLAST"};
++ String WAT[] = new String[] {"Heure d'Afrique de l'Ouest", "WAT",
++ "Heure d'\u00e9t\u00e9 d'Afrique de l'Ouest", "WAST"};
++ String WET[] = new String[] {"Heure d'Europe de l'Ouest", "WET",
++ "Heure d'\u00e9t\u00e9 d'Europe de l'Ouest", "WEST"};
++ String WIT[] = new String[] {"Heure de l'Indon\u00e9sie occidentale", "WIB",
++ "Heure d'\u00e9t\u00e9 de l'Indon\u00e9sie occidentale", "WIST"};
++ String WST_AUS[] = new String[] {"Heure normale de l'Ouest (Australie)", "AWST",
++ "Heure d'\u00E9t\u00E9 de l'Ouest (Australie)", "AWDT"};
++ String WST_SAMOA[] = new String[] {"Heure des Samoas occidentales", "WSST",
+ "Heure d'\u00e9t\u00e9 des Samoas occidentales", "WSDT"};
++ String XJT[] = new String[] {"Heure normale de Chine", "XJT",
++ "Heure avanc\u00e9e de Chine", "XJDT"};
+ String YAKT[] = new String[] {"Heure du Iakoutsk", "YAKT",
+ "Heure d'\u00e9t\u00e9 du Iakoutsk", "YAKST"};
return new Object[][] {
{"America/Los_Angeles", PST},
-@@ -214,6 +220,7 @@
+@@ -214,6 +222,7 @@
{"America/Anchorage", AKST},
{"AST", AKST},
{"America/Halifax", AST},
@@ -1437,7 +1736,12 @@
{"America/St_Johns", NST},
{"CNT", NST},
{"Europe/Paris", CET},
-@@ -259,6 +266,7 @@
+@@ -255,10 +264,11 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT},
{"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST},
@@ -1445,7 +1749,7 @@
{"Africa/Kampala", EAT},
{"Africa/Khartoum", EAT},
{"Africa/Kigali", CAT},
-@@ -300,7 +308,7 @@
+@@ -300,7 +310,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
@@ -1454,7 +1758,7 @@
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
-@@ -309,6 +317,7 @@
+@@ -309,6 +319,7 @@
{"America/Atikokan", EST},
{"America/Atka", HAST},
{"America/Bahia", BRT},
@@ -1462,7 +1766,7 @@
{"America/Barbados", AST},
{"America/Belem", BRT},
{"America/Belize", CST},
-@@ -328,6 +337,7 @@
+@@ -328,6 +339,7 @@
"Heure d'\u00e9t\u00e9 de Guyane fran\u00e7aise", "GFST"}},
{"America/Cayman", EST},
{"America/Chihuahua", MST},
@@ -1470,7 +1774,7 @@
{"America/Coral_Harbour", EST},
{"America/Cordoba", AGT},
{"America/Costa_Rica", CST},
-@@ -339,7 +349,7 @@
+@@ -339,7 +351,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
@@ -1479,7 +1783,16 @@
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
-@@ -361,10 +371,10 @@
+@@ -348,7 +360,7 @@
+ {"America/Godthab", new String[] {"Heure du Groenland de l'Ouest", "WGT",
+ "Heure d'\u00e9t\u00e9 du Groenland de l'Ouest", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -361,10 +373,10 @@
{"America/Indiana/Indianapolis", EST},
{"America/Indiana/Knox", CST},
{"America/Indiana/Marengo", EST},
@@ -1493,7 +1806,7 @@
{"America/Indiana/Winamac", EST},
{"America/Inuvik", MST},
{"America/Iqaluit", EST},
-@@ -374,21 +384,25 @@
+@@ -374,21 +386,24 @@
{"America/Kentucky/Louisville", EST},
{"America/Kentucky/Monticello", EST},
{"America/Knox_IN", CST},
@@ -1515,12 +1828,11 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
-+ {"America/Metlakatla", new String[] {"Heure normale de Metlakatla", "MeST",
-+ "Heure avanc\u00E9e de Metlakatla", "MeDT"}},
++ {"America/Metlakatla", PST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Heure normale de Saint-Pierre et Miquelon", "PMST",
"Heure avanc\u00e9e de Saint-Pierre et Miquelon", "PMDT"}},
-@@ -402,6 +416,7 @@
+@@ -402,6 +417,7 @@
{"America/Nipigon", EST},
{"America/Nome", AKST},
{"America/Noronha", NORONHA},
@@ -1528,7 +1840,7 @@
{"America/North_Dakota/Center", CST},
{"America/North_Dakota/New_Salem", CST},
{"America/Ojinaga", MST},
-@@ -411,15 +426,15 @@
+@@ -411,15 +427,15 @@
"Heure d'\u00e9t\u00e9 du Surinam", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
@@ -1547,7 +1859,7 @@
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
-@@ -428,7 +443,7 @@
+@@ -428,7 +444,7 @@
{"America/Sao_Paulo", BRT},
{"America/Scoresbysund", EGT},
{"America/Shiprock", MST},
@@ -1556,7 +1868,7 @@
{"America/St_Kitts", AST},
{"America/St_Lucia", AST},
{"America/St_Thomas", AST},
-@@ -446,10 +461,13 @@
+@@ -446,10 +462,13 @@
{"America/Winnipeg", CST},
{"America/Yakutat", AKST},
{"America/Yellowknife", MST},
@@ -1566,11 +1878,11 @@
{"Antarctica/DumontDUrville", new String[] {"Heure de Dumont-d'Urville", "DDUT",
"Heure d'\u00e9t\u00e9 de Dumont-d'Urville", "DDUST"}},
+ {"Antarctica/Macquarie", new String[] {"Heure de l'Ile Macquarie", "MIST",
-+ "Heure d'\u00E9t\u00E9 de l'Ile Macquarie", "MIST"}},
++ "Heure d'\u00E9t\u00E9 de l'Ile Macquarie", "MIDT"}},
{"Antarctica/Mawson", new String[] {"Heure de Mawson", "MAWT",
"Heure d'\u00e9t\u00e9 de Mawson", "MAWST"}},
{"Antarctica/McMurdo", NZST},
-@@ -459,6 +477,8 @@
+@@ -459,6 +478,8 @@
{"Antarctica/South_Pole", NZST},
{"Antarctica/Syowa", new String[] {"Heure de Syowa", "SYOT",
"Heure d'\u00e9t\u00e9 de Syowa", "SYOST"}},
@@ -1579,7 +1891,15 @@
{"Antarctica/Vostok", new String[] {"Heure de Vostok", "VOST",
"Heure d'\u00e9t\u00e9 de Vostok", "VOSST"}},
{"Arctic/Longyearbyen", CET},
-@@ -500,6 +520,7 @@
+@@ -485,6 +506,7 @@
+ {"Asia/Brunei", new String[] {"Heure du Brunei", "BNT",
+ "Heure d'\u00e9t\u00e9 du Brunei", "BNST"}},
+ {"Asia/Calcutta", IST},
++ {"Asia/Chita", IRKT},
+ {"Asia/Choibalsan", new String[] {"Heure de Choibalsan", "CHOT",
+ "Heure d'\u00e9t\u00e9 de Choibalsan", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+@@ -500,27 +522,28 @@
"Heure d'\u00e9t\u00e9 du Tadjikistan", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
@@ -1587,8 +1907,10 @@
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Heure de Hovd", "HOVT",
-@@ -508,7 +529,7 @@
- "Heure d'\u00e9t\u00e9 d'Irkutsk", "IRKST"}},
+ "Heure d'\u00e9t\u00e9 de Hovd", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"Heure d'Irkutsk", "IRKT",
+- "Heure d'\u00e9t\u00e9 d'Irkutsk", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"Heure d'Indon\u00e9sie orientale", "EIT",
@@ -1596,19 +1918,46 @@
"Heure d'\u00e9t\u00e9 d'Indon\u00e9sie orientale", "EIST"}},
{"Asia/Kabul", new String[] {"Heure d'Afghanistan", "AFT",
"Heure d'\u00e9t\u00e9 d'Afghanistan", "AFST"}},
-@@ -518,6 +539,8 @@
- {"Asia/Kashgar", CTT},
+ {"Asia/Kamchatka", new String[] {"Heure de Petropavlovsk-Kamchatski", "PETT",
+ "Heure d'\u00e9t\u00e9 de Petropavlovsk-Kamchatski", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"Heure de Khandyga", "YAKT",
+ "Heure d'\u00E9t\u00E9 de Khandyga", "YAKST"}},
{"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"Heure de Krasno\u00efarsk", "KRAT",
- "Heure d'\u00e9t\u00e9 de Krasno\u00efarsk", "KRAST"}},
-@@ -566,11 +589,11 @@
+- {"Asia/Krasnoyarsk", new String[] {"Heure de Krasno\u00efarsk", "KRAT",
+- "Heure d'\u00e9t\u00e9 de Krasno\u00efarsk", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -533,7 +556,7 @@
+ "Heure d'\u00e9t\u00e9 des Philippines", "PHST"}},
+ {"Asia/Muscat", GST},
+ {"Asia/Nicosia", EET},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
+ {"Asia/Novosibirsk", NOVT},
+ {"Asia/Oral", new String[] {"Heure d'Oral", "ORAT",
+ "Heure d'\u00e9t\u00e9 d'Oral", "ORAST"}},
+@@ -554,6 +577,8 @@
+ {"Asia/Samarkand", UZT},
+ {"Asia/Seoul", KST},
+ {"Asia/Singapore", SGT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", CTT},
+ {"Asia/Tel_Aviv", ISRAEL},
+ {"Asia/Tashkent", UZT},
+@@ -565,12 +590,12 @@
+ {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"Heure d'Ust-Nera", "VLAT",
+ "Heure d'\u00E9t\u00E9 d'Ust-Nera", "VLAST"}},
{"Asia/Vientiane", ICT},
@@ -1621,18 +1970,18 @@
{"Asia/Yekaterinburg", new String[] {"Heure de Yekaterinburg", "YEKT",
"Heure d'\u00e9t\u00e9 de Yekaterinburg", "YEKST"}},
{"Asia/Yerevan", ARMT},
-@@ -597,8 +620,8 @@
+@@ -597,8 +622,8 @@
{"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN},
- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST",
- "Central Western Summer Time (Australia)", "CWST"}},
-+ {"Australia/Eucla", new String[] {"Heure standard de l'Australie occidentale (centre)", "CWST",
-+ "Heure d'\u00E9t\u00E9 de l'Australie occidentale (centre)", "CWST"}},
++ {"Australia/Eucla", new String[] {"Heure standard de l'Australie occidentale (centre)", "ACWST",
++ "Heure d'\u00E9t\u00E9 de l'Australie occidentale (centre)", "ACWDT"}},
{"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE},
-@@ -616,7 +639,7 @@
+@@ -616,7 +641,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
@@ -1641,7 +1990,7 @@
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
-@@ -654,6 +677,7 @@
+@@ -654,6 +679,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
@@ -1649,16 +1998,7 @@
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
-@@ -663,7 +687,7 @@
- {"Europe/Isle_of_Man", GMTBST},
- {"Europe/Istanbul", EET},
- {"Europe/Jersey", GMTBST},
-- {"Europe/Kaliningrad", EET},
-+ {"Europe/Kaliningrad", FET},
- {"Europe/Kiev", EET},
- {"Europe/Lisbon", WET},
- {"Europe/Ljubljana", CET},
-@@ -672,7 +696,7 @@
+@@ -672,7 +698,7 @@
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
@@ -1667,7 +2007,7 @@
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
-@@ -685,7 +709,7 @@
+@@ -685,7 +711,7 @@
"Heure d'\u00e9t\u00e9 de Samara", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
@@ -1676,7 +2016,17 @@
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
-@@ -752,6 +776,7 @@
+@@ -697,8 +723,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"Heure de Volgograd", "VOLT",
+- "Heure d'\u00e9t\u00e9 de Volgograd", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -752,6 +777,7 @@
{"Pacific/Apia", WST_SAMOA},
{"Pacific/Auckland", NZST},
{"Pacific/Chatham", CHAST},
@@ -1684,7 +2034,7 @@
{"Pacific/Easter", EASTER},
{"Pacific/Efate", new String[] {"Heure du Vanuatu", "VUT",
"Heure d'\u00e9t\u00e9 du Vanuatu", "VUST"}},
-@@ -790,8 +815,8 @@
+@@ -790,8 +816,8 @@
{"Pacific/Palau", new String[] {"Heure de Palaos", "PWT",
"Heure d'\u00e9t\u00e9 de Palaos", "PWST"}},
{"Pacific/Pitcairn", PITCAIRN},
@@ -1695,7 +2045,7 @@
{"Pacific/Port_Moresby", new String[] {"Heure de Papouasie-Nouvelle-Guin\u00e9e", "PGT",
"Heure d'\u00e9t\u00e9 de de Papouasie-Nouvelle-Guin\u00e9e", "PGST"}},
{"Pacific/Rarotonga", new String[] {"Heure des \u00celes Cook", "CKT",
-@@ -804,12 +829,12 @@
+@@ -804,12 +830,12 @@
"Heure d'\u00e9t\u00e9 de Kiribati", "GILST"}},
{"Pacific/Tongatapu", new String[] {"Heure de Tonga", "TOT",
"Heure d'\u00e9t\u00e9 de Tonga", "TOST"}},
@@ -1725,23 +2075,26 @@
"Ora estiva di Acre", "ACST"};
- String ADELAIDE[] = new String[] {"Ora centrale standard (Australia del Sud)", "CST",
- "Ora estiva standard (Australia del Sud)", "CST"};
-+ String ADELAIDE[] = new String[] {"Ora standard centrale (Australia del Sud)", "CST",
-+ "Ora estiva centrale (Australia del Sud)", "CST"};
++ String ADELAIDE[] = new String[] {"Ora standard centrale (Australia del Sud)", "ACST",
++ "Ora estiva centrale (Australia del Sud)", "ACDT"};
String AGT[] = new String[] {"Ora dell'Argentina", "ART",
"Ora estiva dell'Argentina", "ARST"};
String AKST[] = new String[] {"Ora solare dell'Alaska", "AKST",
-@@ -61,9 +61,9 @@
+@@ -61,10 +61,10 @@
"Ora legale dell'Atlantico occidentale", "ADT"};
String BDT[] = new String[] {"Ora del Bangladesh", "BDT",
"Ora estiva del Bangladesh", "BDST"};
- String BRISBANE[] = new String[] {"Ora orientale standard (Queensland)", "EST",
-+ String BRISBANE[] = new String[] {"Ora standard orientale (Queensland)", "EST",
- "Ora estiva orientale (Queensland)", "EST"};
+- "Ora estiva orientale (Queensland)", "EST"};
- String BROKEN_HILL[] = new String[] {"Ora centrale standard (Australia del Sud/Nuovo Galles del Sud)", "CST",
-+ String BROKEN_HILL[] = new String[] {"Ora standard centrale (Australia del Sud/Nuovo Galles del Sud)", "CST",
- "Ora estiva centrale (Australia del Sud/Nuovo Galles del Sud)", "CST"};
+- "Ora estiva centrale (Australia del Sud/Nuovo Galles del Sud)", "CST"};
++ String BRISBANE[] = new String[] {"Ora standard orientale (Queensland)", "AEST",
++ "Ora estiva orientale (Queensland)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"Ora standard centrale (Australia del Sud/Nuovo Galles del Sud)", "ACST",
++ "Ora estiva centrale (Australia del Sud/Nuovo Galles del Sud)", "ACDT"};
String BRT[] = new String[] {"Ora del Brasile", "BRT",
"Ora estiva del Brasile", "BRST"};
+ String BTT[] = new String[] {"Ora del Bhutan", "BTT",
@@ -75,7 +75,11 @@
"Ora estiva dell'Europa centrale", "CEST"};
String CHAST[] = new String[] {"Ora di Chatham standard", "CHAST",
@@ -1755,32 +2108,49 @@
"Ora estiva dell'Indonesia centrale", "CIST"};
String CLT[] = new String[] {"Ora del Cile", "CLT",
"Ora estiva del Cile", "CLST"};
-@@ -83,9 +87,9 @@
+@@ -83,10 +87,10 @@
"Ora legale USA centrale", "CDT"};
String CTT[] = new String[] {"Ora solare della Cina", "CST",
"Ora legale della Cina", "CDT"};
- String CUBA[] = new String[] {"Cuba Standard Time", "CST",
- "Cuba Daylight Time", "CDT"};
- String DARWIN[] = new String[] {"Ora centrale standard (Territori del Nord)", "CST",
+- "Ora estiva centrale (Territori del Nord)", "CST"};
+ String CUBA[] = new String[] {"Ora solare Cuba", "CST",
+ "Ora legale Cuba", "CDT"};
-+ String DARWIN[] = new String[] {"Ora standard centrale (Territori del Nord)", "CST",
- "Ora estiva centrale (Territori del Nord)", "CST"};
++ String DARWIN[] = new String[] {"Ora standard centrale (Territori del Nord)", "ACST",
++ "Ora estiva centrale (Territori del Nord)", "ACDT"};
String DUBLIN[] = new String[] {"Ora media di Greenwich", "GMT",
"Ora estiva irlandese", "IST"};
+ String EAT[] = new String[] {"Ora dell'Africa orientale", "EAT",
@@ -99,8 +103,10 @@
"Ora estiva della Groenlandia orientale", "EGST"};
String EST[] = new String[] {"Ora solare USA orientale", "EST",
"Ora legale USA orientale", "EDT"};
- String EST_NSW[] = new String[] {"Ora solare dell'Australia orientale (Nuovo Galles del Sud)", "EST",
-+ String EST_NSW[] = new String[] {"Ora standard dell'Australia orientale (Nuovo Galles del Sud)", "EST",
- "Ora estiva dell'Australia orientale (Nuovo Galles del Sud)", "EST"};
+- "Ora estiva dell'Australia orientale (Nuovo Galles del Sud)", "EST"};
++ String EST_NSW[] = new String[] {"Ora standard dell'Australia orientale (Nuovo Galles del Sud)", "AEST",
++ "Ora estiva dell'Australia orientale (Nuovo Galles del Sud)", "AEDT"};
+ String FET[] = new String[] {"Ora dei paesi europei pi\u00F9 orientali", "FET",
+ "Ora estiva dei paesi europei pi\u00F9 orientali", "FEST"};
String GHMT[] = new String[] {"Ora media del Ghana", "GMT",
"Ora legale del Ghana", "GHST"};
String GAMBIER[] = new String[] {"Ora di Gambier", "GAMT",
-@@ -153,10 +159,12 @@
+@@ -127,10 +133,12 @@
+ "Ora legale dell'India", "IDT"};
+ String JST[] = new String[] {"Ora solare del Giappone", "JST",
+ "Ora legale del Giappone", "JDT"};
++ String KRAT[] = new String[] {"Ora di Krasnojarsk", "KRAT",
++ "Ora estiva di Krasnojarsk", "KRAST"};
+ String KST[] = new String[] {"Ora solare della Corea", "KST",
+ "Ora legale della Corea", "KDT"};
+ String LORD_HOWE[] = new String[] {"Ora standard di Lord Howe", "LHST",
+- "Ora estiva di Lord Howe", "LHST"};
++ "Ora estiva di Lord Howe", "LHDT"};
+ String MHT[] = new String[] {"Ora delle Isole Marshall", "MHT",
+ "Ora estiva delle Isole Marshall", "MHST"};
+ String MSK[] = new String[] {"Ora standard di Mosca", "MSK",
+@@ -153,48 +161,48 @@
"Ora legale di Pitcairn", "PDT"};
String PKT[] = new String[] {"Ora del Pakistan", "PKT",
"Ora estiva del Pakistan", "PKST"};
@@ -1792,16 +2162,20 @@
- "Ora legale USA centrale", "CDT"};
+ String SAMOA[] = new String[] {"Ora standard di Samoa", "SST",
+ "Ora legale di Samoa", "SDT"};
++ String IRKT[] = new String[] {"Ora di Irkutsk", "IRKT",
++ "Ora estiva di Irkutsk", "IRKST"};
String SAST[] = new String[] {"Ora solare del Sudafrica", "SAST",
"Ora estiva del Sudafrica", "SAST"};
String SBT[] = new String[] {"Ora delle Isole Salomone", "SBT",
-@@ -165,36 +173,34 @@
+ "Ora estiva delle Isole Salomone", "SBST"};
+ String SGT[] = new String[] {"Ora di Singapore", "SGT",
"Ora estiva di Singapore", "SGST"};
- String SLST[] = new String[] {"Ora media di Greenwich", "GMT",
- "Ora legale della Sierra Leone", "SLST"};
+- String SLST[] = new String[] {"Ora media di Greenwich", "GMT",
+- "Ora legale della Sierra Leone", "SLST"};
- String TASMANIA[] = new String[] {"Ora orientale standard (Tasmania)", "EST",
-+ String TASMANIA[] = new String[] {"Ora standard orientale (Tasmania)", "EST",
- "Ora estiva orientale (Tasmania)", "EST"};
+- "Ora estiva orientale (Tasmania)", "EST"};
++ String TASMANIA[] = new String[] {"Ora standard orientale (Tasmania)", "AEST",
++ "Ora estiva orientale (Tasmania)", "AEDT"};
String TMT[] = new String[] {"Ora del Turkmenistan", "TMT",
"Ora estiva del Turkmenistan", "TMST"};
- String TRUT[] = new String[] {"Ora di Truk", "TRUT",
@@ -1814,12 +2188,10 @@
+ "Tempo universale coordinato", "UTC"};
+ String UZT[] = new String[] {"Ora dell'Uzbekistan", "UZT",
+ "Ora estiva dell'Uzbekistan", "UZST"};
-+ String VICTORIA[] = new String[] {"Ora standard orientale (Victoria)", "EST",
-+ "Ora estiva orientale (Victoria)", "EST"};
++ String VICTORIA[] = new String[] {"Ora standard orientale (Victoria)", "AEST",
++ "Ora estiva orientale (Victoria)", "AEDT"};
+ String VLAT[] = new String[] {"Ora di Vladivostok", "VLAT",
+ "Ora estiva di Vladivostok", "VLAST"};
-+ String WART[] = new String[] {"Ora dell'Argentina occidentale", "WART",
-+ "Ora estiva dell'Argentina occidentale", "WARST"};
String WAT[] = new String[] {"Ora dell'Africa occidentale", "WAT",
"Ora estiva dell'Africa occidentale", "WAST"};
String WET[] = new String[] {"Ora dell'Europa occidentale", "WET",
@@ -1828,11 +2200,10 @@
+ String WIT[] = new String[] {"Ora dell'Indonesia occidentale", "WIB",
"Ora estiva dell'Indonesia occidentale", "WIST"};
- String WST_AUS[] = new String[] {"Ora solare dell'Australia occidentale", "WST",
-+ String WST_AUS[] = new String[] {"Ora standard dell'Australia occidentale", "WST",
- "Ora estiva dell'Australia occidentale", "WST"};
+- "Ora estiva dell'Australia occidentale", "WST"};
- String SAMOA[] = new String[] {"Ora standard di Samoa", "SST",
- "Ora legale di Samoa", "SDT"};
- String WST_SAMOA[] = new String[] {"Ora di Samoa", "WST",
+- String WST_SAMOA[] = new String[] {"Ora di Samoa", "WST",
- "Ora estiva di Samoa", "WSST"};
- String ChST[] = new String[] {"Ora standard di Chamorro", "ChST",
- "Ora legale di Chamorro", "ChDT"};
@@ -1842,13 +2213,18 @@
- "Tempo universale coordinato", "UTC"};
- String UZT[] = new String[] {"Ora dell'Uzbekistan", "UZT",
- "Ora estiva dell'Uzbekistan", "UZST"};
++ String WST_AUS[] = new String[] {"Ora standard dell'Australia occidentale", "AWST",
++ "Ora estiva dell'Australia occidentale", "AWDT"};
++ String WST_SAMOA[] = new String[] {"Ora di Samoa", "WSST",
+ "Ora estiva di Samoa", "WSDT"};
++ String XJT[] = new String[] {"Ora solare della Cina", "XJT",
++ "Ora legale della Cina", "XJDT"};
+ String YAKT[] = new String[] {"Ora di Jakutsk", "YAKT",
+ "Ora estiva di Jakutsk", "YAKST"};
return new Object[][] {
{"America/Los_Angeles", PST},
-@@ -214,6 +220,7 @@
+@@ -214,6 +222,7 @@
{"America/Anchorage", AKST},
{"AST", AKST},
{"America/Halifax", AST},
@@ -1856,7 +2232,12 @@
{"America/St_Johns", NST},
{"CNT", NST},
{"Europe/Paris", CET},
-@@ -259,6 +266,7 @@
+@@ -255,10 +264,11 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT},
{"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST},
@@ -1864,7 +2245,7 @@
{"Africa/Kampala", EAT},
{"Africa/Khartoum", EAT},
{"Africa/Kigali", CAT},
-@@ -300,7 +308,7 @@
+@@ -300,7 +310,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
@@ -1873,7 +2254,7 @@
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
-@@ -309,6 +317,7 @@
+@@ -309,6 +319,7 @@
{"America/Atikokan", EST},
{"America/Atka", HAST},
{"America/Bahia", BRT},
@@ -1881,7 +2262,7 @@
{"America/Barbados", AST},
{"America/Belem", BRT},
{"America/Belize", CST},
-@@ -328,6 +337,7 @@
+@@ -328,6 +339,7 @@
"Ora estiva della Guyana Francese", "GFST"}},
{"America/Cayman", EST},
{"America/Chihuahua", MST},
@@ -1889,7 +2270,7 @@
{"America/Coral_Harbour", EST},
{"America/Cordoba", AGT},
{"America/Costa_Rica", CST},
-@@ -339,7 +349,7 @@
+@@ -339,7 +351,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
@@ -1898,7 +2279,16 @@
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
-@@ -361,10 +371,10 @@
+@@ -348,7 +360,7 @@
+ {"America/Godthab", new String[] {"Ora della Groenlandia occidentale", "WGT",
+ "Ora estiva della Groenlandia occidentale", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -361,10 +373,10 @@
{"America/Indiana/Indianapolis", EST},
{"America/Indiana/Knox", CST},
{"America/Indiana/Marengo", EST},
@@ -1912,7 +2302,7 @@
{"America/Indiana/Winamac", EST},
{"America/Inuvik", MST},
{"America/Iqaluit", EST},
-@@ -374,21 +384,25 @@
+@@ -374,21 +386,24 @@
{"America/Kentucky/Louisville", EST},
{"America/Kentucky/Monticello", EST},
{"America/Knox_IN", CST},
@@ -1934,12 +2324,11 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
-+ {"America/Metlakatla", new String[] {"Ora standard di Metlakatla", "MeST",
-+ "Ora legale di Metlakatla", "MeDT"}},
++ {"America/Metlakatla", PST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Ora solare di Saint-Pierre e Miquelon", "PMST",
"Ora legale di Saint-Pierre e Miquelon", "PMDT"}},
-@@ -402,6 +416,7 @@
+@@ -402,6 +417,7 @@
{"America/Nipigon", EST},
{"America/Nome", AKST},
{"America/Noronha", NORONHA},
@@ -1947,7 +2336,7 @@
{"America/North_Dakota/Center", CST},
{"America/North_Dakota/New_Salem", CST},
{"America/Ojinaga", MST},
-@@ -411,15 +426,15 @@
+@@ -411,15 +427,15 @@
"Ora estiva di Suriname", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
@@ -1966,7 +2355,7 @@
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
-@@ -428,7 +443,7 @@
+@@ -428,7 +444,7 @@
{"America/Sao_Paulo", BRT},
{"America/Scoresbysund", EGT},
{"America/Shiprock", MST},
@@ -1975,7 +2364,7 @@
{"America/St_Kitts", AST},
{"America/St_Lucia", AST},
{"America/St_Thomas", AST},
-@@ -446,10 +461,13 @@
+@@ -446,10 +462,13 @@
{"America/Winnipeg", CST},
{"America/Yakutat", AKST},
{"America/Yellowknife", MST},
@@ -1985,11 +2374,11 @@
{"Antarctica/DumontDUrville", new String[] {"Ora di Dumont-d'Urville", "DDUT",
"Ora estiva di Dumont-d'Urville", "DDUST"}},
+ {"Antarctica/Macquarie", new String[] {"Ora dell'Isola Macquarie", "MIST",
-+ "Ora estiva dell'Isola Macquarie", "MIST"}},
++ "Ora estiva dell'Isola Macquarie", "MIDT"}},
{"Antarctica/Mawson", new String[] {"Ora di Mawson", "MAWT",
"Ora estiva di Mawson", "MAWST"}},
{"Antarctica/McMurdo", NZST},
-@@ -459,6 +477,8 @@
+@@ -459,6 +478,8 @@
{"Antarctica/South_Pole", NZST},
{"Antarctica/Syowa", new String[] {"Ora di Syowa", "SYOT",
"Ora estiva di Syowa", "SYOST"}},
@@ -1998,7 +2387,15 @@
{"Antarctica/Vostok", new String[] {"Ora di Vostok", "VOST",
"Ora estiva di Vostok", "VOSST"}},
{"Arctic/Longyearbyen", CET},
-@@ -500,6 +520,7 @@
+@@ -485,6 +506,7 @@
+ {"Asia/Brunei", new String[] {"Ora del Brunei", "BNT",
+ "Ora estiva del Brunei", "BNST"}},
+ {"Asia/Calcutta", IST},
++ {"Asia/Chita", IRKT},
+ {"Asia/Choibalsan", new String[] {"Ora di Choibalsan", "CHOT",
+ "Ora estiva di Choibalsan", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+@@ -500,27 +522,28 @@
"Ora estiva del Tagikistan", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
@@ -2006,8 +2403,10 @@
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Ora di Hovd", "HOVT",
-@@ -508,7 +529,7 @@
- "Ora estiva di Irkutsk", "IRKST"}},
+ "Ora estiva di Hovd", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"Ora di Irkutsk", "IRKT",
+- "Ora estiva di Irkutsk", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"Ora dell'Indonesia orientale", "EIT",
@@ -2015,19 +2414,46 @@
"Ora estiva dell'Indonesia orientale", "EIST"}},
{"Asia/Kabul", new String[] {"Ora dell'Afghanistan", "AFT",
"Ora estiva dell'Afghanistan", "AFST"}},
-@@ -518,6 +539,8 @@
- {"Asia/Kashgar", CTT},
+ {"Asia/Kamchatka", new String[] {"Ora di Petropavlovsk-Kamchatski", "PETT",
+ "Ora estiva di Petropavlovsk-Kamchatski", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"Ora di Khandyga", "YAKT",
+ "Ora estiva di Khandyga", "YAKST"}},
{"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"Ora di Krasnojarsk", "KRAT",
- "Ora estiva di Krasnojarsk", "KRAST"}},
-@@ -566,11 +589,11 @@
+- {"Asia/Krasnoyarsk", new String[] {"Ora di Krasnojarsk", "KRAT",
+- "Ora estiva di Krasnojarsk", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -533,7 +556,7 @@
+ "Ora estiva delle Filippine", "PHST"}},
+ {"Asia/Muscat", GST},
+ {"Asia/Nicosia", EET},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
+ {"Asia/Novosibirsk", NOVT},
+ {"Asia/Oral", new String[] {"Ora di Oral", "ORAT",
+ "Ora estiva di Oral", "ORAST"}},
+@@ -554,6 +577,8 @@
+ {"Asia/Samarkand", UZT},
+ {"Asia/Seoul", KST},
+ {"Asia/Singapore", SGT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", CTT},
+ {"Asia/Tel_Aviv", ISRAEL},
+ {"Asia/Tashkent", UZT},
+@@ -565,12 +590,12 @@
+ {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"Ora di Ust-Nera", "VLAT",
+ "Ora estiva di Ust-Nera", "VLAST"}},
{"Asia/Vientiane", ICT},
@@ -2040,18 +2466,18 @@
{"Asia/Yekaterinburg", new String[] {"Ora di Ekaterinburg", "YEKT",
"Ora estiva di Ekaterinburg", "YEKST"}},
{"Asia/Yerevan", ARMT},
-@@ -597,8 +620,8 @@
+@@ -597,8 +622,8 @@
{"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN},
- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST",
- "Central Western Summer Time (Australia)", "CWST"}},
-+ {"Australia/Eucla", new String[] {"Ora standard Australia centro-occidentale", "CWST",
-+ "Ora estiva Australia centro-occidentale", "CWST"}},
++ {"Australia/Eucla", new String[] {"Ora standard Australia centro-occidentale", "ACWST",
++ "Ora estiva Australia centro-occidentale", "ACWDT"}},
{"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE},
-@@ -616,7 +639,7 @@
+@@ -616,7 +641,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
@@ -2060,7 +2486,7 @@
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
-@@ -654,6 +677,7 @@
+@@ -654,6 +679,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
@@ -2068,16 +2494,7 @@
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
-@@ -663,7 +687,7 @@
- {"Europe/Isle_of_Man", GMTBST},
- {"Europe/Istanbul", EET},
- {"Europe/Jersey", GMTBST},
-- {"Europe/Kaliningrad", EET},
-+ {"Europe/Kaliningrad", FET},
- {"Europe/Kiev", EET},
- {"Europe/Lisbon", WET},
- {"Europe/Ljubljana", CET},
-@@ -672,7 +696,7 @@
+@@ -672,7 +698,7 @@
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
@@ -2086,7 +2503,7 @@
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
-@@ -685,7 +709,7 @@
+@@ -685,7 +711,7 @@
"Ora estiva di Samara", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
@@ -2095,7 +2512,17 @@
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
-@@ -752,6 +776,7 @@
+@@ -697,8 +723,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"Ora di Volgograd", "VOLT",
+- "Ora estiva di Volgograd", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -752,6 +777,7 @@
{"Pacific/Apia", WST_SAMOA},
{"Pacific/Auckland", NZST},
{"Pacific/Chatham", CHAST},
@@ -2103,7 +2530,7 @@
{"Pacific/Easter", EASTER},
{"Pacific/Efate", new String[] {"Ora di Vanuatu", "VUT",
"Ora estiva di Vanuatu", "VUST"}},
-@@ -790,8 +815,8 @@
+@@ -790,8 +816,8 @@
{"Pacific/Palau", new String[] {"Ora di Palau", "PWT",
"Ora estiva di Palau", "PWST"}},
{"Pacific/Pitcairn", PITCAIRN},
@@ -2114,7 +2541,7 @@
{"Pacific/Port_Moresby", new String[] {"Ora di Papua Nuova Guinea", "PGT",
"Ora estiva di Papua Nuova Guinea", "PGST"}},
{"Pacific/Rarotonga", new String[] {"Ora delle Isole Cook", "CKT",
-@@ -804,12 +829,12 @@
+@@ -804,12 +830,12 @@
"Ora estiva delle Isole Gilbert", "GILST"}},
{"Pacific/Tongatapu", new String[] {"Ora di Tonga", "TOT",
"Ora estiva di Tonga", "TOST"}},
@@ -2144,8 +2571,8 @@
"\u30a2\u30af\u30ec\u590f\u6642\u9593", "ACST"};
- String ADELAIDE[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642 (\u5357\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CST",
- "\u4e2d\u90e8\u590f\u6642\u9593 (\u5357\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CST"};
-+ String ADELAIDE[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CST",
-+ "\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CST"};
++ String ADELAIDE[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "ACST",
++ "\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "ACDT"};
String AGT[] = new String[] {"\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "ART",
"\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u590f\u6642\u9593", "ARST"};
String AKST[] = new String[] {"\u30a2\u30e9\u30b9\u30ab\u6a19\u6e96\u6642", "AKST",
@@ -2157,10 +2584,10 @@
- "\u6771\u90e8\u590f\u6642\u9593 (\u30af\u30a4\u30fc\u30f3\u30ba\u30e9\u30f3\u30c9)", "EST"};
- String BROKEN_HILL[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642 (\u5357\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2/\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "CST",
- "\u4e2d\u90e8\u590f\u6642\u9593 (\u5357\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2/\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "CST"};
-+ String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "EST",
-+ "\u6771\u90E8\u590F\u6642\u9593(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "EST"};
-+ String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "CST",
-+ "\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "CST"};
++ String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "AEST",
++ "\u6771\u90E8\u590F\u6642\u9593(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "ACST",
++ "\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "ACDT"};
String BRT[] = new String[] {"\u30d6\u30e9\u30b8\u30eb\u6642\u9593", "BRT",
"\u30d6\u30e9\u30b8\u30eb\u590f\u6642\u9593", "BRST"};
String BTT[] = new String[] {"\u30d6\u30fc\u30bf\u30f3\u6642\u9593", "BTT",
@@ -2187,8 +2614,8 @@
- "\u4e2d\u90e8\u590f\u6642\u9593 (\u30ce\u30fc\u30b6\u30f3\u30c6\u30ea\u30c8\u30ea\u30fc)", "CST"};
+ String CUBA[] = new String[] {"\u30ad\u30e5\u30fc\u30d0\u6a19\u6e96\u6642", "CST",
+ "\u30ad\u30e5\u30fc\u30d0\u590f\u6642\u9593", "CDT"};
-+ String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "CST",
-+ "\u4E2D\u90E8\u590F\u6642\u9593(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "CST"};
++ String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "ACST",
++ "\u4E2D\u90E8\u590F\u6642\u9593(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "ACDT"};
String DUBLIN[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT",
"\u30a2\u30a4\u30eb\u30e9\u30f3\u30c9\u590f\u6642\u9593", "IST"};
String EAT[] = new String[] {"\u6771\u30a2\u30d5\u30ea\u30ab\u6642\u9593", "EAT",
@@ -2198,14 +2625,28 @@
"\u6771\u90e8\u590f\u6642\u9593", "EDT"};
- String EST_NSW[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "EST",
- "\u6771\u90e8\u590f\u6642\u9593 (\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "EST"};
-+ String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "EST",
-+ "\u6771\u90E8\u590F\u6642\u9593(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "EST"};
++ String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "AEST",
++ "\u6771\u90E8\u590F\u6642\u9593(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "AEDT"};
+ String FET[] = new String[] {"\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u6642\u9593", "FET",
+ "\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u590F\u6642\u9593", "FEST"};
String GHMT[] = new String[] {"\u30ac\u30fc\u30ca\u6a19\u6e96\u6642", "GMT",
"\u30ac\u30fc\u30ca\u590f\u6642\u9593", "GHST"};
String GAMBIER[] = new String[] {"\u30ac\u30f3\u30d3\u30a2\u6642\u9593", "GAMT",
-@@ -153,10 +159,12 @@
+@@ -127,10 +133,12 @@
+ "\u30a4\u30f3\u30c9\u590f\u6642\u9593", "IDT"};
+ String JST[] = new String[] {"\u65e5\u672c\u6a19\u6e96\u6642", "JST",
+ "\u65e5\u672c\u590f\u6642\u9593", "JDT"};
++ String KRAT[] = new String[] {"\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u6642\u9593", "KRAT",
++ "\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u590f\u6642\u9593", "KRAST"};
+ String KST[] = new String[] {"\u97d3\u56fd\u6a19\u6e96\u6642", "KST",
+ "\u97d3\u56fd\u590f\u6642\u9593", "KDT"};
+ String LORD_HOWE[] = new String[] {"\u30ed\u30fc\u30c9\u30cf\u30a6\u5cf6\u6a19\u6e96\u6642", "LHST",
+- "\u30ed\u30fc\u30c9\u30cf\u30a6\u5cf6\u590f\u6642\u9593", "LHST"};
++ "\u30ed\u30fc\u30c9\u30cf\u30a6\u5cf6\u590f\u6642\u9593", "LHDT"};
+ String MHT[] = new String[] {"\u30de\u30fc\u30b7\u30e3\u30eb\u5cf6\u6642\u9593", "MHT",
+ "\u30de\u30fc\u30b7\u30e3\u30eb\u5cf6\u590f\u6642\u9593", "MHST"};
+ String MSK[] = new String[] {"\u30e2\u30b9\u30af\u30ef\u6a19\u6e96\u6642", "MSK",
+@@ -153,48 +161,48 @@
"\u30d4\u30c8\u30b1\u30eb\u30f3\u5cf6\u590f\u6642\u9593", "PDT"};
String PKT[] = new String[] {"\u30d1\u30ad\u30b9\u30bf\u30f3\u6642\u9593", "PKT",
"\u30d1\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "PKST"};
@@ -2217,17 +2658,20 @@
- "\u4e2d\u90e8\u590f\u6642\u9593", "CDT"};
+ String SAMOA[] = new String[] {"\u30b5\u30e2\u30a2\u6a19\u6e96\u6642", "SST",
+ "\u30b5\u30e2\u30a2\u590f\u6642\u9593", "SDT"};
++ String IRKT[] = new String[] {"\u30a4\u30eb\u30af\u30fc\u30c4\u30af\u6642\u9593", "IRKT",
++ "\u30a4\u30eb\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "IRKST"};
String SAST[] = new String[] {"\u5357\u30a2\u30d5\u30ea\u30ab\u6a19\u6e96\u6642", "SAST",
"\u5357\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "SAST"};
String SBT[] = new String[] {"\u30bd\u30ed\u30e2\u30f3\u8af8\u5cf6\u6642\u9593", "SBT",
-@@ -165,36 +173,34 @@
+ "\u30bd\u30ed\u30e2\u30f3\u8af8\u5cf6\u590f\u6642\u9593", "SBST"};
+ String SGT[] = new String[] {"\u30b7\u30f3\u30ac\u30dd\u30fc\u30eb\u6642\u9593", "SGT",
"\u30b7\u30f3\u30ac\u30dd\u30fc\u30eb\u590f\u6642\u9593", "SGST"};
- String SLST[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT",
- "\u30b7\u30a8\u30e9\u30ec\u30aa\u30cd\u590f\u6642\u9593", "SLST"};
+- String SLST[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT",
+- "\u30b7\u30a8\u30e9\u30ec\u30aa\u30cd\u590f\u6642\u9593", "SLST"};
- String TASMANIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30bf\u30b9\u30de\u30cb\u30a2)", "EST",
- "\u6771\u90e8\u590f\u6642\u9593 (\u30bf\u30b9\u30de\u30cb\u30a2)", "EST"};
-+ String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30BF\u30B9\u30DE\u30CB\u30A2)", "EST",
-+ "\u6771\u90E8\u590F\u6642\u9593(\u30BF\u30B9\u30DE\u30CB\u30A2)", "EST"};
++ String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30BF\u30B9\u30DE\u30CB\u30A2)", "AEST",
++ "\u6771\u90E8\u590F\u6642\u9593(\u30BF\u30B9\u30DE\u30CB\u30A2)", "AEDT"};
String TMT[] = new String[] {"\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u6642\u9593", "TMT",
"\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u590f\u6642\u9593", "TMST"};
- String TRUT[] = new String[] {"\u30c8\u30e9\u30c3\u30af\u6642\u9593", "TRUT",
@@ -2240,12 +2684,10 @@
+ "\u5354\u5b9a\u4e16\u754c\u6642", "UTC"};
+ String UZT[] = new String[] {"\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u6642\u9593", "UZT",
+ "\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "UZST"};
-+ String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30D3\u30AF\u30C8\u30EA\u30A2)", "EST",
-+ "\u6771\u90E8\u590F\u6642\u9593(\u30D3\u30AF\u30C8\u30EA\u30A2)", "EST"};
++ String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30D3\u30AF\u30C8\u30EA\u30A2)", "AEST",
++ "\u6771\u90E8\u590F\u6642\u9593(\u30D3\u30AF\u30C8\u30EA\u30A2)", "AEDT"};
+ String VLAT[] = new String[] {"\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u6642\u9593", "VLAT",
+ "\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u590f\u6642\u9593", "VLAST"};
-+ String WART[] = new String[] {"\u897f\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "WART",
-+ "\u897f\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u590f\u6642\u9593", "WARST"};
String WAT[] = new String[] {"\u897f\u30a2\u30d5\u30ea\u30ab\u6642\u9593", "WAT",
"\u897f\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "WAST"};
String WET[] = new String[] {"\u897f\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "WET",
@@ -2257,9 +2699,7 @@
- "\u897f\u90e8\u590f\u6642\u9593 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "WST"};
- String SAMOA[] = new String[] {"\u30b5\u30e2\u30a2\u6a19\u6e96\u6642", "SST",
- "\u30b5\u30e2\u30a2\u590f\u6642\u9593", "SDT"};
-+ String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "WST",
-+ "\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "WST"};
- String WST_SAMOA[] = new String[] {"\u897f\u30b5\u30e2\u30a2\u6642\u9593", "WST",
+- String WST_SAMOA[] = new String[] {"\u897f\u30b5\u30e2\u30a2\u6642\u9593", "WST",
- "\u897f\u30b5\u30e2\u30a2\u590f\u6642\u9593", "WSST"};
- String ChST[] = new String[] {"\u30b0\u30a2\u30e0\u6a19\u6e96\u6642", "ChST",
- "\u30b0\u30a2\u30e0\u590f\u6642\u9593", "ChDT"};
@@ -2269,13 +2709,18 @@
- "\u5354\u5b9a\u4e16\u754c\u6642", "UTC"};
- String UZT[] = new String[] {"\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u6642\u9593", "UZT",
- "\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "UZST"};
++ String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "AWST",
++ "\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "AWDT"};
++ String WST_SAMOA[] = new String[] {"\u897f\u30b5\u30e2\u30a2\u6642\u9593", "WSST",
+ "\u897f\u30b5\u30e2\u30a2\u590f\u6642\u9593", "WSDT"};
++ String XJT[] = new String[] {"\u4e2d\u56fd\u6a19\u6e96\u6642", "XJT",
++ "\u4e2d\u56fd\u590f\u6642\u9593", "XJDT"};
+ String YAKT[] = new String[] {"\u30e4\u30af\u30fc\u30c4\u30af\u6642\u9593", "YAKT",
+ "\u30e4\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "YAKST"};
return new Object[][] {
{"America/Los_Angeles", PST},
-@@ -214,6 +220,7 @@
+@@ -214,6 +222,7 @@
{"America/Anchorage", AKST},
{"AST", AKST},
{"America/Halifax", AST},
@@ -2283,7 +2728,12 @@
{"America/St_Johns", NST},
{"CNT", NST},
{"Europe/Paris", CET},
-@@ -259,6 +266,7 @@
+@@ -255,10 +264,11 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT},
{"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST},
@@ -2291,7 +2741,7 @@
{"Africa/Kampala", EAT},
{"Africa/Khartoum", EAT},
{"Africa/Kigali", CAT},
-@@ -300,7 +308,7 @@
+@@ -300,7 +310,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
@@ -2300,7 +2750,7 @@
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
-@@ -309,6 +317,7 @@
+@@ -309,6 +319,7 @@
{"America/Atikokan", EST},
{"America/Atka", HAST},
{"America/Bahia", BRT},
@@ -2308,7 +2758,7 @@
{"America/Barbados", AST},
{"America/Belem", BRT},
{"America/Belize", CST},
-@@ -328,6 +337,7 @@
+@@ -328,6 +339,7 @@
"\u4ecf\u9818\u30ae\u30a2\u30ca\u590f\u6642\u9593", "GFST"}},
{"America/Cayman", EST},
{"America/Chihuahua", MST},
@@ -2316,7 +2766,7 @@
{"America/Coral_Harbour", EST},
{"America/Cordoba", AGT},
{"America/Costa_Rica", CST},
-@@ -339,7 +349,7 @@
+@@ -339,7 +351,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
@@ -2325,7 +2775,16 @@
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
-@@ -361,10 +371,10 @@
+@@ -348,7 +360,7 @@
+ {"America/Godthab", new String[] {"\u897f\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9\u6642\u9593", "WGT",
+ "\u897f\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9\u590f\u6642\u9593", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -361,10 +373,10 @@
{"America/Indiana/Indianapolis", EST},
{"America/Indiana/Knox", CST},
{"America/Indiana/Marengo", EST},
@@ -2339,7 +2798,7 @@
{"America/Indiana/Winamac", EST},
{"America/Inuvik", MST},
{"America/Iqaluit", EST},
-@@ -374,21 +384,25 @@
+@@ -374,21 +386,24 @@
{"America/Kentucky/Louisville", EST},
{"America/Kentucky/Monticello", EST},
{"America/Knox_IN", CST},
@@ -2361,12 +2820,11 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
-+ {"America/Metlakatla", new String[] {"\u30E1\u30C8\u30E9\u30AB\u30C8\u30E9\u6A19\u6E96\u6642\u9593", "MeST",
-+ "\u30E1\u30C8\u30E9\u30AB\u30C8\u30E9\u590F\u6642\u9593", "MeDT"}},
++ {"America/Metlakatla", PST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u6a19\u6e96\u6642", "PMST",
"\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u590f\u6642\u9593", "PMDT"}},
-@@ -402,6 +416,7 @@
+@@ -402,6 +417,7 @@
{"America/Nipigon", EST},
{"America/Nome", AKST},
{"America/Noronha", NORONHA},
@@ -2374,7 +2832,7 @@
{"America/North_Dakota/Center", CST},
{"America/North_Dakota/New_Salem", CST},
{"America/Ojinaga", MST},
-@@ -411,15 +426,15 @@
+@@ -411,15 +427,15 @@
"\u30b9\u30ea\u30ca\u30e0\u590f\u6642\u9593", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
@@ -2393,7 +2851,7 @@
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
-@@ -428,7 +443,7 @@
+@@ -428,7 +444,7 @@
{"America/Sao_Paulo", BRT},
{"America/Scoresbysund", EGT},
{"America/Shiprock", MST},
@@ -2402,7 +2860,7 @@
{"America/St_Kitts", AST},
{"America/St_Lucia", AST},
{"America/St_Thomas", AST},
-@@ -446,10 +461,13 @@
+@@ -446,10 +462,13 @@
{"America/Winnipeg", CST},
{"America/Yakutat", AKST},
{"America/Yellowknife", MST},
@@ -2412,11 +2870,11 @@
{"Antarctica/DumontDUrville", new String[] {"\u30c7\u30e5\u30e2\u30f3\u30c7\u30e5\u30eb\u30f4\u30a3\u30eb\u6642\u9593", "DDUT",
"\u30c7\u30e5\u30e2\u30f3\u30c7\u30e5\u30eb\u30f4\u30a3\u30eb\u590f\u6642\u9593", "DDUST"}},
+ {"Antarctica/Macquarie", new String[] {"\u30DE\u30C3\u30B3\u30FC\u30EA\u30FC\u5CF6\u6642\u9593", "MIST",
-+ "\u30DE\u30C3\u30B3\u30FC\u30EA\u30FC\u5CF6\u590F\u6642\u9593", "MIST"}},
++ "\u30DE\u30C3\u30B3\u30FC\u30EA\u30FC\u5CF6\u590F\u6642\u9593", "MIDT"}},
{"Antarctica/Mawson", new String[] {"\u30e2\u30fc\u30bd\u30f3\u6642\u9593", "MAWT",
"\u30e2\u30fc\u30bd\u30f3\u590f\u6642\u9593", "MAWST"}},
{"Antarctica/McMurdo", NZST},
-@@ -459,6 +477,8 @@
+@@ -459,6 +478,8 @@
{"Antarctica/South_Pole", NZST},
{"Antarctica/Syowa", new String[] {"\u662d\u548c\u57fa\u5730\u6642\u9593", "SYOT",
"\u662d\u548c\u57fa\u5730\u590f\u6642\u9593", "SYOST"}},
@@ -2425,7 +2883,15 @@
{"Antarctica/Vostok", new String[] {"\u30dc\u30b9\u30c8\u30fc\u30af\u57fa\u5730\u6642\u9593", "VOST",
"\u30dc\u30b9\u30c8\u30fc\u30af\u57fa\u5730\u590f\u6642\u9593", "VOSST"}},
{"Arctic/Longyearbyen", CET},
-@@ -500,6 +520,7 @@
+@@ -485,6 +506,7 @@
+ {"Asia/Brunei", new String[] {"\u30d6\u30eb\u30cd\u30a4\u6642\u9593", "BNT",
+ "\u30d6\u30eb\u30cd\u30a4\u590f\u6642\u9593", "BNST"}},
+ {"Asia/Calcutta", IST},
++ {"Asia/Chita", IRKT},
+ {"Asia/Choibalsan", new String[] {"\u30c1\u30e7\u30a4\u30d0\u30eb\u30b5\u30f3\u6642\u9593", "CHOT",
+ "\u30c1\u30e7\u30a4\u30d0\u30eb\u30b5\u30f3\u590f\u6642\u9593", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+@@ -500,27 +522,28 @@
"\u30bf\u30b8\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
@@ -2433,8 +2899,10 @@
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"\u30db\u30d6\u30c9\u6642\u9593", "HOVT",
-@@ -508,7 +529,7 @@
- "\u30a4\u30eb\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "IRKST"}},
+ "\u30db\u30d6\u30c9\u590f\u6642\u9593", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"\u30a4\u30eb\u30af\u30fc\u30c4\u30af\u6642\u9593", "IRKT",
+- "\u30a4\u30eb\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"\u6771\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "EIT",
@@ -2442,19 +2910,46 @@
"\u6771\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "EIST" }},
{"Asia/Kabul", new String[] {"\u30a2\u30d5\u30ac\u30cb\u30b9\u30bf\u30f3\u6642\u9593", "AFT",
"\u30a2\u30d5\u30ac\u30cb\u30b9\u30bf\u30f3\u590f\u6642\u9593", "AFST"}},
-@@ -518,6 +539,8 @@
- {"Asia/Kashgar", CTT},
+ {"Asia/Kamchatka", new String[] {"\u30da\u30c8\u30ed\u30d1\u30d6\u30ed\u30d5\u30b9\u30af\u30ab\u30e0\u30c1\u30e3\u30c4\u30ad\u30fc\u6642\u9593", "PETT",
+ "\u30da\u30c8\u30ed\u30d1\u30d6\u30ed\u30d5\u30b9\u30af\u30ab\u30e0\u30c1\u30e3\u30c4\u30ad\u30fc\u590f\u6642\u9593", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u6642\u9593", "YAKT",
+ "\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u590F\u6642\u9593", "YAKST"}},
{"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u6642\u9593", "KRAT",
- "\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u590f\u6642\u9593", "KRAST"}},
-@@ -566,11 +589,11 @@
+- {"Asia/Krasnoyarsk", new String[] {"\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u6642\u9593", "KRAT",
+- "\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u590f\u6642\u9593", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -533,7 +556,7 @@
+ "\u30d5\u30a3\u30ea\u30d4\u30f3\u590f\u6642\u9593", "PHST"}},
+ {"Asia/Muscat", GST},
+ {"Asia/Nicosia", EET},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
+ {"Asia/Novosibirsk", NOVT},
+ {"Asia/Oral", new String[] {"\u30aa\u30e9\u30eb\u6642\u9593", "ORAT",
+ "\u30aa\u30e9\u30eb\u590f\u6642\u9593", "ORAST"}},
+@@ -554,6 +577,8 @@
+ {"Asia/Samarkand", UZT},
+ {"Asia/Seoul", KST},
+ {"Asia/Singapore", SGT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", CTT},
+ {"Asia/Tel_Aviv", ISRAEL},
+ {"Asia/Tashkent", UZT},
+@@ -565,12 +590,12 @@
+ {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"\u30A6\u30B9\u30C1\u30CD\u30E9\u6642\u9593", "VLAT",
+ "\u30A6\u30B9\u30C1\u30CD\u30E9\u590F\u6642\u9593", "VLAST"}},
{"Asia/Vientiane", ICT},
@@ -2467,18 +2962,18 @@
{"Asia/Yekaterinburg", new String[] {"\u30a8\u30ab\u30c6\u30ea\u30f3\u30d6\u30eb\u30b0\u6642\u9593", "YEKT",
"\u30a8\u30ab\u30c6\u30ea\u30f3\u30d6\u30eb\u30b0\u590f\u6642\u9593", "YEKST"}},
{"Asia/Yerevan", ARMT},
-@@ -597,8 +620,8 @@
+@@ -597,8 +622,8 @@
{"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN},
- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST",
- "Central Western Summer Time (Australia)", "CWST"}},
-+ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CWST",
-+ "\u4E2D\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CWST"}},
++ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "ACWST",
++ "\u4E2D\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "ACWDT"}},
{"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE},
-@@ -616,7 +639,7 @@
+@@ -616,7 +641,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
@@ -2487,7 +2982,7 @@
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
-@@ -654,6 +677,7 @@
+@@ -654,6 +679,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
@@ -2495,16 +2990,7 @@
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
-@@ -663,7 +687,7 @@
- {"Europe/Isle_of_Man", GMTBST},
- {"Europe/Istanbul", EET},
- {"Europe/Jersey", GMTBST},
-- {"Europe/Kaliningrad", EET},
-+ {"Europe/Kaliningrad", FET},
- {"Europe/Kiev", EET},
- {"Europe/Lisbon", WET},
- {"Europe/Ljubljana", CET},
-@@ -672,7 +696,7 @@
+@@ -672,7 +698,7 @@
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
@@ -2513,7 +2999,7 @@
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
-@@ -685,7 +709,7 @@
+@@ -685,7 +711,7 @@
"\u30b5\u30de\u30e9\u590f\u6642\u9593", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
@@ -2522,7 +3008,17 @@
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
-@@ -752,6 +776,7 @@
+@@ -697,8 +723,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"\u30dc\u30eb\u30b4\u30b0\u30e9\u30fc\u30c9\u6642\u9593", "VOLT",
+- "\u30dc\u30eb\u30b4\u30b0\u30e9\u30fc\u30c9\u590f\u6642\u9593", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -752,6 +777,7 @@
{"Pacific/Apia", WST_SAMOA},
{"Pacific/Auckland", NZST},
{"Pacific/Chatham", CHAST},
@@ -2530,7 +3026,7 @@
{"Pacific/Easter", EASTER},
{"Pacific/Efate", new String[] {"\u30d0\u30cc\u30a2\u30c4\u6642\u9593", "VUT",
"\u30d0\u30cc\u30a2\u30c4\u590f\u6642\u9593", "VUST"}},
-@@ -790,8 +815,8 @@
+@@ -790,8 +816,8 @@
{"Pacific/Palau", new String[] {"\u30d1\u30e9\u30aa\u6642\u9593", "PWT",
"\u30d1\u30e9\u30aa\u590f\u6642\u9593", "PWST"}},
{"Pacific/Pitcairn", PITCAIRN},
@@ -2541,7 +3037,7 @@
{"Pacific/Port_Moresby", new String[] {"\u30d1\u30d7\u30a2\u30cb\u30e5\u30fc\u30ae\u30cb\u30a2\u6642\u9593", "PGT",
"\u30d1\u30d7\u30a2\u30cb\u30e5\u30fc\u30ae\u30cb\u30a2\u590f\u6642\u9593", "PGST"}},
{"Pacific/Rarotonga", new String[] {"\u30af\u30c3\u30af\u8af8\u5cf6\u6642\u9593", "CKT",
-@@ -804,12 +829,12 @@
+@@ -804,12 +830,12 @@
"\u30ae\u30eb\u30d0\u30fc\u30c8\u8af8\u5cf6\u590f\u6642\u9593", "GILST"}},
{"Pacific/Tongatapu", new String[] {"\u30c8\u30f3\u30ac\u6642\u9593", "TOT",
"\u30c8\u30f3\u30ac\u590f\u6642\u9593", "TOST"}},
@@ -2571,8 +3067,8 @@
"\uc5d0\uc774\ucee4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ACST"};
- String ADELAIDE[] = new String[] {"\uc911\ubd80 \ud45c\uc900\uc2dc(\uc0ac\uc6b0\uc2a4 \uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CST",
- "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\uc0ac\uc6b0\uc2a4 \uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CST"};
-+ String ADELAIDE[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CST",
-+ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CST"};
++ String ADELAIDE[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "ACST",
++ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "ACDT"};
String AGT[] = new String[] {"\uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "ART",
"\uc544\ub974\ud5e8\ud2f0\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ARST"};
String AKST[] = new String[] {"\uc54c\ub798\uc2a4\uce74 \ud45c\uc900\uc2dc", "AKST",
@@ -2584,10 +3080,10 @@
- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ud038\uc990\ub79c\ub4dc)", "EST"};
- String BROKEN_HILL[] = new String[] {"\uc911\ubd80 \ud45c\uc900\uc2dc(\uc0ac\uc6b0\uc2a4 \uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544/\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "CST",
- "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\uc0ac\uc6b0\uc2a4 \uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544/\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "CST"};
-+ String BRISBANE[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD038\uC990\uB79C\uB4DC)", "EST",
-+ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD038\uC990\uB79C\uB4DC)", "EST"};
-+ String BROKEN_HILL[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "CST",
-+ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "CST"};
++ String BRISBANE[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD038\uC990\uB79C\uB4DC)", "AEST",
++ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD038\uC990\uB79C\uB4DC)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "ACST",
++ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "ACDT"};
String BRT[] = new String[] {"\ube0c\ub77c\uc9c8\ub9ac\uc544 \uc2dc\uac04", "BRT",
"\ube0c\ub77c\uc9c8\ub9ac\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BRST"};
String BTT[] = new String[] {"\ubd80\ud0c4 \uc2dc\uac04", "BTT",
@@ -2614,8 +3110,8 @@
- "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ub178\ub358 \uc9c0\uc5ed)", "CST"};
+ String CUBA[] = new String[] {"\ucfe0\ubc14 \ud45c\uc900\uc2dc", "CST",
+ "\ucfe0\ubc14 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"};
-+ String DARWIN[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uBD81\uBD80 \uC9C0\uC5ED)", "CST",
-+ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBD81\uBD80 \uC9C0\uC5ED)", "CST"};
++ String DARWIN[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uBD81\uBD80 \uC9C0\uC5ED)", "ACST",
++ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBD81\uBD80 \uC9C0\uC5ED)", "ACDT"};
String DUBLIN[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT",
"\uc544\uc77c\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IST"};
String EAT[] = new String[] {"\ub3d9\ubd80 \uc544\ud504\ub9ac\uce74 \uc2dc\uac04", "EAT",
@@ -2625,14 +3121,28 @@
"\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EDT"};
- String EST_NSW[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "EST",
- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "EST"};
-+ String EST_NSW[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "EST",
-+ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "EST"};
++ String EST_NSW[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "AEST",
++ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "AEDT"};
+ String FET[] = new String[] {"\uADF9\uB3D9 \uC720\uB7FD \uD45C\uC900\uC2DC", "FET",
+ "\uADF9\uB3D9 \uC720\uB7FD \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "FEST"};
String GHMT[] = new String[] {"\uac00\ub098 \ud45c\uc900\uc2dc", "GMT",
"\uac00\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GHST"};
String GAMBIER[] = new String[] {"\uac10\ube44\uc544 \uc2dc\uac04", "GAMT",
-@@ -153,10 +159,12 @@
+@@ -127,10 +133,12 @@
+ "\uc778\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IDT"};
+ String JST[] = new String[] {"\uc77c\ubcf8 \ud45c\uc900\uc2dc", "JST",
+ "\uc77c\ubcf8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "JDT"};
++ String KRAT[] = new String[] {"\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc2dc\uac04", "KRAT",
++ "\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KRAST"};
+ String KST[] = new String[] {"\ud55c\uad6d \ud45c\uc900\uc2dc", "KST",
+ "\ud55c\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KDT"};
+ String LORD_HOWE[] = new String[] {"\ub85c\ub4dc \ud558\uc6b0 \ud45c\uc900\uc2dc", "LHST",
+- "\ub85c\ub4dc \ud558\uc6b0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "LHST"};
++ "\ub85c\ub4dc \ud558\uc6b0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "LHDT"};
+ String MHT[] = new String[] {"\ub9c8\uc15c\uc81c\ub3c4 \uc2dc\uac04", "MHT",
+ "\ub9c8\uc15c\uc81c\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MHST"};
+ String MSK[] = new String[] {"\ubaa8\uc2a4\ud06c\ubc14 \ud45c\uc900\uc2dc", "MSK",
+@@ -153,48 +161,48 @@
"Pitcairn \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PDT"};
String PKT[] = new String[] {"\ud30c\ud0a4\uc2a4\ud0c4 \uc2dc\uac04", "PKT",
"\ud30c\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PKST"};
@@ -2644,17 +3154,20 @@
- "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"};
+ String SAMOA[] = new String[] {"\uc0ac\ubaa8\uc544 \ud45c\uc900\uc2dc", "SST",
+ "\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SDT"};
++ String IRKT[] = new String[] {"\uc774\ub974\ucfe0\uce20\ud06c \uc2dc\uac04", "IRKT",
++ "\uc774\ub974\ucfe0\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IRKST"};
String SAST[] = new String[] {"\ub0a8\uc544\ud504\ub9ac\uce74 \ud45c\uc900\uc2dc", "SAST",
"\ub0a8\uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SAST"};
String SBT[] = new String[] {"\uc194\ub85c\ubaac \uad70\ub3c4 \uc2dc\uac04", "SBT",
-@@ -165,36 +173,34 @@
+ "\uc194\ub85c\ubaac \uad70\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SBST"};
+ String SGT[] = new String[] {"\uc2f1\uac00\ud3ec\ub974 \uc2dc\uac04", "SGT",
"\uc2f1\uac00\ud3ec\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SGST"};
- String SLST[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT",
- "\uc2dc\uc5d0\ub77c\ub9ac\uc628 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SLST"};
+- String SLST[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT",
+- "\uc2dc\uc5d0\ub77c\ub9ac\uc628 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SLST"};
- String TASMANIA[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ud0dc\uc988\uba54\uc774\ub2c8\uc544)", "EST",
- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ud0dc\uc988\uba54\uc774\ub2c8\uc544)", "EST"};
-+ String TASMANIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "EST",
-+ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "EST"};
++ String TASMANIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "AEST",
++ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "AEDT"};
String TMT[] = new String[] {"\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc2dc\uac04", "TMT",
"\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TMST"};
- String TRUT[] = new String[] {"\ud2b8\ub8e8\ud06c \uc2dc\uac04", "TRUT",
@@ -2667,12 +3180,10 @@
+ "\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC"};
+ String UZT[] = new String[] {"\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc2dc\uac04", "UZT",
+ "\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "UZST"};
-+ String VICTORIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uBE45\uD1A0\uB9AC\uC544)", "EST",
-+ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBE45\uD1A0\uB9AC\uC544)", "EST"};
++ String VICTORIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uBE45\uD1A0\uB9AC\uC544)", "AEST",
++ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBE45\uD1A0\uB9AC\uC544)", "AEDT"};
+ String VLAT[] = new String[] {"\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc2dc\uac04", "VLAT",
+ "\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VLAST"};
-+ String WART[] = new String[] {"\uc11c\ubd80 \uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "WART",
-+ "\uc11c\ubd80 \uc544\ub974\ud5e8\ud2f0\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WARST"};
String WAT[] = new String[] {"\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc2dc\uac04", "WAT",
"\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WAST"};
String WET[] = new String[] {"\uc11c\uc720\ub7fd \uc2dc\uac04", "WET",
@@ -2684,9 +3195,7 @@
- "\uc11c\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ud638\uc8fc)", "WST"};
- String SAMOA[] = new String[] {"\uc0ac\ubaa8\uc544 \ud45c\uc900\uc2dc", "SST",
- "\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SDT"};
-+ String WST_AUS[] = new String[] {"\uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "WST",
-+ "\uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "WST"};
- String WST_SAMOA[] = new String[] {"\uc11c\uc0ac\ubaa8\uc544 \uc2dc\uac04", "WST",
+- String WST_SAMOA[] = new String[] {"\uc11c\uc0ac\ubaa8\uc544 \uc2dc\uac04", "WST",
- "\uc11c\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WSST"};
- String ChST[] = new String[] {"\ucc28\ubaa8\ub85c \ud45c\uc900\uc2dc", "ChST",
- "\ucc28\ubaa8\ub85c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ChDT"};
@@ -2696,13 +3205,18 @@
- "\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC"};
- String UZT[] = new String[] {"\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc2dc\uac04", "UZT",
- "\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "UZST"};
++ String WST_AUS[] = new String[] {"\uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "AWST",
++ "\uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "AWDT"};
++ String WST_SAMOA[] = new String[] {"\uc11c\uc0ac\ubaa8\uc544 \uc2dc\uac04", "WSST",
+ "\uc11c\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WSDT"};
++ String XJT[] = new String[] {"\uc911\uad6d \ud45c\uc900\uc2dc", "XJT",
++ "\uc911\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "XJDT"};
+ String YAKT[] = new String[] {"\uc57c\uce20\ud06c \uc2dc\uac04", "YAKT",
+ "\uc57c\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "YAKST"};
return new Object[][] {
{"America/Los_Angeles", PST},
-@@ -214,6 +220,7 @@
+@@ -214,6 +222,7 @@
{"America/Anchorage", AKST},
{"AST", AKST},
{"America/Halifax", AST},
@@ -2710,7 +3224,12 @@
{"America/St_Johns", NST},
{"CNT", NST},
{"Europe/Paris", CET},
-@@ -259,6 +266,7 @@
+@@ -255,10 +264,11 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT},
{"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST},
@@ -2718,7 +3237,7 @@
{"Africa/Kampala", EAT},
{"Africa/Khartoum", EAT},
{"Africa/Kigali", CAT},
-@@ -300,7 +308,7 @@
+@@ -300,7 +310,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
@@ -2727,7 +3246,7 @@
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
-@@ -309,6 +317,7 @@
+@@ -309,6 +319,7 @@
{"America/Atikokan", EST},
{"America/Atka", HAST},
{"America/Bahia", BRT},
@@ -2735,7 +3254,7 @@
{"America/Barbados", AST},
{"America/Belem", BRT},
{"America/Belize", CST},
-@@ -328,6 +337,7 @@
+@@ -328,6 +339,7 @@
"\ud504\ub791\uc2a4\ub839 \uae30\uc544\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GFST"}},
{"America/Cayman", EST},
{"America/Chihuahua", MST},
@@ -2743,7 +3262,7 @@
{"America/Coral_Harbour", EST},
{"America/Cordoba", AGT},
{"America/Costa_Rica", CST},
-@@ -339,7 +349,7 @@
+@@ -339,7 +351,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
@@ -2752,7 +3271,16 @@
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
-@@ -361,10 +371,10 @@
+@@ -348,7 +360,7 @@
+ {"America/Godthab", new String[] {"\uc11c\ubd80 \uadf8\ub9b0\ub79c\ub4dc \uc2dc\uac04", "WGT",
+ "\uc11c\ubd80 \uadf8\ub9b0\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -361,10 +373,10 @@
{"America/Indiana/Indianapolis", EST},
{"America/Indiana/Knox", CST},
{"America/Indiana/Marengo", EST},
@@ -2766,7 +3294,7 @@
{"America/Indiana/Winamac", EST},
{"America/Inuvik", MST},
{"America/Iqaluit", EST},
-@@ -374,21 +384,25 @@
+@@ -374,21 +386,24 @@
{"America/Kentucky/Louisville", EST},
{"America/Kentucky/Monticello", EST},
{"America/Knox_IN", CST},
@@ -2788,12 +3316,11 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
-+ {"America/Metlakatla", new String[] {"\uBA54\uD2B8\uB77C\uCE74\uD2B8\uB77C \uD45C\uC900\uC2DC", "MeST",
-+ "\uBA54\uD2B8\uB77C\uCE74\uD2B8\uB77C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "MeDT"}},
++ {"America/Metlakatla", PST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \ud45c\uc900\uc2dc", "PMST",
"\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PMDT"}},
-@@ -402,6 +416,7 @@
+@@ -402,6 +417,7 @@
{"America/Nipigon", EST},
{"America/Nome", AKST},
{"America/Noronha", NORONHA},
@@ -2801,7 +3328,7 @@
{"America/North_Dakota/Center", CST},
{"America/North_Dakota/New_Salem", CST},
{"America/Ojinaga", MST},
-@@ -411,15 +426,15 @@
+@@ -411,15 +427,15 @@
"\uc218\ub9ac\ub0a8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
@@ -2820,7 +3347,7 @@
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
-@@ -428,7 +443,7 @@
+@@ -428,7 +444,7 @@
{"America/Sao_Paulo", BRT},
{"America/Scoresbysund", EGT},
{"America/Shiprock", MST},
@@ -2829,7 +3356,7 @@
{"America/St_Kitts", AST},
{"America/St_Lucia", AST},
{"America/St_Thomas", AST},
-@@ -446,10 +461,13 @@
+@@ -446,10 +462,13 @@
{"America/Winnipeg", CST},
{"America/Yakutat", AKST},
{"America/Yellowknife", MST},
@@ -2839,11 +3366,11 @@
{"Antarctica/DumontDUrville", new String[] {"\ub4a4\ubabd \ub4a4\ub974\ube4c \uc2dc\uac04", "DDUT",
"\ub4a4\ubabd \ub4a4\ub974\ube4c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "DDUST"}},
+ {"Antarctica/Macquarie", new String[] {"\uB9E4\uCF70\uB9AC \uC12C \uD45C\uC900\uC2DC", "MIST",
-+ "\uB9E4\uCF70\uB9AC \uC12C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "MIST"}},
++ "\uB9E4\uCF70\uB9AC \uC12C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "MIDT"}},
{"Antarctica/Mawson", new String[] {"\ubaa8\uc2a8 \uc2dc\uac04", "MAWT",
"\ubaa8\uc2a8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MAWST"}},
{"Antarctica/McMurdo", NZST},
-@@ -459,6 +477,8 @@
+@@ -459,6 +478,8 @@
{"Antarctica/South_Pole", NZST},
{"Antarctica/Syowa", new String[] {"Syowa \uc2dc\uac04", "SYOT",
"Syowa \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SYOST"}},
@@ -2852,7 +3379,15 @@
{"Antarctica/Vostok", new String[] {"Vostok \uc2dc\uac04", "VOST",
"Vostok \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VOSST"}},
{"Arctic/Longyearbyen", CET},
-@@ -500,6 +520,7 @@
+@@ -485,6 +506,7 @@
+ {"Asia/Brunei", new String[] {"\ube0c\ub8e8\ub098\uc774 \uc2dc\uac04", "BNT",
+ "\ube0c\ub8e8\ub098\uc774 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BNST"}},
+ {"Asia/Calcutta", IST},
++ {"Asia/Chita", IRKT},
+ {"Asia/Choibalsan", new String[] {"Choibalsan \uc2dc\uac04", "CHOT",
+ "Choibalsan \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+@@ -500,27 +522,28 @@
"\ud0c0\uc9c0\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
@@ -2860,8 +3395,10 @@
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Hovd \uc2dc\uac04", "HOVT",
-@@ -508,7 +529,7 @@
- "\uc774\ub974\ucfe0\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IRKST"}},
+ "Hovd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"\uc774\ub974\ucfe0\uce20\ud06c \uc2dc\uac04", "IRKT",
+- "\uc774\ub974\ucfe0\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"\ub3d9\ubd80 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "EIT",
@@ -2869,19 +3406,46 @@
"\ub3d9\ubd80 \uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EIST"}},
{"Asia/Kabul", new String[] {"\uc544\ud504\uac00\ub2c8\uc2a4\ud0c4 \uc2dc\uac04", "AFT",
"\uc544\ud504\uac00\ub2c8\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "AFST"}},
-@@ -518,6 +539,8 @@
- {"Asia/Kashgar", CTT},
+ {"Asia/Kamchatka", new String[] {"\ud398\ud2b8\ub85c\ud30c\ube14\ub85c\ud504\uc2a4\ud06c-\uce84\ucc28\uce20\ud0a4 \uc2dc\uac04", "PETT",
+ "\ud398\ud2b8\ub85c\ud30c\ube14\ub85c\ud504\uc2a4\ud06c-\uce84\ucc28\uce20\ud0a4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"\uD55C\uB514\uAC00 \uD45C\uC900\uC2DC", "YAKT",
+ "\uD55C\uB514\uAC00 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "YAKST"}},
{"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc2dc\uac04", "KRAT",
- "\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KRAST"}},
-@@ -566,11 +589,11 @@
+- {"Asia/Krasnoyarsk", new String[] {"\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc2dc\uac04", "KRAT",
+- "\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -533,7 +556,7 @@
+ "\ud544\ub9ac\ud540 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PHST"}},
+ {"Asia/Muscat", GST},
+ {"Asia/Nicosia", EET},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
+ {"Asia/Novosibirsk", NOVT},
+ {"Asia/Oral", new String[] {"Oral \ud45c\uc900\uc2dc", "ORAT",
+ "Oral \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ORAST"}},
+@@ -554,6 +577,8 @@
+ {"Asia/Samarkand", UZT},
+ {"Asia/Seoul", KST},
+ {"Asia/Singapore", SGT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", CTT},
+ {"Asia/Tel_Aviv", ISRAEL},
+ {"Asia/Tashkent", UZT},
+@@ -565,12 +590,12 @@
+ {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"\uC6B0\uC2A4\uD2F0\uB124\uB77C \uD45C\uC900\uC2DC", "VLAT",
+ "\uC6B0\uC2A4\uD2F0\uB124\uB77C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "VLAST"}},
{"Asia/Vientiane", ICT},
@@ -2894,18 +3458,18 @@
{"Asia/Yekaterinburg", new String[] {"\uc608\uce74\ud14c\ub9b0\ubc84\uadf8 \uc2dc\uac04", "YEKT",
"\uc608\uce74\ud14c\ub9b0\ubc84\uadf8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "YEKST"}},
{"Asia/Yerevan", ARMT},
-@@ -597,8 +620,8 @@
+@@ -597,8 +622,8 @@
{"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN},
- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST",
- "Central Western Summer Time (Australia)", "CWST"}},
-+ {"Australia/Eucla", new String[] {"\uC911\uC559 \uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CWST",
-+ "\uC911\uC559 \uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CWST"}},
++ {"Australia/Eucla", new String[] {"\uC911\uC559 \uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "ACWST",
++ "\uC911\uC559 \uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "ACWDT"}},
{"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE},
-@@ -616,7 +639,7 @@
+@@ -616,7 +641,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
@@ -2914,7 +3478,7 @@
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
-@@ -654,6 +677,7 @@
+@@ -654,6 +679,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
@@ -2922,16 +3486,7 @@
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
-@@ -663,7 +687,7 @@
- {"Europe/Isle_of_Man", GMTBST},
- {"Europe/Istanbul", EET},
- {"Europe/Jersey", GMTBST},
-- {"Europe/Kaliningrad", EET},
-+ {"Europe/Kaliningrad", FET},
- {"Europe/Kiev", EET},
- {"Europe/Lisbon", WET},
- {"Europe/Ljubljana", CET},
-@@ -672,7 +696,7 @@
+@@ -672,7 +698,7 @@
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
@@ -2940,7 +3495,7 @@
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
-@@ -685,7 +709,7 @@
+@@ -685,7 +711,7 @@
"\uc0ac\ub9c8\ub77c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
@@ -2949,7 +3504,17 @@
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
-@@ -752,6 +776,7 @@
+@@ -697,8 +723,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"\ubcfc\uace0\uadf8\ub77c\ub4dc \uc2dc\uac04", "VOLT",
+- "\ubcfc\uace0\uadf8\ub77c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -752,6 +777,7 @@
{"Pacific/Apia", WST_SAMOA},
{"Pacific/Auckland", NZST},
{"Pacific/Chatham", CHAST},
@@ -2957,7 +3522,7 @@
{"Pacific/Easter", EASTER},
{"Pacific/Efate", new String[] {"\ube44\ub204\uc544\ud22c \uc2dc\uac04", "VUT",
"\ubc14\ub204\uc544\ud22c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VUST"}},
-@@ -790,8 +815,8 @@
+@@ -790,8 +816,8 @@
{"Pacific/Palau", new String[] {"\ud314\ub77c\uc6b0 \uc2dc\uac04", "PWT",
"\ud314\ub77c\uc6b0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PWST"}},
{"Pacific/Pitcairn", PITCAIRN},
@@ -2968,7 +3533,7 @@
{"Pacific/Port_Moresby", new String[] {"\ud30c\ud478\uc544\ub274\uae30\ub2c8 \uc2dc\uac04", "PGT",
"\ud30c\ud478\uc544\ub274\uae30\ub2c8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PGST"}},
{"Pacific/Rarotonga", new String[] {"\ucfe0\ud06c \uad70\ub3c4 \uc2dc\uac04", "CKT",
-@@ -804,12 +829,12 @@
+@@ -804,12 +830,12 @@
"\uae38\ubc84\ud2b8 \uad70\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GILST"}},
{"Pacific/Tongatapu", new String[] {"\ud1b5\uac00 \uc2dc\uac04", "TOT",
"\ud1b5\uac00 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TOST"}},
@@ -2998,8 +3563,8 @@
"Acre, sommartid", "ACST"};
- String ADELAIDE[] = new String[] {"Central Standard Time (S\u00f6dra Australien)", "CST",
- "Central Summer Time (S\u00f6dra Australien)", "CST"};
-+ String ADELAIDE[] = new String[] {"Central standardtid (Sydaustralien)", "CST",
-+ "Central sommartid (South Australia)", "CST"};
++ String ADELAIDE[] = new String[] {"Central standardtid (Sydaustralien)", "ACST",
++ "Central sommartid (South Australia)", "ACDT"};
String AGT[] = new String[] {"Argentina, normaltid", "ART",
"Argentina, sommartid", "ARST"};
String AKST[] = new String[] {"Alaska, normaltid", "AKST",
@@ -3011,10 +3576,10 @@
- "Eastern Summer Time (Queensland)", "EST"};
- String BROKEN_HILL[] = new String[] {"Central Standard Time (S\u00f6dra Australien/Nya Sydwales)", "CST",
- "Central Summer Time (S\u00f6dra Australien/Nya Sydwales)", "CST"};
-+ String BRISBANE[] = new String[] {"\u00D6stlig standardtid (Queensland)", "EST",
-+ "\u00D6stlig sommartid (Queensland)", "EST"};
-+ String BROKEN_HILL[] = new String[] {"Central standardtid (Sydaustralien)/New South Wales)", "CST",
-+ "Central sommartid (South Australia/New South Wales)", "CST"};
++ String BRISBANE[] = new String[] {"\u00D6stlig standardtid (Queensland)", "AEST",
++ "\u00D6stlig sommartid (Queensland)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"Central standardtid (Sydaustralien/New South Wales)", "ACST",
++ "Central sommartid (South Australia/New South Wales)", "ACDT"};
String BRT[] = new String[] {"Brasilien, normaltid", "BRT",
"Brasilien, sommartid", "BRST"};
String BTT[] = new String[] {"Bhutan, normaltid", "BTT",
@@ -3041,8 +3606,8 @@
- "Central Summer Time (Nordterritoriet)", "CST"};
+ String CUBA[] = new String[] {"Kuba, normaltid", "CST",
+ "Kuba, sommartid", "CDT"};
-+ String DARWIN[] = new String[] {"Central standardtid (Nordterritoriet)", "CST",
-+ "Central sommartid (Nordterritoriet)", "CST"};
++ String DARWIN[] = new String[] {"Central standardtid (Nordterritoriet)", "ACST",
++ "Central sommartid (Nordterritoriet)", "ACDT"};
String DUBLIN[] = new String[] {"Greenwichtid", "GMT",
"Irland, sommartid", "IST"};
String EAT[] = new String[] {"\u00d6stafrikansk tid", "EAT",
@@ -3052,14 +3617,28 @@
"Eastern, sommartid", "EDT"};
- String EST_NSW[] = new String[] {"Eastern Standard Time (Nya Sydwales)", "EST",
- "Eastern Summer Time (Nya Sydwales)", "EST"};
-+ String EST_NSW[] = new String[] {"\u00D6stlig standardtid (New South Wales)", "EST",
-+ "\u00D6stlig sommartid (New South Wales)", "EST"};
++ String EST_NSW[] = new String[] {"\u00D6stlig standardtid (New South Wales)", "AEST",
++ "\u00D6stlig sommartid (New South Wales)", "AEDT"};
+ String FET[] = new String[] {"Kaliningradtid", "FET",
+ "\u00D6steuropeisk sommartid", "FEST"};
String GHMT[] = new String[] {"Ghana, normaltid", "GMT",
"Ghana, sommartid", "GHST"};
String GAMBIER[] = new String[] {"Gambier, normaltid", "GAMT",
-@@ -153,48 +159,48 @@
+@@ -127,10 +133,12 @@
+ "Indien, sommartid", "IDT"};
+ String JST[] = new String[] {"Japan, normaltid", "JST",
+ "Japan, sommartid", "JDT"};
++ String KRAT[] = new String[] {"Krasnojarsk, normaltid", "KRAT",
++ "Krasnojarsk, sommartid", "KRAST"};
+ String KST[] = new String[] {"Korea, normaltid", "KST",
+ "Korea, sommartid", "KDT"};
+ String LORD_HOWE[] = new String[] {"Lord Howe, normaltid", "LHST",
+- "Lord Howe, sommartid", "LHST"};
++ "Lord Howe, sommartid", "LHDT"};
+ String MHT[] = new String[] {"Marshall\u00f6arna, normaltid", "MHT",
+ "Marshall\u00f6arna, sommartid", "MHST"};
+ String MSK[] = new String[] {"Moskva, normaltid", "MSK",
+@@ -153,48 +161,48 @@
"Pitcairn, sommartid", "PDT"};
String PKT[] = new String[] {"Pakistan, normaltid", "PKT",
"Pakistan, sommartid", "PKST"};
@@ -3071,6 +3650,8 @@
- "Central sommartid", "CDT"};
+ String SAMOA[] = new String[] {"Samoa, normaltid", "SST",
+ "Samoa, sommartid", "SDT"};
++ String IRKT[] = new String[] {"Irkutsk, normaltid", "IRKT",
++ "Irkutsk, sommartid", "IRKST"};
String SAST[] = new String[] {"Sydafrika, normaltid", "SAST",
"Sydafrika, sommartid", "SAST"};
String SBT[] = new String[] {"Salomon\u00f6arna, normaltid", "SBT",
@@ -3078,12 +3659,11 @@
String SGT[] = new String[] {"Singapore, normaltid", "SGT",
"Singapore, sommartid", "SGST"};
- String SLST[] = new String[] {"Greenwich Mean Time", "GMT",
-+ String SLST[] = new String[] {"Greenwichtid", "GMT",
- "Sierra Leone, sommartid", "SLST"};
+- "Sierra Leone, sommartid", "SLST"};
- String TASMANIA[] = new String[] {"Eastern Standard Time (Tasmanien)", "EST",
- "Eastern Summer Time (Tasmanien)", "EST"};
-+ String TASMANIA[] = new String[] {"\u00D6stlig standardtid (Tasmania)", "EST",
-+ "\u00D6stlig sommartid (Tasmanien)", "EST"};
++ String TASMANIA[] = new String[] {"\u00D6stlig standardtid (Tasmania)", "AEST",
++ "\u00D6stlig sommartid (Tasmanien)", "AEDT"};
String TMT[] = new String[] {"Turkmenistan, normaltid", "TMT",
"Turkmenistan, sommartid", "TMST"};
- String TRUT[] = new String[] {"Truk, normaltid", "TRUT",
@@ -3096,12 +3676,10 @@
+ "Koordinerad universell tid", "UTC"};
+ String UZT[] = new String[] {"Uzbekistan, normaltid", "UZT",
+ "Uzbekistan, sommartid", "UZST"};
-+ String VICTORIA[] = new String[] {"\u00D6stlig standardtid (Victoria)", "EST",
-+ "\u00D6stlig sommartid (Victoria)", "EST"};
++ String VICTORIA[] = new String[] {"\u00D6stlig standardtid (Victoria)", "AEST",
++ "\u00D6stlig sommartid (Victoria)", "AEDT"};
+ String VLAT[] = new String[] {"Vladivostok, normaltid", "VLAT",
+ "Vladivostok, sommartid", "VLAST"};
-+ String WART[] = new String[] {"V\u00e4stargentina, normaltid", "WART",
-+ "V\u00e4stargentina, sommartid", "WARST"};
String WAT[] = new String[] {"V\u00e4stafrikansk tid", "WAT",
"V\u00e4stafrikansk sommartid", "WAST"};
String WET[] = new String[] {"V\u00e4steuropeisk tid", "WET",
@@ -3109,12 +3687,11 @@
- String WIT[] = new String[] {"V\u00e4stindonesisk tid", "WIT",
+ String WIT[] = new String[] {"V\u00e4stindonesisk tid", "WIB",
"V\u00e4stindonesisk sommartid", "WIST"};
- String WST_AUS[] = new String[] {"Western Standard Time (Australien)", "WST",
+- String WST_AUS[] = new String[] {"Western Standard Time (Australien)", "WST",
- "Western Summer Time (Australien)", "WST"};
- String SAMOA[] = new String[] {"Samoa, normaltid", "SST",
- "Samoa, sommartid", "SDT"};
-+ "V\u00E4stlig sommartid (Australien)", "WST"};
- String WST_SAMOA[] = new String[] {"V\u00e4stsamoansk tid", "WST",
+- String WST_SAMOA[] = new String[] {"V\u00e4stsamoansk tid", "WST",
- "V\u00e4stsamoansk sommartid", "WSST"};
- String ChST[] = new String[] {"Chamorro, normaltid", "ChST",
- "Chamorro, sommartid", "ChDT"};
@@ -3124,13 +3701,18 @@
- "Koordinerad universell tid", "UTC"};
- String UZT[] = new String[] {"Uzbekistan, normaltid", "UZT",
- "Uzbekistan, sommartid", "UZST"};
++ String WST_AUS[] = new String[] {"Western Standard Time (Australien)", "AWST",
++ "V\u00E4stlig sommartid (Australien)", "AWDT"};
++ String WST_SAMOA[] = new String[] {"V\u00e4stsamoansk tid", "WSST",
+ "V\u00e4stsamoansk sommartid", "WSDT"};
++ String XJT[] = new String[] {"Kina, normaltid", "XJT",
++ "Kina, sommartid", "XJDT"};
+ String YAKT[] = new String[] {"Jakutsk, normaltid", "YAKT",
+ "Jakutsk, sommartid", "YAKST"};
return new Object[][] {
{"America/Los_Angeles", PST},
-@@ -214,6 +220,7 @@
+@@ -214,6 +222,7 @@
{"America/Anchorage", AKST},
{"AST", AKST},
{"America/Halifax", AST},
@@ -3138,7 +3720,12 @@
{"America/St_Johns", NST},
{"CNT", NST},
{"Europe/Paris", CET},
-@@ -259,6 +266,7 @@
+@@ -255,10 +264,11 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT},
{"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST},
@@ -3146,7 +3733,7 @@
{"Africa/Kampala", EAT},
{"Africa/Khartoum", EAT},
{"Africa/Kigali", CAT},
-@@ -300,7 +308,7 @@
+@@ -300,7 +310,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
@@ -3155,7 +3742,7 @@
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
-@@ -309,6 +317,7 @@
+@@ -309,6 +319,7 @@
{"America/Atikokan", EST},
{"America/Atka", HAST},
{"America/Bahia", BRT},
@@ -3163,7 +3750,7 @@
{"America/Barbados", AST},
{"America/Belem", BRT},
{"America/Belize", CST},
-@@ -328,6 +337,7 @@
+@@ -328,6 +339,7 @@
"Franska Guyana, sommartid", "GFST"}},
{"America/Cayman", EST},
{"America/Chihuahua", MST},
@@ -3171,7 +3758,7 @@
{"America/Coral_Harbour", EST},
{"America/Cordoba", AGT},
{"America/Costa_Rica", CST},
-@@ -339,7 +349,7 @@
+@@ -339,7 +351,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
@@ -3180,7 +3767,16 @@
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
-@@ -361,10 +371,10 @@
+@@ -348,7 +360,7 @@
+ {"America/Godthab", new String[] {"V\u00e4stra Gr\u00f6nland, normaltid", "WGT",
+ "V\u00e4stra Gr\u00f6nland, sommartid", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -361,10 +373,10 @@
{"America/Indiana/Indianapolis", EST},
{"America/Indiana/Knox", CST},
{"America/Indiana/Marengo", EST},
@@ -3194,7 +3790,7 @@
{"America/Indiana/Winamac", EST},
{"America/Inuvik", MST},
{"America/Iqaluit", EST},
-@@ -374,21 +384,25 @@
+@@ -374,21 +386,24 @@
{"America/Kentucky/Louisville", EST},
{"America/Kentucky/Monticello", EST},
{"America/Knox_IN", CST},
@@ -3216,12 +3812,11 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
-+ {"America/Metlakatla", new String[] {"Metlakatla, normaltid", "MeST",
-+ "Metlakatla, sommartid", "MeDT"}},
++ {"America/Metlakatla", PST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Saint-Pierre-et-Miquelon, normaltid", "PMST",
"Saint-Pierre-et-Miquelon, sommartid", "PMDT"}},
-@@ -402,6 +416,7 @@
+@@ -402,6 +417,7 @@
{"America/Nipigon", EST},
{"America/Nome", AKST},
{"America/Noronha", NORONHA},
@@ -3229,7 +3824,7 @@
{"America/North_Dakota/Center", CST},
{"America/North_Dakota/New_Salem", CST},
{"America/Ojinaga", MST},
-@@ -411,15 +426,15 @@
+@@ -411,15 +427,15 @@
"Surinam, sommartid", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
@@ -3248,7 +3843,7 @@
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
-@@ -428,7 +443,7 @@
+@@ -428,7 +444,7 @@
{"America/Sao_Paulo", BRT},
{"America/Scoresbysund", EGT},
{"America/Shiprock", MST},
@@ -3257,7 +3852,7 @@
{"America/St_Kitts", AST},
{"America/St_Lucia", AST},
{"America/St_Thomas", AST},
-@@ -446,10 +461,13 @@
+@@ -446,10 +462,13 @@
{"America/Winnipeg", CST},
{"America/Yakutat", AKST},
{"America/Yellowknife", MST},
@@ -3267,11 +3862,11 @@
{"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville, normaltid", "DDUT",
"Dumont-d'Urville, sommartid", "DDUST"}},
+ {"Antarctica/Macquarie", new String[] {"Macquarie\u00F6n, normaltid", "MIST",
-+ "Macquarie\u00F6n, sommartid", "MIST"}},
++ "Macquarie\u00F6n, sommartid", "MIDT"}},
{"Antarctica/Mawson", new String[] {"Mawson, normaltid", "MAWT",
"Mawson, sommartid", "MAWST"}},
{"Antarctica/McMurdo", NZST},
-@@ -459,6 +477,8 @@
+@@ -459,6 +478,8 @@
{"Antarctica/South_Pole", NZST},
{"Antarctica/Syowa", new String[] {"Syowa, normaltid", "SYOT",
"Syowa, sommartid", "SYOST"}},
@@ -3280,7 +3875,15 @@
{"Antarctica/Vostok", new String[] {"Vostok, normaltid", "VOST",
"Vostok, sommartid", "VOSST"}},
{"Arctic/Longyearbyen", CET},
-@@ -500,6 +520,7 @@
+@@ -489,6 +510,7 @@
+ "Choibalsan, sommartid", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+ {"Asia/Chungking", CTT},
++ {"Asia/Chita", IRKT},
+ {"Asia/Colombo", IST},
+ {"Asia/Dacca", BDT},
+ {"Asia/Dhaka", BDT},
+@@ -500,27 +522,28 @@
"Tadzjikistan, sommartid", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
@@ -3288,8 +3891,10 @@
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Hovd, normaltid", "HOVT",
-@@ -508,7 +529,7 @@
- "Irkutsk, sommartid", "IRKST"}},
+ "Hovd, sommartid", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"Irkutsk, normaltid", "IRKT",
+- "Irkutsk, sommartid", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"\u00d6stindonesisk tid", "EIT",
@@ -3297,19 +3902,46 @@
"\u00d6stindonesisk sommartid", "EIST"}},
{"Asia/Kabul", new String[] {"Afghanistan, normaltid", "AFT",
"Afghanistan, sommartid", "AFST"}},
-@@ -518,6 +539,8 @@
- {"Asia/Kashgar", CTT},
+ {"Asia/Kamchatka", new String[] {"Petropavlovsk-Kamtjatka, normaltid", "PETT",
+ "Petropavlovsk-Kamtjatka, sommartid", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"Khandyga, normaltid", "YAKT",
+ "Khandyga, sommartid", "YAKST"}},
{"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"Krasnojarsk, normaltid", "KRAT",
- "Krasnojarsk, sommartid", "KRAST"}},
-@@ -566,11 +589,11 @@
+- {"Asia/Krasnoyarsk", new String[] {"Krasnojarsk, normaltid", "KRAT",
+- "Krasnojarsk, sommartid", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -533,7 +556,7 @@
+ "Filippinerna, sommartid", "PHST"}},
+ {"Asia/Muscat", GST},
+ {"Asia/Nicosia", EET},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
+ {"Asia/Novosibirsk", NOVT},
+ {"Asia/Oral", new String[] {"Oral, normaltid", "ORAT",
+ "Oral, sommartid", "ORAST"}},
+@@ -554,6 +577,8 @@
+ {"Asia/Samarkand", UZT},
+ {"Asia/Seoul", KST},
+ {"Asia/Singapore", SGT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", CTT},
+ {"Asia/Tel_Aviv", ISRAEL},
+ {"Asia/Tashkent", UZT},
+@@ -565,12 +590,12 @@
+ {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"Ust-Nera, normaltid", "VLAT",
+ "Ust-Nera, sommartid", "VLAST"}},
{"Asia/Vientiane", ICT},
@@ -3322,18 +3954,18 @@
{"Asia/Yekaterinburg", new String[] {"Jekaterinburg, normaltid", "YEKT",
"Jekaterinburg, sommartid", "YEKST"}},
{"Asia/Yerevan", ARMT},
-@@ -597,8 +620,8 @@
+@@ -597,8 +622,8 @@
{"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN},
- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST",
- "Central Western Summer Time (Australia)", "CWST"}},
-+ {"Australia/Eucla", new String[] {"Central v\u00E4stlig normaltid (Australien)", "CWST",
-+ "Central v\u00E4stlig sommartid (Australien)", "CWST"}},
++ {"Australia/Eucla", new String[] {"Central v\u00E4stlig normaltid (Australien)", "ACWST",
++ "Central v\u00E4stlig sommartid (Australien)", "ACWDT"}},
{"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE},
-@@ -616,7 +639,7 @@
+@@ -616,7 +641,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
@@ -3342,7 +3974,7 @@
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
-@@ -654,6 +677,7 @@
+@@ -654,6 +679,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
@@ -3350,16 +3982,7 @@
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
-@@ -663,7 +687,7 @@
- {"Europe/Isle_of_Man", GMTBST},
- {"Europe/Istanbul", EET},
- {"Europe/Jersey", GMTBST},
-- {"Europe/Kaliningrad", EET},
-+ {"Europe/Kaliningrad", FET},
- {"Europe/Kiev", EET},
- {"Europe/Lisbon", WET},
- {"Europe/Ljubljana", CET},
-@@ -672,7 +696,7 @@
+@@ -672,7 +698,7 @@
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
@@ -3368,7 +3991,7 @@
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
-@@ -685,7 +709,7 @@
+@@ -685,7 +711,7 @@
"Samara, sommartid", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
@@ -3377,7 +4000,17 @@
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
-@@ -752,6 +776,7 @@
+@@ -697,8 +723,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"Volgograd-tid", "VOLT",
+- "Volgograd, sommartid", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -752,6 +777,7 @@
{"Pacific/Apia", WST_SAMOA},
{"Pacific/Auckland", NZST},
{"Pacific/Chatham", CHAST},
@@ -3385,7 +4018,7 @@
{"Pacific/Easter", EASTER},
{"Pacific/Efate", new String[] {"Vanuatu, normaltid", "VUT",
"Vanuatu, sommartid", "VUST"}},
-@@ -790,8 +815,8 @@
+@@ -790,8 +816,8 @@
{"Pacific/Palau", new String[] {"Palau, normaltid", "PWT",
"Palau, sommartid", "PWST"}},
{"Pacific/Pitcairn", PITCAIRN},
@@ -3396,7 +4029,7 @@
{"Pacific/Port_Moresby", new String[] {"Papua Nya Guinea, normaltid", "PGT",
"Papua Nya Guinea, sommartid", "PGST"}},
{"Pacific/Rarotonga", new String[] {"Cook\u00f6arna, normaltid", "CKT",
-@@ -804,12 +829,12 @@
+@@ -804,12 +830,12 @@
"Gilbert\u00f6arna, sommartid", "GILST"}},
{"Pacific/Tongatapu", new String[] {"Tonga, normaltid", "TOT",
"Tonga, sommartid", "TOST"}},
@@ -3426,8 +4059,8 @@
"Acre \u590f\u4ee4\u65f6", "ACST"};
- String ADELAIDE[] = new String[] {"\u4e2d\u592e\u6807\u51c6\u65f6\u95f4\uff08\u5357\u6fb3\u5927\u5229\u4e9a\uff09", "CST",
- "\u4e2d\u592e\u590f\u4ee4\u65f6\uff08\u5357\u6fb3\u5927\u5229\u4e9a\uff09", "CST"};
-+ String ADELAIDE[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A)", "CST",
-+ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A)", "CST"};
++ String ADELAIDE[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A)", "ACST",
++ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A)", "ACDT"};
String AGT[] = new String[] {"\u963f\u6839\u5ef7\u65f6\u95f4", "ART",
"\u963f\u6839\u5ef7\u590f\u4ee4\u65f6", "ARST"};
String AKST[] = new String[] {"\u963f\u62c9\u65af\u52a0\u6807\u51c6\u65f6\u95f4", "AKST",
@@ -3439,10 +4072,10 @@
- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u6606\u58eb\u5170\uff09", "EST"};
- String BROKEN_HILL[] = new String[] {"\u4e2d\u592e\u6807\u51c6\u65f6\u95f4\uff08\u5357\u6fb3\u5927\u5229\u4e9a/\u65b0\u5357\u5a01\u5c14\u65af\uff09", "CST",
- "\u4e2d\u592e\u590f\u4ee4\u65f6\uff08\u5357\u6fb3\u5927\u5229\u4e9a/\u65b0\u5357\u5a01\u5c14\u65af\uff09", "CST"};
-+ String BRISBANE[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u6606\u58EB\u5170)", "EST",
-+ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u6606\u58EB\u5170)", "EST"};
-+ String BROKEN_HILL[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "CST",
-+ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "CST"};
++ String BRISBANE[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u6606\u58EB\u5170)", "AEST",
++ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u6606\u58EB\u5170)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "ACST",
++ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "ACDT"};
String BRT[] = new String[] {"\u5df4\u897f\u5229\u4e9a\u65f6\u95f4", "BRT",
"\u5df4\u897f\u5229\u4e9a\u590f\u4ee4\u65f6", "BRST"};
String BTT[] = new String[] {"\u4e0d\u4e39\u65f6\u95f4", "BTT",
@@ -3469,8 +4102,8 @@
- "\u4e2d\u592e\u590f\u4ee4\u65f6\uff08\u5317\u9886\u5730\uff09", "CST"};
+ String CUBA[] = new String[] {"\u53e4\u5df4\u6807\u51c6\u65f6\u95f4", "CST",
+ "\u53e4\u5df4\u590f\u4ee4\u65f6", "CDT"};
-+ String DARWIN[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5317\u9886\u5730)", "CST",
-+ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5317\u9886\u5730)", "CST"};
++ String DARWIN[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5317\u9886\u5730)", "ACST",
++ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5317\u9886\u5730)", "ACDT"};
String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT",
"\u7231\u5c14\u5170\u590f\u4ee4\u65f6", "IST"};
String EAT[] = new String[] {"\u4e1c\u975e\u65f6\u95f4", "EAT",
@@ -3480,14 +4113,28 @@
"\u4e1c\u90e8\u590f\u4ee4\u65f6", "EDT"};
- String EST_NSW[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u65b0\u5357\u5a01\u5c14\u65af\uff09", "EST",
- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u65b0\u5357\u5a01\u5c14\u65af\uff09", "EST"};
-+ String EST_NSW[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u65B0\u5357\u5A01\u5C14\u65AF)", "EST",
-+ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u65B0\u5357\u5A01\u5C14\u65AF)", "EST"};
++ String EST_NSW[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u65B0\u5357\u5A01\u5C14\u65AF)", "AEST",
++ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u65B0\u5357\u5A01\u5C14\u65AF)", "AEDT"};
+ String FET[] = new String[] {"\u8FDC\u4E1C\u6B27\u65F6\u95F4", "FET",
+ "\u8FDC\u4E1C\u6B27\u590F\u4EE4\u65F6", "FEST"};
String GHMT[] = new String[] {"\u52a0\u7eb3\u65f6\u95f4", "GMT",
"\u52a0\u7eb3\u590f\u4ee4\u65f6", "GHST"};
String GAMBIER[] = new String[] {"\u5188\u6bd4\u4e9a\u65f6\u95f4", "GAMT",
-@@ -153,10 +159,12 @@
+@@ -127,10 +133,12 @@
+ "\u5370\u5ea6\u590f\u4ee4\u65f6", "IDT"};
+ String JST[] = new String[] {"\u65e5\u672c\u6807\u51c6\u65f6\u95f4", "JST",
+ "\u65e5\u672c\u590f\u4ee4\u65f6", "JDT"};
++ String KRAT[] = new String[] {"\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u65f6\u95f4", "KRAT",
++ "\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u590f\u4ee4\u65f6", "KRAST"};
+ String KST[] = new String[] {"\u97e9\u56fd\u6807\u51c6\u65f6\u95f4", "KST",
+ "\u97e9\u56fd\u590f\u4ee4\u65f6", "KDT"};
+ String LORD_HOWE[] = new String[] {"\u8c6a\u516c\u6807\u51c6\u65f6\u95f4", "LHST",
+- "\u8c6a\u516c\u590f\u4ee4\u65f6", "LHST"};
++ "\u8c6a\u516c\u590f\u4ee4\u65f6", "LHDT"};
+ String MHT[] = new String[] {"\u9a6c\u7ecd\u5c14\u7fa4\u5c9b\u65f6\u95f4", "MHT",
+ "\u9a6c\u7ecd\u5c14\u7fa4\u5c9b\u590f\u4ee4\u65f6", "MHST"};
+ String MSK[] = new String[] {"\u83ab\u65af\u79d1\u6807\u51c6\u65f6\u95f4", "MSK",
+@@ -153,48 +161,48 @@
"\u76ae\u7279\u5eb7\u5c9b\u590f\u4ee4\u65f6", "PDT"};
String PKT[] = new String[] {"\u5df4\u57fa\u65af\u5766\u65f6\u95f4", "PKT",
"\u5df4\u57fa\u65af\u5766\u590f\u4ee4\u65f6", "PKST"};
@@ -3499,17 +4146,20 @@
- "\u4e2d\u592e\u590f\u4ee4\u65f6", "CDT"};
+ String SAMOA[] = new String[] {"\u8428\u6469\u4e9a\u7fa4\u5c9b\u6807\u51c6\u65f6\u95f4", "SST",
+ "\u8428\u6469\u4e9a\u7fa4\u5c9b\u590f\u4ee4\u65f6", "SDT"};
++ String IRKT[] = new String[] {"\u4f0a\u5c14\u5e93\u6b21\u514b\u65f6\u95f4", "IRKT",
++ "\u4f0a\u5c14\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "IRKST"};
String SAST[] = new String[] {"\u5357\u975e\u6807\u51c6\u65f6\u95f4", "SAST",
"\u5357\u975e\u590f\u4ee4\u65f6", "SAST"};
String SBT[] = new String[] {"\u6240\u7f57\u95e8\u7fa4\u5c9b\u65f6\u95f4", "SBT",
-@@ -165,36 +173,34 @@
+ "\u6240\u7f57\u95e8\u7fa4\u5c9b\u590f\u4ee4\u65f6", "SBST"};
+ String SGT[] = new String[] {"\u65b0\u52a0\u5761\u65f6\u95f4", "SGT",
"\u65b0\u52a0\u5761\u590f\u4ee4\u65f6", "SGST"};
- String SLST[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT",
- "\u585e\u62c9\u5229\u6602\u590f\u4ee4\u65f6", "SLST"};
+- String SLST[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT",
+- "\u585e\u62c9\u5229\u6602\u590f\u4ee4\u65f6", "SLST"};
- String TASMANIA[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u5854\u65af\u9a6c\u5c3c\u4e9a\uff09", "EST",
- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u5854\u65af\u9a6c\u5c3c\u4e9a\uff09", "EST"};
-+ String TASMANIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "EST",
-+ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "EST"};
++ String TASMANIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "AEST",
++ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "AEDT"};
String TMT[] = new String[] {"\u571f\u5e93\u66fc\u65f6\u95f4", "TMT",
"\u571f\u5e93\u66fc\u590f\u4ee4\u65f6", "TMST"};
- String TRUT[] = new String[] {"\u7279\u9c81\u514b\u65f6\u95f4", "TRUT",
@@ -3522,12 +4172,10 @@
+ "\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC"};
+ String UZT[] = new String[] {"\u4e4c\u5179\u522b\u514b\u65af\u5766\u65f6\u95f4", "UZT",
+ "\u4e4c\u5179\u522b\u514b\u65af\u5766\u590f\u4ee4\u65f6", "UZST"};
-+ String VICTORIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u7EF4\u591A\u5229\u4E9A)", "EST",
-+ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u7EF4\u591A\u5229\u4E9A)", "EST"};
++ String VICTORIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u7EF4\u591A\u5229\u4E9A)", "AEST",
++ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u7EF4\u591A\u5229\u4E9A)", "AEDT"};
+ String VLAT[] = new String[] {"\u6d77\u53c2\u5d34\u65f6\u95f4", "VLAT",
+ "\u6d77\u53c2\u5d34\u590f\u4ee4\u65f6", "VLAST"};
-+ String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u65f6\u95f4", "WART",
-+ "\u897f\u963f\u6839\u5ef7\u590f\u4ee4\u65f6", "WARST"};
String WAT[] = new String[] {"\u897f\u975e\u65f6\u95f4", "WAT",
"\u897f\u975e\u590f\u4ee4\u65f6", "WAST"};
String WET[] = new String[] {"\u897f\u6b27\u65f6\u95f4", "WET",
@@ -3539,9 +4187,7 @@
- "\u897f\u90e8\u590f\u4ee4\u65f6\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "WST"};
- String SAMOA[] = new String[] {"\u8428\u6469\u4e9a\u7fa4\u5c9b\u6807\u51c6\u65f6\u95f4", "SST",
- "\u8428\u6469\u4e9a\u7fa4\u5c9b\u590f\u4ee4\u65f6", "SDT"};
-+ String WST_AUS[] = new String[] {"\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "WST",
-+ "\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "WST"};
- String WST_SAMOA[] = new String[] {"\u897f\u8428\u6469\u4e9a\u65f6\u95f4", "WST",
+- String WST_SAMOA[] = new String[] {"\u897f\u8428\u6469\u4e9a\u65f6\u95f4", "WST",
- "\u897f\u8428\u6469\u4e9a\u590f\u4ee4\u65f6", "WSST"};
- String ChST[] = new String[] {"Chamorro \u6807\u51c6\u65f6\u95f4", "ChST",
- "Chamorro \u590f\u4ee4\u65f6", "ChDT"};
@@ -3551,13 +4197,18 @@
- "\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC"};
- String UZT[] = new String[] {"\u4e4c\u5179\u522b\u514b\u65af\u5766\u65f6\u95f4", "UZT",
- "\u4e4c\u5179\u522b\u514b\u65af\u5766\u590f\u4ee4\u65f6", "UZST"};
++ String WST_AUS[] = new String[] {"\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "AWST",
++ "\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "AWDT"};
++ String WST_SAMOA[] = new String[] {"\u897f\u8428\u6469\u4e9a\u65f6\u95f4", "WSST",
+ "\u897f\u8428\u6469\u4e9a\u590f\u4ee4\u65f6", "WSDT"};
++ String XJT[] = new String[] {"\u4e2d\u56fd\u6807\u51c6\u65f6\u95f4", "XJT",
++ "\u4e2d\u56fd\u590f\u4ee4\u65f6", "XJDT"};
+ String YAKT[] = new String[] {"\u4e9a\u5e93\u6b21\u514b\u65f6\u95f4", "YAKT",
+ "\u4e9a\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "YAKST"};
return new Object[][] {
{"America/Los_Angeles", PST},
-@@ -214,6 +220,7 @@
+@@ -214,6 +222,7 @@
{"America/Anchorage", AKST},
{"AST", AKST},
{"America/Halifax", AST},
@@ -3565,7 +4216,12 @@
{"America/St_Johns", NST},
{"CNT", NST},
{"Europe/Paris", CET},
-@@ -259,6 +266,7 @@
+@@ -255,10 +264,11 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT},
{"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST},
@@ -3573,7 +4229,7 @@
{"Africa/Kampala", EAT},
{"Africa/Khartoum", EAT},
{"Africa/Kigali", CAT},
-@@ -300,7 +308,7 @@
+@@ -300,7 +310,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
@@ -3582,7 +4238,7 @@
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
-@@ -309,6 +317,7 @@
+@@ -309,6 +319,7 @@
{"America/Atikokan", EST},
{"America/Atka", HAST},
{"America/Bahia", BRT},
@@ -3590,7 +4246,7 @@
{"America/Barbados", AST},
{"America/Belem", BRT},
{"America/Belize", CST},
-@@ -328,6 +337,7 @@
+@@ -328,6 +339,7 @@
"\u6cd5\u5c5e\u572d\u4e9a\u90a3\u590f\u4ee4\u65f6", "GFST"}},
{"America/Cayman", EST},
{"America/Chihuahua", MST},
@@ -3598,7 +4254,7 @@
{"America/Coral_Harbour", EST},
{"America/Cordoba", AGT},
{"America/Costa_Rica", CST},
-@@ -339,7 +349,7 @@
+@@ -339,7 +351,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
@@ -3607,7 +4263,16 @@
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
-@@ -361,10 +371,10 @@
+@@ -348,7 +360,7 @@
+ {"America/Godthab", new String[] {"\u897f\u683c\u6797\u5170\u5c9b\u65f6\u95f4", "WGT",
+ "\u897f\u683c\u6797\u5170\u5c9b\u590f\u4ee4\u65f6", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -361,10 +373,10 @@
{"America/Indiana/Indianapolis", EST},
{"America/Indiana/Knox", CST},
{"America/Indiana/Marengo", EST},
@@ -3621,7 +4286,7 @@
{"America/Indiana/Winamac", EST},
{"America/Inuvik", MST},
{"America/Iqaluit", EST},
-@@ -374,21 +384,25 @@
+@@ -374,21 +386,24 @@
{"America/Kentucky/Louisville", EST},
{"America/Kentucky/Monticello", EST},
{"America/Knox_IN", CST},
@@ -3643,12 +4308,11 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
-+ {"America/Metlakatla", new String[] {"\u6885\u7279\u62C9\u5361\u7279\u62C9\u6807\u51C6\u65F6\u95F4", "MeST",
-+ "\u6885\u7279\u62C9\u5361\u7279\u62C9\u590F\u4EE4\u65F6", "MeDT"}},
++ {"America/Metlakatla", PST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u6807\u51c6\u65f6\u95f4", "PMST",
"\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u590f\u4ee4\u65f6", "PMDT"}},
-@@ -402,6 +416,7 @@
+@@ -402,6 +417,7 @@
{"America/Nipigon", EST},
{"America/Nome", AKST},
{"America/Noronha", NORONHA},
@@ -3656,7 +4320,7 @@
{"America/North_Dakota/Center", CST},
{"America/North_Dakota/New_Salem", CST},
{"America/Ojinaga", MST},
-@@ -411,15 +426,15 @@
+@@ -411,15 +427,15 @@
"\u82cf\u5229\u5357\u590f\u4ee4\u65f6", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
@@ -3675,7 +4339,7 @@
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
-@@ -428,7 +443,7 @@
+@@ -428,7 +444,7 @@
{"America/Sao_Paulo", BRT},
{"America/Scoresbysund", EGT},
{"America/Shiprock", MST},
@@ -3684,7 +4348,7 @@
{"America/St_Kitts", AST},
{"America/St_Lucia", AST},
{"America/St_Thomas", AST},
-@@ -446,10 +461,13 @@
+@@ -446,10 +462,13 @@
{"America/Winnipeg", CST},
{"America/Yakutat", AKST},
{"America/Yellowknife", MST},
@@ -3694,11 +4358,11 @@
{"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville \u65f6\u95f4", "DDUT",
"Dumont-d'Urville \u590f\u4ee4\u65f6", "DDUST"}},
+ {"Antarctica/Macquarie", new String[] {"\u9EA6\u5938\u91CC\u5C9B\u65F6\u95F4", "MIST",
-+ "\u9EA6\u5938\u91CC\u5C9B\u590F\u4EE4\u65F6", "MIST"}},
++ "\u9EA6\u5938\u91CC\u5C9B\u590F\u4EE4\u65F6", "MIDT"}},
{"Antarctica/Mawson", new String[] {"\u83ab\u68ee\u65f6\u95f4", "MAWT",
"\u83ab\u68ee\u590f\u4ee4\u65f6", "MAWST"}},
{"Antarctica/McMurdo", NZST},
-@@ -459,6 +477,8 @@
+@@ -459,6 +478,8 @@
{"Antarctica/South_Pole", NZST},
{"Antarctica/Syowa", new String[] {"Syowa \u65f6\u95f4", "SYOT",
"Syowa \u590f\u4ee4\u65f6", "SYOST"}},
@@ -3707,7 +4371,15 @@
{"Antarctica/Vostok", new String[] {"\u83ab\u65af\u6258\u514b\u65f6\u95f4", "VOST",
"\u83ab\u65af\u6258\u514b\u590f\u4ee4\u65f6", "VOSST"}},
{"Arctic/Longyearbyen", CET},
-@@ -500,6 +520,7 @@
+@@ -485,6 +506,7 @@
+ {"Asia/Brunei", new String[] {"\u6587\u83b1\u65f6\u95f4", "BNT",
+ "\u6587\u83b1\u590f\u4ee4\u65f6", "BNST"}},
+ {"Asia/Calcutta", IST},
++ {"Asia/Chita", IRKT},
+ {"Asia/Choibalsan", new String[] {"Choibalsan \u65f6\u95f4", "CHOT",
+ "Choibalsan \u590f\u4ee4\u65f6", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+@@ -500,27 +522,28 @@
"\u5854\u5409\u514b\u65af\u5766\u590f\u4ee4\u65f6", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
@@ -3715,8 +4387,10 @@
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"\u79d1\u5e03\u591a\u65f6\u95f4", "HOVT",
-@@ -508,7 +529,7 @@
- "\u4f0a\u5c14\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "IRKST"}},
+ "\u79d1\u5e03\u591a\u590f\u4ee4\u65f6", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"\u4f0a\u5c14\u5e93\u6b21\u514b\u65f6\u95f4", "IRKT",
+- "\u4f0a\u5c14\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"\u4e1c\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "EIT",
@@ -3724,19 +4398,46 @@
"\u4e1c\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "EIST"}},
{"Asia/Kabul", new String[] {"\u963f\u5bcc\u6c57\u65f6\u95f4", "AFT",
"\u963f\u5bcc\u6c57\u590f\u4ee4\u65f6", "AFST"}},
-@@ -518,6 +539,8 @@
- {"Asia/Kashgar", CTT},
+ {"Asia/Kamchatka", new String[] {"\u5f7c\u5f97\u7f57\u5df4\u752b\u6d1b\u592b\u65af\u514b\u65f6\u95f4", "PETT",
+ "\u5f7c\u5f97\u7f57\u5df4\u752b\u6d1b\u592b\u65af\u514b\u590f\u4ee4\u65f6", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"\u6C49\u5FB7\u52A0\u65F6\u95F4", "YAKT",
+ "\u6C49\u5FB7\u52A0\u590F\u4EE4\u65F6", "YAKST"}},
{"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u65f6\u95f4", "KRAT",
- "\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u590f\u4ee4\u65f6", "KRAST"}},
-@@ -566,11 +589,11 @@
+- {"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u65f6\u95f4", "KRAT",
+- "\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u590f\u4ee4\u65f6", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -533,7 +556,7 @@
+ "\u83f2\u5f8b\u5bbe\u590f\u4ee4\u65f6", "PHST"}},
+ {"Asia/Muscat", GST},
+ {"Asia/Nicosia", EET},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
+ {"Asia/Novosibirsk", NOVT},
+ {"Asia/Oral", new String[] {"Oral \u65f6\u95f4", "ORAT",
+ "Oral \u590f\u4ee4\u65f6", "ORAST"}},
+@@ -554,6 +577,8 @@
+ {"Asia/Samarkand", UZT},
+ {"Asia/Seoul", KST},
+ {"Asia/Singapore", SGT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", CTT},
+ {"Asia/Tel_Aviv", ISRAEL},
+ {"Asia/Tashkent", UZT},
+@@ -565,12 +590,12 @@
+ {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"\u4E4C\u65AF\u5B63\u6D85\u62C9\u65F6\u95F4", "VLAT",
+ "\u4E4C\u65AF\u5B63\u6D85\u62C9\u590F\u4EE4\u65F6", "VLAST"}},
{"Asia/Vientiane", ICT},
@@ -3749,18 +4450,18 @@
{"Asia/Yekaterinburg", new String[] {"Yekaterinburg \u65f6\u95f4", "YEKT",
"Yekaterinburg \u590f\u4ee4\u65f6", "YEKST"}},
{"Asia/Yerevan", ARMT},
-@@ -597,8 +620,8 @@
+@@ -597,8 +622,8 @@
{"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN},
- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST",
- "Central Western Summer Time (Australia)", "CWST"}},
-+ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "CWST",
-+ "\u4E2D\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "CWST"}},
++ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "ACWST",
++ "\u4E2D\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "ACWDT"}},
{"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE},
-@@ -616,7 +639,7 @@
+@@ -616,7 +641,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
@@ -3769,7 +4470,7 @@
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
-@@ -654,6 +677,7 @@
+@@ -654,6 +679,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
@@ -3777,16 +4478,7 @@
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
-@@ -663,7 +687,7 @@
- {"Europe/Isle_of_Man", GMTBST},
- {"Europe/Istanbul", EET},
- {"Europe/Jersey", GMTBST},
-- {"Europe/Kaliningrad", EET},
-+ {"Europe/Kaliningrad", FET},
- {"Europe/Kiev", EET},
- {"Europe/Lisbon", WET},
- {"Europe/Ljubljana", CET},
-@@ -672,7 +696,7 @@
+@@ -672,7 +698,7 @@
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
@@ -3795,7 +4487,7 @@
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
-@@ -685,7 +709,7 @@
+@@ -685,7 +711,7 @@
"\u6c99\u9a6c\u62c9\u590f\u4ee4\u65f6", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
@@ -3804,7 +4496,17 @@
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
-@@ -752,6 +776,7 @@
+@@ -697,8 +723,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"\u4f0f\u5c14\u52a0\u683c\u52d2\u65f6\u95f4", "VOLT",
+- "\u4f0f\u5c14\u52a0\u683c\u52d2\u590f\u4ee4\u65f6", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -752,6 +777,7 @@
{"Pacific/Apia", WST_SAMOA},
{"Pacific/Auckland", NZST},
{"Pacific/Chatham", CHAST},
@@ -3812,7 +4514,7 @@
{"Pacific/Easter", EASTER},
{"Pacific/Efate", new String[] {"\u74e6\u5974\u963f\u56fe\u65f6\u95f4", "VUT",
"\u74e6\u5974\u963f\u56fe\u590f\u4ee4\u65f6", "VUST"}},
-@@ -790,8 +815,8 @@
+@@ -790,8 +816,8 @@
{"Pacific/Palau", new String[] {"\u5e1b\u7409\u65f6\u95f4", "PWT",
"\u5e1b\u7409\u590f\u4ee4\u65f6", "PWST"}},
{"Pacific/Pitcairn", PITCAIRN},
@@ -3823,7 +4525,7 @@
{"Pacific/Port_Moresby", new String[] {"\u5df4\u5e03\u4e9a\u65b0\u51e0\u5185\u4e9a\u65f6\u95f4", "PGT",
"\u5df4\u5e03\u4e9a\u65b0\u51e0\u5185\u4e9a\u590f\u4ee4\u65f6", "PGST"}},
{"Pacific/Rarotonga", new String[] {"\u5e93\u514b\u7fa4\u5c9b\u65f6\u95f4", "CKT",
-@@ -804,12 +829,12 @@
+@@ -804,12 +830,12 @@
"\u5409\u4f2f\u7279\u7fa4\u5c9b\u590f\u4ee4\u65f6", "GILST"}},
{"Pacific/Tongatapu", new String[] {"\u4e1c\u52a0\u65f6\u95f4", "TOT",
"\u4e1c\u52a0\u590f\u4ee4\u65f6", "TOST"}},
@@ -3853,8 +4555,8 @@
"Acre \u590f\u4ee4\u6642\u9593", "ACST"};
- String ADELAIDE[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e\u5357\u5340)", "CST",
- "\u4e2d\u90e8\u590f\u4ee4\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e\u5357\u5340)", "CST"};
-+ String ADELAIDE[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u90E8)", "CST",
-+ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340)", "CST"};
++ String ADELAIDE[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u90E8)", "ACST",
++ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340)", "ACDT"};
String AGT[] = new String[] {"\u963f\u6839\u5ef7\u6642\u9593", "ART",
"\u963f\u6839\u5ef7\u590f\u4ee4\u6642\u9593", "ARST"};
String AKST[] = new String[] {"\u963f\u62c9\u65af\u52a0\u6a19\u6e96\u6642\u9593", "AKST",
@@ -3866,10 +4568,10 @@
- "\u6771\u90e8\u590f\u4ee4\u6642\u9593 (\u6606\u58eb\u862d)", "EST"};
- String BROKEN_HILL[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e\u5357\u5340/\u65b0\u5357\u5a01\u723e\u65af)", "CST",
- "\u4e2d\u90e8\u590f\u4ee4\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e\u5357\u5340/\u65b0\u5357\u5a01\u723e\u65af)", "CST"};
-+ String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u6606\u58EB\u862D)", "EST",
-+ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u6606\u58EB\u862D)", "EST"};
-+ String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "CST",
-+ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "CST"};
++ String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u6606\u58EB\u862D)", "AEST",
++ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u6606\u58EB\u862D)", "AEDT"};
++ String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "ACST",
++ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "ACDT"};
String BRT[] = new String[] {"\u5df4\u897f\u5229\u4e9e\u6642\u9593", "BRT",
"\u5df4\u897f\u5229\u4e9e\u590f\u4ee4\u6642\u9593", "BRST"};
String BTT[] = new String[] {"\u4e0d\u4e39\u6642\u9593", "BTT",
@@ -3896,8 +4598,8 @@
- "\u4e2d\u90e8\u590f\u4ee4\u6642\u9593 (\u5317\u90e8\u5404\u5730\u5340)", "CST"};
+ String CUBA[] = new String[] {"\u53e4\u5df4\u6a19\u6e96\u6642\u9593", "CST",
+ "\u53e4\u5df4\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"};
-+ String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "CST",
-+ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "CST"};
++ String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "ACST",
++ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "ACDT"};
String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u5e73\u5747\u6642\u9593", "GMT",
"\u611b\u723e\u862d\u590f\u4ee4\u6642\u9593", "IST"};
String EAT[] = new String[] {"\u6771\u975e\u6642\u9593", "EAT",
@@ -3907,14 +4609,28 @@
"\u6771\u65b9\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "EDT"};
- String EST_NSW[] = new String[] {"\u6771\u65b9\u6a19\u6e96\u6642\u9593 (\u65b0\u5357\u5a01\u723e\u65af)", "EST",
- "\u6771\u65b9\u590f\u4ee4\u6642\u9593 (\u65b0\u5357\u5a01\u723e\u65af)", "EST"};
-+ String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "EST",
-+ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "EST"};
++ String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "AEST",
++ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "AEDT"};
+ String FET[] = new String[] {"\u6771\u6B50\u5167\u9678\u6642\u9593", "FET",
+ "\u6771\u6B50\u5167\u9678\u590F\u4EE4\u6642\u9593", "FEST"};
String GHMT[] = new String[] {"\u8fe6\u7d0d\u5e73\u5747\u6642\u9593", "GMT",
"\u8fe6\u7d0d\u590f\u4ee4\u6642\u9593", "GHST"};
String GAMBIER[] = new String[] {"\u7518\u6bd4\u723e\u6642\u9593", "GAMT",
-@@ -153,10 +159,12 @@
+@@ -127,10 +133,12 @@
+ "\u5370\u5ea6\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "IDT"};
+ String JST[] = new String[] {"\u65e5\u672c\u6a19\u6e96\u6642\u9593", "JST",
+ "\u65e5\u672c\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "JDT"};
++ String KRAT[] = new String[] {"\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u6642\u9593", "KRAT",
++ "\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u590f\u4ee4\u6642\u9593", "KRAST"};
+ String KST[] = new String[] {"\u97d3\u570b\u6a19\u6e96\u6642\u9593", "KST",
+ "\u97d3\u570b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "KDT"};
+ String LORD_HOWE[] = new String[] {"\u8c6a\u52f3\u7235\u5cf6\u6a19\u6e96\u6642\u9593", "LHST",
+- "\u8c6a\u52f3\u7235\u5cf6\u590f\u4ee4\u6642\u9593", "LHST"};
++ "\u8c6a\u52f3\u7235\u5cf6\u590f\u4ee4\u6642\u9593", "LHDT"};
+ String MHT[] = new String[] {"\u99ac\u7d39\u723e\u7fa4\u5cf6\u6642\u9593", "MHT",
+ "\u99ac\u7d39\u723e\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "MHST"};
+ String MSK[] = new String[] {"\u83ab\u65af\u79d1\u6a19\u6e96\u6642\u9593", "MSK",
+@@ -153,48 +161,48 @@
"\u76ae\u7279\u5eb7\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PDT"};
String PKT[] = new String[] {"\u5df4\u57fa\u65af\u5766\u6642\u9593", "PKT",
"\u5df4\u57fa\u65af\u5766\u590f\u4ee4\u6642\u9593", "PKST"};
@@ -3926,17 +4642,20 @@
- "\u4e2d\u592e\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"};
+ String SAMOA[] = new String[] {"\u85a9\u6469\u4e9e\u6a19\u6e96\u6642\u9593", "SST",
+ "\u85a9\u6469\u4e9e\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "SDT"};
++ String IRKT[] = new String[] {"Irkutsk \u6642\u9593", "IRKT",
++ "Irkutsk \u590f\u4ee4\u6642\u9593", "IRKST"};
String SAST[] = new String[] {"\u5357\u975e\u6a19\u6e96\u6642\u9593", "SAST",
"\u5357\u975e\u590f\u4ee4\u6642\u9593", "SAST"};
String SBT[] = new String[] {"\u6240\u7f85\u9580\u7fa4\u5cf6\u6642\u9593", "SBT",
-@@ -165,36 +173,34 @@
+ "\u6240\u7f85\u9580\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "SBST"};
+ String SGT[] = new String[] {"\u65b0\u52a0\u5761\u6642\u9593", "SGT",
"\u65b0\u52a0\u5761\u590f\u4ee4\u6642\u9593", "SGST"};
- String SLST[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u5e73\u5747\u6642\u9593", "GMT",
- "\u7345\u5b50\u5c71\u590f\u4ee4\u6642\u9593", "SLST"};
+- String SLST[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u5e73\u5747\u6642\u9593", "GMT",
+- "\u7345\u5b50\u5c71\u590f\u4ee4\u6642\u9593", "SLST"};
- String TASMANIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642\u9593 (\u5854\u65af\u6885\u5c3c\u4e9e\u5cf6)", "EST",
- "\u6771\u90e8\u590f\u4ee4\u6642\u9593 (\u5854\u65af\u6885\u5c3c\u4e9e\u5cf6)", "EST"};
-+ String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "EST",
-+ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "EST"};
++ String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "AEST",
++ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "AEDT"};
String TMT[] = new String[] {"\u571f\u5eab\u66fc\u6642\u9593", "TMT",
"\u571f\u5eab\u66fc\u590f\u4ee4\u6642\u9593", "TMST"};
- String TRUT[] = new String[] {"\u7279\u9b6f\u514b\u6642\u9593", "TRUT",
@@ -3949,12 +4668,10 @@
+ "\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC"};
+ String UZT[] = new String[] {"\u70cf\u8332\u5225\u514b\u65af\u5766\u6642\u9593", "UZT",
+ "\u70cf\u8332\u5225\u514b\u65af\u5766\u590f\u4ee4\u6642\u9593", "UZST"};
-+ String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "EST",
-+ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "EST"};
++ String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "AEST",
++ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "AEDT"};
+ String VLAT[] = new String[] {"\u6d77\u53c3\u5d34\u6642\u9593", "VLAT",
+ "\u6d77\u53c3\u5d34\u590f\u4ee4\u6642\u9593", "VLAST"};
-+ String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u6642\u9593", "WART",
-+ "\u897f\u963f\u6839\u5ef7\u590f\u4ee4\u6642\u9593", "WARST"};
String WAT[] = new String[] {"\u897f\u975e\u6642\u9593", "WAT",
"\u897f\u975e\u590f\u4ee4\u6642\u9593", "WAST"};
String WET[] = new String[] {"\u897f\u6b50\u6642\u9593", "WET",
@@ -3966,9 +4683,7 @@
- "\u897f\u65b9\u590f\u4ee4\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "WST"};
- String SAMOA[] = new String[] {"\u85a9\u6469\u4e9e\u6a19\u6e96\u6642\u9593", "SST",
- "\u85a9\u6469\u4e9e\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "SDT"};
-+ String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "WST",
-+ "\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "WST"};
- String WST_SAMOA[] = new String[] {"\u897f\u85a9\u6469\u4e9e\u6642\u9593", "WST",
+- String WST_SAMOA[] = new String[] {"\u897f\u85a9\u6469\u4e9e\u6642\u9593", "WST",
- "\u897f\u85a9\u6469\u4e9e\u590f\u4ee4\u6642\u9593", "WSST"};
- String ChST[] = new String[] {"\u67e5\u83ab\u6d1b\u6a19\u6e96\u6642\u9593", "ChST",
- "\u67e5\u83ab\u6d1b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ChDT"};
@@ -3978,13 +4693,18 @@
- "\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC"};
- String UZT[] = new String[] {"\u70cf\u8332\u5225\u514b\u65af\u5766\u6642\u9593", "UZT",
- "\u70cf\u8332\u5225\u514b\u65af\u5766\u590f\u4ee4\u6642\u9593", "UZST"};
++ String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "AWST",
++ "\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "AWDT"};
++ String WST_SAMOA[] = new String[] {"\u897f\u85a9\u6469\u4e9e\u6642\u9593", "WSST",
+ "\u897f\u85a9\u6469\u4e9e\u590f\u4ee4\u6642\u9593", "WSDT"};
++ String XJT[] = new String[] {"\u4e2d\u570b\u6a19\u6e96\u6642\u9593", "XJT",
++ "\u4e2d\u570b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "XJDT"};
+ String YAKT[] = new String[] {"\u4e9e\u5eab\u6b21\u514b\u6642\u9593", "YAKT",
+ "\u4e9e\u5eab\u6b21\u514b\u590f\u4ee4\u6642\u9593", "YAKST"};
return new Object[][] {
{"America/Los_Angeles", PST},
-@@ -214,6 +220,7 @@
+@@ -214,6 +222,7 @@
{"America/Anchorage", AKST},
{"AST", AKST},
{"America/Halifax", AST},
@@ -3992,7 +4712,12 @@
{"America/St_Johns", NST},
{"CNT", NST},
{"Europe/Paris", CET},
-@@ -259,6 +266,7 @@
+@@ -255,10 +264,11 @@
+ {"Africa/Djibouti", EAT},
+ {"Africa/Douala", WAT},
+ {"Africa/El_Aaiun", WET},
+- {"Africa/Freetown", SLST},
++ {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT},
{"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST},
@@ -4000,7 +4725,7 @@
{"Africa/Kampala", EAT},
{"Africa/Khartoum", EAT},
{"Africa/Kigali", CAT},
-@@ -300,7 +308,7 @@
+@@ -300,7 +310,7 @@
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/Salta", AGT},
{"America/Argentina/San_Juan", AGT},
@@ -4009,7 +4734,7 @@
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
-@@ -309,6 +317,7 @@
+@@ -309,6 +319,7 @@
{"America/Atikokan", EST},
{"America/Atka", HAST},
{"America/Bahia", BRT},
@@ -4017,7 +4742,7 @@
{"America/Barbados", AST},
{"America/Belem", BRT},
{"America/Belize", CST},
-@@ -328,6 +337,7 @@
+@@ -328,6 +339,7 @@
"\u6cd5\u5c6c\u572d\u4e9e\u90a3\u590f\u4ee4\u6642\u9593", "GFST"}},
{"America/Cayman", EST},
{"America/Chihuahua", MST},
@@ -4025,7 +4750,7 @@
{"America/Coral_Harbour", EST},
{"America/Cordoba", AGT},
{"America/Costa_Rica", CST},
-@@ -339,7 +349,7 @@
+@@ -339,7 +351,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
@@ -4034,7 +4759,16 @@
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
-@@ -361,10 +371,10 @@
+@@ -348,7 +360,7 @@
+ {"America/Godthab", new String[] {"\u897f\u683c\u6797\u862d\u5cf6\u6642\u9593", "WGT",
+ "\u897f\u683c\u6797\u862d\u5cf6\u590f\u4ee4\u6642\u9593", "WGST"}},
+ {"America/Goose_Bay", AST},
+- {"America/Grand_Turk", EST},
++ {"America/Grand_Turk", AST},
+ {"America/Grenada", AST},
+ {"America/Guadeloupe", AST},
+ {"America/Guatemala", CST},
+@@ -361,10 +373,10 @@
{"America/Indiana/Indianapolis", EST},
{"America/Indiana/Knox", CST},
{"America/Indiana/Marengo", EST},
@@ -4048,7 +4782,7 @@
{"America/Indiana/Winamac", EST},
{"America/Inuvik", MST},
{"America/Iqaluit", EST},
-@@ -374,21 +384,25 @@
+@@ -374,21 +386,24 @@
{"America/Kentucky/Louisville", EST},
{"America/Kentucky/Monticello", EST},
{"America/Knox_IN", CST},
@@ -4070,12 +4804,11 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
-+ {"America/Metlakatla", new String[] {"\u6885\u7279\u62C9\u5361\u7279\u62C9\u6A19\u6E96\u6642\u9593", "MeST",
-+ "\u6885\u7279\u62C9\u5361\u7279\u62C9\u65E5\u5149\u7BC0\u7D04\u6642\u9593", "MeDT"}},
++ {"America/Metlakatla", PST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u6a19\u6e96\u6642\u9593", "PMST",
"\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PMDT"}},
-@@ -402,6 +416,7 @@
+@@ -402,6 +417,7 @@
{"America/Nipigon", EST},
{"America/Nome", AKST},
{"America/Noronha", NORONHA},
@@ -4083,7 +4816,7 @@
{"America/North_Dakota/Center", CST},
{"America/North_Dakota/New_Salem", CST},
{"America/Ojinaga", MST},
-@@ -411,15 +426,15 @@
+@@ -411,15 +427,15 @@
"\u8607\u5229\u5357\u590f\u4ee4\u6642\u9593", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
@@ -4102,7 +4835,7 @@
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
-@@ -428,7 +443,7 @@
+@@ -428,7 +444,7 @@
{"America/Sao_Paulo", BRT},
{"America/Scoresbysund", EGT},
{"America/Shiprock", MST},
@@ -4111,7 +4844,7 @@
{"America/St_Kitts", AST},
{"America/St_Lucia", AST},
{"America/St_Thomas", AST},
-@@ -446,10 +461,13 @@
+@@ -446,10 +462,13 @@
{"America/Winnipeg", CST},
{"America/Yakutat", AKST},
{"America/Yellowknife", MST},
@@ -4121,11 +4854,11 @@
{"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville \u6642\u9593", "DDUT",
"Dumont-d'Urville \u590f\u4ee4\u6642\u9593", "DDUST"}},
+ {"Antarctica/Macquarie", new String[] {"\u9EA5\u5938\u5229\u5CF6\u6642\u9593", "MIST",
-+ "\u9EA5\u5938\u5229\u5CF6\u590F\u4EE4\u6642\u9593", "MIST"}},
++ "\u9EA5\u5938\u5229\u5CF6\u590F\u4EE4\u6642\u9593", "MIDT"}},
{"Antarctica/Mawson", new String[] {"\u83ab\u68ee\u6642\u9593", "MAWT",
"\u83ab\u68ee\u590f\u4ee4\u6642\u9593", "MAWST"}},
{"Antarctica/McMurdo", NZST},
-@@ -459,6 +477,8 @@
+@@ -459,6 +478,8 @@
{"Antarctica/South_Pole", NZST},
{"Antarctica/Syowa", new String[] {"\u5915\u6b50\u74e6 (Syowa) \u6642\u9593", "SYOT",
"\u5915\u6b50\u74e6 (Syowa) \u590f\u4ee4\u6642\u9593", "SYOST"}},
@@ -4134,7 +4867,15 @@
{"Antarctica/Vostok", new String[] {"\u4f5b\u65af\u6258 (Vostok) \u6642\u9593", "VOST",
"\u4f5b\u65af\u6258 (Vostok) \u590f\u4ee4\u6642\u9593", "VOSST"}},
{"Arctic/Longyearbyen", CET},
-@@ -500,6 +520,7 @@
+@@ -485,6 +506,7 @@
+ {"Asia/Brunei", new String[] {"\u6c76\u840a\u6642\u9593", "BNT",
+ "\u6c76\u840a\u590f\u4ee4\u6642\u9593", "BNST"}},
+ {"Asia/Calcutta", IST},
++ {"Asia/Chita", IRKT},
+ {"Asia/Choibalsan", new String[] {"\u5de7\u5df4\u5c71 (Choibalsan) \u6642\u9593", "CHOT",
+ "\u5de7\u5df4\u5c71 (Choibalsan) \u590f\u4ee4\u6642\u9593", "CHOST"}},
+ {"Asia/Chongqing", CTT},
+@@ -500,27 +522,28 @@
"\u5854\u5409\u514b\u590f\u4ee4\u6642\u9593", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
@@ -4142,8 +4883,10 @@
{"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"\u4faf\u5fb7 (Hovd) \u6642\u9593", "HOVT",
-@@ -508,7 +529,7 @@
- "Irkutsk \u590f\u4ee4\u6642\u9593", "IRKST"}},
+ "\u4faf\u5fb7 (Hovd) \u590f\u4ee4\u6642\u9593", "HOVST"}},
+- {"Asia/Irkutsk", new String[] {"Irkutsk \u6642\u9593", "IRKT",
+- "Irkutsk \u590f\u4ee4\u6642\u9593", "IRKST"}},
++ {"Asia/Irkutsk", IRKT},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
- {"Asia/Jayapura", new String[] {"\u6771\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "EIT",
@@ -4151,29 +4894,49 @@
"\u6771\u5370\u5ea6\u5c3c\u897f\u4e9e\u590f\u65e5\u6642\u9593", "EIST"}},
{"Asia/Kabul", new String[] {"\u963f\u5bcc\u6c57\u6642\u9593", "AFT",
"\u963f\u5bcc\u6c57\u590f\u4ee4\u6642\u9593", "AFST"}},
-@@ -518,6 +539,8 @@
- {"Asia/Kashgar", CTT},
+ {"Asia/Kamchatka", new String[] {"Petropavlovsk-Kamchatski \u6642\u9593", "PETT",
+ "Petropavlovsk-Kamchatski \u590f\u4ee4\u6642\u9593", "PETST"}},
+ {"Asia/Karachi", PKT},
+- {"Asia/Kashgar", CTT},
++ {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
+ {"Asia/Khandyga", new String[] {"\u6F22\u5730\u52A0 (Khandyga) \u6642\u9593", "YAKT",
+ "\u6F22\u5730\u52A0 (Khandyga) \u590F\u4EE4\u6642\u9593", "YAKST"}},
{"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u6642\u9593", "KRAT",
- "\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u590f\u4ee4\u6642\u9593", "KRAST"}},
-@@ -554,7 +577,8 @@
+- {"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u6642\u9593", "KRAT",
+- "\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u590f\u4ee4\u6642\u9593", "KRAST"}},
++ {"Asia/Krasnoyarsk", KRAT},
+ {"Asia/Kuala_Lumpur", MYT},
+ {"Asia/Kuching", MYT},
+ {"Asia/Kuwait", ARAST},
+@@ -533,7 +556,7 @@
+ "\u83f2\u5f8b\u8cd3\u590f\u4ee4\u6642\u9593", "PHST"}},
+ {"Asia/Muscat", GST},
+ {"Asia/Nicosia", EET},
+- {"Asia/Novokuznetsk", NOVT},
++ {"Asia/Novokuznetsk", KRAT},
+ {"Asia/Novosibirsk", NOVT},
+ {"Asia/Oral", new String[] {"\u6b50\u4f5b\u6642\u9593", "ORAT",
+ "\u6b50\u4f5b\u590f\u4ee4\u6642\u9593", "ORAST"}},
+@@ -554,7 +577,10 @@
{"Asia/Samarkand", UZT},
{"Asia/Seoul", KST},
{"Asia/Singapore", SGT},
- {"Asia/Taipei", CTT},
++ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
++ "Srednekolymsk Daylight Time", "SREDT"}},
+ {"Asia/Taipei", new String[] {"\u53f0\u7063\u6a19\u6e96\u6642\u9593", "TST",
+ "\u53f0\u7063\u590f\u4ee4\u6642\u9593", "TDT"}},
{"Asia/Tel_Aviv", ISRAEL},
{"Asia/Tashkent", UZT},
{"Asia/Tbilisi", new String[] {"\u55ac\u6cbb\u4e9e\u6642\u9593", "GET",
-@@ -566,11 +590,11 @@
+@@ -565,12 +591,12 @@
+ {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
+- {"Asia/Urumqi", CTT},
++ {"Asia/Urumqi", XJT},
+ {"Asia/Ust-Nera", new String[] {"\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u6642\u9593", "VLAT",
+ "\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u590F\u4EE4\u6642\u9593", "VLAST"}},
{"Asia/Vientiane", ICT},
@@ -4186,18 +4949,18 @@
{"Asia/Yekaterinburg", new String[] {"Yekaterinburg \u6642\u9593", "YEKT",
"Yekaterinburg \u590f\u4ee4\u6642\u9593", "YEKST"}},
{"Asia/Yerevan", ARMT},
-@@ -597,8 +621,8 @@
+@@ -597,8 +623,8 @@
{"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN},
- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST",
- "Central Western Summer Time (Australia)", "CWST"}},
-+ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "CWST",
-+ "\u4E2D\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "CWST"}},
++ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "ACWST",
++ "\u4E2D\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "ACWDT"}},
{"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE},
-@@ -616,7 +640,7 @@
+@@ -616,7 +642,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
@@ -4206,7 +4969,7 @@
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
-@@ -654,6 +678,7 @@
+@@ -654,6 +680,7 @@
{"Europe/Bratislava", CET},
{"Europe/Brussels", CET},
{"Europe/Budapest", CET},
@@ -4214,16 +4977,7 @@
{"Europe/Chisinau", EET},
{"Europe/Copenhagen", CET},
{"Europe/Dublin", DUBLIN},
-@@ -663,7 +688,7 @@
- {"Europe/Isle_of_Man", GMTBST},
- {"Europe/Istanbul", EET},
- {"Europe/Jersey", GMTBST},
-- {"Europe/Kaliningrad", EET},
-+ {"Europe/Kaliningrad", FET},
- {"Europe/Kiev", EET},
- {"Europe/Lisbon", WET},
- {"Europe/Ljubljana", CET},
-@@ -672,7 +697,7 @@
+@@ -672,7 +699,7 @@
{"Europe/Madrid", CET},
{"Europe/Malta", CET},
{"Europe/Mariehamn", EET},
@@ -4232,7 +4986,7 @@
{"Europe/Monaco", CET},
{"Europe/Moscow", MSK},
{"Europe/Nicosia", EET},
-@@ -685,7 +710,7 @@
+@@ -685,7 +712,7 @@
"\u6c99\u99ac\u62c9\u590f\u4ee4\u6642\u9593", "SAMST"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
@@ -4241,7 +4995,17 @@
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},
-@@ -752,6 +777,7 @@
+@@ -697,8 +724,7 @@
+ {"Europe/Vatican", CET},
+ {"Europe/Vienna", CET},
+ {"Europe/Vilnius", EET},
+- {"Europe/Volgograd", new String[] {"\u4f0f\u723e\u52a0\u683c\u52d2\u6642\u9593", "VOLT",
+- "\u4f0f\u723e\u52a0\u683c\u52d2\u590f\u4ee4\u6642\u9593", "VOLST"}},
++ {"Europe/Volgograd", MSK},
+ {"Europe/Warsaw", CET},
+ {"Europe/Zagreb", CET},
+ {"Europe/Zaporozhye", EET},
+@@ -752,6 +778,7 @@
{"Pacific/Apia", WST_SAMOA},
{"Pacific/Auckland", NZST},
{"Pacific/Chatham", CHAST},
@@ -4249,7 +5013,7 @@
{"Pacific/Easter", EASTER},
{"Pacific/Efate", new String[] {"\u74e6\u5974\u963f\u5716\u6642\u9593", "VUT",
"\u74e6\u5974\u963f\u5716\u590f\u4ee4\u6642\u9593", "VUST"}},
-@@ -790,8 +816,8 @@
+@@ -790,8 +817,8 @@
{"Pacific/Palau", new String[] {"\u5e1b\u7409\u6642\u9593", "PWT",
"\u5e1b\u7409\u590f\u4ee4\u6642\u9593", "PWST"}},
{"Pacific/Pitcairn", PITCAIRN},
@@ -4260,7 +5024,7 @@
{"Pacific/Port_Moresby", new String[] {"\u5df4\u5e03\u4e9e\u65b0\u5e7e\u5167\u4e9e\u6642\u9593", "PGT",
"\u5df4\u5e03\u4e9e\u65b0\u5e7e\u5167\u4e9e\u590f\u4ee4\u6642\u9593", "PGST"}},
{"Pacific/Rarotonga", new String[] {"\u5eab\u514b\u7fa4\u5cf6\u6642\u9593", "CKT",
-@@ -804,12 +830,12 @@
+@@ -804,12 +831,12 @@
"\u5409\u4f2f\u7279\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "GILST"}},
{"Pacific/Tongatapu", new String[] {"\u6771\u52a0\u6642\u9593", "TOT",
"\u6771\u52a0\u590f\u4ee4\u6642\u9593", "TOST"}},
diff --git a/java/openjdk6/files/patch-set b/java/openjdk6/files/patch-set
index 615ba6e5595f..21767728e029 100644
--- a/java/openjdk6/files/patch-set
+++ b/java/openjdk6/files/patch-set
@@ -682,10 +682,19 @@
-#
-
-#
- # Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ # Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-@@ -221,6 +217,7 @@
+@@ -88,7 +84,7 @@
+ JVM_EnableCompiler;
+ JVM_Exit;
+ JVM_FillInStackTrace;
+- JVM_FindClassFromCaller
++ JVM_FindClassFromCaller;
+ JVM_FindClassFromClass;
+ JVM_FindClassFromClassLoader;
+ JVM_FindClassFromBootLoader;
+@@ -222,6 +218,7 @@
JVM_SetArrayElement;
JVM_SetClassSigners;
JVM_SetLength;
@@ -693,7 +702,7 @@
JVM_SetPrimitiveArrayElement;
JVM_SetProtectionDomain;
JVM_SetSockOpt;
-@@ -244,24 +241,6 @@
+@@ -245,24 +242,6 @@
JVM_Yield;
JVM_handle_bsd_signal;
@@ -726,10 +735,19 @@
-#
-
-#
- # Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ # Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-@@ -221,6 +217,7 @@
+@@ -88,7 +84,7 @@
+ JVM_EnableCompiler;
+ JVM_Exit;
+ JVM_FillInStackTrace;
+- JVM_FindClassFromCaller
++ JVM_FindClassFromCaller;
+ JVM_FindClassFromClass;
+ JVM_FindClassFromClassLoader;
+ JVM_FindClassFromBootLoader;
+@@ -222,6 +218,7 @@
JVM_SetArrayElement;
JVM_SetClassSigners;
JVM_SetLength;
@@ -737,7 +755,7 @@
JVM_SetPrimitiveArrayElement;
JVM_SetProtectionDomain;
JVM_SetSockOpt;
-@@ -244,24 +241,6 @@
+@@ -245,24 +242,6 @@
JVM_Yield;
JVM_handle_bsd_signal;
generated by cgit (git 2.34.1) at 2024-11-16 17:30:16 +0800