From owner-svn-ports-head@FreeBSD.ORG Fri Oct 17 05:00:21 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EBC2D97E; Fri, 17 Oct 2014 05:00:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D730D105; Fri, 17 Oct 2014 05:00:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9H50LOC003676; Fri, 17 Oct 2014 05:00:21 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9H50LWa003672; Fri, 17 Oct 2014 05:00:21 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201410170500.s9H50LWa003672@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Fri, 17 Oct 2014 05:00:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371027 - in head/java/openjdk6: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Oct 2014 05:00:22 -0000 Author: jkim Date: Fri Oct 17 05:00:20 2014 New Revision: 371027 URL: https://svnweb.freebsd.org/changeset/ports/371027 QAT: https://qat.redports.org/buildarchive/r371027/ Log: - Update to b33. - Update TimeZoneNames to tzdata2014g. Modified: head/java/openjdk6/Makefile head/java/openjdk6/distinfo head/java/openjdk6/files/patch-TimeZoneNames head/java/openjdk6/files/patch-set Modified: head/java/openjdk6/Makefile ============================================================================== --- head/java/openjdk6/Makefile Fri Oct 17 02:45:15 2014 (r371026) +++ head/java/openjdk6/Makefile Fri Oct 17 05:00:20 2014 (r371027) @@ -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}/ 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 Modified: head/java/openjdk6/distinfo ============================================================================== --- head/java/openjdk6/distinfo Fri Oct 17 02:45:15 2014 (r371026) +++ head/java/openjdk6/distinfo Fri Oct 17 05:00:20 2014 (r371027) @@ -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 Modified: head/java/openjdk6/files/patch-TimeZoneNames ============================================================================== --- head/java/openjdk6/files/patch-TimeZoneNames Fri Oct 17 02:45:15 2014 (r371026) +++ head/java/openjdk6/files/patch-TimeZoneNames Fri Oct 17 05:00:20 2014 (r371027) @@ -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", *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***