diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2015-01-24 00:02:00 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2015-01-24 00:02:00 +0000 |
| commit | d5ce7749e1392aa0a26701026878deadb19ff28a (patch) | |
| tree | 5c7c123482d0cefaf10d867024eea4882748df7f /java | |
| parent | Mark BROKEN: Missing headers with cld 20150113 (diff) | |
Update to b34.
Notes
Notes:
svn path=/head/; revision=377775
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk6-jre/Makefile | 1 | ||||
| -rw-r--r-- | java/openjdk6/Makefile | 17 | ||||
| -rw-r--r-- | java/openjdk6/distinfo | 4 | ||||
| -rw-r--r-- | java/openjdk6/files/patch-TimeZoneNames | 5041 | ||||
| -rw-r--r-- | java/openjdk6/files/patch-jdk_src_share_classes_java_util_CurrencyData.properties | 11 | ||||
| -rw-r--r-- | java/openjdk6/files/patch-set | 689 |
6 files changed, 351 insertions, 5412 deletions
diff --git a/java/openjdk6-jre/Makefile b/java/openjdk6-jre/Makefile index 2ba20c72c8b2..65624f4bb35c 100644 --- a/java/openjdk6-jre/Makefile +++ b/java/openjdk6-jre/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 0 CATEGORIES= java devel PKGNAMESUFFIX= -jre diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile index 59ffe9f82db8..4050e14adc9f 100644 --- a/java/openjdk6/Makefile +++ b/java/openjdk6/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= openjdk6 -PORTVERSION= b33 -PORTREVISION?= 0 +PORTVERSION= b34 +PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \ @@ -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= 14_oct_2014 +OPENJDK_BUILDDATE= 20_jan_2015 OPTIONS_DEFINE= ICEDTEA IPV6 POLICY SOUND TZUPDATE OPTIONS_DEFAULT=ICEDTEA IPV6 TZUPDATE @@ -142,6 +142,10 @@ MAKE_ENV+= SKIP_FASTDEBUG_BUILD=true MAKE_ENV+= DONT_ENABLE_IPV6="YES" .endif +.if ${PORT_OPTIONS:MPOLICY} +MAKE_ENV+= UNLIMITED_CRYPTO="YES" +.endif + .if ${PORT_OPTIONS:MSOUND} EXTRA_PATCHES+= ${FILESDIR}/alsa-enable.patch LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib @@ -248,13 +252,6 @@ post-patch: ${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp \ ${WRKSRC}/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java \ ${WRKSRC}/jdk/src/share/classes/sun/print/PSPrinterJob.java -.if ${PORT_OPTIONS:MPOLICY} - @${REINPLACE_CMD} -e 's|%%POLICY%%|unlimited|' \ - ${WRKSRC}/jdk/make/javax/crypto/Makefile -.else - @${REINPLACE_CMD} -e 's|%%POLICY%%|limited|' \ - ${WRKSRC}/jdk/make/javax/crypto/Makefile -.endif .if defined(BUILD_JRE) @${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${PREFIX}/openjdk6-jre|" \ ${WRKSRC}/hotspot/src/os/posix/launcher/java_md.c \ diff --git a/java/openjdk6/distinfo b/java/openjdk6/distinfo index ef3edbb352bc..23fb64d83869 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-b33-14_oct_2014.tar.xz) = cabc35587a90fa81edd8ba8537c0454348c37456de27e407bbb66d52031a1293 -SIZE (openjdk-6-src-b33-14_oct_2014.tar.xz) = 33476800 +SHA256 (openjdk-6-src-b34-20_jan_2015.tar.xz) = 13d1b4e1e152b6f9ad81b5558d6c7c0d3315a9e9494e49e515229722e2ee4e51 +SIZE (openjdk-6-src-b34-20_jan_2015.tar.xz) = 33601316 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 deleted file mode 100644 index 612168d157a7..000000000000 --- a/java/openjdk6/files/patch-TimeZoneNames +++ /dev/null @@ -1,5041 +0,0 @@ ---- jdk/src/share/classes/sun/util/resources/TimeZoneNames.java -+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved. - * 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", - "Chatham Daylight Time", "CHADT"}; -- String CIT[] = new String[] {"Central Indonesia Time", "CIT", -+ String ChST[] = new String[] {"Chamorro Standard Time", "ChST", -+ "Chamorro Daylight Time", "ChDT"}; -+ String CHUT[] = new String[] {"Chuuk Time", "CHUT", -+ "Chuuk Summer Time", "CHUST"}; -+ String CIT[] = new String[] {"Central Indonesia Time", "WITA", - "Central Indonesia Summer Time", "CIST"}; - String CLT[] = new String[] {"Chile Time", "CLT", - "Chile Summer Time", "CLST"}; -@@ -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[] {"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", -@@ -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"}; -+ String PONT[] = new String[] {"Pohnpei Time", "PONT", -+ "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"Pacific Standard Time", "PST", - "Pacific Daylight Time", "PDT"}; -- String RST[] = new String[] {"Eastern Standard Time", "EST", -- "Central Daylight Time", "CDT"}; -+ String SAMOA[] = new String[] {"Samoa Standard Time", "SST", -+ "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", - "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[] {"Australian Eastern Standard Time (Victoria)", "AEST", -+ "Australian Eastern Daylight Time (Victoria)", "AEDT"}; -+ String VLAT[] = new String[] {"Vladivostok Time", "VLAT", -+ "Vladivostok Summer Time", "VLAST"}; - String WAT[] = new String[] {"Western African Time", "WAT", - "Western African Summer Time", "WAST"}; - String WET[] = new String[] {"Western European Time", "WET", - "Western European Summer Time", "WEST"}; -- 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 SAMOA[] = new String[] {"Samoa Standard Time", "SST", -- "Samoa Daylight Time", "SDT"}; -- 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"}; -- String VICTORIA[] = new String[] {"Eastern Standard Time (Victoria)", "EST", -- "Eastern Summer Time (Victoria)", "EST"}; -- String UTC[] = new String[] {"Coordinated Universal Time", "UTC", -- "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 +222,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -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}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -300,7 +310,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -309,6 +319,7 @@ - {"America/Atikokan", EST}, - {"America/Atka", HAST}, - {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, - {"America/Barbados", AST}, - {"America/Belem", BRT}, - {"America/Belize", CST}, -@@ -328,6 +339,7 @@ - "French Guiana Summer Time", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -339,7 +351,7 @@ - {"America/Detroit", EST}, - {"America/Dominica", AST}, - {"America/Edmonton", MST}, -- {"America/Eirunepe", AMT}, -+ {"America/Eirunepe", ACT}, - {"America/El_Salvador", CST}, - {"America/Ensenada", PST}, - {"America/Fort_Wayne", EST}, -@@ -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}, -- {"America/Indiana/Petersburg", EST}, -- {"America/Indiana/Tell_City", CST}, -+ {"America/Indiana/Petersburg", EST}, -+ {"America/Indiana/Tell_City", CST}, - {"America/Indiana/Vevay", EST}, -- {"America/Indiana/Vincennes", EST}, -+ {"America/Indiana/Vincennes", EST}, - {"America/Indiana/Winamac", EST}, - {"America/Inuvik", MST}, - {"America/Iqaluit", EST}, -@@ -374,21 +386,24 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"Bolivia Time", "BOT", - "Bolivia Summer Time", "BOST"}}, - {"America/Lima", new String[] {"Peru Time", "PET", - "Peru Summer Time", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -- {"America/Marigot", AST}, -+ {"America/Marigot", AST}, - {"America/Martinique", AST}, - {"America/Matamoros", CST}, - {"America/Mazatlan", MST}, - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"America/Metlakatla", PST}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"Pierre & Miquelon Standard Time", "PMST", - "Pierre & Miquelon Daylight Time", "PMDT"}}, -@@ -402,6 +417,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Ojinaga", MST}, -@@ -411,15 +427,15 @@ - "Suriname Summer Time", "SRST"}}, - {"America/Port-au-Prince", EST}, - {"America/Port_of_Spain", AST}, -- {"America/Porto_Acre", AMT}, -+ {"America/Porto_Acre", ACT}, - {"America/Porto_Velho", AMT}, - {"America/Puerto_Rico", AST}, - {"America/Rainy_River", CST}, - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -- {"America/Rio_Branco", AMT}, -+ {"America/Resolute", CST}, -+ {"America/Rio_Branco", ACT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, - {"America/Santarem", BRT}, -@@ -428,7 +444,7 @@ - {"America/Sao_Paulo", BRT}, - {"America/Scoresbysund", EGT}, - {"America/Shiprock", MST}, -- {"America/St_Barthelemy", AST}, -+ {"America/St_Barthelemy", AST}, - {"America/St_Kitts", AST}, - {"America/St_Lucia", AST}, - {"America/St_Thomas", AST}, -@@ -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"}}, -+ {"Antarctica/Troll", new String[] {"Coordinated Universal Time", "UTC", -+ "Central European Summer Time", "CEST"}}, - {"Antarctica/Vostok", new String[] {"Vostok Time", "VOST", - "Vostok Summer Time", "VOSST"}}, - {"Arctic/Longyearbyen", CET}, -@@ -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}, -+ {"Asia/Hebron", EET}, - {"Asia/Ho_Chi_Minh", ICT}, - {"Asia/Hong_Kong", HKT}, - {"Asia/Hovd", new String[] {"Hovd Time", "HOVT", - "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", -+ {"Asia/Jayapura", new String[] {"East Indonesia Time", "WIT", - "East Indonesia Summer Time", "EIST"}}, - {"Asia/Kabul", new String[] {"Afghanistan Time", "AFT", - "Afghanistan Summer Time", "AFST"}}, - {"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"}}, -+ {"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", XJT}, -+ {"Asia/Ust-Nera", new String[] {"Ust-Nera Time", "VLAT", -+ "Ust-Nera Summer Time", "VLAST"}}, - {"Asia/Vientiane", ICT}, -- {"Asia/Vladivostok", new String[] {"Vladivostok Time", "VLAT", -- "Vladivostok Summer Time", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"Yakutsk Time", "YAKT", -- "Yakutsk Summer Time", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"Asia/Yekaterinburg", new String[] {"Yekaterinburg Time", "YEKT", - "Yekaterinburg Summer Time", "YEKST"}}, - {"Asia/Yerevan", ARMT}, -@@ -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}, -- {"Brazil/Acre", AMT}, -+ {"Brazil/Acre", ACT}, - {"Brazil/DeNoronha", NORONHA}, - {"Brazil/East", BRT}, - {"Brazil/West", AMT}, -@@ -657,6 +679,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -675,7 +698,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -688,7 +711,7 @@ - "Samara Summer Time", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", MSK}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, -@@ -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}, -+ {"Pacific/Chuuk", CHUT}, - {"Pacific/Easter", EASTER}, - {"Pacific/Efate", new String[] {"Vanuatu Time", "VUT", - "Vanuatu Summer Time", "VUST"}}, -@@ -793,8 +816,8 @@ - {"Pacific/Palau", new String[] {"Palau Time", "PWT", - "Palau Summer Time", "PWST"}}, - {"Pacific/Pitcairn", PITCAIRN}, -- {"Pacific/Ponape", new String[] {"Ponape Time", "PONT", -- "Ponape Summer Time", "PONST"}}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, - {"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 +830,12 @@ - "Gilbert Is. Summer Time", "GILST"}}, - {"Pacific/Tongatapu", new String[] {"Tonga Time", "TOT", - "Tonga Summer Time", "TOST"}}, -- {"Pacific/Truk", TRUT}, -+ {"Pacific/Truk", CHUT}, - {"Pacific/Wake", new String[] {"Wake Time", "WAKT", - "Wake Summer Time", "WAKST"}}, - {"Pacific/Wallis", new String[] {"Wallis & Futuna Time", "WFT", - "Wallis & Futuna Summer Time", "WFST"}}, -- {"Pacific/Yap", TRUT}, -+ {"Pacific/Yap", CHUT}, - {"Poland", CET}, - {"PRC", CTT}, - {"PST8PDT", PST}, ---- jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. - * 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 Normalzeit", "ACT", - "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)", "ACST", -+ "Zentrale Sommerzeit (S\u00FCdaustralien)", "ACDT"}; - String AGT[] = new String[] {"Argentinische Zeit", "ART", - "Argentinische Sommerzeit", "ARST"}; - String AKST[] = new String[] {"Alaska Normalzeit", "AKST", -@@ -61,10 +61,10 @@ - "Atlantik Sommerzeit", "ADT"}; - String BDT[] = new String[] {"Bangladesch Zeit", "BDT", - "Bangladesch Sommerzeit", "BDST"}; -- 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", -@@ -75,7 +75,11 @@ - "Mitteleurop\u00e4ische Sommerzeit", "MESZ"}; - String CHAST[] = new String[] {"Chatham Normalzeit", "CHAST", - "Chatham Sommerzeit", "CHADT"}; -- String CIT[] = new String[] {"Zentralindonesische Zeit", "CIT", -+ String ChST[] = new String[] {"Chamorro Normalzeit", "ChST", -+ "Chamorro Sommerzeit", "ChDT"}; -+ String CHUT[] = new String[] {"Chuuk Zeit", "CHUT", -+ "Chuuk Sommerzeit", "CHUST"}; -+ String CIT[] = new String[] {"Zentralindonesische Zeit", "WITA", - "Zentralindonesische Sommerzeit", "CIST"}; - String CLT[] = new String[] {"Chilenische Zeit", "CLT", - "Chilenische Sommerzeit", "CLST"}; -@@ -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[] {"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[] {"\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", -@@ -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"}; -+ String PONT[] = new String[] {"Pohnpei Zeit", "PONT", -+ "Pohnpei Sommerzeit", "PONST"}; - String PST[] = new String[] {"Pazifische Normalzeit", "PST", - "Pazifische Sommerzeit", "PDT"}; -- String RST[] = new String[] {"\u00d6stliche Normalzeit", "EST", -- "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", - "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 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", -- "Truk Sommerzeit", "TRUST"}; - String ULAT[]= new String[] {"Ulaanbaatar Zeit", "ULAT", - "Ulaanbaatar Sommerzeit", "ULAST"}; -- String WART[] = new String[] {"Argentinische Zeit", "WART", -- "Argentinische Sommerzeit", "WARST"}; -+ String UTC[] = new String[] {"Koordinierte Universalzeit", "UTC", -+ "Koordinierte Universalzeit", "UTC"}; -+ String UZT[] = new String[] {"Usbekistan Zeit", "UZT", -+ "Usbekistan Sommerzeit", "UZST"}; -+ String VICTORIA[] = new String[] {"\u00D6stliche Normalzeit (Victoria)", "AEST", -+ "\u00D6stliche Sommerzeit (Victoria)", "AEDT"}; -+ String VLAT[] = new String[] {"Wladiwostok Zeit", "VLAT", -+ "Wladiwostok Sommerzeit", "VLAST"}; - String WAT[] = new String[] {"Westafrikanische Zeit", "WAT", - "Westafrikanische Sommerzeit", "WAST"}; - String WET[] = new String[] {"Westeurop\u00e4ische Zeit", "WEZ", - "Westeurop\u00e4ische Sommerzeit", "WESZ"}; -- 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 SAMOA[] = new String[] {"Samoa Normalzeit", "SST", -- "Samoa Sommerzeit", "SDT"}; -- String WST_SAMOA[] = new String[] {"West Samoa Zeit", "WST", -- "West Samoa Sommerzeit", "WSST"}; -- String ChST[] = new String[] {"Chamorro Normalzeit", "ChST", -- "Chamorro Sommerzeit", "ChDT"}; -- String VICTORIA[] = new String[] {"\u00d6stliche Normalzeit (Victoria)", "EST", -- "\u00d6stliche Sommerzeit (Victoria)", "EST"}; -- String UTC[] = new String[] {"Koordinierte Universalzeit", "UTC", -- "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 +222,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -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}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -300,7 +310,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -309,6 +319,7 @@ - {"America/Atikokan", EST}, - {"America/Atka", HAST}, - {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, - {"America/Barbados", AST}, - {"America/Belem", BRT}, - {"America/Belize", CST}, -@@ -328,6 +339,7 @@ - "Franz\u00f6sisch-Guiana Sommerzeit", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -339,7 +351,7 @@ - {"America/Detroit", EST}, - {"America/Dominica", AST}, - {"America/Edmonton", MST}, -- {"America/Eirunepe", AMT}, -+ {"America/Eirunepe", ACT}, - {"America/El_Salvador", CST}, - {"America/Ensenada", PST}, - {"America/Fort_Wayne", EST}, -@@ -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}, -- {"America/Indiana/Petersburg", EST}, -- {"America/Indiana/Tell_City", CST}, -+ {"America/Indiana/Petersburg", EST}, -+ {"America/Indiana/Tell_City", CST}, - {"America/Indiana/Vevay", EST}, -- {"America/Indiana/Vincennes", EST}, -+ {"America/Indiana/Vincennes", EST}, - {"America/Indiana/Winamac", EST}, - {"America/Inuvik", MST}, - {"America/Iqaluit", EST}, -@@ -374,21 +386,24 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"Bolivianische Zeit", "BOT", - "Bolivianische Sommerzeit", "BOST"}}, - {"America/Lima", new String[] {"Peruanische Zeit", "PET", - "Peruanische Sommerzeit", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -- {"America/Marigot", AST}, -+ {"America/Marigot", AST}, - {"America/Martinique", AST}, - {"America/Matamoros", CST}, - {"America/Mazatlan", MST}, - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"America/Metlakatla", PST}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"Pierre & Miquelon Normalzeit", "PMST", - "Pierre & Miquelon Sommerzeit", "PMDT"}}, -@@ -402,6 +417,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Ojinaga", MST}, -@@ -411,15 +427,15 @@ - "Suriname Sommerzeit", "SRST"}}, - {"America/Port-au-Prince", EST}, - {"America/Port_of_Spain", AST}, -- {"America/Porto_Acre", AMT}, -+ {"America/Porto_Acre", ACT}, - {"America/Porto_Velho", AMT}, - {"America/Puerto_Rico", AST}, - {"America/Rainy_River", CST}, - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -- {"America/Rio_Branco", AMT}, -+ {"America/Resolute", CST}, -+ {"America/Rio_Branco", ACT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, - {"America/Santarem", BRT}, -@@ -428,7 +444,7 @@ - {"America/Sao_Paulo", BRT}, - {"America/Scoresbysund", EGT}, - {"America/Shiprock", MST}, -- {"America/St_Barthelemy", AST}, -+ {"America/St_Barthelemy", AST}, - {"America/St_Kitts", AST}, - {"America/St_Lucia", AST}, - {"America/St_Thomas", AST}, -@@ -446,10 +462,13 @@ - {"America/Winnipeg", CST}, - {"America/Yakutat", AKST}, - {"America/Yellowknife", MST}, -+ {"Antarctica/Casey", WST_AUS}, - {"Antarctica/Davis", new String[] {"Davis Zeit", "DAVT", - "Davis Sommerzeit", "DAVST"}}, - {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville Zeit", "DDUT", - "Dumont-d'Urville Sommerzeit", "DDUST"}}, -+ {"Antarctica/Macquarie", new String[] {"Macquarieinsel Zeit", "MIST", -+ "Macquarieinsel Sommerzeit", "MIDT"}}, - {"Antarctica/Mawson", new String[] {"Mawson Zeit", "MAWT", - "Mawson Sommerzeit", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -459,6 +478,8 @@ - {"Antarctica/South_Pole", NZST}, - {"Antarctica/Syowa", new String[] {"Syowa Zeit", "SYOT", - "Syowa Sommerzeit", "SYOST"}}, -+ {"Antarctica/Troll", new String[] {"Koordinierte Universalzeit", "UTC", -+ "Mitteleurop\u00e4ische Sommerzeit", "MESZ"}}, - {"Antarctica/Vostok", new String[] {"Vostok Zeit", "VOST", - "Vostok Sommerzeit", "VOSST"}}, - {"Arctic/Longyearbyen", CET}, -@@ -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}, -+ {"Asia/Hebron", EET}, - {"Asia/Ho_Chi_Minh", ICT}, - {"Asia/Hong_Kong", HKT}, - {"Asia/Hovd", new String[] {"Hovd Zeit", "HOVT", - "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", -+ {"Asia/Jayapura", new String[] {"Ostindonesische Zeit", "WIT", - "Ostindonesische Sommerzeit", "EIST"}}, - {"Asia/Kabul", new String[] {"Afghanistanische Zeit", "AFT", - "Afghanistanische Sommerzeit", "AFST"}}, - {"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"}}, -+ {"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", XJT}, -+ {"Asia/Ust-Nera", new String[] {"Ust-Nera Zeit", "VLAT", -+ "Ust-Nera Sommerzeit", "VLAST"}}, - {"Asia/Vientiane", ICT}, -- {"Asia/Vladivostok", new String[] {"Wladiwostok Zeit", "VLAT", -- "Wladiwostok Sommerzeit", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"Jakutsk Zeit", "YAKT", -- "Jakutsk Sommerzeit", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"Asia/Yekaterinburg", new String[] {"Jekaterinburger Zeit", "YEKT", - "Jekaterinburger Sommerzeit", "YEKST"}}, - {"Asia/Yerevan", ARMT}, -@@ -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)", "ACWST", -+ "Zentral-Westliche Sommerzeit (Australien)", "ACWDT"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, -@@ -616,7 +641,7 @@ - {"Australia/Yancowinna", BROKEN_HILL}, - {"BET", BRT}, - {"BST", BDT}, -- {"Brazil/Acre", AMT}, -+ {"Brazil/Acre", ACT}, - {"Brazil/DeNoronha", NORONHA}, - {"Brazil/East", BRT}, - {"Brazil/West", AMT}, -@@ -654,6 +679,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -672,7 +698,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -685,7 +711,7 @@ - "Samarische Sommerzeit", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", MSK}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, -@@ -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}, -+ {"Pacific/Chuuk", CHUT}, - {"Pacific/Easter", EASTER}, - {"Pacific/Efate", new String[] {"Vanuatu Zeit", "VUT", - "Vanuatu Sommerzeit", "VUST"}}, -@@ -790,8 +816,8 @@ - {"Pacific/Palau", new String[] {"Palau Zeit", "PWT", - "Palau Sommerzeit", "PWST"}}, - {"Pacific/Pitcairn", PITCAIRN}, -- {"Pacific/Ponape", new String[] {"Ponape Zeit", "PONT", -- "Ponape Sommerzeit", "PONST"}}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, - {"Pacific/Port_Moresby", new String[] {"Papua-Neuguinea Zeit", "PGT", - "Papua-Neuguinea Sommerzeit", "PGST"}}, - {"Pacific/Rarotonga", new String[] {"Cook-Inseln Zeit", "CKT", -@@ -804,12 +830,12 @@ - "Gilbert-Inseln Sommerzeit", "GILST"}}, - {"Pacific/Tongatapu", new String[] {"Tonga Zeit", "TOT", - "Tonga Sommerzeit", "TOST"}}, -- {"Pacific/Truk", TRUT}, -+ {"Pacific/Truk", CHUT}, - {"Pacific/Wake", new String[] {"Wake Zeit", "WAKT", - "Wake Sommerzeit", "WAKST"}}, - {"Pacific/Wallis", new String[] {"Wallis u. Futuna Zeit", "WFT", - "Wallis u. Futuna Sommerzeit", "WFST"}}, -- {"Pacific/Yap", TRUT}, -+ {"Pacific/Yap", CHUT}, - {"Poland", CET}, - {"PRC", CTT}, - {"PST8PDT", PST}, ---- jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. - * 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[] {"Hora de Acre", "ACT", - "Hora de verano de Acre", "ACST"}; -- String ADELAIDE[] = new String[] {"Hora est\u00e1ndar 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"}; - 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", -- "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", - "Hora de verano de Chatham", "CHADT"}; -- 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[] {"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,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)", "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", -- "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", -@@ -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[] {"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", - "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 TASMANIA[] = new String[] {"Hora est\u00e1ndar 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", -- "Hora de verano de Truk", "TRUST"}; - String ULAT[]= new String[] {"Hora de Ulan Bator", "ULAT", - "Hora de verano de Ulan Bator", "ULAST"}; -- String WART[] = new String[] {"Hora de Argentina", "WART", -- "Hora de verano de Argentina", "WARST"}; -+ String UTC[] = new String[] {"Hora Universal Coordinada", "UTC", -+ "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)", "AEST", -+ "Hora de verano del Este (Victoria)", "AEDT"}; -+ String VLAT[] = new String[] {"Hora de Vladivostok", "VLAT", -+ "Hora de verano de Vladivostok", "VLAST"}; - 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", - "Hora de verano de Europa Occidental", "WEST"}; -- String WIT[] = new String[] {"Hora de Indonesia Occidental", "WIT", -+ 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", -- "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", -- "Hora de verano de Samoa Occidental", "WSST"}; -- String ChST[] = new String[] {"Hora est\u00e1ndar de Chamorro", "ChST", -- "Hora de verano de Chamorro", "ChDT"}; -- String VICTORIA[] = new String[] {"Hora est\u00e1ndar del Este (Victoria)", "EST", -- "Hora de verano del Este (Victoria)", "EST"}; -- String UTC[] = new String[] {"Hora Universal Coordinada", "UTC", -- "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 +222,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -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}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -300,7 +310,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -309,6 +319,7 @@ - {"America/Atikokan", EST}, - {"America/Atka", HAST}, - {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, - {"America/Barbados", AST}, - {"America/Belem", BRT}, - {"America/Belize", CST}, -@@ -328,6 +339,7 @@ - "Hora de verano de la Guayana Francesa", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -339,7 +351,7 @@ - {"America/Detroit", EST}, - {"America/Dominica", AST}, - {"America/Edmonton", MST}, -- {"America/Eirunepe", AMT}, -+ {"America/Eirunepe", ACT}, - {"America/El_Salvador", CST}, - {"America/Ensenada", PST}, - {"America/Fort_Wayne", EST}, -@@ -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}, -- {"America/Indiana/Petersburg", EST}, -- {"America/Indiana/Tell_City", CST}, -+ {"America/Indiana/Petersburg", EST}, -+ {"America/Indiana/Tell_City", CST}, - {"America/Indiana/Vevay", EST}, -- {"America/Indiana/Vincennes", EST}, -+ {"America/Indiana/Vincennes", EST}, - {"America/Indiana/Winamac", EST}, - {"America/Inuvik", MST}, - {"America/Iqaluit", EST}, -@@ -374,21 +386,24 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"Hora de Bolivia", "BOT", - "Hora de verano de Bolivia", "BOST"}}, - {"America/Lima", new String[] {"Hora de Per\u00fa", "PET", - "Hora de verano de Per\u00fa", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -- {"America/Marigot", AST}, -+ {"America/Marigot", AST}, - {"America/Martinique", AST}, - {"America/Matamoros", CST}, - {"America/Mazatlan", MST}, - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"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 +417,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Ojinaga", MST}, -@@ -411,15 +427,15 @@ - "Hora de verano de Surinam", "SRST"}}, - {"America/Port-au-Prince", EST}, - {"America/Port_of_Spain", AST}, -- {"America/Porto_Acre", AMT}, -+ {"America/Porto_Acre", ACT}, - {"America/Porto_Velho", AMT}, - {"America/Puerto_Rico", AST}, - {"America/Rainy_River", CST}, - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -- {"America/Rio_Branco", AMT}, -+ {"America/Resolute", CST}, -+ {"America/Rio_Branco", ACT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, - {"America/Santarem", BRT}, -@@ -428,7 +444,7 @@ - {"America/Sao_Paulo", BRT}, - {"America/Scoresbysund", EGT}, - {"America/Shiprock", MST}, -- {"America/St_Barthelemy", AST}, -+ {"America/St_Barthelemy", AST}, - {"America/St_Kitts", AST}, - {"America/St_Lucia", AST}, - {"America/St_Thomas", AST}, -@@ -446,10 +462,13 @@ - {"America/Winnipeg", CST}, - {"America/Yakutat", AKST}, - {"America/Yellowknife", MST}, -+ {"Antarctica/Casey", WST_AUS}, - {"Antarctica/Davis", new String[] {"Hora de Davis", "DAVT", - "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[] {"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 +478,8 @@ - {"Antarctica/South_Pole", NZST}, - {"Antarctica/Syowa", new String[] {"Hora de Syowa", "SYOT", - "Hora de verano de Syowa", "SYOST"}}, -+ {"Antarctica/Troll", new String[] {"Hora Universal Coordinada", "UTC", -+ "Hora de verano de Europa Central", "CEST"}}, - {"Antarctica/Vostok", new String[] {"Hora de Vostok", "VOST", - "Hora de verano de Vostok", "VOSST"}}, - {"Arctic/Longyearbyen", CET}, -@@ -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}, -+ {"Asia/Hebron", EET}, - {"Asia/Ho_Chi_Minh", ICT}, - {"Asia/Hong_Kong", HKT}, - {"Asia/Hovd", new String[] {"Hora de Hovd", "HOVT", - "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", -+ {"Asia/Jayapura", new String[] {"Hora de Indonesia Oriental", "WIT", - "Hora de verano de Indonesia Oriental", "EIST"}}, - {"Asia/Kabul", new String[] {"Hora de Afganist\u00e1n", "AFT", - "Hora de verano de Afganist\u00e1n", "AFST"}}, - {"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"}}, -+ {"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", KRAT}, - {"Asia/Novosibirsk", NOVT}, - {"Asia/Oral", new String[] {"Hora de Uralsk", "ORAT", - "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", XJT}, -+ {"Asia/Ust-Nera", new String[] {"Hora de Ust-Nera", "VLAT", -+ "Hora de verano de Ust-Nera", "VLAST"}}, - {"Asia/Vientiane", ICT}, -- {"Asia/Vladivostok", new String[] {"Hora de Vladivostok", "VLAT", -- "Hora de verano de Vladivostok", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"Hora de Yakutsk", "YAKT", -- "Hora de verano de Yakutsk", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"Asia/Yekaterinburg", new String[] {"Hora de Ekaterinburgo", "YEKT", - "Hora de verano de Ekaterinburgo", "YEKST"}}, - {"Asia/Yerevan", ARMT}, -@@ -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", "ACWST", -+ "Hora est\u00E1ndar de verano de Australia Central y Occidental", "ACWDT"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, -@@ -617,7 +641,7 @@ - {"Australia/Yancowinna", BROKEN_HILL}, - {"BET", BRT}, - {"BST", BDT}, -- {"Brazil/Acre", AMT}, -+ {"Brazil/Acre", ACT}, - {"Brazil/DeNoronha", NORONHA}, - {"Brazil/East", BRT}, - {"Brazil/West", AMT}, -@@ -655,6 +679,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -673,7 +698,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -686,7 +711,7 @@ - "Hora de verano de Samara", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", MSK}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, -@@ -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}, -+ {"Pacific/Chuuk", CHUT}, - {"Pacific/Easter", EASTER}, - {"Pacific/Efate", new String[] {"Hora de Vanuatu", "VUT", - "Hora de verano de Vanuatu", "VUST"}}, -@@ -791,8 +816,8 @@ - {"Pacific/Palau", new String[] {"Hora de Palau", "PWT", - "Hora de verano de Palau", "PWST"}}, - {"Pacific/Pitcairn", PITCAIRN}, -- {"Pacific/Ponape", new String[] {"Hora de Ponape", "PONT", -- "Hora de verano de Ponape", "PONST"}}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, - {"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 +830,12 @@ - "Hora de verano de las islas Gilbert", "GILST"}}, - {"Pacific/Tongatapu", new String[] {"Hora de Tonga", "TOT", - "Hora de verano de Tonga", "TOST"}}, -- {"Pacific/Truk", TRUT}, -+ {"Pacific/Truk", CHUT}, - {"Pacific/Wake", new String[] {"Hora de Wake", "WAKT", - "Hora de verano de Wake", "WAKST"}}, - {"Pacific/Wallis", new String[] {"Hora de Wallis y Futuna", "WFT", - "Hora de verano de Wallis y Futuna", "WFST"}}, -- {"Pacific/Yap", TRUT}, -+ {"Pacific/Yap", CHUT}, - {"Poland", CET}, - {"PRC", CTT}, - {"PST8PDT", PST}, ---- jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. - * 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,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", -- "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"}; - String AKST[] = new String[] {"Heure normale d'Alaska", "AKST", -- "Heure avanc\u00e9e d'Alaska", "AKDT"} ; -+ "Heure avanc\u00e9e d'Alaska", "AKDT"}; - String AMT[] = new String[] {"Heure normale d'Amazonie", "AMT", -- "Heure d'\u00e9t\u00e9 d'Amazonie", "AMST"} ; -+ "Heure d'\u00e9t\u00e9 d'Amazonie", "AMST"}; - String ARAST[] = new String[] {"Heure normale d'Arabie", "AST", -- "Heure avanc\u00e9e d'Arabie", "ADT"} ; -+ "Heure avanc\u00e9e d'Arabie", "ADT"}; - String ARMT[] = new String[] {"Heure d'Arm\u00e9nie", "AMT", -- "Heure d'\u00e9t\u00e9 d'Arm\u00e9nie", "AMST"} ; -+ "Heure d'\u00e9t\u00e9 d'Arm\u00e9nie", "AMST"}; - String AST[] = new String[] {"Heure normale de l'Atlantique", "AST", -- "Heure avanc\u00e9e de l'Atlantique", "ADT"} ; -+ "Heure avanc\u00e9e de l'Atlantique", "ADT"}; - String BDT[] = new String[] {"Heure du Bangladesh", "BDT", -- "Heure d'\u00e9t\u00e9 du Bangladesh", "BDST"} ; -- String BRISBANE[] = new String[] {"Heure standard 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", -- "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"}; - String BTT[] = new String[] {"Heure du Bhoutan", "BTT", -- "Heure d'\u00e9t\u00e9 du Bhoutan", "BTST"} ; -+ "Heure d'\u00e9t\u00e9 du Bhoutan", "BTST"}; - String CAT[] = new String[] {"Heure d'Afrique centrale", "CAT", -- "Heure d'\u00e9t\u00e9 d'Afrique centrale", "CAST"} ; -+ "Heure d'\u00e9t\u00e9 d'Afrique centrale", "CAST"}; - String CET[] = new String[] {"Heure d'Europe centrale", "CET", -- "Heure d'\u00e9t\u00e9 d'Europe centrale", "CEST"} ; -+ "Heure d'\u00e9t\u00e9 d'Europe centrale", "CEST"}; - String CHAST[] = new String[] {"Heure standard de Chatham", "CHAST", - "Heure avanc\u00e9e de Chatham", "CHADT"}; -- String CIT[] = new String[] {"Heure d'Indon\u00e9sie centrale", "CIT", -+ String ChST[] = new String[] {"Heure normale des \u00eeles Mariannes", "ChST", -+ "Heure d'\u00e9t\u00e9 des \u00eeles Mariannes", "ChDT"}; -+ String CHUT[] = new String[] {"Heure de Chuuk", "CHUT", -+ "Heure d'\u00E9t\u00E9 de Chuuk", "CHUST"}; -+ String CIT[] = new String[] {"Heure d'Indon\u00e9sie centrale", "WITA", - "Heure d'\u00e9t\u00e9 d'Indon\u00e9sie centrale", "CIST"}; - String CLT[] = new String[] {"Heure du Chili", "CLT", -- "Heure d'\u00e9t\u00e9 du Chili", "CLST"} ; -+ "Heure d'\u00e9t\u00e9 du Chili", "CLST"}; - String CST[] = new String[] {"Heure normale du Centre", "CST", -- "Heure avanc\u00e9e du Centre", "CDT"} ; -+ "Heure avanc\u00e9e du Centre", "CDT"}; - String CTT[] = new String[] {"Heure normale de Chine", "CST", -- "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)", "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", -- "Heure d'\u00e9t\u00e9 d'Afrique de l'Est", "EAST"} ; -+ "Heure d'\u00e9t\u00e9 d'Afrique de l'Est", "EAST"}; - String EASTER[] = new String[] {"Heure de l'Ile de P\u00e2ques", "EAST", - "Heure d'\u00e9t\u00e9 de l'Ile de P\u00e2ques", "EASST"}; - String EET[] = new String[] {"Heure d'Europe de l'Est", "EET", -- "Heure d'\u00e9t\u00e9 d'Europe de l'Est", "EEST"} ; -+ "Heure d'\u00e9t\u00e9 d'Europe de l'Est", "EEST"}; - String EGT[] = new String[] {"Heure du Groenland de l'Est", "EGT", -- "Heure d'\u00e9t\u00e9 du Groenland de l'Est", "EGST"} ; -+ "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"} ; -- 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 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", - "Heure d'\u00e9t\u00e9 du Ghana", "GHST"}; - String GAMBIER[] = new String[] {"Heure de Gambi", "GAMT", - "Heure d'\u00e9t\u00e9 de Gambi", "GAMST"}; - String GMT[] = new String[] {"Heure de Greenwich", "GMT", -- "Heure de Greenwich", "GMT"} ; -+ "Heure de Greenwich", "GMT"}; - String GMTBST[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT", - "Heure d'\u00e9t\u00e9 britannique", "BST"}; - String GST[] = new String[] {"Heure normale du Golfe", "GST", -- "Heure avanc\u00e9e du Golfe", "GDT"} ; -+ "Heure avanc\u00e9e du Golfe", "GDT"}; - String HAST[] = new String[] {"Heure normale d'Hawa\u00ef-Al\u00e9outiennes", "HAST", -- "Heure avanc\u00e9e d'Hawa\u00ef-Al\u00e9outiennes", "HADT"} ; -+ "Heure avanc\u00e9e d'Hawa\u00ef-Al\u00e9outiennes", "HADT"}; - String HKT[] = new String[] {"Heure de Hong Kong", "HKT", - "Heure d'\u00e9t\u00e9 de Hong Kong", "HKST"}; - String HST[] = new String[] {"Heure normale d'Hawa\u00ef", "HST", -- "Heure avanc\u00e9e d'Hawa\u00ef", "HDT"} ; -+ "Heure avanc\u00e9e d'Hawa\u00ef", "HDT"}; - String ICT[] = new String[] {"Heure d'Indochine", "ICT", -- "Heure d'\u00e9t\u00e9 d'Indochine", "ICST"} ; -+ "Heure d'\u00e9t\u00e9 d'Indochine", "ICST"}; - String IRT[] = new String[] {"Heure normale d'Iran", "IRST", -- "Heure avanc\u00e9e d'Iran", "IRDT"} ; -+ "Heure avanc\u00e9e d'Iran", "IRDT"}; - String ISRAEL[] = new String[] {"Heure standard d'Isra\u00ebl", "IST", - "Heure avanc\u00e9e d'Isra\u00ebl", "IDT"}; - String IST[] = new String[] {"Heure normale d'Inde", "IST", -- "Heure avanc\u00e9e d'Inde", "IDT"} ; -+ "Heure avanc\u00e9e d'Inde", "IDT"}; - 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", "LHDT"}; - String MHT[] = new String[] {"Heure des Iles Marshall", "MHT", - "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", -- "Heure avanc\u00e9e des Rocheuses", "MDT"} ; -+ "Heure avanc\u00e9e des Rocheuses", "MDT"}; - 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 +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", -- "Heure avanc\u00e9e de Terre-Neuve", "NDT"} ; -+ "Heure avanc\u00e9e de Terre-Neuve", "NDT"}; - String NZST[] = new String[] {"Heure normale de Nouvelle-Z\u00e9lande", "NZST", -- "Heure avanc\u00e9e de Nouvelle-Z\u00e9lande", "NZDT"} ; -+ "Heure avanc\u00e9e de Nouvelle-Z\u00e9lande", "NZDT"}; - String PITCAIRN[] = new String[] {"Heure standard des Pitcairn", "PST", - "heure avanc\u00e9e des Pitcairn", "PDT"}; - String PKT[] = new String[] {"Heure du Pakistan", "PKT", -- "Heure d'\u00e9t\u00e9 du Pakistan", "PKST"} ; -+ "Heure d'\u00e9t\u00e9 du Pakistan", "PKST"}; -+ String PONT[] = new String[] {"Heure de Pohnpei", "PONT", -+ "Heure d'\u00E9t\u00E9 de Pohnpei", "PONST"}; - String PST[] = new String[] {"Heure normale du Pacifique", "PST", -- "Heure avanc\u00e9e du Pacifique", "PDT"} ; -- String RST[] = new String[] {"Heure normale de l'Est", "EST", -- "Heure avanc\u00e9e du Centre", "CDT"} ; -+ "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"}; - String SBT[] = new String[] {"Heure des \u00celes Salomon", "SBT", -- "Heure d'\u00e9t\u00e9 des \u00celes Salomon", "SBST"} ; -+ "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", -- "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", -- "Heure d'\u00e9t\u00e9 de Truk", "TRUST"}; -+ "Heure d'\u00e9t\u00e9 du Turkm\u00e9nistan", "TMST"}; - String ULAT[]= new String[] {"Heure de l'Ulaanbaatar", "ULAT", -- "Heure d'\u00e9t\u00e9 de l'Ulaanbaatar", "ULAST"} ; -- String WART[] = new String[] {"Heure D'Argentine", "WART", -- "Heure d'\u00e9t\u00e9 D'Argentine", "WARST"} ; -- 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", "WIT", -- "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"}; -- 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"}; -+ "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 +222,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -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}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -300,7 +310,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -309,6 +319,7 @@ - {"America/Atikokan", EST}, - {"America/Atka", HAST}, - {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, - {"America/Barbados", AST}, - {"America/Belem", BRT}, - {"America/Belize", CST}, -@@ -328,6 +339,7 @@ - "Heure d'\u00e9t\u00e9 de Guyane fran\u00e7aise", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -339,7 +351,7 @@ - {"America/Detroit", EST}, - {"America/Dominica", AST}, - {"America/Edmonton", MST}, -- {"America/Eirunepe", AMT}, -+ {"America/Eirunepe", ACT}, - {"America/El_Salvador", CST}, - {"America/Ensenada", PST}, - {"America/Fort_Wayne", EST}, -@@ -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}, -- {"America/Indiana/Petersburg", EST}, -- {"America/Indiana/Tell_City", CST}, -+ {"America/Indiana/Petersburg", EST}, -+ {"America/Indiana/Tell_City", CST}, - {"America/Indiana/Vevay", EST}, -- {"America/Indiana/Vincennes", EST}, -+ {"America/Indiana/Vincennes", EST}, - {"America/Indiana/Winamac", EST}, - {"America/Inuvik", MST}, - {"America/Iqaluit", EST}, -@@ -374,21 +386,24 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"Heure de Bolivie", "BOT", - "Heure d'\u00e9t\u00e9 de Bolivie", "BOST"}}, - {"America/Lima", new String[] {"Heure du P\u00e9rou", "PET", - "Heure d'\u00e9t\u00e9 du P\u00e9rou", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -- {"America/Marigot", AST}, -+ {"America/Marigot", AST}, - {"America/Martinique", AST}, - {"America/Matamoros", CST}, - {"America/Mazatlan", MST}, - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"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 +417,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Ojinaga", MST}, -@@ -411,15 +427,15 @@ - "Heure d'\u00e9t\u00e9 du Surinam", "SRST"}}, - {"America/Port-au-Prince", EST}, - {"America/Port_of_Spain", AST}, -- {"America/Porto_Acre", AMT}, -+ {"America/Porto_Acre", ACT}, - {"America/Porto_Velho", AMT}, - {"America/Puerto_Rico", AST}, - {"America/Rainy_River", CST}, - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -- {"America/Rio_Branco", AMT}, -+ {"America/Resolute", CST}, -+ {"America/Rio_Branco", ACT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, - {"America/Santarem", BRT}, -@@ -428,7 +444,7 @@ - {"America/Sao_Paulo", BRT}, - {"America/Scoresbysund", EGT}, - {"America/Shiprock", MST}, -- {"America/St_Barthelemy", AST}, -+ {"America/St_Barthelemy", AST}, - {"America/St_Kitts", AST}, - {"America/St_Lucia", AST}, - {"America/St_Thomas", AST}, -@@ -446,10 +462,13 @@ - {"America/Winnipeg", CST}, - {"America/Yakutat", AKST}, - {"America/Yellowknife", MST}, -+ {"Antarctica/Casey", WST_AUS}, - {"Antarctica/Davis", new String[] {"Heure de Davis", "DAVT", - "Heure d'\u00e9t\u00e9 de Davis", "DAVST"}}, - {"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", "MIDT"}}, - {"Antarctica/Mawson", new String[] {"Heure de Mawson", "MAWT", - "Heure d'\u00e9t\u00e9 de Mawson", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -459,6 +478,8 @@ - {"Antarctica/South_Pole", NZST}, - {"Antarctica/Syowa", new String[] {"Heure de Syowa", "SYOT", - "Heure d'\u00e9t\u00e9 de Syowa", "SYOST"}}, -+ {"Antarctica/Troll", new String[] {"Temps universel coordonn\u00e9", "UTC", -+ "Heure d'\u00e9t\u00e9 d'Europe centrale", "CEST"}}, - {"Antarctica/Vostok", new String[] {"Heure de Vostok", "VOST", - "Heure d'\u00e9t\u00e9 de Vostok", "VOSST"}}, - {"Arctic/Longyearbyen", CET}, -@@ -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}, -+ {"Asia/Hebron", EET}, - {"Asia/Ho_Chi_Minh", ICT}, - {"Asia/Hong_Kong", HKT}, - {"Asia/Hovd", new String[] {"Heure de Hovd", "HOVT", - "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", -+ {"Asia/Jayapura", new String[] {"Heure d'Indon\u00e9sie orientale", "WIT", - "Heure d'\u00e9t\u00e9 d'Indon\u00e9sie orientale", "EIST"}}, - {"Asia/Kabul", new String[] {"Heure d'Afghanistan", "AFT", - "Heure d'\u00e9t\u00e9 d'Afghanistan", "AFST"}}, - {"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"}}, -+ {"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", XJT}, -+ {"Asia/Ust-Nera", new String[] {"Heure d'Ust-Nera", "VLAT", -+ "Heure d'\u00E9t\u00E9 d'Ust-Nera", "VLAST"}}, - {"Asia/Vientiane", ICT}, -- {"Asia/Vladivostok", new String[] {"Heure de Vladivostok", "VLAT", -- "Heure d'\u00e9t\u00e9 de Vladivostok", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"Heure du Iakoutsk", "YAKT", -- "Heure d'\u00e9t\u00e9 du Iakoutsk", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"Asia/Yekaterinburg", new String[] {"Heure de Yekaterinburg", "YEKT", - "Heure d'\u00e9t\u00e9 de Yekaterinburg", "YEKST"}}, - {"Asia/Yerevan", ARMT}, -@@ -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)", "ACWST", -+ "Heure d'\u00E9t\u00E9 de l'Australie occidentale (centre)", "ACWDT"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, -@@ -616,7 +641,7 @@ - {"Australia/Yancowinna", BROKEN_HILL}, - {"BET", BRT}, - {"BST", BDT}, -- {"Brazil/Acre", AMT}, -+ {"Brazil/Acre", ACT}, - {"Brazil/DeNoronha", NORONHA}, - {"Brazil/East", BRT}, - {"Brazil/West", AMT}, -@@ -654,6 +679,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -672,7 +698,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -685,7 +711,7 @@ - "Heure d'\u00e9t\u00e9 de Samara", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", MSK}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, -@@ -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}, -+ {"Pacific/Chuuk", CHUT}, - {"Pacific/Easter", EASTER}, - {"Pacific/Efate", new String[] {"Heure du Vanuatu", "VUT", - "Heure d'\u00e9t\u00e9 du Vanuatu", "VUST"}}, -@@ -790,8 +816,8 @@ - {"Pacific/Palau", new String[] {"Heure de Palaos", "PWT", - "Heure d'\u00e9t\u00e9 de Palaos", "PWST"}}, - {"Pacific/Pitcairn", PITCAIRN}, -- {"Pacific/Ponape", new String[] {"Heure de Ponap\u00e9", "PONT", -- "Heure d'\u00e9t\u00e9 de Ponap\u00e9", "PONST"}}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, - {"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 +830,12 @@ - "Heure d'\u00e9t\u00e9 de Kiribati", "GILST"}}, - {"Pacific/Tongatapu", new String[] {"Heure de Tonga", "TOT", - "Heure d'\u00e9t\u00e9 de Tonga", "TOST"}}, -- {"Pacific/Truk", TRUT}, -+ {"Pacific/Truk", CHUT}, - {"Pacific/Wake", new String[] {"Heure de Wake", "WAKT", - "Heure d'\u00e9t\u00e9 de Wake", "WAKST"}}, - {"Pacific/Wallis", new String[] {"Heure de Wallis et Futuna", "WFT", - "Heure d'\u00e9t\u00e9 de Wallis et Futuna", "WFST"}}, -- {"Pacific/Yap", TRUT}, -+ {"Pacific/Yap", CHUT}, - {"Poland", CET}, - {"PRC", CTT}, - {"PST8PDT", PST}, ---- jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. - * 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[] {"Ora di Acre", "ACT", - "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)", "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,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", -- "Ora estiva orientale (Queensland)", "EST"}; -- String BROKEN_HILL[] = new String[] {"Ora centrale standard (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", - "Ora legale di Chatham", "CHADT"}; -- String CIT[] = new String[] {"Ora dell'Indonesia centrale", "CIT", -+ String CHUT[] = new String[] {"Ora di Chuuk", "CHUT", -+ "Ora estiva di Chuuk", "CHUST"}; -+ String ChST[] = new String[] {"Ora standard di Chamorro", "ChST", -+ "Ora legale di Chamorro", "ChDT"}; -+ String CIT[] = new String[] {"Ora dell'Indonesia centrale", "WITA", - "Ora estiva dell'Indonesia centrale", "CIST"}; - String CLT[] = new String[] {"Ora del Cile", "CLT", - "Ora estiva del Cile", "CLST"}; -@@ -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)", "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", -- "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", -@@ -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"}; -+ String PONT[] = new String[] {"Ora di Pohnpei", "PONT", -+ "Ora estiva di Pohnpei", "PONST"}; - String PST[] = new String[] {"Ora solare della costa occidentale USA", "PST", - "Ora legale della costa occidentale USA", "PDT"}; -- String RST[] = new String[] {"Ora solare USA orientale", "EST", -- "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", - "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 TASMANIA[] = new String[] {"Ora orientale standard (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", -- "Ora estiva di Truk", "TRUST"}; - String ULAT[]= new String[] {"Ora di Ulaanbaatar", "ULAT", - "Ora estiva di Ulaanbaatar", "ULAST"}; -- String WART[] = new String[] {"Ora dell'Argentina", "WART", -- "Ora estiva dell'Argentina", "WARST"}; -+ String UTC[] = new String[] {"Tempo universale coordinato", "UTC", -+ "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)", "AEST", -+ "Ora estiva orientale (Victoria)", "AEDT"}; -+ String VLAT[] = new String[] {"Ora di Vladivostok", "VLAT", -+ "Ora estiva di Vladivostok", "VLAST"}; - String WAT[] = new String[] {"Ora dell'Africa occidentale", "WAT", - "Ora estiva dell'Africa occidentale", "WAST"}; - String WET[] = new String[] {"Ora dell'Europa occidentale", "WET", - "Ora estiva dell'Europa occidentale", "WEST"}; -- String WIT[] = new String[] {"Ora dell'Indonesia occidentale", "WIT", -+ 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", -- "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", -- "Ora estiva di Samoa", "WSST"}; -- String ChST[] = new String[] {"Ora standard di Chamorro", "ChST", -- "Ora legale di Chamorro", "ChDT"}; -- String VICTORIA[] = new String[] {"Ora orientale standard (Victoria)", "EST", -- "Ora estiva orientale (Victoria)", "EST"}; -- String UTC[] = new String[] {"Tempo universale coordinato", "UTC", -- "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 +222,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -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}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -300,7 +310,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -309,6 +319,7 @@ - {"America/Atikokan", EST}, - {"America/Atka", HAST}, - {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, - {"America/Barbados", AST}, - {"America/Belem", BRT}, - {"America/Belize", CST}, -@@ -328,6 +339,7 @@ - "Ora estiva della Guyana Francese", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -339,7 +351,7 @@ - {"America/Detroit", EST}, - {"America/Dominica", AST}, - {"America/Edmonton", MST}, -- {"America/Eirunepe", AMT}, -+ {"America/Eirunepe", ACT}, - {"America/El_Salvador", CST}, - {"America/Ensenada", PST}, - {"America/Fort_Wayne", EST}, -@@ -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}, -- {"America/Indiana/Petersburg", EST}, -- {"America/Indiana/Tell_City", CST}, -+ {"America/Indiana/Petersburg", EST}, -+ {"America/Indiana/Tell_City", CST}, - {"America/Indiana/Vevay", EST}, -- {"America/Indiana/Vincennes", EST}, -+ {"America/Indiana/Vincennes", EST}, - {"America/Indiana/Winamac", EST}, - {"America/Inuvik", MST}, - {"America/Iqaluit", EST}, -@@ -374,21 +386,24 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"Ora della Bolivia", "BOT", - "Ora estiva della Bolivia", "BOST"}}, - {"America/Lima", new String[] {"Ora del Per\u00f9", "PET", - "Ora estiva del Per\u00f9", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -- {"America/Marigot", AST}, -+ {"America/Marigot", AST}, - {"America/Martinique", AST}, - {"America/Matamoros", CST}, - {"America/Mazatlan", MST}, - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"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 +417,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Ojinaga", MST}, -@@ -411,15 +427,15 @@ - "Ora estiva di Suriname", "SRST"}}, - {"America/Port-au-Prince", EST}, - {"America/Port_of_Spain", AST}, -- {"America/Porto_Acre", AMT}, -+ {"America/Porto_Acre", ACT}, - {"America/Porto_Velho", AMT}, - {"America/Puerto_Rico", AST}, - {"America/Rainy_River", CST}, - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -- {"America/Rio_Branco", AMT}, -+ {"America/Resolute", CST}, -+ {"America/Rio_Branco", ACT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, - {"America/Santarem", BRT}, -@@ -428,7 +444,7 @@ - {"America/Sao_Paulo", BRT}, - {"America/Scoresbysund", EGT}, - {"America/Shiprock", MST}, -- {"America/St_Barthelemy", AST}, -+ {"America/St_Barthelemy", AST}, - {"America/St_Kitts", AST}, - {"America/St_Lucia", AST}, - {"America/St_Thomas", AST}, -@@ -446,10 +462,13 @@ - {"America/Winnipeg", CST}, - {"America/Yakutat", AKST}, - {"America/Yellowknife", MST}, -+ {"Antarctica/Casey", WST_AUS}, - {"Antarctica/Davis", new String[] {"Ora di Davis", "DAVT", - "Ora estiva di Davis", "DAVST"}}, - {"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", "MIDT"}}, - {"Antarctica/Mawson", new String[] {"Ora di Mawson", "MAWT", - "Ora estiva di Mawson", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -459,6 +478,8 @@ - {"Antarctica/South_Pole", NZST}, - {"Antarctica/Syowa", new String[] {"Ora di Syowa", "SYOT", - "Ora estiva di Syowa", "SYOST"}}, -+ {"Antarctica/Troll", new String[] {"Tempo universale coordinato", "UTC", -+ "Ora estiva dell'Europa centrale", "CEST"}}, - {"Antarctica/Vostok", new String[] {"Ora di Vostok", "VOST", - "Ora estiva di Vostok", "VOSST"}}, - {"Arctic/Longyearbyen", CET}, -@@ -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}, -+ {"Asia/Hebron", EET}, - {"Asia/Ho_Chi_Minh", ICT}, - {"Asia/Hong_Kong", HKT}, - {"Asia/Hovd", new String[] {"Ora di Hovd", "HOVT", - "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", -+ {"Asia/Jayapura", new String[] {"Ora dell'Indonesia orientale", "WIT", - "Ora estiva dell'Indonesia orientale", "EIST"}}, - {"Asia/Kabul", new String[] {"Ora dell'Afghanistan", "AFT", - "Ora estiva dell'Afghanistan", "AFST"}}, - {"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"}}, -+ {"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", XJT}, -+ {"Asia/Ust-Nera", new String[] {"Ora di Ust-Nera", "VLAT", -+ "Ora estiva di Ust-Nera", "VLAST"}}, - {"Asia/Vientiane", ICT}, -- {"Asia/Vladivostok", new String[] {"Ora di Vladivostok", "VLAT", -- "Ora estiva di Vladivostok", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"Ora di Jakutsk", "YAKT", -- "Ora estiva di Jakutsk", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"Asia/Yekaterinburg", new String[] {"Ora di Ekaterinburg", "YEKT", - "Ora estiva di Ekaterinburg", "YEKST"}}, - {"Asia/Yerevan", ARMT}, -@@ -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", "ACWST", -+ "Ora estiva Australia centro-occidentale", "ACWDT"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, -@@ -616,7 +641,7 @@ - {"Australia/Yancowinna", BROKEN_HILL}, - {"BET", BRT}, - {"BST", BDT}, -- {"Brazil/Acre", AMT}, -+ {"Brazil/Acre", ACT}, - {"Brazil/DeNoronha", NORONHA}, - {"Brazil/East", BRT}, - {"Brazil/West", AMT}, -@@ -654,6 +679,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -672,7 +698,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -685,7 +711,7 @@ - "Ora estiva di Samara", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", MSK}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, -@@ -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}, -+ {"Pacific/Chuuk", CHUT}, - {"Pacific/Easter", EASTER}, - {"Pacific/Efate", new String[] {"Ora di Vanuatu", "VUT", - "Ora estiva di Vanuatu", "VUST"}}, -@@ -790,8 +816,8 @@ - {"Pacific/Palau", new String[] {"Ora di Palau", "PWT", - "Ora estiva di Palau", "PWST"}}, - {"Pacific/Pitcairn", PITCAIRN}, -- {"Pacific/Ponape", new String[] {"Ora di Ponape", "PONT", -- "Ora estiva di Ponape", "PONST"}}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, - {"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 +830,12 @@ - "Ora estiva delle Isole Gilbert", "GILST"}}, - {"Pacific/Tongatapu", new String[] {"Ora di Tonga", "TOT", - "Ora estiva di Tonga", "TOST"}}, -- {"Pacific/Truk", TRUT}, -+ {"Pacific/Truk", CHUT}, - {"Pacific/Wake", new String[] {"Ora di Wake", "WAKT", - "Ora estiva di Wake", "WAKST"}}, - {"Pacific/Wallis", new String[] {"Ora di Wallis e Futuna", "WFT", - "Ora estiva di Wallis e Futuna", "WFST"}}, -- {"Pacific/Yap", TRUT}, -+ {"Pacific/Yap", CHUT}, - {"Poland", CET}, - {"PRC", CTT}, - {"PST8PDT", PST}, ---- jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. - * 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[] {"\u30a2\u30af\u30ec\u6642\u9593", "ACT", - "\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)", "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", -@@ -61,10 +61,10 @@ - "\u5927\u897f\u6d0b\u590f\u6642\u9593", "ADT"}; - String BDT[] = new String[] {"\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5\u6642\u9593", "BDT", - "\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5\u590f\u6642\u9593", "BDST"}; -- 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", -@@ -75,7 +75,11 @@ - "\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "CEST"}; - String CHAST[] = new String[] {"\u30c1\u30e3\u30bf\u30e0\u6a19\u6e96\u6642", "CHAST", - "\u30c1\u30e3\u30bf\u30e0\u590f\u6642\u9593", "CHADT"}; -- String CIT[] = new String[] {"\u4e2d\u592e\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "CIT", -+ String ChST[] = new String[] {"\u30b0\u30a2\u30e0\u6a19\u6e96\u6642", "ChST", -+ "\u30b0\u30a2\u30e0\u590f\u6642\u9593", "ChDT"}; -+ String CHUT[] = new String[] {"\u30C1\u30E5\u30FC\u30AF\u6642\u9593", "CHUT", -+ "Chuuk Time", "CHUST"}; -+ String CIT[] = new String[] {"\u4e2d\u592e\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WITA", - "\u4e2d\u592e\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "CIST"}; - String CLT[] = new String[] {"\u30c1\u30ea\u6642\u9593", "CLT", - "\u30c1\u30ea\u590f\u6642\u9593", "CLST"}; -@@ -83,10 +87,10 @@ - "\u4e2d\u90e8\u590f\u6642\u9593", "CDT"}; - String CTT[] = new String[] {"\u4e2d\u56fd\u6a19\u6e96\u6642", "CST", - "\u4e2d\u56fd\u590f\u6642\u9593", "CDT"}; -- String CUBA[] = new String[] {"Cuba Standard Time", "CST", -- "Cuba Daylight Time", "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 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)", "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", -@@ -99,8 +103,10 @@ - "\u6771\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9\u590f\u6642\u9593", "EGST"}; - String EST[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642", "EST", - "\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)", "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", -@@ -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"}; -+ String PONT[] = new String[] {"\u30DD\u30F3\u30DA\u30A4\u6642\u9593", "PONT", -+ "\u30DD\u30F3\u30DA\u30A4\u590F\u6642\u9593", "PONST"}; - String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6a19\u6e96\u6642", "PST", - "\u592a\u5e73\u6d0b\u590f\u6642\u9593", "PDT"}; -- String RST[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642", "EST", -- "\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", - "\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 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", -- "\u30c8\u30e9\u30c3\u30af\u590f\u6642\u9593", "TRUST"}; - String ULAT[]= new String[] {"\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u6642\u9593", "ULAT", - "\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u590f\u6642\u9593", "ULAST"}; -- String WART[] = new String[] {"\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "WART", -- "\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u590f\u6642\u9593", "WARST"}; -+ String UTC[] = new String[] {"\u5354\u5b9a\u4e16\u754c\u6642", "UTC", -+ "\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)", "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 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", - "\u897f\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "WEST"}; -- String WIT[] = new String[] {"\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIT", -+ String WIT[] = new String[] {"\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIB", - "\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "WIST"}; -- 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 SAMOA[] = new String[] {"\u30b5\u30e2\u30a2\u6a19\u6e96\u6642", "SST", -- "\u30b5\u30e2\u30a2\u590f\u6642\u9593", "SDT"}; -- 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"}; -- 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 UTC[] = new String[] {"\u5354\u5b9a\u4e16\u754c\u6642", "UTC", -- "\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 +222,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -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}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -300,7 +310,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -309,6 +319,7 @@ - {"America/Atikokan", EST}, - {"America/Atka", HAST}, - {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, - {"America/Barbados", AST}, - {"America/Belem", BRT}, - {"America/Belize", CST}, -@@ -328,6 +339,7 @@ - "\u4ecf\u9818\u30ae\u30a2\u30ca\u590f\u6642\u9593", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -339,7 +351,7 @@ - {"America/Detroit", EST}, - {"America/Dominica", AST}, - {"America/Edmonton", MST}, -- {"America/Eirunepe", AMT}, -+ {"America/Eirunepe", ACT}, - {"America/El_Salvador", CST}, - {"America/Ensenada", PST}, - {"America/Fort_Wayne", EST}, -@@ -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}, -- {"America/Indiana/Petersburg", EST}, -- {"America/Indiana/Tell_City", CST}, -+ {"America/Indiana/Petersburg", EST}, -+ {"America/Indiana/Tell_City", CST}, - {"America/Indiana/Vevay", EST}, -- {"America/Indiana/Vincennes", EST}, -+ {"America/Indiana/Vincennes", EST}, - {"America/Indiana/Winamac", EST}, - {"America/Inuvik", MST}, - {"America/Iqaluit", EST}, -@@ -374,21 +386,24 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"\u30dc\u30ea\u30d3\u30a2\u6642\u9593", "BOT", - "\u30dc\u30ea\u30d3\u30a2\u590f\u6642\u9593", "BOST"}}, - {"America/Lima", new String[] {"\u30da\u30eb\u30fc\u6642\u9593", "PET", - "\u30da\u30eb\u30fc\u590f\u6642\u9593", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -- {"America/Marigot", AST}, -+ {"America/Marigot", AST}, - {"America/Martinique", AST}, - {"America/Matamoros", CST}, - {"America/Mazatlan", MST}, - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"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 +417,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Ojinaga", MST}, -@@ -411,15 +427,15 @@ - "\u30b9\u30ea\u30ca\u30e0\u590f\u6642\u9593", "SRST"}}, - {"America/Port-au-Prince", EST}, - {"America/Port_of_Spain", AST}, -- {"America/Porto_Acre", AMT}, -+ {"America/Porto_Acre", ACT}, - {"America/Porto_Velho", AMT}, - {"America/Puerto_Rico", AST}, - {"America/Rainy_River", CST}, - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -- {"America/Rio_Branco", AMT}, -+ {"America/Resolute", CST}, -+ {"America/Rio_Branco", ACT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, - {"America/Santarem", BRT}, -@@ -428,7 +444,7 @@ - {"America/Sao_Paulo", BRT}, - {"America/Scoresbysund", EGT}, - {"America/Shiprock", MST}, -- {"America/St_Barthelemy", AST}, -+ {"America/St_Barthelemy", AST}, - {"America/St_Kitts", AST}, - {"America/St_Lucia", AST}, - {"America/St_Thomas", AST}, -@@ -446,10 +462,13 @@ - {"America/Winnipeg", CST}, - {"America/Yakutat", AKST}, - {"America/Yellowknife", MST}, -+ {"Antarctica/Casey", WST_AUS}, - {"Antarctica/Davis", new String[] {"\u30c7\u30a4\u30d3\u30b9\u6642\u9593", "DAVT", - "\u30c7\u30a4\u30d3\u30b9\u590f\u6642\u9593", "DAVST"}}, - {"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", "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 +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"}}, -+ {"Antarctica/Troll", new String[] {"\u5354\u5b9a\u4e16\u754c\u6642", "UTC", -+ "\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "CEST"}}, - {"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}, -@@ -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}, -+ {"Asia/Hebron", EET}, - {"Asia/Ho_Chi_Minh", ICT}, - {"Asia/Hong_Kong", HKT}, - {"Asia/Hovd", new String[] {"\u30db\u30d6\u30c9\u6642\u9593", "HOVT", - "\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", -+ {"Asia/Jayapura", new String[] {"\u6771\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIT", - "\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"}}, - {"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"}}, -+ {"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", 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}, -- {"Asia/Vladivostok", new String[] {"\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u6642\u9593", "VLAT", -- "\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u590f\u6642\u9593", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"\u30e4\u30af\u30fc\u30c4\u30af\u6642\u9593", "YAKT", -- "\u30e4\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"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 +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)", "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 +641,7 @@ - {"Australia/Yancowinna", BROKEN_HILL}, - {"BET", BRT}, - {"BST", BDT}, -- {"Brazil/Acre", AMT}, -+ {"Brazil/Acre", ACT}, - {"Brazil/DeNoronha", NORONHA}, - {"Brazil/East", BRT}, - {"Brazil/West", AMT}, -@@ -654,6 +679,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -672,7 +698,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -685,7 +711,7 @@ - "\u30b5\u30de\u30e9\u590f\u6642\u9593", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", MSK}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, -@@ -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}, -+ {"Pacific/Chuuk", CHUT}, - {"Pacific/Easter", EASTER}, - {"Pacific/Efate", new String[] {"\u30d0\u30cc\u30a2\u30c4\u6642\u9593", "VUT", - "\u30d0\u30cc\u30a2\u30c4\u590f\u6642\u9593", "VUST"}}, -@@ -790,8 +816,8 @@ - {"Pacific/Palau", new String[] {"\u30d1\u30e9\u30aa\u6642\u9593", "PWT", - "\u30d1\u30e9\u30aa\u590f\u6642\u9593", "PWST"}}, - {"Pacific/Pitcairn", PITCAIRN}, -- {"Pacific/Ponape", new String[] {"\u30dd\u30ca\u30da\u6642\u9593", "PONT", -- "\u30dd\u30ca\u30da\u590f\u6642\u9593", "PONST"}}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, - {"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 +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"}}, -- {"Pacific/Truk", TRUT}, -+ {"Pacific/Truk", CHUT}, - {"Pacific/Wake", new String[] {"\u30a6\u30a7\u30fc\u30af\u6642\u9593", "WAKT", - "\u30a6\u30a7\u30fc\u30af\u590f\u6642\u9593", "WAKST"}}, - {"Pacific/Wallis", new String[] {"\u30ef\u30ea\u30b9\u53ca\u3073\u30d5\u30c4\u30ca\u6642\u9593", "WFT", - "\u30ef\u30ea\u30b9\u53ca\u3073\u30d5\u30c4\u30ca\u590f\u6642\u9593", "WFST"}}, -- {"Pacific/Yap", TRUT}, -+ {"Pacific/Yap", CHUT}, - {"Poland", CET}, - {"PRC", CTT}, - {"PST8PDT", PST}, ---- jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. - * 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[] {"\uc5d0\uc774\ucee4 \uc2dc\uac04", "ACT", - "\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)", "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", -@@ -61,10 +61,10 @@ - "\ub300\uc11c\uc591 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ADT"}; - String BDT[] = new String[] {"\ubc29\uae00\ub77c\ub370\uc2dc \uc2dc\uac04", "BDT", - "\ubc29\uae00\ub77c\ub370\uc2dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BDST"}; -- 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(\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)", "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", -@@ -75,7 +75,11 @@ - "\uc911\uc559 \uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CEST"}; - String CHAST[] = new String[] {"Chatham \ud45c\uc900\uc2dc", "CHAST", - "Chatham \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CHADT"}; -- String CIT[] = new String[] {"\uc911\uc559 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "CIT", -+ String ChST[] = new String[] {"\ucc28\ubaa8\ub85c \ud45c\uc900\uc2dc", "ChST", -+ "\ucc28\ubaa8\ub85c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ChDT"}; -+ String CHUT[] = new String[] {"\uCD94\uD06C \uD45C\uC900\uC2DC", "CHUT", -+ "\uCD94\uD06C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "CHUST"}; -+ String CIT[] = new String[] {"\uc911\uc559 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WITA", - "\uc911\uc559 \uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CIST"}; - String CLT[] = new String[] {"\uce60\ub808 \uc2dc\uac04", "CLT", - "\uce60\ub808 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CLST"}; -@@ -83,10 +87,10 @@ - "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"}; - String CTT[] = new String[] {"\uc911\uad6d \ud45c\uc900\uc2dc", "CST", - "\uc911\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"}; -- String CUBA[] = new String[] {"Cuba Standard Time", "CST", -- "Cuba Daylight Time", "CDT"}; -- String DARWIN[] = new String[] {"\uc911\ubd80 \ud45c\uc900\uc2dc(\ub178\ub358 \uc9c0\uc5ed)", "CST", -- "\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)", "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", -@@ -99,8 +103,10 @@ - "\ub3d9\ubd80 \uadf8\ub9b0\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EGST"}; - String EST[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc", "EST", - "\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)", "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", -@@ -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"}; -+ String PONT[] = new String[] {"\uD3F0\uD398\uC774 \uD45C\uC900\uC2DC", "PONT", -+ "\uD3F0\uD398\uC774 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "PONST"}; - String PST[] = new String[] {"\ud0dc\ud3c9\uc591 \ud45c\uc900\uc2dc", "PST", - "\ud0dc\ud3c9\uc591 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PDT"}; -- String RST[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc", "EST", -- "\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", - "\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 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", -- "\ud2b8\ub8e8\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TRUST"}; - String ULAT[]= new String[] {"\uc6b8\ub780\ubc14\ud0c0\ub974 \uc2dc\uac04", "ULAT", - "\uc6b8\ub780\ubc14\ud0c0\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ULAST"}; -- String WART[] = new String[] {"\uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "WART", -- "\uc544\ub974\ud5e8\ud2f0\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WARST"}; -+ String UTC[] = new String[] {"\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC", -+ "\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)", "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 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", - "\uc11c\uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WEST"}; -- String WIT[] = new String[] {"\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIT", -+ String WIT[] = new String[] {"\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIB", - "\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WIST"}; -- String WST_AUS[] = new String[] {"\uc11c\ubd80 \ud45c\uc900\uc2dc(\ud638\uc8fc)", "WST", -- "\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_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"}; -- 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 UTC[] = new String[] {"\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC", -- "\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 +222,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -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}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -300,7 +310,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -309,6 +319,7 @@ - {"America/Atikokan", EST}, - {"America/Atka", HAST}, - {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, - {"America/Barbados", AST}, - {"America/Belem", BRT}, - {"America/Belize", CST}, -@@ -328,6 +339,7 @@ - "\ud504\ub791\uc2a4\ub839 \uae30\uc544\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -339,7 +351,7 @@ - {"America/Detroit", EST}, - {"America/Dominica", AST}, - {"America/Edmonton", MST}, -- {"America/Eirunepe", AMT}, -+ {"America/Eirunepe", ACT}, - {"America/El_Salvador", CST}, - {"America/Ensenada", PST}, - {"America/Fort_Wayne", EST}, -@@ -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}, -- {"America/Indiana/Petersburg", EST}, -- {"America/Indiana/Tell_City", CST}, -+ {"America/Indiana/Petersburg", EST}, -+ {"America/Indiana/Tell_City", CST}, - {"America/Indiana/Vevay", EST}, -- {"America/Indiana/Vincennes", EST}, -+ {"America/Indiana/Vincennes", EST}, - {"America/Indiana/Winamac", EST}, - {"America/Inuvik", MST}, - {"America/Iqaluit", EST}, -@@ -374,21 +386,24 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"\ubcfc\ub9ac\ube44\uc544 \uc2dc\uac04", "BOT", - "\ubcfc\ub9ac\ube44\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BOST"}}, - {"America/Lima", new String[] {"\ud398\ub8e8 \uc2dc\uac04", "PET", - "\ud398\ub8e8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -- {"America/Marigot", AST}, -+ {"America/Marigot", AST}, - {"America/Martinique", AST}, - {"America/Matamoros", CST}, - {"America/Mazatlan", MST}, - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"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 +417,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Ojinaga", MST}, -@@ -411,15 +427,15 @@ - "\uc218\ub9ac\ub0a8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SRST"}}, - {"America/Port-au-Prince", EST}, - {"America/Port_of_Spain", AST}, -- {"America/Porto_Acre", AMT}, -+ {"America/Porto_Acre", ACT}, - {"America/Porto_Velho", AMT}, - {"America/Puerto_Rico", AST}, - {"America/Rainy_River", CST}, - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -- {"America/Rio_Branco", AMT}, -+ {"America/Resolute", CST}, -+ {"America/Rio_Branco", ACT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, - {"America/Santarem", BRT}, -@@ -428,7 +444,7 @@ - {"America/Sao_Paulo", BRT}, - {"America/Scoresbysund", EGT}, - {"America/Shiprock", MST}, -- {"America/St_Barthelemy", AST}, -+ {"America/St_Barthelemy", AST}, - {"America/St_Kitts", AST}, - {"America/St_Lucia", AST}, - {"America/St_Thomas", AST}, -@@ -446,10 +462,13 @@ - {"America/Winnipeg", CST}, - {"America/Yakutat", AKST}, - {"America/Yellowknife", MST}, -+ {"Antarctica/Casey", WST_AUS}, - {"Antarctica/Davis", new String[] {"Davis \uc2dc\uac04", "DAVT", - "Davis \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "DAVST"}}, - {"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", "MIDT"}}, - {"Antarctica/Mawson", new String[] {"\ubaa8\uc2a8 \uc2dc\uac04", "MAWT", - "\ubaa8\uc2a8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -459,6 +478,8 @@ - {"Antarctica/South_Pole", NZST}, - {"Antarctica/Syowa", new String[] {"Syowa \uc2dc\uac04", "SYOT", - "Syowa \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SYOST"}}, -+ {"Antarctica/Troll", new String[] {"\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC", -+ "\uc911\uc559 \uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CEST"}}, - {"Antarctica/Vostok", new String[] {"Vostok \uc2dc\uac04", "VOST", - "Vostok \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VOSST"}}, - {"Arctic/Longyearbyen", CET}, -@@ -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}, -+ {"Asia/Hebron", EET}, - {"Asia/Ho_Chi_Minh", ICT}, - {"Asia/Hong_Kong", HKT}, - {"Asia/Hovd", new String[] {"Hovd \uc2dc\uac04", "HOVT", - "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", -+ {"Asia/Jayapura", new String[] {"\ub3d9\ubd80 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIT", - "\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"}}, - {"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"}}, -+ {"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", 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}, -- {"Asia/Vladivostok", new String[] {"\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc2dc\uac04", "VLAT", -- "\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"\uc57c\uce20\ud06c \uc2dc\uac04", "YAKT", -- "\uc57c\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"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 +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)", "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 +641,7 @@ - {"Australia/Yancowinna", BROKEN_HILL}, - {"BET", BRT}, - {"BST", BDT}, -- {"Brazil/Acre", AMT}, -+ {"Brazil/Acre", ACT}, - {"Brazil/DeNoronha", NORONHA}, - {"Brazil/East", BRT}, - {"Brazil/West", AMT}, -@@ -654,6 +679,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -672,7 +698,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -685,7 +711,7 @@ - "\uc0ac\ub9c8\ub77c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", MSK}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, -@@ -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}, -+ {"Pacific/Chuuk", CHUT}, - {"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 +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}, -- {"Pacific/Ponape", new String[] {"\ud3ec\ub098\ud504 \uc2dc\uac04", "PONT", -- "\ud3ec\ub098\ud504 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PONST"}}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, - {"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 +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"}}, -- {"Pacific/Truk", TRUT}, -+ {"Pacific/Truk", CHUT}, - {"Pacific/Wake", new String[] {"\uc6e8\uc774\ud06c \uc2dc\uac04", "WAKT", - "\uc6e8\uc774\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WAKST"}}, - {"Pacific/Wallis", new String[] {"\uc6d4\ub9ac\uc2a4 \ud6c4\ud22c\ub098 \uc2dc\uac04", "WFT", - "\uc6d4\ub9ac\uc2a4 \ud6c4\ud2b8\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WFST"}}, -- {"Pacific/Yap", TRUT}, -+ {"Pacific/Yap", CHUT}, - {"Poland", CET}, - {"PRC", CTT}, - {"PST8PDT", PST}, ---- jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. - * 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, normaltid", "ACT", - "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)", "ACST", -+ "Central sommartid (South Australia)", "ACDT"}; - String AGT[] = new String[] {"Argentina, normaltid", "ART", - "Argentina, sommartid", "ARST"}; - String AKST[] = new String[] {"Alaska, normaltid", "AKST", -@@ -61,10 +61,10 @@ - "Atlantisk sommartid", "ADT"}; - String BDT[] = new String[] {"Bangladesh, normaltid", "BDT", - "Bangladesh, sommartid", "BDST"}; -- String BRISBANE[] = new String[] {"Eastern Standard Time (Queensland)", "EST", -- "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)", "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", -@@ -75,7 +75,11 @@ - "Centraleuropeisk sommartid", "CEST"}; - String CHAST[] = new String[] {"Chatham, normaltid", "CHAST", - "Chatham, sommartid", "CHADT"}; -- String CIT[] = new String[] {"Centralindonesisk tid", "CIT", -+ String ChST[] = new String[] {"Chamorro, normaltid", "ChST", -+ "Chamorro, sommartid", "ChDT"}; -+ String CHUT[] = new String[] {"Chuuk, normaltid", "CHUT", -+ "Chuuk, sommartid", "CHUST"}; -+ String CIT[] = new String[] {"Centralindonesisk tid", "WITA", - "Centralindonesisk sommartid", "CIST"}; - String CLT[] = new String[] {"Chile, normaltid", "CLT", - "Chile, sommartid", "CLST"}; -@@ -83,10 +87,10 @@ - "Central sommartid", "CDT"}; - String CTT[] = new String[] {"Kina, normaltid", "CST", - "Kina, sommartid", "CDT"}; -- String CUBA[] = new String[] {"Cuba Standard Time", "CST", -- "Cuba Daylight Time", "CDT"}; -- String DARWIN[] = new String[] {"Central Standard Time (Nordterritoriet)", "CST", -- "Central Summer Time (Nordterritoriet)", "CST"}; -+ String CUBA[] = new String[] {"Kuba, normaltid", "CST", -+ "Kuba, sommartid", "CDT"}; -+ 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", -@@ -99,8 +103,10 @@ - "\u00d6stgr\u00f6nl\u00e4ndsk sommartid", "EGST"}; - String EST[] = new String[] {"Eastern, normaltid", "EST", - "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)", "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", -@@ -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"}; -+ String PONT[] = new String[] {"Pohnpei, normaltid", "PONT", -+ "Pohnpei, sommartid", "PONST"}; - String PST[] = new String[] {"Stilla havet, normaltid", "PST", - "Stilla havet, sommartid", "PDT"}; -- String RST[] = new String[] {"Eastern, normaltid", "EST", -- "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", - "Salomon\u00f6arna, sommartid", "SBST"}; - String SGT[] = new String[] {"Singapore, normaltid", "SGT", - "Singapore, sommartid", "SGST"}; -- String SLST[] = new String[] {"Greenwich Mean Time", "GMT", -- "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)", "AEST", -+ "\u00D6stlig sommartid (Tasmanien)", "AEDT"}; - String TMT[] = new String[] {"Turkmenistan, normaltid", "TMT", - "Turkmenistan, sommartid", "TMST"}; -- String TRUT[] = new String[] {"Truk, normaltid", "TRUT", -- "Truk, sommartid", "TRUST"}; - String ULAT[]= new String[] {"Ulaanbaatar, normaltid", "ULAT", - "Ulaanbaatar, sommartid", "ULAST"}; -- String WART[] = new String[] {"Argentina, normaltid", "WART", -- "Argentina, sommartid", "WARST"}; -+ String UTC[] = new String[] {"Koordinerad universell tid", "UTC", -+ "Koordinerad universell tid", "UTC"}; -+ String UZT[] = new String[] {"Uzbekistan, normaltid", "UZT", -+ "Uzbekistan, sommartid", "UZST"}; -+ String VICTORIA[] = new String[] {"\u00D6stlig standardtid (Victoria)", "AEST", -+ "\u00D6stlig sommartid (Victoria)", "AEDT"}; -+ String VLAT[] = new String[] {"Vladivostok, normaltid", "VLAT", -+ "Vladivostok, sommartid", "VLAST"}; - String WAT[] = new String[] {"V\u00e4stafrikansk tid", "WAT", - "V\u00e4stafrikansk sommartid", "WAST"}; - String WET[] = new String[] {"V\u00e4steuropeisk tid", "WET", - "V\u00e4steuropeisk sommartid", "WEST"}; -- 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", -- "Western Summer Time (Australien)", "WST"}; -- String SAMOA[] = new String[] {"Samoa, normaltid", "SST", -- "Samoa, sommartid", "SDT"}; -- String WST_SAMOA[] = new String[] {"V\u00e4stsamoansk tid", "WST", -- "V\u00e4stsamoansk sommartid", "WSST"}; -- String ChST[] = new String[] {"Chamorro, normaltid", "ChST", -- "Chamorro, sommartid", "ChDT"}; -- String VICTORIA[] = new String[] {"Eastern Standard Time (Victoria)", "EST", -- "Eastern Summer Time (Victoria)", "EST"}; -- String UTC[] = new String[] {"Koordinerad universell tid", "UTC", -- "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 +222,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -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}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -300,7 +310,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -309,6 +319,7 @@ - {"America/Atikokan", EST}, - {"America/Atka", HAST}, - {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, - {"America/Barbados", AST}, - {"America/Belem", BRT}, - {"America/Belize", CST}, -@@ -328,6 +339,7 @@ - "Franska Guyana, sommartid", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -339,7 +351,7 @@ - {"America/Detroit", EST}, - {"America/Dominica", AST}, - {"America/Edmonton", MST}, -- {"America/Eirunepe", AMT}, -+ {"America/Eirunepe", ACT}, - {"America/El_Salvador", CST}, - {"America/Ensenada", PST}, - {"America/Fort_Wayne", EST}, -@@ -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}, -- {"America/Indiana/Petersburg", EST}, -- {"America/Indiana/Tell_City", CST}, -+ {"America/Indiana/Petersburg", EST}, -+ {"America/Indiana/Tell_City", CST}, - {"America/Indiana/Vevay", EST}, -- {"America/Indiana/Vincennes", EST}, -+ {"America/Indiana/Vincennes", EST}, - {"America/Indiana/Winamac", EST}, - {"America/Inuvik", MST}, - {"America/Iqaluit", EST}, -@@ -374,21 +386,24 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"Bolivia, normaltid", "BOT", - "Bolivia, sommartid", "BOST"}}, - {"America/Lima", new String[] {"Peru, normaltid", "PET", - "Peru, sommartid", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -- {"America/Marigot", AST}, -+ {"America/Marigot", AST}, - {"America/Martinique", AST}, - {"America/Matamoros", CST}, - {"America/Mazatlan", MST}, - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"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 +417,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Ojinaga", MST}, -@@ -411,15 +427,15 @@ - "Surinam, sommartid", "SRST"}}, - {"America/Port-au-Prince", EST}, - {"America/Port_of_Spain", AST}, -- {"America/Porto_Acre", AMT}, -+ {"America/Porto_Acre", ACT}, - {"America/Porto_Velho", AMT}, - {"America/Puerto_Rico", AST}, - {"America/Rainy_River", CST}, - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -- {"America/Rio_Branco", AMT}, -+ {"America/Resolute", CST}, -+ {"America/Rio_Branco", ACT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, - {"America/Santarem", BRT}, -@@ -428,7 +444,7 @@ - {"America/Sao_Paulo", BRT}, - {"America/Scoresbysund", EGT}, - {"America/Shiprock", MST}, -- {"America/St_Barthelemy", AST}, -+ {"America/St_Barthelemy", AST}, - {"America/St_Kitts", AST}, - {"America/St_Lucia", AST}, - {"America/St_Thomas", AST}, -@@ -446,10 +462,13 @@ - {"America/Winnipeg", CST}, - {"America/Yakutat", AKST}, - {"America/Yellowknife", MST}, -+ {"Antarctica/Casey", WST_AUS}, - {"Antarctica/Davis", new String[] {"Davis, normaltid", "DAVT", - "Davis, sommartid", "DAVST"}}, - {"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", "MIDT"}}, - {"Antarctica/Mawson", new String[] {"Mawson, normaltid", "MAWT", - "Mawson, sommartid", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -459,6 +478,8 @@ - {"Antarctica/South_Pole", NZST}, - {"Antarctica/Syowa", new String[] {"Syowa, normaltid", "SYOT", - "Syowa, sommartid", "SYOST"}}, -+ {"Antarctica/Troll", new String[] {"Koordinerad universell tid", "UTC", -+ "Centraleuropeisk sommartid", "CEST"}}, - {"Antarctica/Vostok", new String[] {"Vostok, normaltid", "VOST", - "Vostok, sommartid", "VOSST"}}, - {"Arctic/Longyearbyen", CET}, -@@ -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}, -+ {"Asia/Hebron", EET}, - {"Asia/Ho_Chi_Minh", ICT}, - {"Asia/Hong_Kong", HKT}, - {"Asia/Hovd", new String[] {"Hovd, normaltid", "HOVT", - "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", -+ {"Asia/Jayapura", new String[] {"\u00d6stindonesisk tid", "WIT", - "\u00d6stindonesisk sommartid", "EIST"}}, - {"Asia/Kabul", new String[] {"Afghanistan, normaltid", "AFT", - "Afghanistan, sommartid", "AFST"}}, - {"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"}}, -+ {"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", XJT}, -+ {"Asia/Ust-Nera", new String[] {"Ust-Nera, normaltid", "VLAT", -+ "Ust-Nera, sommartid", "VLAST"}}, - {"Asia/Vientiane", ICT}, -- {"Asia/Vladivostok", new String[] {"Vladivostok, normaltid", "VLAT", -- "Vladivostok, sommartid", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"Jakutsk, normaltid", "YAKT", -- "Jakutsk, sommartid", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"Asia/Yekaterinburg", new String[] {"Jekaterinburg, normaltid", "YEKT", - "Jekaterinburg, sommartid", "YEKST"}}, - {"Asia/Yerevan", ARMT}, -@@ -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)", "ACWST", -+ "Central v\u00E4stlig sommartid (Australien)", "ACWDT"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, -@@ -616,7 +641,7 @@ - {"Australia/Yancowinna", BROKEN_HILL}, - {"BET", BRT}, - {"BST", BDT}, -- {"Brazil/Acre", AMT}, -+ {"Brazil/Acre", ACT}, - {"Brazil/DeNoronha", NORONHA}, - {"Brazil/East", BRT}, - {"Brazil/West", AMT}, -@@ -654,6 +679,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -672,7 +698,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -685,7 +711,7 @@ - "Samara, sommartid", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", MSK}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, -@@ -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}, -+ {"Pacific/Chuuk", CHUT}, - {"Pacific/Easter", EASTER}, - {"Pacific/Efate", new String[] {"Vanuatu, normaltid", "VUT", - "Vanuatu, sommartid", "VUST"}}, -@@ -790,8 +816,8 @@ - {"Pacific/Palau", new String[] {"Palau, normaltid", "PWT", - "Palau, sommartid", "PWST"}}, - {"Pacific/Pitcairn", PITCAIRN}, -- {"Pacific/Ponape", new String[] {"Ponape, normaltid", "PONT", -- "Ponape, sommartid", "PONST"}}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, - {"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 +830,12 @@ - "Gilbert\u00f6arna, sommartid", "GILST"}}, - {"Pacific/Tongatapu", new String[] {"Tonga, normaltid", "TOT", - "Tonga, sommartid", "TOST"}}, -- {"Pacific/Truk", TRUT}, -+ {"Pacific/Truk", CHUT}, - {"Pacific/Wake", new String[] {"Wake, normaltid", "WAKT", - "Wake, sommartid", "WAKST"}}, - {"Pacific/Wallis", new String[] {"Wallis & Futuna, normaltid", "WFT", - "Wallis & Futuna, sommartid", "WFST"}}, -- {"Pacific/Yap", TRUT}, -+ {"Pacific/Yap", CHUT}, - {"Poland", CET}, - {"PRC", CTT}, - {"PST8PDT", PST}, ---- jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. - * 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 \u65f6\u95f4", "ACT", - "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)", "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", -@@ -61,10 +61,10 @@ - "\u5927\u897f\u6d0b\u590f\u4ee4\u65f6", "ADT"}; - String BDT[] = new String[] {"\u5b5f\u52a0\u62c9\u65f6\u95f4", "BDT", - "\u5b5f\u52a0\u62c9\u590f\u4ee4\u65f6", "BDST"}; -- String BRISBANE[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u6606\u58eb\u5170\uff09", "EST", -- "\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)", "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", -@@ -75,7 +75,11 @@ - "\u4e2d\u6b27\u590f\u4ee4\u65f6", "CEST"}; - String CHAST[] = new String[] {"\u67e5\u8428\u59c6\u6807\u51c6\u65f6\u95f4", "CHAST", - "\u67e5\u8428\u59c6\u590f\u4ee4\u65f6", "CHADT"}; -- String CIT[] = new String[] {"\u4e2d\u90e8\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "CIT", -+ String ChST[] = new String[] {"Chamorro \u6807\u51c6\u65f6\u95f4", "ChST", -+ "Chamorro \u590f\u4ee4\u65f6", "ChDT"}; -+ String CHUT[] = new String[] {"\u4E18\u514B\u65F6\u95F4", "CHUT", -+ "\u4E18\u514B\u590F\u4EE4\u65F6", "CHUST"}; -+ String CIT[] = new String[] {"\u4e2d\u90e8\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WITA", - "\u4e2d\u90e8\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "CIST"}; - String CLT[] = new String[] {"\u667a\u5229\u65f6\u95f4", "CLT", - "\u667a\u5229\u590f\u4ee4\u65f6", "CLST"}; -@@ -83,10 +87,10 @@ - "\u4e2d\u592e\u590f\u4ee4\u65f6", "CDT"}; - String CTT[] = new String[] {"\u4e2d\u56fd\u6807\u51c6\u65f6\u95f4", "CST", - "\u4e2d\u56fd\u590f\u4ee4\u65f6", "CDT"}; -- String CUBA[] = new String[] {"Cuba Standard Time", "CST", -- "Cuba Daylight Time", "CDT"}; -- String DARWIN[] = new String[] {"\u4e2d\u592e\u6807\u51c6\u65f6\u95f4\uff08\u5317\u9886\u5730\uff09", "CST", -- "\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)", "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", -@@ -99,8 +103,10 @@ - "\u4e1c\u683c\u6797\u5c9b\u590f\u4ee4\u65f6", "EGST"}; - String EST[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4", "EST", - "\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)", "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", -@@ -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"}; -+ String PONT[] = new String[] {"\u6CE2\u7EB3\u4F69\u65F6\u95F4", "PONT", -+ "\u6CE2\u7EB3\u4F69\u590F\u4EE4\u65F6", "PONST"}; - String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6807\u51c6\u65f6\u95f4", "PST", - "\u592a\u5e73\u6d0b\u590f\u4ee4\u65f6", "PDT"}; -- String RST[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4", "EST", -- "\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", - "\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 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)", "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", -- "\u7279\u9c81\u514b\u590f\u4ee4\u65f6", "TRUST"}; - String ULAT[]= new String[] {"\u5e93\u4f26\u65f6\u95f4", "ULAT", - "\u5e93\u4f26\u590f\u4ee4\u65f6", "ULAST"}; -- String WART[] = new String[] {"\u963f\u6839\u5ef7\u65f6\u95f4", "WART", -- "\u963f\u6839\u5ef7\u590f\u4ee4\u65f6", "WARST"}; -+ String UTC[] = new String[] {"\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC", -+ "\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)", "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 WAT[] = new String[] {"\u897f\u975e\u65f6\u95f4", "WAT", - "\u897f\u975e\u590f\u4ee4\u65f6", "WAST"}; - String WET[] = new String[] {"\u897f\u6b27\u65f6\u95f4", "WET", - "\u897f\u6b27\u590f\u4ee4\u65f6", "WEST"}; -- String WIT[] = new String[] {"\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIT", -+ String WIT[] = new String[] {"\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIB", - "\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "WIST"}; -- String WST_AUS[] = new String[] {"\u897f\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "WST", -- "\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_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"}; -- String VICTORIA[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u7ef4\u591a\u5229\u4e9a\uff09", "EST", -- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u7ef4\u591a\u5229\u4e9a\uff09", "EST"}; -- String UTC[] = new String[] {"\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC", -- "\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 +222,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -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}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -300,7 +310,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -309,6 +319,7 @@ - {"America/Atikokan", EST}, - {"America/Atka", HAST}, - {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, - {"America/Barbados", AST}, - {"America/Belem", BRT}, - {"America/Belize", CST}, -@@ -328,6 +339,7 @@ - "\u6cd5\u5c5e\u572d\u4e9a\u90a3\u590f\u4ee4\u65f6", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -339,7 +351,7 @@ - {"America/Detroit", EST}, - {"America/Dominica", AST}, - {"America/Edmonton", MST}, -- {"America/Eirunepe", AMT}, -+ {"America/Eirunepe", ACT}, - {"America/El_Salvador", CST}, - {"America/Ensenada", PST}, - {"America/Fort_Wayne", EST}, -@@ -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}, -- {"America/Indiana/Petersburg", EST}, -- {"America/Indiana/Tell_City", CST}, -+ {"America/Indiana/Petersburg", EST}, -+ {"America/Indiana/Tell_City", CST}, - {"America/Indiana/Vevay", EST}, -- {"America/Indiana/Vincennes", EST}, -+ {"America/Indiana/Vincennes", EST}, - {"America/Indiana/Winamac", EST}, - {"America/Inuvik", MST}, - {"America/Iqaluit", EST}, -@@ -374,21 +386,24 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"\u73bb\u5229\u7ef4\u4e9a\u65f6\u95f4", "BOT", - "\u73bb\u5229\u7ef4\u4e9a\u590f\u4ee4\u65f6", "BOST"}}, - {"America/Lima", new String[] {"\u79d8\u9c81\u65f6\u95f4", "PET", - "\u79d8\u9c81\u590f\u4ee4\u65f6", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -- {"America/Marigot", AST}, -+ {"America/Marigot", AST}, - {"America/Martinique", AST}, - {"America/Matamoros", CST}, - {"America/Mazatlan", MST}, - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"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 +417,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Ojinaga", MST}, -@@ -411,15 +427,15 @@ - "\u82cf\u5229\u5357\u590f\u4ee4\u65f6", "SRST"}}, - {"America/Port-au-Prince", EST}, - {"America/Port_of_Spain", AST}, -- {"America/Porto_Acre", AMT}, -+ {"America/Porto_Acre", ACT}, - {"America/Porto_Velho", AMT}, - {"America/Puerto_Rico", AST}, - {"America/Rainy_River", CST}, - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -- {"America/Rio_Branco", AMT}, -+ {"America/Resolute", CST}, -+ {"America/Rio_Branco", ACT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, - {"America/Santarem", BRT}, -@@ -428,7 +444,7 @@ - {"America/Sao_Paulo", BRT}, - {"America/Scoresbysund", EGT}, - {"America/Shiprock", MST}, -- {"America/St_Barthelemy", AST}, -+ {"America/St_Barthelemy", AST}, - {"America/St_Kitts", AST}, - {"America/St_Lucia", AST}, - {"America/St_Thomas", AST}, -@@ -446,10 +462,13 @@ - {"America/Winnipeg", CST}, - {"America/Yakutat", AKST}, - {"America/Yellowknife", MST}, -+ {"Antarctica/Casey", WST_AUS}, - {"Antarctica/Davis", new String[] {"\u6234\u7ef4\u65af\u65f6\u95f4", "DAVT", - "\u6234\u7ef4\u65af\u590f\u4ee4\u65f6", "DAVST"}}, - {"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", "MIDT"}}, - {"Antarctica/Mawson", new String[] {"\u83ab\u68ee\u65f6\u95f4", "MAWT", - "\u83ab\u68ee\u590f\u4ee4\u65f6", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -459,6 +478,8 @@ - {"Antarctica/South_Pole", NZST}, - {"Antarctica/Syowa", new String[] {"Syowa \u65f6\u95f4", "SYOT", - "Syowa \u590f\u4ee4\u65f6", "SYOST"}}, -+ {"Antarctica/Troll", new String[] {"\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC", -+ "\u4e2d\u6b27\u590f\u4ee4\u65f6", "CEST"}}, - {"Antarctica/Vostok", new String[] {"\u83ab\u65af\u6258\u514b\u65f6\u95f4", "VOST", - "\u83ab\u65af\u6258\u514b\u590f\u4ee4\u65f6", "VOSST"}}, - {"Arctic/Longyearbyen", CET}, -@@ -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}, -+ {"Asia/Hebron", EET}, - {"Asia/Ho_Chi_Minh", ICT}, - {"Asia/Hong_Kong", HKT}, - {"Asia/Hovd", new String[] {"\u79d1\u5e03\u591a\u65f6\u95f4", "HOVT", - "\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", -+ {"Asia/Jayapura", new String[] {"\u4e1c\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIT", - "\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"}}, - {"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"}}, -+ {"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", 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}, -- {"Asia/Vladivostok", new String[] {"\u6d77\u53c2\u5d34\u65f6\u95f4", "VLAT", -- "\u6d77\u53c2\u5d34\u590f\u4ee4\u65f6", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"\u4e9a\u5e93\u6b21\u514b\u65f6\u95f4", "YAKT", -- "\u4e9a\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"Asia/Yekaterinburg", new String[] {"Yekaterinburg \u65f6\u95f4", "YEKT", - "Yekaterinburg \u590f\u4ee4\u65f6", "YEKST"}}, - {"Asia/Yerevan", ARMT}, -@@ -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)", "ACWST", -+ "\u4E2D\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "ACWDT"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, -@@ -616,7 +641,7 @@ - {"Australia/Yancowinna", BROKEN_HILL}, - {"BET", BRT}, - {"BST", BDT}, -- {"Brazil/Acre", AMT}, -+ {"Brazil/Acre", ACT}, - {"Brazil/DeNoronha", NORONHA}, - {"Brazil/East", BRT}, - {"Brazil/West", AMT}, -@@ -654,6 +679,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -672,7 +698,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -685,7 +711,7 @@ - "\u6c99\u9a6c\u62c9\u590f\u4ee4\u65f6", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", MSK}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, -@@ -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}, -+ {"Pacific/Chuuk", CHUT}, - {"Pacific/Easter", EASTER}, - {"Pacific/Efate", new String[] {"\u74e6\u5974\u963f\u56fe\u65f6\u95f4", "VUT", - "\u74e6\u5974\u963f\u56fe\u590f\u4ee4\u65f6", "VUST"}}, -@@ -790,8 +816,8 @@ - {"Pacific/Palau", new String[] {"\u5e1b\u7409\u65f6\u95f4", "PWT", - "\u5e1b\u7409\u590f\u4ee4\u65f6", "PWST"}}, - {"Pacific/Pitcairn", PITCAIRN}, -- {"Pacific/Ponape", new String[] {"Ponape \u65f6\u95f4", "PONT", -- "Ponape \u590f\u4ee4\u65f6", "PONST"}}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, - {"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 +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"}}, -- {"Pacific/Truk", TRUT}, -+ {"Pacific/Truk", CHUT}, - {"Pacific/Wake", new String[] {"\u5a01\u514b\u65f6\u95f4", "WAKT", - "\u5a01\u514b\u590f\u4ee4\u65f6", "WAKST"}}, - {"Pacific/Wallis", new String[] {"\u74e6\u5229\u65af\u53ca\u798f\u675c\u7eb3\u7fa4\u5c9b\u65f6\u95f4", "WFT", - "\u74e6\u5229\u65af\u53ca\u798f\u675c\u7eb3\u7fa4\u5c9b\u590f\u4ee4\u65f6", "WFST"}}, -- {"Pacific/Yap", TRUT}, -+ {"Pacific/Yap", CHUT}, - {"Poland", CET}, - {"PRC", CTT}, - {"PST8PDT", PST}, ---- jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -+++ jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. - * 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 \u6642\u9593", "ACT", - "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)", "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", -@@ -61,10 +61,10 @@ - "\u5927\u897f\u6d0b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ADT"}; - String BDT[] = new String[] {"\u5b5f\u52a0\u62c9\u6642\u9593", "BDT", - "\u5b5f\u52a0\u62c9\u590f\u4ee4\u6642\u9593", "BDST"}; -- 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", -@@ -75,7 +75,11 @@ - "\u4e2d\u6b50\u590f\u4ee4\u6642\u9593", "CEST"}; - String CHAST[] = new String[] {"\u67e5\u5766\u6a19\u6e96\u6642\u9593", "CHAST", - "\u67e5\u5766\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CHADT"}; -- String CIT[] = new String[] {"\u4e2d\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "CIT", -+ String ChST[] = new String[] {"\u67e5\u83ab\u6d1b\u6a19\u6e96\u6642\u9593", "ChST", -+ "\u67e5\u83ab\u6d1b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ChDT"}; -+ String CHUT[] = new String[] {"\u695A\u514B\u6642\u9593", "CHUT", -+ "\u695A\u514B\u590F\u4EE4\u6642\u9593", "CHUST"}; -+ String CIT[] = new String[] {"\u4e2d\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "WITA", - "\u4e2d\u5370\u5ea6\u5c3c\u897f\u4e9e\u590f\u4ee4\u6642\u9593", "CIST"}; - String CLT[] = new String[] {"\u667a\u5229\u6642\u9593", "CLT", - "\u667a\u5229\u590f\u4ee4\u6642\u9593", "CLST"}; -@@ -83,10 +87,10 @@ - "\u4e2d\u592e\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"}; - String CTT[] = new String[] {"\u4e2d\u570b\u6a19\u6e96\u6642\u9593", "CST", - "\u4e2d\u570b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"}; -- String CUBA[] = new String[] {"Cuba Standard Time", "CST", -- "Cuba Daylight Time", "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 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)", "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", -@@ -99,8 +103,10 @@ - "\u6771\u683c\u6797\u5cf6\u590f\u4ee4\u6642\u9593", "EGST"}; - String EST[] = new String[] {"\u6771\u65b9\u6a19\u6e96\u6642\u9593", "EST", - "\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)", "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", -@@ -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"}; -+ String PONT[] = new String[] {"\u6CE2\u7D0D\u4F69\u6642\u9593", "PONT", -+ "\u6CE2\u7D0D\u4F69\u590F\u4EE4\u6642\u9593", "PONST"}; - String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6a19\u6e96\u6642\u9593", "PST", - "\u592a\u5e73\u6d0b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PDT"}; -- String RST[] = new String[] {"\u6771\u65b9\u6a19\u6e96\u6642\u9593", "EST", -- "\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", - "\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 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", -- "\u7279\u9b6f\u514b\u590f\u4ee4\u6642\u9593", "TRUST"}; - String ULAT[]= new String[] {"\u5eab\u502b\u6642\u9593", "ULAT", - "\u5eab\u502b\u590f\u4ee4\u6642\u9593", "ULAST"}; -- String WART[] = new String[] {"\u963f\u6839\u5ef7\u6642\u9593", "WART", -- "\u963f\u6839\u5ef7\u590f\u4ee4\u6642\u9593", "WARST"}; -+ String UTC[] = new String[] {"\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC", -+ "\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)", "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 WAT[] = new String[] {"\u897f\u975e\u6642\u9593", "WAT", - "\u897f\u975e\u590f\u4ee4\u6642\u9593", "WAST"}; - String WET[] = new String[] {"\u897f\u6b50\u6642\u9593", "WET", - "\u897f\u6b50\u590f\u4ee4\u6642\u9593", "WEST"}; -- String WIT[] = new String[] {"\u897f\u5370\u5c3c\u6642\u9593", "WIT", -+ String WIT[] = new String[] {"\u897f\u5370\u5c3c\u6642\u9593", "WIB", - "\u897f\u5370\u5c3c\u590f\u4ee4\u6642\u9593", "WIST"}; -- String WST_AUS[] = new String[] {"\u897f\u65b9\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "WST", -- "\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_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"}; -- 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 UTC[] = new String[] {"\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC", -- "\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 +222,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -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}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -300,7 +310,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -309,6 +319,7 @@ - {"America/Atikokan", EST}, - {"America/Atka", HAST}, - {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, - {"America/Barbados", AST}, - {"America/Belem", BRT}, - {"America/Belize", CST}, -@@ -328,6 +339,7 @@ - "\u6cd5\u5c6c\u572d\u4e9e\u90a3\u590f\u4ee4\u6642\u9593", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -339,7 +351,7 @@ - {"America/Detroit", EST}, - {"America/Dominica", AST}, - {"America/Edmonton", MST}, -- {"America/Eirunepe", AMT}, -+ {"America/Eirunepe", ACT}, - {"America/El_Salvador", CST}, - {"America/Ensenada", PST}, - {"America/Fort_Wayne", EST}, -@@ -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}, -- {"America/Indiana/Petersburg", EST}, -- {"America/Indiana/Tell_City", CST}, -+ {"America/Indiana/Petersburg", EST}, -+ {"America/Indiana/Tell_City", CST}, - {"America/Indiana/Vevay", EST}, -- {"America/Indiana/Vincennes", EST}, -+ {"America/Indiana/Vincennes", EST}, - {"America/Indiana/Winamac", EST}, - {"America/Inuvik", MST}, - {"America/Iqaluit", EST}, -@@ -374,21 +386,24 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"\u73bb\u5229\u7dad\u4e9e\u6642\u9593", "BOT", - "\u73bb\u5229\u7dad\u4e9e\u590f\u4ee4\u6642\u9593", "BOST"}}, - {"America/Lima", new String[] {"\u7955\u9b6f\u6642\u9593", "PET", - "\u7955\u9b6f\u590f\u4ee4\u6642\u9593", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -- {"America/Marigot", AST}, -+ {"America/Marigot", AST}, - {"America/Martinique", AST}, - {"America/Matamoros", CST}, - {"America/Mazatlan", MST}, - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"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 +417,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Ojinaga", MST}, -@@ -411,15 +427,15 @@ - "\u8607\u5229\u5357\u590f\u4ee4\u6642\u9593", "SRST"}}, - {"America/Port-au-Prince", EST}, - {"America/Port_of_Spain", AST}, -- {"America/Porto_Acre", AMT}, -+ {"America/Porto_Acre", ACT}, - {"America/Porto_Velho", AMT}, - {"America/Puerto_Rico", AST}, - {"America/Rainy_River", CST}, - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -- {"America/Rio_Branco", AMT}, -+ {"America/Resolute", CST}, -+ {"America/Rio_Branco", ACT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, - {"America/Santarem", BRT}, -@@ -428,7 +444,7 @@ - {"America/Sao_Paulo", BRT}, - {"America/Scoresbysund", EGT}, - {"America/Shiprock", MST}, -- {"America/St_Barthelemy", AST}, -+ {"America/St_Barthelemy", AST}, - {"America/St_Kitts", AST}, - {"America/St_Lucia", AST}, - {"America/St_Thomas", AST}, -@@ -446,10 +462,13 @@ - {"America/Winnipeg", CST}, - {"America/Yakutat", AKST}, - {"America/Yellowknife", MST}, -+ {"Antarctica/Casey", WST_AUS}, - {"Antarctica/Davis", new String[] {"\u81fa\u7dad\u65af\u6642\u9593", "DAVT", - "\u81fa\u7dad\u65af\u590f\u4ee4\u6642\u9593", "DAVST"}}, - {"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", "MIDT"}}, - {"Antarctica/Mawson", new String[] {"\u83ab\u68ee\u6642\u9593", "MAWT", - "\u83ab\u68ee\u590f\u4ee4\u6642\u9593", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -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"}}, -+ {"Antarctica/Troll", new String[] {"\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC", -+ "\u4e2d\u6b50\u590f\u4ee4\u6642\u9593", "CEST"}}, - {"Antarctica/Vostok", new String[] {"\u4f5b\u65af\u6258 (Vostok) \u6642\u9593", "VOST", - "\u4f5b\u65af\u6258 (Vostok) \u590f\u4ee4\u6642\u9593", "VOSST"}}, - {"Arctic/Longyearbyen", CET}, -@@ -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}, -+ {"Asia/Hebron", EET}, - {"Asia/Ho_Chi_Minh", ICT}, - {"Asia/Hong_Kong", HKT}, - {"Asia/Hovd", new String[] {"\u4faf\u5fb7 (Hovd) \u6642\u9593", "HOVT", - "\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", -+ {"Asia/Jayapura", new String[] {"\u6771\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "WIT", - "\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"}}, - {"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"}}, -+ {"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", -@@ -565,12 +591,12 @@ - {"Asia/Ujung_Pandang", CIT}, - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, -- {"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}, -- {"Asia/Vladivostok", new String[] {"\u6d77\u53c3\u5d34\u6642\u9593", "VLAT", -- "\u6d77\u53c3\u5d34\u590f\u4ee4\u6642\u9593", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"\u4e9e\u5eab\u6b21\u514b\u6642\u9593", "YAKT", -- "\u4e9e\u5eab\u6b21\u514b\u590f\u4ee4\u6642\u9593", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"Asia/Yekaterinburg", new String[] {"Yekaterinburg \u6642\u9593", "YEKT", - "Yekaterinburg \u590f\u4ee4\u6642\u9593", "YEKST"}}, - {"Asia/Yerevan", ARMT}, -@@ -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)", "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 +642,7 @@ - {"Australia/Yancowinna", BROKEN_HILL}, - {"BET", BRT}, - {"BST", BDT}, -- {"Brazil/Acre", AMT}, -+ {"Brazil/Acre", ACT}, - {"Brazil/DeNoronha", NORONHA}, - {"Brazil/East", BRT}, - {"Brazil/West", AMT}, -@@ -654,6 +680,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -672,7 +699,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -685,7 +712,7 @@ - "\u6c99\u99ac\u62c9\u590f\u4ee4\u6642\u9593", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", MSK}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, -@@ -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}, -+ {"Pacific/Chuuk", CHUT}, - {"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 +817,8 @@ - {"Pacific/Palau", new String[] {"\u5e1b\u7409\u6642\u9593", "PWT", - "\u5e1b\u7409\u590f\u4ee4\u6642\u9593", "PWST"}}, - {"Pacific/Pitcairn", PITCAIRN}, -- {"Pacific/Ponape", new String[] {"Ponape \u6642\u9593", "PONT", -- "Ponape \u590f\u4ee4\u6642\u9593", "PONST"}}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, - {"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 +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"}}, -- {"Pacific/Truk", TRUT}, -+ {"Pacific/Truk", CHUT}, - {"Pacific/Wake", new String[] {"\u5a01\u514b\u6642\u9593", "WAKT", - "\u5a01\u514b\u590f\u4ee4\u6642\u9593", "WAKST"}}, - {"Pacific/Wallis", new String[] {"\u74e6\u5229\u65af\u53ca\u798f\u675c\u7d0d\u7fa4\u5cf6\u6642\u9593", "WFT", - "\u74e6\u5229\u65af\u53ca\u798f\u675c\u7d0d\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "WFST"}}, -- {"Pacific/Yap", TRUT}, -+ {"Pacific/Yap", CHUT}, - {"Poland", CET}, - {"PRC", CTT}, - {"PST8PDT", PST}, diff --git a/java/openjdk6/files/patch-jdk_src_share_classes_java_util_CurrencyData.properties b/java/openjdk6/files/patch-jdk_src_share_classes_java_util_CurrencyData.properties deleted file mode 100644 index 017ad0d41414..000000000000 --- a/java/openjdk6/files/patch-jdk_src_share_classes_java_util_CurrencyData.properties +++ /dev/null @@ -1,11 +0,0 @@ ---- jdk/src/share/classes/java/util/CurrencyData.properties.orig 2014-10-08 15:35:09 UTC -+++ jdk/src/share/classes/java/util/CurrencyData.properties -@@ -522,7 +522,7 @@ TT=TTD - # TUNISIA - TN=TND - # TURKEY --TR=TRL;2004-12-31-22-00-00;TRY -+TR=TRY - # TURKMENISTAN - TM=TMM - # TURKS AND CAICOS ISLANDS diff --git a/java/openjdk6/files/patch-set b/java/openjdk6/files/patch-set index 5f17ef0db3d2..48b18a0000d1 100644 --- a/java/openjdk6/files/patch-set +++ b/java/openjdk6/files/patch-set @@ -1797,6 +1797,84 @@ static int pthread_getcpuclockid(pthread_t tid, clockid_t *clock_id) { return _pthread_getcpuclockid ? _pthread_getcpuclockid(tid, clock_id) : -1; } +--- hotspot/src/os/bsd/vm/perfMemory_bsd.cpp ++++ hotspot/src/os/bsd/vm/perfMemory_bsd.cpp +@@ -303,7 +303,6 @@ + DIR *dirp = NULL; + RESTARTABLE(::open(dirname, O_RDONLY|O_NOFOLLOW), result); + if (result == OS_ERR) { +- // Directory doesn't exist or is a symlink, so there is nothing to cleanup. + if (PrintMiscellaneous && Verbose) { + if (errno == ELOOP) { + warning("directory %s is a symlink and is not secure\n", dirname); +@@ -420,6 +419,7 @@ + return true; + } + ++ + // return the user name for the given user id + // + // the caller is expected to free the allocated memory. +@@ -542,6 +542,18 @@ + continue; + } + ++ // Since we don't create the backing store files in directories ++ // pointed to by symbolic links, we also don't follow them when ++ // looking for the files. We check for a symbolic link after the ++ // call to opendir in order to eliminate a small window where the ++ // symlink can be exploited. ++ // ++ if (!is_directory_secure(usrdir_name)) { ++ FREE_C_HEAP_ARRAY(char, usrdir_name); ++ os::closedir(subdirp); ++ continue; ++ } ++ + struct dirent* udentry; + char* udbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(usrdir_name)); + errno = 0; +@@ -643,6 +655,7 @@ + } + } + ++ + // cleanup stale shared memory resources + // + // This method attempts to remove all stale shared memory files in +@@ -655,7 +668,7 @@ + static void cleanup_sharedmem_resources(const char* dirname) { + + int saved_cwd_fd; +- // open the directory and set the current working directory to it ++ // open the directory + DIR* dirp = open_directory_secure_cwd(dirname, &saved_cwd_fd); + if (dirp == NULL) { + // directory doesn't exist or is insecure, so there is nothing to cleanup +@@ -681,7 +694,6 @@ + if (pid == 0) { + + if (strcmp(entry->d_name, ".") != 0 && strcmp(entry->d_name, "..") != 0) { +- + // attempt to remove all unexpected files, except "." and ".." + unlink(entry->d_name); + } +@@ -705,7 +717,6 @@ + // + if ((pid == os::current_process_id()) || + (kill(pid, 0) == OS_ERR && (errno == ESRCH || errno == EPERM))) { +- + unlink(entry->d_name); + } + errno = 0; +@@ -914,7 +925,6 @@ + + char* dirname = get_user_tmp_dir(user_name); + char* filename = get_sharedmem_filename(dirname, vmid); +- + // get the short filename + char* short_filename = strrchr(filename, '/'); + if (short_filename == NULL) { --- hotspot/src/os/bsd/vm/threadCritical_bsd.cpp +++ hotspot/src/os/bsd/vm/threadCritical_bsd.cpp @@ -33,35 +33,36 @@ @@ -4331,17 +4409,6 @@ OTHER_LDLIBS = $(JVMLIB) +endif + ---- jdk/make/javax/crypto/Makefile -+++ jdk/make/javax/crypto/Makefile -@@ -155,7 +155,7 @@ - # - - ifdef OPENJDK --all: build-jar install-jar build-policy install-limited -+all: build-jar install-jar build-policy install-%%POLICY%% - else # OPENJDK - ifeq ($(strip $(FILES_java)),) - all: --- jdk/make/javax/sound/FILES_c.gmk +++ jdk/make/javax/sound/FILES_c.gmk @@ -34,6 +34,8 @@ @@ -12036,10 +12103,10 @@ } --- jdk/src/solaris/native/java/net/NetworkInterface.c +++ jdk/src/solaris/native/java/net/NetworkInterface.c -@@ -23,13 +23,13 @@ - * questions. +@@ -24,13 +24,13 @@ */ + +#include <sys/types.h> +#include <sys/socket.h> #include <errno.h> @@ -12052,11 +12119,11 @@ #include <arpa/inet.h> #include <net/if.h> #include <net/if_arp.h> -@@ -47,6 +47,19 @@ - #else +@@ -41,6 +41,19 @@ + #include <stropts.h> #include <sys/sockio.h> #endif -+#if defined(_ALLBSD_SOURCE) ++#ifdef _ALLBSD_SOURCE +#include <sys/param.h> +#include <sys/ioctl.h> +#if defined(__FreeBSD__) || defined(__APPLE__) @@ -12071,247 +12138,267 @@ +#endif #ifdef __linux__ - #define ifr_index ifr_ifindex -@@ -577,6 +590,7 @@ - } + #include <sys/ioctl.h> +@@ -133,8 +146,9 @@ -+#if !defined(_ALLBSD_SOURCE) - /* - * Enumerates and returns all IPv4 interfaces - */ -@@ -687,6 +701,176 @@ - return ifs; + +-#ifdef __solaris__ ++#if defined(_ALLBSD_SOURCE) || defined(__solaris__) + static netif *enumIPvXInterfaces(JNIEnv *env, int sock, netif *ifs, int family); ++#ifdef __solaris__ + static int getMacFromDevice(JNIEnv *env, const char* ifname, unsigned char* retbuf); + + #ifndef SIOCGLIFHWADDR +@@ -142,6 +156,7 @@ + #endif + + #endif ++#endif + + /******************* Java entry points *****************************/ + +@@ -995,6 +1010,240 @@ } -+#else /* _ALLBSD_SOURCE */ -+ -+/* -+ * Enumerates and returns all IPv4 interfaces -+ * -+ * WARNING! Make sure that it's correctly synchronized on future JDK -+ * versions imports! + ++/** BSD **/ ++#ifdef _ALLBSD_SOURCE ++/* Open socket for further ioct calls, try v4 socket first and ++ * if it falls return v6 socket + */ -+static netif *enumIPv4Interfaces(JNIEnv *env, netif *ifs) -+{ ++ ++#ifdef AF_INET6 ++// unused arg ifname and struct if2 ++static int openSocketWithFallback(JNIEnv *env, const char *ifname){ + int sock; -+ struct ifaddrs *ifa, *origifa; ++ struct ifreq if2; + -+ sock = JVM_Socket(AF_INET, SOCK_DGRAM, 0); -+ if (sock < 0) { -+ /* -+ * If EPROTONOSUPPORT is returned it means we don't have -+ * IPv4 support so don't throw an exception. -+ */ -+ if (errno != EPROTONOSUPPORT) { -+ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", -+ "Socket creation failed"); -+ } -+ return ifs; ++ if ((sock = JVM_Socket(AF_INET, SOCK_DGRAM, 0)) < 0) { ++ if (errno == EPROTONOSUPPORT){ ++ if ( (sock = JVM_Socket(AF_INET6, SOCK_DGRAM, 0)) < 0 ){ ++ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", "IPV6 Socket creation failed"); ++ return -1; ++ } ++ } ++ else{ // errno is not NOSUPPORT ++ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", "IPV4 Socket creation failed"); ++ return -1; ++ } + } + -+ if (getifaddrs(&origifa) != 0) { -+ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", -+ "getifaddrs() function failed"); -+ close(sock); -+ return ifs; -+ } ++ return sock; ++} + -+ for (ifa = origifa; ifa != NULL; ifa = ifa->ifa_next) { ++#else ++static int openSocketWithFallback(JNIEnv *env, const char *ifname){ ++ return openSocket(env, AF_INET); ++} ++#endif + -+ /* -+ * Skip non-AF_INET entries. -+ */ -+ if (ifa->ifa_addr == NULL || ifa->ifa_addr->sa_family != AF_INET) -+ continue; ++static netif *enumIPv4Interfaces(JNIEnv *env, int sock, netif *ifs) { ++ return enumIPvXInterfaces(env, sock, ifs, AF_INET); ++} + -+ /* -+ * Add to the list. -+ * -+ * BSDNOTE: in order to optimize code, interface index detection -+ * logic was added directly to addif(). -+ */ -+ ifs = addif(env, ifs, ifa->ifa_name, (-1), AF_INET, -+ ifa->ifa_addr, sizeof(struct sockaddr_in), 0); ++#ifdef AF_INET6 ++static netif *enumIPv6Interfaces(JNIEnv *env, int sock, netif *ifs) { ++ return enumIPvXInterfaces(env, sock, ifs, AF_INET6); ++} ++#endif + -+ /* -+ * If an exception occurred then free the list. -+ */ -+ if ((*env)->ExceptionOccurred(env)) { -+ close(sock); -+ freeifaddrs(origifa); -+ freeif(ifs); -+ return NULL; -+ } ++/* ++ Enumerates and returns all interfaces on BSD ++ use the same code for IPv4 and IPv6 ++ */ ++static netif *enumIPvXInterfaces(JNIEnv *env, int sock, netif *ifs, int family) { ++ struct ifaddrs *ifa0, *ifa; ++ ++ /* ++ * Grab the interface list ++ */ ++ if (getifaddrs(&ifa0) < 0) { ++ return NULL; + } + + /* -+ * Free socket and buffer ++ * Iterate through each interface + */ -+ close(sock); -+ freeifaddrs(origifa); ++ for (ifa = ifa0; ifa != NULL; ifa = ifa->ifa_next) { ++ if (ifa->ifa_addr->sa_family == family) { ++ /* ++ * Add to the list ++ */ ++ ifs = addif(env, sock, ifa->ifa_name, ifs, ifa->ifa_addr, family, 0); ++ ++ /* ++ * If an exception occurred then free the list ++ */ ++ if ((*env)->ExceptionOccurred(env)) { ++ freeif(ifs); ++ ifs = NULL; ++ break; ++ } ++ } ++ } ++ freeifaddrs(ifa0); ++ + return ifs; +} + -+#if defined(AF_INET6) -+/* -+ * Determines the prefix on BSD for IPv6 interfaces. ++static int getIndex(int sock, const char *name){ ++ /* ++ * Try to get the interface index ++ */ ++ struct ifreq if2; ++ strcpy(if2.ifr_name, name); ++ ++ if (ioctl(sock, SIOCGIFINDEX, (char *)&if2) < 0) { ++ return -1; ++ } ++ ++ return if2.ifr_index; ++} ++ ++/** ++ * Returns the IPv4 broadcast address of a named interface, if it exists. ++ * Returns 0 if it doesn't have one. + */ -+static -+int prefix(void *val, int size) { -+ u_char *name = (u_char *)val; -+ int byte, bit, plen = 0; -+ -+ for (byte = 0; byte < size; byte++, plen += 8) -+ if (name[byte] != 0xff) -+ break; -+ if (byte == size) -+ return (plen); -+ for (bit = 7; bit != 0; bit--, plen++) -+ if (!(name[byte] & (1 << bit))) -+ break; -+ for (; bit != 0; bit--) -+ if (name[byte] & (1 << bit)) -+ return (0); -+ byte++; -+ for (; byte < size; byte++) -+ if (name[byte]) -+ return (0); -+ return (plen); ++static struct sockaddr *getBroadcast(JNIEnv *env, int sock, const char *ifname, struct sockaddr *brdcast_store) { ++ struct sockaddr *ret = NULL; ++ struct ifreq if2; ++ ++ memset((char *) &if2, 0, sizeof(if2)); ++ strcpy(if2.ifr_name, ifname); ++ ++ /* Let's make sure the interface does have a broadcast address */ ++ if (ioctl(sock, SIOCGIFFLAGS, (char *)&if2) < 0) { ++ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "IOCTL SIOCGIFFLAGS failed"); ++ return ret; ++ } ++ ++ if (if2.ifr_flags & IFF_BROADCAST) { ++ /* It does, let's retrieve it*/ ++ if (ioctl(sock, SIOCGIFBRDADDR, (char *)&if2) < 0) { ++ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "IOCTL SIOCGIFBRDADDR failed"); ++ return ret; ++ } ++ ++ ret = brdcast_store; ++ memcpy(ret, &if2.ifr_broadaddr, sizeof(struct sockaddr)); ++ } ++ ++ return ret; +} + -+/* -+ * Enumerates and returns all IPv6 interfaces on FreeBSD -+ * -+ * BSDNOTE: it's done in same as IPv4 enumeration and should be carefully -+ * reviewed with each JDK update (according to Solaris/Linux version) ++/** ++ * Returns the IPv4 subnet prefix length (aka subnet mask) for the named ++ * interface, if it has one, otherwise return -1. + */ -+static netif *enumIPv6Interfaces(JNIEnv *env, netif *ifs) { ++static short getSubnet(JNIEnv *env, int sock, const char *ifname) { ++ unsigned int mask; ++ short ret; ++ struct ifreq if2; + -+ int sock; -+ struct ifaddrs *ifa, *origifa; -+ struct sockaddr_in6 *sin6; -+ struct in6_ifreq ifr6; -+ -+ // Open IPv6 UDP socket. -+ sock = JVM_Socket(AF_INET6, SOCK_DGRAM, 0); -+ if (sock < 0) { -+ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", -+ "Failed to create IPv6 socket"); -+ return ifs; -+ } ++ memset((char *) &if2, 0, sizeof(if2)); ++ strcpy(if2.ifr_name, ifname); + -+ if (getifaddrs(&origifa) != 0) { -+ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", -+ "getifaddrs() function failed"); -+ close(sock); -+ return ifs; ++ if (ioctl(sock, SIOCGIFNETMASK, (char *)&if2) < 0) { ++ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "IOCTL SIOCGIFNETMASK failed"); ++ return -1; + } + -+ for (ifa = origifa; ifa != NULL; ifa = ifa->ifa_next) { ++ mask = ntohl(((struct sockaddr_in*)&(if2.ifr_addr))->sin_addr.s_addr); ++ ret = 0; ++ while (mask) { ++ mask <<= 1; ++ ret++; ++ } + -+ /* -+ * Skip non-AF_INET6 entries. -+ */ -+ if (ifa->ifa_addr == NULL || ifa->ifa_addr->sa_family != AF_INET6) -+ continue; -+ -+ memset(&ifr6, 0, sizeof(ifr6)); -+ strlcpy(ifr6.ifr_name, ifa->ifa_name, sizeof(ifr6.ifr_name)); -+ memcpy(&ifr6.ifr_addr, ifa->ifa_addr, MIN(sizeof(ifr6.ifr_addr), ifa->ifa_addr->sa_len)); -+ -+ if (ioctl(sock, SIOCGIFNETMASK_IN6, (caddr_t)&ifr6) < 0) { -+ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", -+ "ioctl SIOCGIFNETMASK_IN6 failed"); -+ close(sock); -+ freeifaddrs(origifa); -+ freeif(ifs); -+ return NULL; -+ } ++ return ret; ++} + -+ /* Add to the list. */ -+ sin6 = (struct sockaddr_in6 *)&ifr6.ifr_addr; -+ ifs = addif(env, ifs, ifa->ifa_name, (-1), AF_INET6, -+ ifa->ifa_addr, sizeof(struct sockaddr_in6), -+ prefix(&sin6->sin6_addr, sizeof(struct in6_addr))); -+ -+ /* If an exception occurred then free the list. */ -+ if ((*env)->ExceptionOccurred(env)) { -+ close(sock); -+ freeifaddrs(origifa); -+ freeif(ifs); -+ return NULL; -+ } ++/** ++ * Get the Hardware address (usually MAC address) for the named interface. ++ * return puts the data in buf, and returns the length, in byte, of the ++ * MAC address. Returns -1 if there is no hardware address on that interface. ++ */ ++static int getMacAddress(JNIEnv *env, int sock, const char* ifname, const struct in_addr* addr, unsigned char *buf) { ++ struct ifaddrs *ifa0, *ifa; ++ struct sockaddr *saddr; ++ struct sockaddr_dl *sadl; ++ int ret = -1; ++ ++ /* ++ * Grab the interface list ++ */ ++ if (getifaddrs(&ifa0) < 0) { ++ return ret; + } + + /* -+ * Free socket and ifaddrs buffer ++ * Iterate through each interface + */ -+ close(sock); -+ freeifaddrs(origifa); -+ return ifs; -+} -+#endif /* AF_INET6 */ ++ for (ifa = ifa0; ifa != NULL; ifa = ifa->ifa_next) { ++ saddr = ifa->ifa_addr; + -+#endif /* !_ALLBSD_SOURCE */ - - #if defined(__solaris__) && defined(AF_INET6) - /* -@@ -1007,7 +1191,13 @@ - JNU_ThrowOutOfMemoryError(env, "heap allocation failed"); - return ifs; - } -+#if defined(_ALLBSD_SOURCE) -+ currif->index = if_nametoindex(name); -+ if (currif->index == 0) -+ currif->index = -1; -+#else - currif->index = index; -+#endif - currif->addr = NULL; - currif->childs = NULL; - currif->virtual = isVirtual; -@@ -1295,6 +1485,31 @@ - * All bytes to 0 means no hardware address. - */ - return -1; -+#elif defined(_ALLBSD_SOURCE) -+ struct ifaddrs *ifa0, *ifa; -+ struct sockaddr *saddr; -+ int i; -+ -+ /* Grab the interface list */ -+ if (!getifaddrs(&ifa0)) { -+ /* Cycle through the interfaces */ -+ for (i = 0, ifa = ifa0; ifa != NULL; ifa = ifa->ifa_next, i++) { -+ saddr = ifa->ifa_addr; -+ /* Link layer contains the MAC address */ -+ if (saddr->sa_family == AF_LINK && !strcmp(ifname, ifa->ifa_name)) { -+ struct sockaddr_dl *sadl = (struct sockaddr_dl *) saddr; -+ /* Check the address is the correct length */ -+ if (sadl->sdl_alen == ETHER_ADDR_LEN) { -+ memcpy(buf, (sadl->sdl_data + sadl->sdl_nlen), ETHER_ADDR_LEN); -+ freeifaddrs(ifa0); -+ return ETHER_ADDR_LEN; ++ /* Link layer contains the MAC address */ ++ if (saddr->sa_family == AF_LINK && strcmp(ifname, ifa->ifa_name) == 0) { ++ sadl = (struct sockaddr_dl *)saddr; ++ ++ /* Check the address is the correct length */ ++ if (sadl->sdl_alen == ETHER_ADDR_LEN) { ++ memcpy(buf, (sadl->sdl_data + sadl->sdl_nlen), ETHER_ADDR_LEN); ++ ret = ETHER_ADDR_LEN; ++ break; ++ } + } -+ } + } + freeifaddrs(ifa0); -+ } + -+ return -1; - #else - struct arpreq arpreq; - struct sockaddr_in* sin; -@@ -1460,7 +1675,7 @@ - "Socket creation failed"); - } else { - --#ifdef __linux__ -+#if defined(__linux__) || defined(_ALLBSD_SOURCE) - memset((char *) &if2, 0, sizeof(if2)); - strcpy(if2.ifr_name, name_utf); - ++ return ret; ++} ++ ++static int getMTU(JNIEnv *env, int sock, const char *ifname) { ++ struct ifreq if2; ++ memset((char *) &if2, 0, sizeof(if2)); ++ ++ if (ifname != NULL) { ++ strcpy(if2.ifr_name, ifname); ++ } else { ++ JNU_ThrowNullPointerException(env, "network interface name is NULL"); ++ return -1; ++ } ++ ++ if (ioctl(sock, SIOCGIFMTU, (char *)&if2) < 0) { ++ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "IOCTL SIOCGIFMTU failed"); ++ return -1; ++ } ++ ++ return if2.ifr_mtu; ++} ++ ++static int getFlags(int sock, const char *ifname) { ++ struct ifreq if2; ++ int flags; ++ ++ memset((char *) &if2, 0, sizeof(if2)); ++ strcpy(if2.ifr_name, ifname); ++ ++ if (ioctl(sock, SIOCGIFFLAGS, (char *)&if2) < 0) { ++ return -1; ++ } ++ ++ flags = if2.ifr_flags & 0xffff; ++ flags |= if2.ifr_flagshigh << 16; ++ ++ return flags; ++} ++ ++#endif ++ + /** Linux **/ + #ifdef __linux__ + /* Open socket for further ioct calls, try v4 socket first and --- jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c +++ jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c @@ -23,12 +23,12 @@ @@ -12329,7 +12416,7 @@ #ifdef __solaris__ #include <fcntl.h> -@@ -335,7 +335,7 @@ +@@ -331,7 +331,7 @@ /* The fdObj'fd */ jint fd; @@ -12338,7 +12425,7 @@ SOCKADDR addr; int len; #endif -@@ -345,26 +345,39 @@ +@@ -341,26 +341,39 @@ } fd = (*env)->GetIntField(env, fdObj, IO_fd_fdID); @@ -12378,7 +12465,7 @@ // After disconnecting a UDP socket, Linux kernel will set // local port to zero if the port number comes from implicit // bind. Successive send/recv on the same socket will fail. -@@ -387,6 +400,7 @@ +@@ -383,6 +396,7 @@ NET_Bind(fd, (struct sockaddr *)&addr, len); } } @@ -12386,69 +12473,7 @@ #else JVM_Connect(fd, 0, 0); #endif -@@ -1056,31 +1070,38 @@ - Java_java_net_PlainDatagramSocketImpl_datagramSocketCreate(JNIEnv *env, - jobject this) { - jobject fdObj = (*env)->GetObjectField(env, this, pdsi_fdID); -- int fd; -- -- int arg = -1; -- int t = 1; -+ int fd, t = 1; -+#ifdef AF_INET6 -+ int domain = ipv6_available() ? AF_INET6 : AF_INET; -+#else -+ int domain = AF_INET; -+#endif - - if (IS_NULL(fdObj)) { - JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", - "Socket closed"); - return; -- } else { --#ifdef AF_INET6 -- if (ipv6_available()) { -- fd = JVM_Socket(AF_INET6, SOCK_DGRAM, 0); -- } else --#endif /* AF_INET6 */ -- { -- fd = JVM_Socket(AF_INET, SOCK_DGRAM, 0); -- } - } -- if (fd == JVM_IO_ERR) { -+ -+ if ((fd = JVM_Socket(domain, SOCK_DGRAM, 0)) == JVM_IO_ERR) { - NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", - "Error creating socket"); - return; - } - -+#ifdef AF_INET6 -+ /* Disable IPV6_V6ONLY to ensure dual-socket support */ -+ if (domain == AF_INET6) { -+ int arg = 0; -+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&arg, -+ sizeof(int)) < 0) { -+ NET_ThrowNew(env, errno, "cannot set IPPROTO_IPV6"); -+ close(fd); -+ return; -+ } -+ } -+#endif /* AF_INET6 */ -+ - setsockopt(fd, SOL_SOCKET, SO_BROADCAST, (char*) &t, sizeof(int)); - - #ifdef __linux__ -@@ -1093,7 +1114,7 @@ - * On Linux for IPv6 sockets we must set the hop limit - * to 1 to be compatible with default ttl of 1 for IPv4 sockets. - */ -- if (ipv6_available()) { -+ if (domain == AF_INET6) { - int ttl = 1; - setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, (char *)&ttl, - sizeof(ttl)); -@@ -1303,7 +1324,7 @@ +@@ -1306,7 +1320,7 @@ /* * value is an InetAddress. */ @@ -12457,7 +12482,7 @@ if (ipv6_available()) { mcast_set_if_by_addr_v6(env, this, fd, value); } else { -@@ -1322,7 +1343,7 @@ +@@ -1325,7 +1339,7 @@ /* * value is a NetworkInterface. */ @@ -12466,7 +12491,7 @@ if (ipv6_available()) { mcast_set_if_by_if_v6(env, this, fd, value); } else { -@@ -1399,7 +1420,7 @@ +@@ -1402,7 +1416,7 @@ */ static void setMulticastLoopbackMode(JNIEnv *env, jobject this, int fd, jint opt, jobject value) { @@ -12475,7 +12500,7 @@ if (ipv6_available()) { mcast_set_loop_v6(env, this, fd, value); } else { -@@ -1964,7 +1985,7 @@ +@@ -1982,7 +1996,7 @@ fd = (*env)->GetIntField(env, fdObj, IO_fd_fdID); } /* setsockopt to be correct ttl */ @@ -12484,7 +12509,7 @@ if (ipv6_available()) { setHopLimit(env, fd, ttl); } else { -@@ -2357,18 +2378,30 @@ +@@ -2374,18 +2388,30 @@ mname6.ipv6mr_interface = idx; } @@ -12520,38 +12545,7 @@ } --- jdk/src/solaris/native/java/net/PlainSocketImpl.c +++ jdk/src/solaris/native/java/net/PlainSocketImpl.c -@@ -253,7 +253,12 @@ - jboolean stream) { - jobject fdObj, ssObj; - int fd; -- int arg = -1; -+ int type = (stream ? SOCK_STREAM : SOCK_DGRAM); -+#ifdef AF_INET6 -+ int domain = ipv6_available() ? AF_INET6 : AF_INET; -+#else -+ int domain = AF_INET; -+#endif - - if (socketExceptionCls == NULL) { - jclass c = (*env)->FindClass(env, "java/net/SocketException"); -@@ -267,25 +272,29 @@ - (*env)->ThrowNew(env, socketExceptionCls, "null fd object"); - return; - } --#ifdef AF_INET6 -- if (ipv6_available()) { -- fd = JVM_Socket(AF_INET6, (stream ? SOCK_STREAM: SOCK_DGRAM), 0); -- } else --#endif /* AF_INET6 */ -- { -- fd = JVM_Socket(AF_INET, (stream ? SOCK_STREAM: SOCK_DGRAM), 0); -- } -- if (fd == JVM_IO_ERR) { -+ -+ if ((fd = JVM_Socket(domain, type, 0)) == JVM_IO_ERR) { - /* note: if you run out of fds, you may not be able to load - * the exception class, and get a NoClassDefFoundError - * instead. +@@ -279,10 +279,21 @@ */ NET_ThrowNew(env, errno, "can't create socket"); return; @@ -12561,7 +12555,7 @@ +#ifdef AF_INET6 + /* Disable IPV6_V6ONLY to ensure dual-socket support */ -+ if (domain == AF_INET6) { ++ if (ipv6_available()) { + int arg = 0; + if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&arg, + sizeof(int)) < 0) { @@ -12575,7 +12569,7 @@ /* * If this is a server socket then enable SO_REUSEADDR * automatically and set to non blocking. -@@ -294,9 +303,15 @@ +@@ -291,9 +302,15 @@ if (ssObj != NULL) { int arg = 1; SET_NONBLOCKING(fd); @@ -12593,7 +12587,7 @@ } /* -@@ -528,9 +543,11 @@ +@@ -525,9 +542,11 @@ if (connect_rv == JVM_IO_INTR) { JNU_ThrowByName(env, JNU_JAVAIOPKG "InterruptedIOException", "operation interrupted"); @@ -12616,6 +12610,24 @@ /* * The fd table and the number of file descriptors +@@ -281,7 +281,7 @@ + + int NET_RecvFrom(int s, void *buf, int len, unsigned int flags, + struct sockaddr *from, int *fromlen) { +- BLOCKING_IO_RETURN_INT( s, recvfrom(s, buf, len, flags, from, (socklen_t)fromlen) ); ++ BLOCKING_IO_RETURN_INT( s, recvfrom(s, buf, len, flags, from, (socklen_t *)fromlen) ); + } + + int NET_Send(int s, void *msg, int len, unsigned int flags) { +@@ -298,7 +298,7 @@ + } + + int NET_Accept(int s, struct sockaddr *addr, int *addrlen) { +- BLOCKING_IO_RETURN_INT( s, accept(s, addr, (socklen_t)addrlen) ); ++ BLOCKING_IO_RETURN_INT( s, accept(s, addr, (socklen_t *)addrlen) ); + } + + int NET_Connect(int s, struct sockaddr *addr, int addrlen) { --- jdk/src/solaris/native/java/net/net_util_md.c +++ jdk/src/solaris/native/java/net/net_util_md.c @@ -34,6 +34,15 @@ @@ -12649,15 +12661,6 @@ jint IPv6_supported() { #ifndef AF_INET6 -@@ -230,7 +247,7 @@ - int fd; - void *ipv6_fn; - SOCKADDR sa; -- int sa_len = sizeof(sa); -+ socklen_t sa_len = sizeof(sa); - - fd = JVM_Socket(AF_INET6, SOCK_STREAM, 0) ; - if (fd < 0) { @@ -356,6 +373,7 @@ close(fd); return JNI_TRUE; @@ -12666,7 +12669,7 @@ void NET_AllocSockaddr(struct sockaddr **him, int *len) { -@@ -710,6 +728,10 @@ +@@ -707,6 +725,10 @@ him6->sin6_family = AF_INET6; *len = sizeof(struct sockaddr_in6) ; @@ -12677,24 +12680,16 @@ /* * On Linux if we are connecting to a link-local address * we need to specify the interface in the scope_id (2.4 kernel only) -@@ -1107,7 +1129,16 @@ +@@ -1104,7 +1126,7 @@ } #endif -+#ifdef __solaris__ - rv = getsockopt(fd, level, opt, result, len); -+#else -+ { -+ socklen_t socklen = *len; -+ rv = getsockopt(fd, level, opt, result, &socklen); -+ *len = socklen; -+ } -+#endif -+ +- rv = getsockopt(fd, level, opt, result, (socklen_t)len); ++ rv = getsockopt(fd, level, opt, result, (socklen_t *)len); if (rv < 0) { return rv; } -@@ -1154,6 +1185,24 @@ +@@ -1151,6 +1173,24 @@ #define IPTOS_PREC_MASK 0xe0 #endif @@ -12719,7 +12714,7 @@ /* * IPPROTO/IP_TOS :- * 1. IPv6 on Solaris: no-op and will be set in flowinfo -@@ -1186,6 +1235,10 @@ +@@ -1183,6 +1223,10 @@ *iptos &= (IPTOS_TOS_MASK | IPTOS_PREC_MASK); } @@ -12730,7 +12725,7 @@ /* * SOL_SOCKET/{SO_SNDBUF,SO_RCVBUF} - On Solaris need to * ensure that value is <= max_buf as otherwise we get -@@ -1233,6 +1286,84 @@ +@@ -1230,6 +1274,84 @@ } #endif |