diff options
| author | jkim <jkim@FreeBSD.org> | 2014-03-04 07:45:26 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-03-04 07:45:26 +0800 |
| commit | 94378812465702c10db677bfe9cca9bb65123b14 (patch) | |
| tree | 0a2c8b36128a412bff900cc8bb97a33d038f15a0 /java | |
| parent | 5642848171710752f82c644f965e10b8c82b1c24 (diff) | |
| download | freebsd-ports-gnome-94378812465702c10db677bfe9cca9bb65123b14.tar.gz freebsd-ports-gnome-94378812465702c10db677bfe9cca9bb65123b14.tar.zst freebsd-ports-gnome-94378812465702c10db677bfe9cca9bb65123b14.zip | |
- Sync. extremely outdated sun.util.resources.TimeZoneNames to the latest
tzdata 2013i from the upstream. Note we are not updating zoneinfo data here
as it can be updated via java/java-zoneinfo.
- Fix build with Clang 3.4 and other miscellaneous issues while I am here.
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk6-jre/Makefile | 2 | ||||
| -rw-r--r-- | java/openjdk6/Makefile | 12 | ||||
| -rw-r--r-- | java/openjdk6/files/patch-TimeZoneNames | 4097 | ||||
| -rw-r--r-- | java/openjdk6/files/patch-set | 887 |
4 files changed, 4947 insertions, 51 deletions
diff --git a/java/openjdk6-jre/Makefile b/java/openjdk6-jre/Makefile index 2ba20c72c8b2..e4c29c2ab185 100644 --- a/java/openjdk6-jre/Makefile +++ b/java/openjdk6-jre/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= java devel PKGNAMESUFFIX= -jre diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile index 3ac8cbe4267a..9468073c283f 100644 --- a/java/openjdk6/Makefile +++ b/java/openjdk6/Makefile @@ -3,7 +3,7 @@ PORTNAME= openjdk6 PORTVERSION= b30 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \ @@ -41,8 +41,9 @@ TZUPDATE_DESC= Update the time zone data .if !defined(BUILD_JRE) OPTIONS_DEFINE+=TEST -OPTIONS_RADIO= Debugging -OPTIONS_RADIO_Debugging= DEBUG FASTDEBUG +OPTIONS_RADIO= DEVEL +DEVEL_DESC= Build for OpenJDK development +OPTIONS_RADIO_DEVEL= DEBUG FASTDEBUG DEBUG_DESC= Enable legacy debugging support FASTDEBUG_DESC= Include fastdebug build TEST_DESC= Add support for running regression test @@ -193,10 +194,7 @@ ICONV_LIBS= -L${LOCALBASE}/lib ${ICONV_LIB} ZLIB_LIBS?= -lz .if ${COMPILER_TYPE} == "clang" -MAKE_ENV+= COMPILER_WARNINGS_FATAL=false DEBUG_CFLAGS/i486=-g -.if empty(PORT_OPTIONS:MDEBUG) && empty(PORT_OPTIONS:MFASTDEBUG) -MAKE_ENV+= WARNINGS_ARE_ERRORS=-w -.endif +MAKE_ENV+= USE_CLANG=true .endif post-extract: diff --git a/java/openjdk6/files/patch-TimeZoneNames b/java/openjdk6/files/patch-TimeZoneNames new file mode 100644 index 000000000000..fcb020749a03 --- /dev/null +++ b/java/openjdk6/files/patch-TimeZoneNames @@ -0,0 +1,4097 @@ +--- 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 +@@ -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"}; +@@ -101,6 +105,8 @@ + "Eastern Daylight Time", "EDT"}; + String EST_NSW[] = new String[] {"Eastern Standard Time (New South Wales)", "EST", + "Eastern Summer Time (New South Wales)", "EST"}; ++ String FET[] = new String[] {"Further-eastern European Time", "FET", ++ "Further-eastern European Summer Time", "FEST"}; + String GHMT[] = new String[] {"Ghana Mean Time", "GMT", + "Ghana Summer Time", "GHST"}; + String GAMBIER[] = new String[] {"Gambier Time", "GAMT", +@@ -153,10 +159,12 @@ + "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 SBT[] = new String[] {"Solomon Is. Time", "SBT", +@@ -169,32 +177,30 @@ + "Eastern Summer Time (Tasmania)", "EST"}; + 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 UTC[] = new String[] {"Coordinated Universal Time", "UTC", ++ "Coordinated Universal Time", "UTC"}; ++ String UZT[] = new String[] {"Uzbekistan Time", "UZT", ++ "Uzbekistan Summer Time", "UZST"}; ++ String VICTORIA[] = new String[] {"Eastern Standard Time (Victoria)", "EST", ++ "Eastern Summer Time (Victoria)", "EST"}; ++ String VLAT[] = new String[] {"Vladivostok Time", "VLAT", ++ "Vladivostok Summer Time", "VLAST"}; + String WART[] = new String[] {"Western Argentine Time", "WART", + "Western Argentine Summer Time", "WARST"}; + String WAT[] = new String[] {"Western African Time", "WAT", + "Western African Summer Time", "WAST"}; + String WET[] = new String[] {"Western European Time", "WET", + "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"}; ++ "West Samoa Daylight Time", "WSDT"}; ++ String YAKT[] = new String[] {"Yakutsk Time", "YAKT", ++ "Yakutsk Summer Time", "YAKST"}; + + return new Object[][] { + {"America/Los_Angeles", PST}, +@@ -214,6 +220,7 @@ + {"America/Anchorage", AKST}, + {"AST", AKST}, + {"America/Halifax", AST}, ++ {"America/Sitka", AKST}, + {"America/St_Johns", NST}, + {"CNT", NST}, + {"Europe/Paris", CET}, +@@ -259,6 +266,7 @@ + {"Africa/Gaborone", CAT}, + {"Africa/Harare", CAT}, + {"Africa/Johannesburg", SAST}, ++ {"Africa/Juba", EAT}, + {"Africa/Kampala", EAT}, + {"Africa/Khartoum", EAT}, + {"Africa/Kigali", CAT}, +@@ -300,7 +308,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 +317,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 +337,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 +349,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}, +@@ -361,10 +371,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 +384,25 @@ + {"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", new String[] {"Metlakatla Standard Time", "MeST", ++ "Metlakatla Daylight Time", "MeDT"}}, + {"America/Mexico_City", CST}, + {"America/Miquelon", new String[] {"Pierre & Miquelon Standard Time", "PMST", + "Pierre & Miquelon Daylight Time", "PMDT"}}, +@@ -402,6 +416,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 +426,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 +443,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}, +@@ -503,6 +518,7 @@ + "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", +@@ -511,7 +527,7 @@ + "Irkutsk Summer Time", "IRKST"}}, + {"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"}}, +@@ -521,6 +537,8 @@ + {"Asia/Kashgar", CTT}, + {"Asia/Kathmandu", NPT}, + {"Asia/Katmandu", NPT}, ++ {"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT", ++ "Khandyga Summer Time", "YAKST"}}, + {"Asia/Kolkata", IST}, + {"Asia/Krasnoyarsk", new String[] {"Krasnoyarsk Time", "KRAT", + "Krasnoyarsk Summer Time", "KRAST"}}, +@@ -569,11 +587,11 @@ + {"Asia/Ulaanbaatar", ULAT}, + {"Asia/Ulan_Bator", ULAT}, + {"Asia/Urumqi", CTT}, ++ {"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}, +@@ -619,7 +637,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 +675,7 @@ + {"Europe/Bratislava", CET}, + {"Europe/Brussels", CET}, + {"Europe/Budapest", CET}, ++ {"Europe/Busingen", CET}, + {"Europe/Chisinau", EET}, + {"Europe/Copenhagen", CET}, + {"Europe/Dublin", DUBLIN}, +@@ -666,7 +685,7 @@ + {"Europe/Isle_of_Man", GMTBST}, + {"Europe/Istanbul", EET}, + {"Europe/Jersey", GMTBST}, +- {"Europe/Kaliningrad", EET}, ++ {"Europe/Kaliningrad", FET}, + {"Europe/Kiev", EET}, + {"Europe/Lisbon", WET}, + {"Europe/Ljubljana", CET}, +@@ -675,7 +694,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}, +@@ -755,6 +774,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 +813,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 +827,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)", "CST", ++ "Zentrale Sommerzeit (S\u00FCdaustralien)", "CST"}; + 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)", "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 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,9 +87,9 @@ + "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", ++ String CUBA[] = new String[] {"Kubanische Normalzeit", "CST", ++ "Kubanische Sommerzeit", "CDT"}; ++ String DARWIN[] = new String[] {"Central Normalzeit (Northern Territory)", "CST", + "Zentrale Sommerzeit (Northern Territory)", "CST"}; + String DUBLIN[] = new String[] {"Greenwich Zeit", "GMT", + "Irische Sommerzeit", "IST"}; +@@ -99,8 +103,10 @@ + "Ostgr\u00f6nl\u00e4ndische Sommerzeit", "EGST"}; + String EST[] = new String[] {"\u00d6stliche Normalzeit", "EST", + "\u00d6stliche Sommerzeit", "EDT"}; +- String EST_NSW[] = new String[] {"\u00d6stliche Normalzeit (New South Wales)", "EST", +- "\u00d6stliche Sommerzeit (New South Wales)", "EST"}; ++ String EST_NSW[] = new String[] {"Eastern Normalzeit (Neus\u00FCdwales)", "EST", ++ "\u00D6stliche Sommerzeit (New South Wales)", "EST"}; ++ String FET[] = new String[] {"Kaliningrader Zeit", "FET", ++ "Kaliningrader Sommerzeit", "FEST"}; + String GHMT[] = new String[] {"Ghanaische Normalzeit", "GMT", + "Ghanaische Sommerzeit", "GHST"}; + String GAMBIER[] = new String[] {"Gambier Zeit", "GAMT", +@@ -153,10 +159,12 @@ + "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 SAST[] = new String[] {"S\u00fcdafrikanische Normalzeit", "SAST", + "S\u00fcdafrikanische Sommerzeit", "SAST"}; + String SBT[] = new String[] {"Salomoninseln Zeit", "SBT", +@@ -165,36 +173,34 @@ + "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)", "EST", ++ "\u00D6stliche Sommerzeit (Tasmanien)", "EST"}; + 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)", "EST", ++ "\u00D6stliche Sommerzeit (Victoria)", "EST"}; ++ String VLAT[] = new String[] {"Wladiwostok Zeit", "VLAT", ++ "Wladiwostok Sommerzeit", "VLAST"}; ++ String WART[] = new String[] {"Westargentinische Zeit", "WART", ++ "Westargentinische Sommerzeit", "WARST"}; + String WAT[] = new String[] {"Westafrikanische Zeit", "WAT", + "Westafrikanische Sommerzeit", "WAST"}; + String WET[] = new String[] {"Westeurop\u00e4ische Zeit", "WEZ", + "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"}; ++ "West Samoa Sommerzeit", "WSDT"}; ++ String YAKT[] = new String[] {"Jakutsk Zeit", "YAKT", ++ "Jakutsk Sommerzeit", "YAKST"}; + + return new Object[][] { + {"America/Los_Angeles", PST}, +@@ -214,6 +220,7 @@ + {"America/Anchorage", AKST}, + {"AST", AKST}, + {"America/Halifax", AST}, ++ {"America/Sitka", AKST}, + {"America/St_Johns", NST}, + {"CNT", NST}, + {"Europe/Paris", CET}, +@@ -259,6 +266,7 @@ + {"Africa/Gaborone", CAT}, + {"Africa/Harare", CAT}, + {"Africa/Johannesburg", SAST}, ++ {"Africa/Juba", EAT}, + {"Africa/Kampala", EAT}, + {"Africa/Khartoum", EAT}, + {"Africa/Kigali", CAT}, +@@ -300,7 +308,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 +317,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 +337,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 +349,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}, +@@ -361,10 +371,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 +384,25 @@ + {"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", new String[] {"Metlakatla Normalzeit", "MeST", ++ "Metlakatla Sommerzeit", "MeDT"}}, + {"America/Mexico_City", CST}, + {"America/Miquelon", new String[] {"Pierre & Miquelon Normalzeit", "PMST", + "Pierre & Miquelon Sommerzeit", "PMDT"}}, +@@ -402,6 +416,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 +426,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 +443,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 +461,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", "MIST"}}, + {"Antarctica/Mawson", new String[] {"Mawson Zeit", "MAWT", + "Mawson Sommerzeit", "MAWST"}}, + {"Antarctica/McMurdo", NZST}, +@@ -500,6 +518,7 @@ + "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", +@@ -508,7 +527,7 @@ + "Irkutsk Sommerzeit", "IRKST"}}, + {"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"}}, +@@ -518,6 +537,8 @@ + {"Asia/Kashgar", CTT}, + {"Asia/Kathmandu", NPT}, + {"Asia/Katmandu", NPT}, ++ {"Asia/Khandyga", new String[] {"Chandyga Zeit", "YAKT", ++ "Chandyga Sommerzeit", "YAKST"}}, + {"Asia/Kolkata", IST}, + {"Asia/Krasnoyarsk", new String[] {"Krasnojarsker Zeit", "KRAT", + "Krasnojarsker Sommerzeit", "KRAST"}}, +@@ -566,11 +587,11 @@ + {"Asia/Ulaanbaatar", ULAT}, + {"Asia/Ulan_Bator", ULAT}, + {"Asia/Urumqi", CTT}, ++ {"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 +618,8 @@ + {"Australia/Canberra", EST_NSW}, + {"Australia/Currie", EST_NSW}, + {"Australia/Darwin", DARWIN}, +- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", +- "Central Western Summer Time (Australia)", "CWST"}}, ++ {"Australia/Eucla", new String[] {"Zentral-Westliche Normalzeit (Australien)", "CWST", ++ "Zentral-Westliche Sommerzeit (Australien)", "CWST"}}, + {"Australia/Hobart", TASMANIA}, + {"Australia/LHI", LORD_HOWE}, + {"Australia/Lindeman", BRISBANE}, +@@ -616,7 +637,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 +675,7 @@ + {"Europe/Bratislava", CET}, + {"Europe/Brussels", CET}, + {"Europe/Budapest", CET}, ++ {"Europe/Busingen", CET}, + {"Europe/Chisinau", EET}, + {"Europe/Copenhagen", CET}, + {"Europe/Dublin", DUBLIN}, +@@ -663,7 +685,7 @@ + {"Europe/Isle_of_Man", GMTBST}, + {"Europe/Istanbul", EET}, + {"Europe/Jersey", GMTBST}, +- {"Europe/Kaliningrad", EET}, ++ {"Europe/Kaliningrad", FET}, + {"Europe/Kiev", EET}, + {"Europe/Lisbon", WET}, + {"Europe/Ljubljana", CET}, +@@ -672,7 +694,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}, +@@ -752,6 +774,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 +813,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 +827,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,7 +45,7 @@ + protected final Object[][] getContents() { + String ACT[] = new String[] {"Hora de Acre", "ACT", + "Hora de verano de Acre", "ACST"}; +- String ADELAIDE[] = new String[] {"Hora est\u00e1ndar Central (Sur de Australia)", "CST", ++ String ADELAIDE[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia)", "CST", + "Hora de verano Central (Sur de Australia)", "CST"}; + String AGT[] = new String[] {"Hora de Argentina", "ART", + "Hora de verano de Argentina", "ARST"}; +@@ -61,9 +61,9 @@ + "Hora de verano Atl\u00e1ntico", "ADT"}; + String BDT[] = new String[] {"Hora de Bangladesh", "BDT", + "Hora de verano de Bangladesh", "BDST"}; +- String BRISBANE[] = new String[] {"Hora est\u00e1ndar del Este (Queensland)", "EST", +- "Hora de verano del Este (Queensland)", "EST"}; +- String BROKEN_HILL[] = new String[] {"Hora est\u00e1ndar Central (Sur de Australia/Nueva Gales del Sur)", "CST", ++ String BRISBANE[] = new String[] {"Hora est\u00E1ndar del Este (Queensland)", "EST", ++ "Hora est\u00E1ndar de verano del Este (Queensland)", "EST"}; ++ String BROKEN_HILL[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia/Nueva Gales del Sur)", "CST", + "Hora de verano Central (Sur de Australia/Nueva Gales del Sur)", "CST"}; + String BRT[] = new String[] {"Hora de Brasil", "BRT", + "Hora de verano de Brasil", "BRST"}; +@@ -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[] {"Chuuk Time", "CHUT", ++ "Chuuk Summer Time", "CHUST"}; ++ String CIT[] = new String[] {"Hora de Indonesia Central", "WITA", + "Hora de verano de Indonesia Central", "CIST"}; + String CLT[] = new String[] {"Hora de Chile", "CLT", + "Hora de verano de Chile", "CLST"}; +@@ -83,9 +87,9 @@ + "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", ++ String CUBA[] = new String[] {"Hora est\u00e1ndar de Cuba", "CST", ++ "Hora de verano de Cuba", "CDT"}; ++ String DARWIN[] = new String[] {"Hora est\u00E1ndar Central (territorio del Norte)", "CST", + "Hora de verano Central (territorio del Norte)", "CST"}; + String DUBLIN[] = new String[] {"Hora del Meridiano de Greenwich", "GMT", + "Hora de verano de Irlanda", "IST"}; +@@ -99,8 +103,10 @@ + "Hora de verano de Groenlandia Oriental", "EGST"}; + String EST[] = new String[] {"Hora est\u00e1ndar Oriental", "EST", + "Hora de verano Oriental", "EDT"}; +- String EST_NSW[] = new String[] {"Hora est\u00e1ndar Oriental (Nueva Gales del Sur)", "EST", ++ String EST_NSW[] = new String[] {"Hora est\u00E1ndar Oriental (Nueva Gales del Sur)", "EST", + "Hora de verano Oriental (Nueva Gales del Sur)", "EST"}; ++ String FET[] = new String[] {"Hora de Europa m\u00E1s Oriental", "FET", ++ "Hora de verano de Europa m\u00E1s Oriental", "FEST"}; + String GHMT[] = new String[] {"Hora central de Ghana", "GMT", + "Hora de verano de Ghana", "GHST"}; + String GAMBIER[] = new String[] {"Hora de Gambier", "GAMT", +@@ -153,10 +159,12 @@ + "Hora de verano de Pitcairn", "PDT"}; + String PKT[] = new String[] {"Hora de Pakist\u00e1n", "PKT", + "Hora de verano de Pakist\u00e1n", "PKST"}; ++ String PONT[] = new String[] {"Pohnpei Time", "PONT", ++ "Pohnpei Summer Time", "PONST"}; + String 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 SAST[] = new String[] {"Hora est\u00e1ndar de Sud\u00e1frica", "SAST", + "Hora de verano de Sud\u00e1frica", "SAST"}; + String SBT[] = new String[] {"Hora de las Islas Solomon", "SBT", +@@ -165,36 +173,34 @@ + "Hora de verano de 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", ++ String TASMANIA[] = new String[] {"Hora est\u00E1ndar del Este (Tasmania)", "EST", + "Hora de verano del Este (Tasmania)", "EST"}; + 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)", "EST", ++ "Hora de verano del Este (Victoria)", "EST"}; ++ String VLAT[] = new String[] {"Hora de Vladivostok", "VLAT", ++ "Hora de verano de Vladivostok", "VLAST"}; ++ String WART[] = new String[] {"Hora de Argentina Occidental", "WART", ++ "Hora de verano de Argentina Occidental", "WARST"}; + String WAT[] = new String[] {"Hora de \u00c1frica Occidental", "WAT", + "Hora de verano de \u00c1frica Occidental", "WAST"}; + String WET[] = new String[] {"Hora de Europa Occidental", "WET", + "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", ++ 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"}; ++ "Hora de verano de Samoa Occidental", "WSDT"}; ++ String YAKT[] = new String[] {"Hora de Yakutsk", "YAKT", ++ "Hora de verano de Yakutsk", "YAKST"}; + + return new Object[][] { + {"America/Los_Angeles", PST}, +@@ -214,6 +220,7 @@ + {"America/Anchorage", AKST}, + {"AST", AKST}, + {"America/Halifax", AST}, ++ {"America/Sitka", AKST}, + {"America/St_Johns", NST}, + {"CNT", NST}, + {"Europe/Paris", CET}, +@@ -259,6 +266,7 @@ + {"Africa/Gaborone", CAT}, + {"Africa/Harare", CAT}, + {"Africa/Johannesburg", SAST}, ++ {"Africa/Juba", EAT}, + {"Africa/Kampala", EAT}, + {"Africa/Khartoum", EAT}, + {"Africa/Kigali", CAT}, +@@ -300,7 +308,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 +317,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 +337,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 +349,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}, +@@ -361,10 +371,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 +384,25 @@ + {"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", new String[] {"Metlakatla Standard Time", "MeST", ++ "Metlakatla Daylight Time", "MeDT"}}, + {"America/Mexico_City", CST}, + {"America/Miquelon", new String[] {"Hora est\u00e1ndar de Pierre & Miquelon", "PMST", + "Hora de verano de Pierre & Miquelon", "PMDT"}}, +@@ -402,6 +416,7 @@ + {"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 +426,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 +443,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 +461,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[] {"Macquarie Island Time", "MIST", ++ "Macquarie Island Summer Time", "MIST"}}, + {"Antarctica/Mawson", new String[] {"Hora de Mawson", "MAWT", + "Hora de verano de Mawson", "MAWST"}}, + {"Antarctica/McMurdo", NZST}, +@@ -500,6 +518,7 @@ + "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", +@@ -508,7 +527,7 @@ + "Hora de verano de Irkutsk", "IRKST"}}, + {"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"}}, +@@ -518,6 +537,8 @@ + {"Asia/Kashgar", CTT}, + {"Asia/Kathmandu", NPT}, + {"Asia/Katmandu", NPT}, ++ {"Asia/Khandyga", new String[] {"Hora de Khandyga", "YAKT", ++ "Hora de verano de Khandyga", "YAKST"}}, + {"Asia/Kolkata", IST}, + {"Asia/Krasnoyarsk", new String[] {"Hora de Krasnoyarsk", "KRAT", + "Hora de verano de Krasnoyarsk", "KRAST"}}, +@@ -533,7 +554,6 @@ + "Hora de verano de Filipinas", "PHST"}}, + {"Asia/Muscat", GST}, + {"Asia/Nicosia", EET}, +- + {"Asia/Novokuznetsk", NOVT}, + {"Asia/Novosibirsk", NOVT}, + {"Asia/Oral", new String[] {"Hora de Uralsk", "ORAT", +@@ -567,11 +587,11 @@ + {"Asia/Ulaanbaatar", ULAT}, + {"Asia/Ulan_Bator", ULAT}, + {"Asia/Urumqi", CTT}, ++ {"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 +618,8 @@ + {"Australia/Canberra", EST_NSW}, + {"Australia/Currie", EST_NSW}, + {"Australia/Darwin", DARWIN}, +- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", +- "Central Western Summer Time (Australia)", "CWST"}}, ++ {"Australia/Eucla", new String[] {"Hora est\u00E1ndar de Australia Central y Occidental", "CWST", ++ "Hora est\u00E1ndar de verano de Australia Central y Occidental", "CWST"}}, + {"Australia/Hobart", TASMANIA}, + {"Australia/LHI", LORD_HOWE}, + {"Australia/Lindeman", BRISBANE}, +@@ -617,7 +637,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 +675,7 @@ + {"Europe/Bratislava", CET}, + {"Europe/Brussels", CET}, + {"Europe/Budapest", CET}, ++ {"Europe/Busingen", CET}, + {"Europe/Chisinau", EET}, + {"Europe/Copenhagen", CET}, + {"Europe/Dublin", DUBLIN}, +@@ -664,7 +685,7 @@ + {"Europe/Isle_of_Man", GMTBST}, + {"Europe/Istanbul", EET}, + {"Europe/Jersey", GMTBST}, +- {"Europe/Kaliningrad", EET}, ++ {"Europe/Kaliningrad", FET}, + {"Europe/Kiev", EET}, + {"Europe/Lisbon", WET}, + {"Europe/Ljubljana", CET}, +@@ -673,7 +694,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}, +@@ -753,6 +774,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 +813,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 +827,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 +@@ -46,89 +46,95 @@ + 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"}; ++ "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud)", "CST"}; + 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"} ; ++ "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"}; ++ "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 d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "CST"}; + 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"}; ++ "Heure avanc\u00e9e de Chine", "CDT"}; ++ String CUBA[] = new String[] {"Heure standard de Cuba", "CST", ++ "Heure d'\u00e9t\u00e9 de Cuba", "CDT"}; + String DARWIN[] = new String[] {"Heure standard d'Australie centrale (Territoire du Nord)", "CST", +- "Heure d'\u00e9t\u00e9 d'Australie centrale (Territoire du Nord)", "CST"}; ++ "Heure d'\u00E9t\u00E9 d'Australie centrale (Territoire du Nord)", "CST"}; + String 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"} ; ++ "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 d'\u00E9t\u00E9 de l'Est (Nouvelle-Galles du Sud)", "EST"}; ++ 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 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"}; + String MHT[] = new String[] {"Heure des Iles Marshall", "MHT", +@@ -136,7 +142,7 @@ + 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 +152,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 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"}; ++ "Heure d'\u00E9t\u00E9 d'Australie orientale (Tasmanie)", "EST"}; + 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"} ; ++ "Heure d'\u00e9t\u00e9 de l'Ulaanbaatar", "ULAST"}; ++ String UTC[] = new String[] {"Temps universel coordonn\u00e9", "UTC", ++ "Temps universel coordonn\u00e9", "UTC"}; ++ String UZT[] = new String[] {"Heure de l'Ouzb\u00e9kistan", "UZT", ++ "Heure d'\u00e9t\u00e9 de l'Ouzb\u00e9kistan", "UZST"}; ++ String VICTORIA[] = new String[] {"Heure standard d'Australie orientale (Victoria)", "EST", ++ "Heure d'\u00E9t\u00E9 d'Australie orientale (Victoria)", "EST"}; ++ String VLAT[] = new String[] {"Heure de Vladivostok", "VLAT", ++ "Heure d'\u00e9t\u00e9 de Vladivostok", "VLAST"}; ++ String WART[] = new String[] {"Heure D'Argentine de l'Ouest", "WART", ++ "Heure d'\u00e9t\u00e9 D'Argentine de l'Ouest", "WARST"}; + String WAT[] = new String[] {"Heure d'Afrique de l'Ouest", "WAT", +- "Heure d'\u00e9t\u00e9 d'Afrique de l'Ouest", "WAST"} ; ++ "Heure d'\u00e9t\u00e9 d'Afrique de l'Ouest", "WAST"}; + String WET[] = new String[] {"Heure d'Europe de l'Ouest", "WET", +- "Heure d'\u00e9t\u00e9 d'Europe de l'Ouest", "WEST"} ; +- String WIT[] = new String[] {"Heure de l'Indon\u00e9sie occidentale", "WIT", ++ "Heure d'\u00e9t\u00e9 d'Europe de l'Ouest", "WEST"}; ++ String WIT[] = new String[] {"Heure de l'Indon\u00e9sie occidentale", "WIB", + "Heure d'\u00e9t\u00e9 de l'Indon\u00e9sie occidentale", "WIST"}; + String WST_AUS[] = new String[] {"Heure normale de l'Ouest (Australie)", "WST", +- "Heure d'\u00e9t\u00e9 de l'Ouest (Australie)", "WST"} ; +- String SAMOA[] = new String[] {"Heure standard de Samoa", "SST", +- "Heure avanc\u00e9e de Samoa", "SDT"}; ++ "Heure d'\u00E9t\u00E9 de l'Ouest (Australie)", "WST"}; + String WST_SAMOA[] = new String[] {"Heure des Samoas occidentales", "WST", +- "Heure d'\u00e9t\u00e9 des Samoas occidentales", "WSST"} ; +- String ChST[] = new String[] {"Heure normale des \u00eeles Mariannes", "ChST", +- "Heure d'\u00e9t\u00e9 des \u00eeles Mariannes", "ChDT"}; +- String VICTORIA[] = new String[] {"Heure standard d'Australie orientale (Victoria)", "EST", +- "Heure d'\u00e9t\u00e9 d'Australie orientale (Victoria)", "EST"}; +- String UTC[] = new String[] {"Temps universel coordonn\u00e9", "UTC", +- "Temps universel coordonn\u00e9", "UTC"}; +- String UZT[] = new String[] {"Heure de l'Ouzb\u00e9kistan", "UZT", +- "Heure d'\u00e9t\u00e9 de l'Ouzb\u00e9kistan", "UZST"}; ++ "Heure d'\u00e9t\u00e9 des Samoas occidentales", "WSDT"}; ++ String YAKT[] = new String[] {"Heure du Iakoutsk", "YAKT", ++ "Heure d'\u00e9t\u00e9 du Iakoutsk", "YAKST"}; + + return new Object[][] { + {"America/Los_Angeles", PST}, +@@ -214,6 +220,7 @@ + {"America/Anchorage", AKST}, + {"AST", AKST}, + {"America/Halifax", AST}, ++ {"America/Sitka", AKST}, + {"America/St_Johns", NST}, + {"CNT", NST}, + {"Europe/Paris", CET}, +@@ -259,6 +266,7 @@ + {"Africa/Gaborone", CAT}, + {"Africa/Harare", CAT}, + {"Africa/Johannesburg", SAST}, ++ {"Africa/Juba", EAT}, + {"Africa/Kampala", EAT}, + {"Africa/Khartoum", EAT}, + {"Africa/Kigali", CAT}, +@@ -300,7 +308,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 +317,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 +337,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 +349,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}, +@@ -361,10 +371,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 +384,25 @@ + {"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", new String[] {"Heure normale de Metlakatla", "MeST", ++ "Heure avanc\u00E9e de Metlakatla", "MeDT"}}, + {"America/Mexico_City", CST}, + {"America/Miquelon", new String[] {"Heure normale de Saint-Pierre et Miquelon", "PMST", + "Heure avanc\u00e9e de Saint-Pierre et Miquelon", "PMDT"}}, +@@ -402,6 +416,7 @@ + {"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 +426,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 +443,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 +461,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", "MIST"}}, + {"Antarctica/Mawson", new String[] {"Heure de Mawson", "MAWT", + "Heure d'\u00e9t\u00e9 de Mawson", "MAWST"}}, + {"Antarctica/McMurdo", NZST}, +@@ -500,6 +518,7 @@ + "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", +@@ -508,7 +527,7 @@ + "Heure d'\u00e9t\u00e9 d'Irkutsk", "IRKST"}}, + {"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"}}, +@@ -518,6 +537,8 @@ + {"Asia/Kashgar", CTT}, + {"Asia/Kathmandu", NPT}, + {"Asia/Katmandu", NPT}, ++ {"Asia/Khandyga", new String[] {"Heure de Khandyga", "YAKT", ++ "Heure d'\u00E9t\u00E9 de Khandyga", "YAKST"}}, + {"Asia/Kolkata", IST}, + {"Asia/Krasnoyarsk", new String[] {"Heure de Krasno\u00efarsk", "KRAT", + "Heure d'\u00e9t\u00e9 de Krasno\u00efarsk", "KRAST"}}, +@@ -566,11 +587,11 @@ + {"Asia/Ulaanbaatar", ULAT}, + {"Asia/Ulan_Bator", ULAT}, + {"Asia/Urumqi", CTT}, ++ {"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 +618,8 @@ + {"Australia/Canberra", EST_NSW}, + {"Australia/Currie", EST_NSW}, + {"Australia/Darwin", DARWIN}, +- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", +- "Central Western Summer Time (Australia)", "CWST"}}, ++ {"Australia/Eucla", new String[] {"Heure standard de l'Australie occidentale (centre)", "CWST", ++ "Heure d'\u00E9t\u00E9 de l'Australie occidentale (centre)", "CWST"}}, + {"Australia/Hobart", TASMANIA}, + {"Australia/LHI", LORD_HOWE}, + {"Australia/Lindeman", BRISBANE}, +@@ -616,7 +637,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 +675,7 @@ + {"Europe/Bratislava", CET}, + {"Europe/Brussels", CET}, + {"Europe/Budapest", CET}, ++ {"Europe/Busingen", CET}, + {"Europe/Chisinau", EET}, + {"Europe/Copenhagen", CET}, + {"Europe/Dublin", DUBLIN}, +@@ -663,7 +685,7 @@ + {"Europe/Isle_of_Man", GMTBST}, + {"Europe/Istanbul", EET}, + {"Europe/Jersey", GMTBST}, +- {"Europe/Kaliningrad", EET}, ++ {"Europe/Kaliningrad", FET}, + {"Europe/Kiev", EET}, + {"Europe/Lisbon", WET}, + {"Europe/Ljubljana", CET}, +@@ -672,7 +694,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}, +@@ -752,6 +774,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 +813,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 +827,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)", "CST", ++ "Ora estiva centrale (Australia del Sud)", "CST"}; + String AGT[] = new String[] {"Ora dell'Argentina", "ART", + "Ora estiva dell'Argentina", "ARST"}; + String AKST[] = new String[] {"Ora solare dell'Alaska", "AKST", +@@ -61,9 +61,9 @@ + "Ora legale dell'Atlantico occidentale", "ADT"}; + String BDT[] = new String[] {"Ora del Bangladesh", "BDT", + "Ora estiva del Bangladesh", "BDST"}; +- String BRISBANE[] = new String[] {"Ora orientale standard (Queensland)", "EST", ++ String BRISBANE[] = new String[] {"Ora standard orientale (Queensland)", "EST", + "Ora estiva orientale (Queensland)", "EST"}; +- String BROKEN_HILL[] = new String[] {"Ora centrale standard (Australia del Sud/Nuovo Galles del Sud)", "CST", ++ String BROKEN_HILL[] = new String[] {"Ora standard centrale (Australia del Sud/Nuovo Galles del Sud)", "CST", + "Ora estiva centrale (Australia del Sud/Nuovo Galles del Sud)", "CST"}; + String BRT[] = new String[] {"Ora del Brasile", "BRT", + "Ora estiva del Brasile", "BRST"}; +@@ -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,9 +87,9 @@ + "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", ++ String CUBA[] = new String[] {"Ora solare Cuba", "CST", ++ "Ora legale Cuba", "CDT"}; ++ String DARWIN[] = new String[] {"Ora standard centrale (Territori del Nord)", "CST", + "Ora estiva centrale (Territori del Nord)", "CST"}; + String DUBLIN[] = new String[] {"Ora media di Greenwich", "GMT", + "Ora estiva irlandese", "IST"}; +@@ -99,8 +103,10 @@ + "Ora estiva della Groenlandia orientale", "EGST"}; + String EST[] = new String[] {"Ora solare USA orientale", "EST", + "Ora legale USA orientale", "EDT"}; +- String EST_NSW[] = new String[] {"Ora solare dell'Australia orientale (Nuovo Galles del Sud)", "EST", ++ String EST_NSW[] = new String[] {"Ora standard dell'Australia orientale (Nuovo Galles del Sud)", "EST", + "Ora estiva dell'Australia orientale (Nuovo Galles del Sud)", "EST"}; ++ String FET[] = new String[] {"Ora dei paesi europei pi\u00F9 orientali", "FET", ++ "Ora estiva dei paesi europei pi\u00F9 orientali", "FEST"}; + String GHMT[] = new String[] {"Ora media del Ghana", "GMT", + "Ora legale del Ghana", "GHST"}; + String GAMBIER[] = new String[] {"Ora di Gambier", "GAMT", +@@ -153,10 +159,12 @@ + "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 SAST[] = new String[] {"Ora solare del Sudafrica", "SAST", + "Ora estiva del Sudafrica", "SAST"}; + String SBT[] = new String[] {"Ora delle Isole Salomone", "SBT", +@@ -165,36 +173,34 @@ + "Ora estiva 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", ++ String TASMANIA[] = new String[] {"Ora standard orientale (Tasmania)", "EST", + "Ora estiva orientale (Tasmania)", "EST"}; + 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)", "EST", ++ "Ora estiva orientale (Victoria)", "EST"}; ++ String VLAT[] = new String[] {"Ora di Vladivostok", "VLAT", ++ "Ora estiva di Vladivostok", "VLAST"}; ++ String WART[] = new String[] {"Ora dell'Argentina occidentale", "WART", ++ "Ora estiva dell'Argentina occidentale", "WARST"}; + String WAT[] = new String[] {"Ora dell'Africa occidentale", "WAT", + "Ora estiva dell'Africa occidentale", "WAST"}; + String WET[] = new String[] {"Ora dell'Europa occidentale", "WET", + "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", ++ String WST_AUS[] = new String[] {"Ora standard 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"}; ++ "Ora estiva di Samoa", "WSDT"}; ++ String YAKT[] = new String[] {"Ora di Jakutsk", "YAKT", ++ "Ora estiva di Jakutsk", "YAKST"}; + + return new Object[][] { + {"America/Los_Angeles", PST}, +@@ -214,6 +220,7 @@ + {"America/Anchorage", AKST}, + {"AST", AKST}, + {"America/Halifax", AST}, ++ {"America/Sitka", AKST}, + {"America/St_Johns", NST}, + {"CNT", NST}, + {"Europe/Paris", CET}, +@@ -259,6 +266,7 @@ + {"Africa/Gaborone", CAT}, + {"Africa/Harare", CAT}, + {"Africa/Johannesburg", SAST}, ++ {"Africa/Juba", EAT}, + {"Africa/Kampala", EAT}, + {"Africa/Khartoum", EAT}, + {"Africa/Kigali", CAT}, +@@ -300,7 +308,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 +317,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 +337,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 +349,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}, +@@ -361,10 +371,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 +384,25 @@ + {"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", new String[] {"Ora standard di Metlakatla", "MeST", ++ "Ora legale di Metlakatla", "MeDT"}}, + {"America/Mexico_City", CST}, + {"America/Miquelon", new String[] {"Ora solare di Saint-Pierre e Miquelon", "PMST", + "Ora legale di Saint-Pierre e Miquelon", "PMDT"}}, +@@ -402,6 +416,7 @@ + {"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 +426,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 +443,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 +461,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", "MIST"}}, + {"Antarctica/Mawson", new String[] {"Ora di Mawson", "MAWT", + "Ora estiva di Mawson", "MAWST"}}, + {"Antarctica/McMurdo", NZST}, +@@ -500,6 +518,7 @@ + "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", +@@ -508,7 +527,7 @@ + "Ora estiva di Irkutsk", "IRKST"}}, + {"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"}}, +@@ -518,6 +537,8 @@ + {"Asia/Kashgar", CTT}, + {"Asia/Kathmandu", NPT}, + {"Asia/Katmandu", NPT}, ++ {"Asia/Khandyga", new String[] {"Ora di Khandyga", "YAKT", ++ "Ora estiva di Khandyga", "YAKST"}}, + {"Asia/Kolkata", IST}, + {"Asia/Krasnoyarsk", new String[] {"Ora di Krasnojarsk", "KRAT", + "Ora estiva di Krasnojarsk", "KRAST"}}, +@@ -566,11 +587,11 @@ + {"Asia/Ulaanbaatar", ULAT}, + {"Asia/Ulan_Bator", ULAT}, + {"Asia/Urumqi", CTT}, ++ {"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 +618,8 @@ + {"Australia/Canberra", EST_NSW}, + {"Australia/Currie", EST_NSW}, + {"Australia/Darwin", DARWIN}, +- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", +- "Central Western Summer Time (Australia)", "CWST"}}, ++ {"Australia/Eucla", new String[] {"Ora standard Australia centro-occidentale", "CWST", ++ "Ora estiva Australia centro-occidentale", "CWST"}}, + {"Australia/Hobart", TASMANIA}, + {"Australia/LHI", LORD_HOWE}, + {"Australia/Lindeman", BRISBANE}, +@@ -616,7 +637,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 +675,7 @@ + {"Europe/Bratislava", CET}, + {"Europe/Brussels", CET}, + {"Europe/Budapest", CET}, ++ {"Europe/Busingen", CET}, + {"Europe/Chisinau", EET}, + {"Europe/Copenhagen", CET}, + {"Europe/Dublin", DUBLIN}, +@@ -663,7 +685,7 @@ + {"Europe/Isle_of_Man", GMTBST}, + {"Europe/Istanbul", EET}, + {"Europe/Jersey", GMTBST}, +- {"Europe/Kaliningrad", EET}, ++ {"Europe/Kaliningrad", FET}, + {"Europe/Kiev", EET}, + {"Europe/Lisbon", WET}, + {"Europe/Ljubljana", CET}, +@@ -672,7 +694,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}, +@@ -752,6 +774,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 +813,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 +827,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)", "CST", ++ "\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CST"}; + 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)", "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 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)", "CST", ++ "\u4E2D\u90E8\u590F\u6642\u9593(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "CST"}; + 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)", "EST", ++ "\u6771\u90E8\u590F\u6642\u9593(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "EST"}; ++ String FET[] = new String[] {"\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u6642\u9593", "FET", ++ "\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u590F\u6642\u9593", "FEST"}; + String GHMT[] = new String[] {"\u30ac\u30fc\u30ca\u6a19\u6e96\u6642", "GMT", + "\u30ac\u30fc\u30ca\u590f\u6642\u9593", "GHST"}; + String GAMBIER[] = new String[] {"\u30ac\u30f3\u30d3\u30a2\u6642\u9593", "GAMT", +@@ -153,10 +159,12 @@ + "\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 SAST[] = new String[] {"\u5357\u30a2\u30d5\u30ea\u30ab\u6a19\u6e96\u6642", "SAST", + "\u5357\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "SAST"}; + String SBT[] = new String[] {"\u30bd\u30ed\u30e2\u30f3\u8af8\u5cf6\u6642\u9593", "SBT", +@@ -165,36 +173,34 @@ + "\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)", "EST", ++ "\u6771\u90E8\u590F\u6642\u9593(\u30BF\u30B9\u30DE\u30CB\u30A2)", "EST"}; + 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)", "EST", ++ "\u6771\u90E8\u590F\u6642\u9593(\u30D3\u30AF\u30C8\u30EA\u30A2)", "EST"}; ++ String VLAT[] = new String[] {"\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u6642\u9593", "VLAT", ++ "\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u590f\u6642\u9593", "VLAST"}; ++ String WART[] = new String[] {"\u897f\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "WART", ++ "\u897f\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u590f\u6642\u9593", "WARST"}; + String WAT[] = new String[] {"\u897f\u30a2\u30d5\u30ea\u30ab\u6642\u9593", "WAT", + "\u897f\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "WAST"}; + String WET[] = new String[] {"\u897f\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "WET", + "\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_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "WST", ++ "\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "WST"}; + String WST_SAMOA[] = new String[] {"\u897f\u30b5\u30e2\u30a2\u6642\u9593", "WST", +- "\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"}; ++ "\u897f\u30b5\u30e2\u30a2\u590f\u6642\u9593", "WSDT"}; ++ String YAKT[] = new String[] {"\u30e4\u30af\u30fc\u30c4\u30af\u6642\u9593", "YAKT", ++ "\u30e4\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "YAKST"}; + + return new Object[][] { + {"America/Los_Angeles", PST}, +@@ -214,6 +220,7 @@ + {"America/Anchorage", AKST}, + {"AST", AKST}, + {"America/Halifax", AST}, ++ {"America/Sitka", AKST}, + {"America/St_Johns", NST}, + {"CNT", NST}, + {"Europe/Paris", CET}, +@@ -259,6 +266,7 @@ + {"Africa/Gaborone", CAT}, + {"Africa/Harare", CAT}, + {"Africa/Johannesburg", SAST}, ++ {"Africa/Juba", EAT}, + {"Africa/Kampala", EAT}, + {"Africa/Khartoum", EAT}, + {"Africa/Kigali", CAT}, +@@ -300,7 +308,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 +317,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 +337,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 +349,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}, +@@ -361,10 +371,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 +384,25 @@ + {"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", new String[] {"\u30E1\u30C8\u30E9\u30AB\u30C8\u30E9\u6A19\u6E96\u6642\u9593", "MeST", ++ "\u30E1\u30C8\u30E9\u30AB\u30C8\u30E9\u590F\u6642\u9593", "MeDT"}}, + {"America/Mexico_City", CST}, + {"America/Miquelon", new String[] {"\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u6a19\u6e96\u6642", "PMST", + "\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u590f\u6642\u9593", "PMDT"}}, +@@ -402,6 +416,7 @@ + {"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 +426,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 +443,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 +461,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", "MIST"}}, + {"Antarctica/Mawson", new String[] {"\u30e2\u30fc\u30bd\u30f3\u6642\u9593", "MAWT", + "\u30e2\u30fc\u30bd\u30f3\u590f\u6642\u9593", "MAWST"}}, + {"Antarctica/McMurdo", NZST}, +@@ -500,6 +518,7 @@ + "\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", +@@ -508,7 +527,7 @@ + "\u30a4\u30eb\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "IRKST"}}, + {"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"}}, +@@ -518,6 +537,8 @@ + {"Asia/Kashgar", CTT}, + {"Asia/Kathmandu", NPT}, + {"Asia/Katmandu", NPT}, ++ {"Asia/Khandyga", new String[] {"\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u6642\u9593", "YAKT", ++ "\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u590F\u6642\u9593", "YAKST"}}, + {"Asia/Kolkata", IST}, + {"Asia/Krasnoyarsk", new String[] {"\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u6642\u9593", "KRAT", + "\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u590f\u6642\u9593", "KRAST"}}, +@@ -566,11 +587,11 @@ + {"Asia/Ulaanbaatar", ULAT}, + {"Asia/Ulan_Bator", ULAT}, + {"Asia/Urumqi", CTT}, ++ {"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 +618,8 @@ + {"Australia/Canberra", EST_NSW}, + {"Australia/Currie", EST_NSW}, + {"Australia/Darwin", DARWIN}, +- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", +- "Central Western Summer Time (Australia)", "CWST"}}, ++ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CWST", ++ "\u4E2D\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CWST"}}, + {"Australia/Hobart", TASMANIA}, + {"Australia/LHI", LORD_HOWE}, + {"Australia/Lindeman", BRISBANE}, +@@ -616,7 +637,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 +675,7 @@ + {"Europe/Bratislava", CET}, + {"Europe/Brussels", CET}, + {"Europe/Budapest", CET}, ++ {"Europe/Busingen", CET}, + {"Europe/Chisinau", EET}, + {"Europe/Copenhagen", CET}, + {"Europe/Dublin", DUBLIN}, +@@ -663,7 +685,7 @@ + {"Europe/Isle_of_Man", GMTBST}, + {"Europe/Istanbul", EET}, + {"Europe/Jersey", GMTBST}, +- {"Europe/Kaliningrad", EET}, ++ {"Europe/Kaliningrad", FET}, + {"Europe/Kiev", EET}, + {"Europe/Lisbon", WET}, + {"Europe/Ljubljana", CET}, +@@ -672,7 +694,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}, +@@ -752,6 +774,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 +813,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 +827,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)", "CST", ++ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CST"}; + 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)", "EST", ++ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD038\uC990\uB79C\uB4DC)", "EST"}; ++ String BROKEN_HILL[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "CST", ++ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "CST"}; + String 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)", "CST", ++ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBD81\uBD80 \uC9C0\uC5ED)", "CST"}; + 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)", "EST", ++ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "EST"}; ++ String FET[] = new String[] {"\uADF9\uB3D9 \uC720\uB7FD \uD45C\uC900\uC2DC", "FET", ++ "\uADF9\uB3D9 \uC720\uB7FD \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "FEST"}; + String GHMT[] = new String[] {"\uac00\ub098 \ud45c\uc900\uc2dc", "GMT", + "\uac00\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GHST"}; + String GAMBIER[] = new String[] {"\uac10\ube44\uc544 \uc2dc\uac04", "GAMT", +@@ -153,10 +159,12 @@ + "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 SAST[] = new String[] {"\ub0a8\uc544\ud504\ub9ac\uce74 \ud45c\uc900\uc2dc", "SAST", + "\ub0a8\uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SAST"}; + String SBT[] = new String[] {"\uc194\ub85c\ubaac \uad70\ub3c4 \uc2dc\uac04", "SBT", +@@ -165,36 +173,34 @@ + "\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)", "EST", ++ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "EST"}; + 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)", "EST", ++ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBE45\uD1A0\uB9AC\uC544)", "EST"}; ++ String VLAT[] = new String[] {"\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc2dc\uac04", "VLAT", ++ "\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VLAST"}; ++ String WART[] = new String[] {"\uc11c\ubd80 \uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "WART", ++ "\uc11c\ubd80 \uc544\ub974\ud5e8\ud2f0\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WARST"}; + String WAT[] = new String[] {"\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc2dc\uac04", "WAT", + "\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WAST"}; + String WET[] = new String[] {"\uc11c\uc720\ub7fd \uc2dc\uac04", "WET", + "\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_AUS[] = new String[] {"\uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "WST", ++ "\uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "WST"}; + String WST_SAMOA[] = new String[] {"\uc11c\uc0ac\ubaa8\uc544 \uc2dc\uac04", "WST", +- "\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"}; ++ "\uc11c\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WSDT"}; ++ String YAKT[] = new String[] {"\uc57c\uce20\ud06c \uc2dc\uac04", "YAKT", ++ "\uc57c\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "YAKST"}; + + return new Object[][] { + {"America/Los_Angeles", PST}, +@@ -214,6 +220,7 @@ + {"America/Anchorage", AKST}, + {"AST", AKST}, + {"America/Halifax", AST}, ++ {"America/Sitka", AKST}, + {"America/St_Johns", NST}, + {"CNT", NST}, + {"Europe/Paris", CET}, +@@ -259,6 +266,7 @@ + {"Africa/Gaborone", CAT}, + {"Africa/Harare", CAT}, + {"Africa/Johannesburg", SAST}, ++ {"Africa/Juba", EAT}, + {"Africa/Kampala", EAT}, + {"Africa/Khartoum", EAT}, + {"Africa/Kigali", CAT}, +@@ -300,7 +308,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 +317,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 +337,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 +349,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}, +@@ -361,10 +371,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 +384,25 @@ + {"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", new String[] {"\uBA54\uD2B8\uB77C\uCE74\uD2B8\uB77C \uD45C\uC900\uC2DC", "MeST", ++ "\uBA54\uD2B8\uB77C\uCE74\uD2B8\uB77C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "MeDT"}}, + {"America/Mexico_City", CST}, + {"America/Miquelon", new String[] {"\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \ud45c\uc900\uc2dc", "PMST", + "\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PMDT"}}, +@@ -402,6 +416,7 @@ + {"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 +426,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 +443,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 +461,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", "MIST"}}, + {"Antarctica/Mawson", new String[] {"\ubaa8\uc2a8 \uc2dc\uac04", "MAWT", + "\ubaa8\uc2a8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MAWST"}}, + {"Antarctica/McMurdo", NZST}, +@@ -500,6 +518,7 @@ + "\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", +@@ -508,7 +527,7 @@ + "\uc774\ub974\ucfe0\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IRKST"}}, + {"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"}}, +@@ -518,6 +537,8 @@ + {"Asia/Kashgar", CTT}, + {"Asia/Kathmandu", NPT}, + {"Asia/Katmandu", NPT}, ++ {"Asia/Khandyga", new String[] {"\uD55C\uB514\uAC00 \uD45C\uC900\uC2DC", "YAKT", ++ "\uD55C\uB514\uAC00 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "YAKST"}}, + {"Asia/Kolkata", IST}, + {"Asia/Krasnoyarsk", new String[] {"\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc2dc\uac04", "KRAT", + "\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KRAST"}}, +@@ -566,11 +587,11 @@ + {"Asia/Ulaanbaatar", ULAT}, + {"Asia/Ulan_Bator", ULAT}, + {"Asia/Urumqi", CTT}, ++ {"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 +618,8 @@ + {"Australia/Canberra", EST_NSW}, + {"Australia/Currie", EST_NSW}, + {"Australia/Darwin", DARWIN}, +- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", +- "Central Western Summer Time (Australia)", "CWST"}}, ++ {"Australia/Eucla", new String[] {"\uC911\uC559 \uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CWST", ++ "\uC911\uC559 \uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CWST"}}, + {"Australia/Hobart", TASMANIA}, + {"Australia/LHI", LORD_HOWE}, + {"Australia/Lindeman", BRISBANE}, +@@ -616,7 +637,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 +675,7 @@ + {"Europe/Bratislava", CET}, + {"Europe/Brussels", CET}, + {"Europe/Budapest", CET}, ++ {"Europe/Busingen", CET}, + {"Europe/Chisinau", EET}, + {"Europe/Copenhagen", CET}, + {"Europe/Dublin", DUBLIN}, +@@ -663,7 +685,7 @@ + {"Europe/Isle_of_Man", GMTBST}, + {"Europe/Istanbul", EET}, + {"Europe/Jersey", GMTBST}, +- {"Europe/Kaliningrad", EET}, ++ {"Europe/Kaliningrad", FET}, + {"Europe/Kiev", EET}, + {"Europe/Lisbon", WET}, + {"Europe/Ljubljana", CET}, +@@ -672,7 +694,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}, +@@ -752,6 +774,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 +813,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 +827,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)", "CST", ++ "Central sommartid (South Australia)", "CST"}; + 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)", "EST", ++ "\u00D6stlig sommartid (Queensland)", "EST"}; ++ String BROKEN_HILL[] = new String[] {"Central standardtid (Sydaustralien)/New South Wales)", "CST", ++ "Central sommartid (South Australia/New South Wales)", "CST"}; + String 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)", "CST", ++ "Central sommartid (Nordterritoriet)", "CST"}; + 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)", "EST", ++ "\u00D6stlig sommartid (New South Wales)", "EST"}; ++ String FET[] = new String[] {"Kaliningradtid", "FET", ++ "\u00D6steuropeisk sommartid", "FEST"}; + String GHMT[] = new String[] {"Ghana, normaltid", "GMT", + "Ghana, sommartid", "GHST"}; + String GAMBIER[] = new String[] {"Gambier, normaltid", "GAMT", +@@ -153,48 +159,48 @@ + "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 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", ++ String SLST[] = new String[] {"Greenwichtid", "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)", "EST", ++ "\u00D6stlig sommartid (Tasmanien)", "EST"}; + 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)", "EST", ++ "\u00D6stlig sommartid (Victoria)", "EST"}; ++ String VLAT[] = new String[] {"Vladivostok, normaltid", "VLAT", ++ "Vladivostok, sommartid", "VLAST"}; ++ String WART[] = new String[] {"V\u00e4stargentina, normaltid", "WART", ++ "V\u00e4stargentina, sommartid", "WARST"}; + String WAT[] = new String[] {"V\u00e4stafrikansk tid", "WAT", + "V\u00e4stafrikansk sommartid", "WAST"}; + String WET[] = new String[] {"V\u00e4steuropeisk tid", "WET", + "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"}; ++ "V\u00E4stlig sommartid (Australien)", "WST"}; + 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"}; ++ "V\u00e4stsamoansk sommartid", "WSDT"}; ++ String YAKT[] = new String[] {"Jakutsk, normaltid", "YAKT", ++ "Jakutsk, sommartid", "YAKST"}; + + return new Object[][] { + {"America/Los_Angeles", PST}, +@@ -214,6 +220,7 @@ + {"America/Anchorage", AKST}, + {"AST", AKST}, + {"America/Halifax", AST}, ++ {"America/Sitka", AKST}, + {"America/St_Johns", NST}, + {"CNT", NST}, + {"Europe/Paris", CET}, +@@ -259,6 +266,7 @@ + {"Africa/Gaborone", CAT}, + {"Africa/Harare", CAT}, + {"Africa/Johannesburg", SAST}, ++ {"Africa/Juba", EAT}, + {"Africa/Kampala", EAT}, + {"Africa/Khartoum", EAT}, + {"Africa/Kigali", CAT}, +@@ -300,7 +308,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 +317,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 +337,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 +349,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}, +@@ -361,10 +371,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 +384,25 @@ + {"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", new String[] {"Metlakatla, normaltid", "MeST", ++ "Metlakatla, sommartid", "MeDT"}}, + {"America/Mexico_City", CST}, + {"America/Miquelon", new String[] {"Saint-Pierre-et-Miquelon, normaltid", "PMST", + "Saint-Pierre-et-Miquelon, sommartid", "PMDT"}}, +@@ -402,6 +416,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 +426,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 +443,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 +461,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", "MIST"}}, + {"Antarctica/Mawson", new String[] {"Mawson, normaltid", "MAWT", + "Mawson, sommartid", "MAWST"}}, + {"Antarctica/McMurdo", NZST}, +@@ -500,6 +518,7 @@ + "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", +@@ -508,7 +527,7 @@ + "Irkutsk, sommartid", "IRKST"}}, + {"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"}}, +@@ -518,6 +537,8 @@ + {"Asia/Kashgar", CTT}, + {"Asia/Kathmandu", NPT}, + {"Asia/Katmandu", NPT}, ++ {"Asia/Khandyga", new String[] {"Khandyga, normaltid", "YAKT", ++ "Khandyga, sommartid", "YAKST"}}, + {"Asia/Kolkata", IST}, + {"Asia/Krasnoyarsk", new String[] {"Krasnojarsk, normaltid", "KRAT", + "Krasnojarsk, sommartid", "KRAST"}}, +@@ -566,11 +587,11 @@ + {"Asia/Ulaanbaatar", ULAT}, + {"Asia/Ulan_Bator", ULAT}, + {"Asia/Urumqi", CTT}, ++ {"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 +618,8 @@ + {"Australia/Canberra", EST_NSW}, + {"Australia/Currie", EST_NSW}, + {"Australia/Darwin", DARWIN}, +- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", +- "Central Western Summer Time (Australia)", "CWST"}}, ++ {"Australia/Eucla", new String[] {"Central v\u00E4stlig normaltid (Australien)", "CWST", ++ "Central v\u00E4stlig sommartid (Australien)", "CWST"}}, + {"Australia/Hobart", TASMANIA}, + {"Australia/LHI", LORD_HOWE}, + {"Australia/Lindeman", BRISBANE}, +@@ -616,7 +637,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 +675,7 @@ + {"Europe/Bratislava", CET}, + {"Europe/Brussels", CET}, + {"Europe/Budapest", CET}, ++ {"Europe/Busingen", CET}, + {"Europe/Chisinau", EET}, + {"Europe/Copenhagen", CET}, + {"Europe/Dublin", DUBLIN}, +@@ -663,7 +685,7 @@ + {"Europe/Isle_of_Man", GMTBST}, + {"Europe/Istanbul", EET}, + {"Europe/Jersey", GMTBST}, +- {"Europe/Kaliningrad", EET}, ++ {"Europe/Kaliningrad", FET}, + {"Europe/Kiev", EET}, + {"Europe/Lisbon", WET}, + {"Europe/Ljubljana", CET}, +@@ -672,7 +694,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}, +@@ -752,6 +774,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 +813,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 +827,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)", "CST", ++ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A)", "CST"}; + 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)", "EST", ++ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u6606\u58EB\u5170)", "EST"}; ++ String BROKEN_HILL[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "CST", ++ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "CST"}; + String 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)", "CST", ++ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5317\u9886\u5730)", "CST"}; + 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)", "EST", ++ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u65B0\u5357\u5A01\u5C14\u65AF)", "EST"}; ++ String FET[] = new String[] {"\u8FDC\u4E1C\u6B27\u65F6\u95F4", "FET", ++ "\u8FDC\u4E1C\u6B27\u590F\u4EE4\u65F6", "FEST"}; + String GHMT[] = new String[] {"\u52a0\u7eb3\u65f6\u95f4", "GMT", + "\u52a0\u7eb3\u590f\u4ee4\u65f6", "GHST"}; + String GAMBIER[] = new String[] {"\u5188\u6bd4\u4e9a\u65f6\u95f4", "GAMT", +@@ -153,10 +159,12 @@ + "\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 SAST[] = new String[] {"\u5357\u975e\u6807\u51c6\u65f6\u95f4", "SAST", + "\u5357\u975e\u590f\u4ee4\u65f6", "SAST"}; + String SBT[] = new String[] {"\u6240\u7f57\u95e8\u7fa4\u5c9b\u65f6\u95f4", "SBT", +@@ -165,36 +173,34 @@ + "\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)", "EST", ++ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "EST"}; + 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)", "EST", ++ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u7EF4\u591A\u5229\u4E9A)", "EST"}; ++ String VLAT[] = new String[] {"\u6d77\u53c2\u5d34\u65f6\u95f4", "VLAT", ++ "\u6d77\u53c2\u5d34\u590f\u4ee4\u65f6", "VLAST"}; ++ String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u65f6\u95f4", "WART", ++ "\u897f\u963f\u6839\u5ef7\u590f\u4ee4\u65f6", "WARST"}; + String WAT[] = new String[] {"\u897f\u975e\u65f6\u95f4", "WAT", + "\u897f\u975e\u590f\u4ee4\u65f6", "WAST"}; + String WET[] = new String[] {"\u897f\u6b27\u65f6\u95f4", "WET", + "\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_AUS[] = new String[] {"\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "WST", ++ "\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "WST"}; + String WST_SAMOA[] = new String[] {"\u897f\u8428\u6469\u4e9a\u65f6\u95f4", "WST", +- "\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"}; ++ "\u897f\u8428\u6469\u4e9a\u590f\u4ee4\u65f6", "WSDT"}; ++ String YAKT[] = new String[] {"\u4e9a\u5e93\u6b21\u514b\u65f6\u95f4", "YAKT", ++ "\u4e9a\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "YAKST"}; + + return new Object[][] { + {"America/Los_Angeles", PST}, +@@ -214,6 +220,7 @@ + {"America/Anchorage", AKST}, + {"AST", AKST}, + {"America/Halifax", AST}, ++ {"America/Sitka", AKST}, + {"America/St_Johns", NST}, + {"CNT", NST}, + {"Europe/Paris", CET}, +@@ -259,6 +266,7 @@ + {"Africa/Gaborone", CAT}, + {"Africa/Harare", CAT}, + {"Africa/Johannesburg", SAST}, ++ {"Africa/Juba", EAT}, + {"Africa/Kampala", EAT}, + {"Africa/Khartoum", EAT}, + {"Africa/Kigali", CAT}, +@@ -300,7 +308,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 +317,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 +337,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 +349,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}, +@@ -361,10 +371,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 +384,25 @@ + {"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", new String[] {"\u6885\u7279\u62C9\u5361\u7279\u62C9\u6807\u51C6\u65F6\u95F4", "MeST", ++ "\u6885\u7279\u62C9\u5361\u7279\u62C9\u590F\u4EE4\u65F6", "MeDT"}}, + {"America/Mexico_City", CST}, + {"America/Miquelon", new String[] {"\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u6807\u51c6\u65f6\u95f4", "PMST", + "\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u590f\u4ee4\u65f6", "PMDT"}}, +@@ -402,6 +416,7 @@ + {"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 +426,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 +443,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 +461,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", "MIST"}}, + {"Antarctica/Mawson", new String[] {"\u83ab\u68ee\u65f6\u95f4", "MAWT", + "\u83ab\u68ee\u590f\u4ee4\u65f6", "MAWST"}}, + {"Antarctica/McMurdo", NZST}, +@@ -500,6 +518,7 @@ + "\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", +@@ -508,7 +527,7 @@ + "\u4f0a\u5c14\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "IRKST"}}, + {"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"}}, +@@ -518,6 +537,8 @@ + {"Asia/Kashgar", CTT}, + {"Asia/Kathmandu", NPT}, + {"Asia/Katmandu", NPT}, ++ {"Asia/Khandyga", new String[] {"\u6C49\u5FB7\u52A0\u65F6\u95F4", "YAKT", ++ "\u6C49\u5FB7\u52A0\u590F\u4EE4\u65F6", "YAKST"}}, + {"Asia/Kolkata", IST}, + {"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u65f6\u95f4", "KRAT", + "\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u590f\u4ee4\u65f6", "KRAST"}}, +@@ -566,11 +587,11 @@ + {"Asia/Ulaanbaatar", ULAT}, + {"Asia/Ulan_Bator", ULAT}, + {"Asia/Urumqi", CTT}, ++ {"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 +618,8 @@ + {"Australia/Canberra", EST_NSW}, + {"Australia/Currie", EST_NSW}, + {"Australia/Darwin", DARWIN}, +- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", +- "Central Western Summer Time (Australia)", "CWST"}}, ++ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "CWST", ++ "\u4E2D\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "CWST"}}, + {"Australia/Hobart", TASMANIA}, + {"Australia/LHI", LORD_HOWE}, + {"Australia/Lindeman", BRISBANE}, +@@ -616,7 +637,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 +675,7 @@ + {"Europe/Bratislava", CET}, + {"Europe/Brussels", CET}, + {"Europe/Budapest", CET}, ++ {"Europe/Busingen", CET}, + {"Europe/Chisinau", EET}, + {"Europe/Copenhagen", CET}, + {"Europe/Dublin", DUBLIN}, +@@ -663,7 +685,7 @@ + {"Europe/Isle_of_Man", GMTBST}, + {"Europe/Istanbul", EET}, + {"Europe/Jersey", GMTBST}, +- {"Europe/Kaliningrad", EET}, ++ {"Europe/Kaliningrad", FET}, + {"Europe/Kiev", EET}, + {"Europe/Lisbon", WET}, + {"Europe/Ljubljana", CET}, +@@ -672,7 +694,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}, +@@ -752,6 +774,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 +813,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 +827,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)", "CST", ++ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340)", "CST"}; + 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)", "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 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)", "CST", ++ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "CST"}; + 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)", "EST", ++ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "EST"}; ++ String FET[] = new String[] {"\u6771\u6B50\u5167\u9678\u6642\u9593", "FET", ++ "\u6771\u6B50\u5167\u9678\u590F\u4EE4\u6642\u9593", "FEST"}; + String GHMT[] = new String[] {"\u8fe6\u7d0d\u5e73\u5747\u6642\u9593", "GMT", + "\u8fe6\u7d0d\u590f\u4ee4\u6642\u9593", "GHST"}; + String GAMBIER[] = new String[] {"\u7518\u6bd4\u723e\u6642\u9593", "GAMT", +@@ -153,10 +159,12 @@ + "\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 SAST[] = new String[] {"\u5357\u975e\u6a19\u6e96\u6642\u9593", "SAST", + "\u5357\u975e\u590f\u4ee4\u6642\u9593", "SAST"}; + String SBT[] = new String[] {"\u6240\u7f85\u9580\u7fa4\u5cf6\u6642\u9593", "SBT", +@@ -165,36 +173,34 @@ + "\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)", "EST", ++ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "EST"}; + 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)", "EST", ++ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "EST"}; ++ String VLAT[] = new String[] {"\u6d77\u53c3\u5d34\u6642\u9593", "VLAT", ++ "\u6d77\u53c3\u5d34\u590f\u4ee4\u6642\u9593", "VLAST"}; ++ String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u6642\u9593", "WART", ++ "\u897f\u963f\u6839\u5ef7\u590f\u4ee4\u6642\u9593", "WARST"}; + String WAT[] = new String[] {"\u897f\u975e\u6642\u9593", "WAT", + "\u897f\u975e\u590f\u4ee4\u6642\u9593", "WAST"}; + String WET[] = new String[] {"\u897f\u6b50\u6642\u9593", "WET", + "\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_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "WST", ++ "\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "WST"}; + String WST_SAMOA[] = new String[] {"\u897f\u85a9\u6469\u4e9e\u6642\u9593", "WST", +- "\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"}; ++ "\u897f\u85a9\u6469\u4e9e\u590f\u4ee4\u6642\u9593", "WSDT"}; ++ String YAKT[] = new String[] {"\u4e9e\u5eab\u6b21\u514b\u6642\u9593", "YAKT", ++ "\u4e9e\u5eab\u6b21\u514b\u590f\u4ee4\u6642\u9593", "YAKST"}; + + return new Object[][] { + {"America/Los_Angeles", PST}, +@@ -214,6 +220,7 @@ + {"America/Anchorage", AKST}, + {"AST", AKST}, + {"America/Halifax", AST}, ++ {"America/Sitka", AKST}, + {"America/St_Johns", NST}, + {"CNT", NST}, + {"Europe/Paris", CET}, +@@ -259,6 +266,7 @@ + {"Africa/Gaborone", CAT}, + {"Africa/Harare", CAT}, + {"Africa/Johannesburg", SAST}, ++ {"Africa/Juba", EAT}, + {"Africa/Kampala", EAT}, + {"Africa/Khartoum", EAT}, + {"Africa/Kigali", CAT}, +@@ -300,7 +308,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 +317,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 +337,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 +349,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}, +@@ -361,10 +371,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 +384,25 @@ + {"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", new String[] {"\u6885\u7279\u62C9\u5361\u7279\u62C9\u6A19\u6E96\u6642\u9593", "MeST", ++ "\u6885\u7279\u62C9\u5361\u7279\u62C9\u65E5\u5149\u7BC0\u7D04\u6642\u9593", "MeDT"}}, + {"America/Mexico_City", CST}, + {"America/Miquelon", new String[] {"\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u6a19\u6e96\u6642\u9593", "PMST", + "\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PMDT"}}, +@@ -402,6 +416,7 @@ + {"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 +426,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 +443,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 +461,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", "MIST"}}, + {"Antarctica/Mawson", new String[] {"\u83ab\u68ee\u6642\u9593", "MAWT", + "\u83ab\u68ee\u590f\u4ee4\u6642\u9593", "MAWST"}}, + {"Antarctica/McMurdo", NZST}, +@@ -500,6 +518,7 @@ + "\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", +@@ -508,7 +527,7 @@ + "Irkutsk \u590f\u4ee4\u6642\u9593", "IRKST"}}, + {"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"}}, +@@ -518,6 +537,8 @@ + {"Asia/Kashgar", CTT}, + {"Asia/Kathmandu", NPT}, + {"Asia/Katmandu", NPT}, ++ {"Asia/Khandyga", new String[] {"\u6F22\u5730\u52A0 (Khandyga) \u6642\u9593", "YAKT", ++ "\u6F22\u5730\u52A0 (Khandyga) \u590F\u4EE4\u6642\u9593", "YAKST"}}, + {"Asia/Kolkata", IST}, + {"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u6642\u9593", "KRAT", + "\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u590f\u4ee4\u6642\u9593", "KRAST"}}, +@@ -554,7 +575,8 @@ + {"Asia/Samarkand", UZT}, + {"Asia/Seoul", KST}, + {"Asia/Singapore", SGT}, +- {"Asia/Taipei", CTT}, ++ {"Asia/Taipei", new String[] {"\u53f0\u7063\u6a19\u6e96\u6642\u9593", "TST", ++ "\u53f0\u7063\u590f\u4ee4\u6642\u9593", "TDT"}}, + {"Asia/Tel_Aviv", ISRAEL}, + {"Asia/Tashkent", UZT}, + {"Asia/Tbilisi", new String[] {"\u55ac\u6cbb\u4e9e\u6642\u9593", "GET", +@@ -566,11 +588,11 @@ + {"Asia/Ulaanbaatar", ULAT}, + {"Asia/Ulan_Bator", ULAT}, + {"Asia/Urumqi", CTT}, ++ {"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 +619,8 @@ + {"Australia/Canberra", EST_NSW}, + {"Australia/Currie", EST_NSW}, + {"Australia/Darwin", DARWIN}, +- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", +- "Central Western Summer Time (Australia)", "CWST"}}, ++ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "CWST", ++ "\u4E2D\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "CWST"}}, + {"Australia/Hobart", TASMANIA}, + {"Australia/LHI", LORD_HOWE}, + {"Australia/Lindeman", BRISBANE}, +@@ -616,7 +638,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 +676,7 @@ + {"Europe/Bratislava", CET}, + {"Europe/Brussels", CET}, + {"Europe/Budapest", CET}, ++ {"Europe/Busingen", CET}, + {"Europe/Chisinau", EET}, + {"Europe/Copenhagen", CET}, + {"Europe/Dublin", DUBLIN}, +@@ -663,7 +686,7 @@ + {"Europe/Isle_of_Man", GMTBST}, + {"Europe/Istanbul", EET}, + {"Europe/Jersey", GMTBST}, +- {"Europe/Kaliningrad", EET}, ++ {"Europe/Kaliningrad", FET}, + {"Europe/Kiev", EET}, + {"Europe/Lisbon", WET}, + {"Europe/Ljubljana", CET}, +@@ -672,7 +695,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}, +@@ -752,6 +775,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 +814,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 +828,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-set b/java/openjdk6/files/patch-set index 8d3cc7509709..ab9e6d2b3d75 100644 --- a/java/openjdk6/files/patch-set +++ b/java/openjdk6/files/patch-set @@ -146,17 +146,6 @@ override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER override SUN_CMM_SUBDIR = override THREADS_FLAG = native ---- corba/make/common/Defs-linux.gmk -+++ corba/make/common/Defs-linux.gmk -@@ -290,7 +290,7 @@ - override LIBTHREAD = - override MOOT_PRIORITIES = true - override NO_INTERRUPTIBLE_IO = true --override OPENWIN_HOME = /usr/X11R6 -+override OPENWIN_HOME = $(X11_PATH) - ifeq ($(ARCH), amd64) - override OPENWIN_LIB = $(OPENWIN_HOME)/lib64 - else --- corba/make/common/Defs.gmk +++ corba/make/common/Defs.gmk @@ -53,6 +53,24 @@ @@ -566,6 +555,33 @@ // Whether the caller can read /proc/<pid> file? sm.checkRead("/proc/" + pid); } +--- hotspot/make/bsd/makefiles/adlc.make ++++ hotspot/make/bsd/makefiles/adlc.make +@@ -69,7 +69,7 @@ + # CFLAGS_WARN holds compiler options to suppress/enable warnings. + # Compiler warnings are treated as errors + ifneq ($(COMPILER_WARNINGS_FATAL),false) +- CFLAGS_WARN = -Werror ++ CFLAGS_WARN = $(WARNINGS_ARE_ERRORS) + endif + CFLAGS += $(CFLAGS_WARN) + +--- hotspot/make/bsd/makefiles/build_vm_def.sh ++++ hotspot/make/bsd/makefiles/build_vm_def.sh +@@ -7,6 +7,10 @@ + NM=nm + fi + +-$NM --defined-only $* | awk ' +- { if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 ";" } +- ' ++$NM --defined-only $* \ ++ | awk '{ ++ if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 ";" ++ if ($3 ~ /^UseSharedSpaces$/) print "\t" $3 ";" ++ if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";" ++ }' \ ++ | sort -u --- hotspot/make/bsd/makefiles/gcc.make +++ hotspot/make/bsd/makefiles/gcc.make @@ -35,8 +35,8 @@ @@ -579,6 +595,287 @@ HOSTCXX = $(CXX) HOSTCC = $(CC) endif +@@ -110,12 +110,16 @@ + CFLAGS += $(VM_PICFLAG) + CFLAGS += -fno-rtti + CFLAGS += -fno-exceptions +-CFLAGS += -pthread +-CFLAGS += -fcheck-new +-# version 4 and above support fvisibility=hidden (matches jni_x86.h file) +-# except 4.1.2 gives pointless warnings that can't be disabled (afaik) +-ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0" +-CFLAGS += -fvisibility=hidden ++CFLAGS += -D_REENTRANT ++ifeq ($(USE_CLANG),) ++ CFLAGS += -fcheck-new ++ # version 4 and above support fvisibility=hidden (matches jni_x86.h file) ++ # except 4.1.2 gives pointless warnings that can't be disabled (afaik) ++ ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0" ++ CFLAGS += -fvisibility=hidden ++ endif ++else ++ CFLAGS += -fvisibility=hidden + endif + + ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) +@@ -163,14 +167,24 @@ + WARNINGS_ARE_ERRORS = -Werror + endif + +-# Except for a few acceptable ones +-# Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit +-# conversions which might affect the values. To avoid that, we need to turn +-# it off explicitly. +-ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0" ++ifeq ($(USE_CLANG), true) ++ # However we need to clean the code up before we can unrestrictedly enable this option with Clang ++ WARNINGS_ARE_ERRORS += -Wno-logical-op-parentheses -Wno-parentheses-equality -Wno-parentheses ++ WARNINGS_ARE_ERRORS += -Wno-switch -Wno-tautological-compare ++# Not yet supported by clang in Xcode 4.6.2 ++# WARNINGS_ARE_ERRORS += -Wno-tautological-constant-out-of-range-compare ++ WARNINGS_ARE_ERRORS += -Wno-delete-non-virtual-dtor -Wno-deprecated -Wno-format -Wno-dynamic-class-memaccess ++ WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body ++endif ++ + ACCEPTABLE_WARNINGS = -Wpointer-arith -Wsign-compare +-else +-ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare ++ ++ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0" ++ # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit ++ # conversions which might affect the values. Only enable it in earlier versions. ++ ifeq ($(USE_CLANG),) ++ ACCEPTABLE_WARNINGS += -Wconversion ++ endif + endif + + CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS) +@@ -282,7 +296,11 @@ + DEBUG_CFLAGS/ppc = -g + DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH)) + ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),) +-DEBUG_CFLAGS += -gstabs ++ ifeq ($(USE_CLANG), true) ++ DEBUG_CFLAGS += -g ++ else ++ DEBUG_CFLAGS += -gstabs ++ endif + endif + + # DEBUG_BINARIES overrides everything, use full -g debug information +--- hotspot/make/bsd/makefiles/jsig.make ++++ hotspot/make/bsd/makefiles/jsig.make +@@ -47,7 +47,7 @@ + # cause problems with interposing. See CR: 6466665 + # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE)) + +-LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) ++LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) + + # DEBUG_BINARIES overrides everything, use full -g debug information + ifeq ($(DEBUG_BINARIES), true) +--- hotspot/make/bsd/makefiles/mapfile-vers-debug ++++ hotspot/make/bsd/makefiles/mapfile-vers-debug +@@ -1,8 +1,4 @@ + # +-# @(#)mapfile-vers-debug 1.18 07/10/25 16:47:35 +-# +- +-# + # Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + # +@@ -221,6 +217,7 @@ + JVM_SetArrayElement; + JVM_SetClassSigners; + JVM_SetLength; ++ JVM_SetNativeThreadName; + JVM_SetPrimitiveArrayElement; + JVM_SetProtectionDomain; + JVM_SetSockOpt; +@@ -244,24 +241,6 @@ + JVM_Yield; + JVM_handle_bsd_signal; + +- # Old reflection routines +- # These do not need to be present in the product build in JDK 1.4 +- # but their code has not been removed yet because there will not +- # be a substantial code savings until JVM_InvokeMethod and +- # JVM_NewInstanceFromConstructor can also be removed; see +- # reflectionCompat.hpp. +- JVM_GetClassConstructor; +- JVM_GetClassConstructors; +- JVM_GetClassField; +- JVM_GetClassFields; +- JVM_GetClassMethod; +- JVM_GetClassMethods; +- JVM_GetField; +- JVM_GetPrimitiveField; +- JVM_NewInstance; +- JVM_SetField; +- JVM_SetPrimitiveField; +- + # debug JVM + JVM_AccessVMBooleanFlag; + JVM_AccessVMIntFlag; +--- hotspot/make/bsd/makefiles/mapfile-vers-product ++++ hotspot/make/bsd/makefiles/mapfile-vers-product +@@ -1,8 +1,4 @@ + # +-# @(#)mapfile-vers-product 1.19 08/02/12 10:56:37 +-# +- +-# + # Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + # +@@ -221,6 +217,7 @@ + JVM_SetArrayElement; + JVM_SetClassSigners; + JVM_SetLength; ++ JVM_SetNativeThreadName; + JVM_SetPrimitiveArrayElement; + JVM_SetProtectionDomain; + JVM_SetSockOpt; +@@ -244,24 +241,6 @@ + JVM_Yield; + JVM_handle_bsd_signal; + +- # Old reflection routines +- # These do not need to be present in the product build in JDK 1.4 +- # but their code has not been removed yet because there will not +- # be a substantial code savings until JVM_InvokeMethod and +- # JVM_NewInstanceFromConstructor can also be removed; see +- # reflectionCompat.hpp. +- JVM_GetClassConstructor; +- JVM_GetClassConstructors; +- JVM_GetClassField; +- JVM_GetClassFields; +- JVM_GetClassMethod; +- JVM_GetClassMethods; +- JVM_GetField; +- JVM_GetPrimitiveField; +- JVM_NewInstance; +- JVM_SetField; +- JVM_SetPrimitiveField; +- + # miscellaneous functions + jio_fprintf; + jio_printf; +--- hotspot/make/bsd/makefiles/rules.make ++++ hotspot/make/bsd/makefiles/rules.make +@@ -126,8 +126,8 @@ + RUN.JAR$(MAKE_VERBOSE) += >/dev/null + + # Settings for javac +-BOOT_SOURCE_LANGUAGE_VERSION = 6 +-BOOT_TARGET_CLASS_VERSION = 6 ++BOOT_SOURCE_LANGUAGE_VERSION = 5 ++BOOT_TARGET_CLASS_VERSION = 5 + JAVAC_FLAGS = -g -encoding ascii + BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) + +--- hotspot/src/cpu/x86/vm/assembler_x86.cpp ++++ hotspot/src/cpu/x86/vm/assembler_x86.cpp +@@ -4087,7 +4087,7 @@ + } + + void Assembler::adcq(Register dst, Register src) { +- (int) prefixq_and_encode(dst->encoding(), src->encoding()); ++ (void) prefixq_and_encode(dst->encoding(), src->encoding()); + emit_arith(0x13, 0xC0, dst, src); + } + +@@ -4142,7 +4142,7 @@ + } + + void Assembler::andq(Register dst, Register src) { +- (int) prefixq_and_encode(dst->encoding(), src->encoding()); ++ (void) prefixq_and_encode(dst->encoding(), src->encoding()); + emit_arith(0x23, 0xC0, dst, src); + } + +--- hotspot/src/cpu/x86/vm/globals_x86.hpp ++++ hotspot/src/cpu/x86/vm/globals_x86.hpp +@@ -70,11 +70,7 @@ + define_pd_global(bool, RewriteBytecodes, true); + define_pd_global(bool, RewriteFrequentPairs, true); + +-#ifdef _ALLBSD_SOURCE +-define_pd_global(bool, UseMembar, true); +-#else + define_pd_global(bool, UseMembar, false); +-#endif + + // GC Ergo Flags + define_pd_global(intx, CMSYoungGenPerWorker, 64*M); // default max size of CMS young gen, per GC worker thread +--- hotspot/src/cpu/x86/vm/jni_x86.h ++++ hotspot/src/cpu/x86/vm/jni_x86.h +@@ -28,7 +28,7 @@ + + #if defined(SOLARIS) || defined(LINUX) || defined(_ALLBSD_SOURCE) + +-#if defined(__GNUC__) && (__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2) ++#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2)) + #define JNIEXPORT __attribute__((visibility("default"))) + #define JNIIMPORT __attribute__((visibility("default"))) + #else +--- hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp ++++ hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp +@@ -94,7 +94,7 @@ + private: + + #ifdef PRODUCT +-#define inc_counter_np(counter) (0) ++#define inc_counter_np(counter) ((void)0) + #else + void inc_counter_np_(int& counter) { + __ incrementl(ExternalAddress((address)&counter)); +--- hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp ++++ hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp +@@ -92,7 +92,7 @@ + private: + + #ifdef PRODUCT +-#define inc_counter_np(counter) (0) ++#define inc_counter_np(counter) ((void)0) + #else + void inc_counter_np_(int& counter) { + // This can destroy rscratch1 if counter is far from the code cache +--- hotspot/src/os/bsd/vm/globals_bsd.hpp ++++ hotspot/src/os/bsd/vm/globals_bsd.hpp +@@ -26,25 +26,19 @@ + #define OS_BSD_VM_GLOBALS_BSD_HPP + + // +-// Defines Bsd specific flags. They are not available on other platforms. ++// Defines BSD specific flags. They are not available on other platforms. + // + #define RUNTIME_OS_FLAGS(develop, develop_pd, product, product_pd, diagnostic, notproduct) \ + product(bool, UseOprofile, false, \ + "enable support for Oprofile profiler") \ + \ +- product(bool, UseBsdPosixThreadCPUClocks, true, \ +- "enable fast Bsd Posix clocks where available") \ +-/* NB: The default value of UseBsdPosixThreadCPUClocks may be \ +- overridden in Arguments::parse_each_vm_init_arg. */ \ +- \ +- product(bool, UseHugeTLBFS, false, \ +- "Use MAP_HUGETLB for large pages") \ +- \ +- product(bool, UseSHM, false, \ +- "Use SYSV shared memory for large pages") ++ product(bool, UseBsdPosixThreadCPUClocks, true, \ ++ "enable fast BSD Posix clocks where available") ++/* NB: The default value of UseBsdPosixThreadCPUClocks may be ++ overridden in Arguments::parse_each_vm_init_arg. */ + + // +-// Defines Bsd-specific default values. The flags are available on all ++// Defines BSD-specific default values. The flags are available on all + // platforms, but they may have different default values on other platforms. + // + define_pd_global(bool, UseLargePages, false); --- hotspot/src/os/bsd/vm/jsig.c +++ hotspot/src/os/bsd/vm/jsig.c @@ -140,9 +140,13 @@ @@ -701,12 +998,35 @@ + char signame[8]; + const char *s = sys_signame[signo]; + uint i; -+ for (i = 0; i < strlen(s); i++) ++ for (i = 0; i < sizeof(signame) - 1 && s[i] != '\0'; i++) + signame[i] = toupper(s[i]); + signame[i] = '\0'; + jio_snprintf(buf, len, "SIG%s", signame); + return true; } +--- hotspot/src/os/bsd/vm/jvm_bsd.h ++++ hotspot/src/os/bsd/vm/jvm_bsd.h +@@ -112,20 +112,6 @@ + #define SHUTDOWN2_SIGNAL SIGINT + #define SHUTDOWN3_SIGNAL SIGTERM + +-#ifndef SIGRTMIN +-#ifdef __OpenBSD__ +-#define SIGRTMIN 1 +-#else +-#define SIGRTMIN 33 +-#endif +-#endif +-#ifndef SIGRTMAX +-#ifdef __OpenBSD__ +-#define SIGRTMAX 31 +-#else +-#define SIGRTMAX 63 +-#endif +-#endif + #endif /* JVM_MD_H */ + + #endif // OS_BSD_VM_JVM_BSD_H --- hotspot/src/os/bsd/vm/osThread_bsd.cpp +++ hotspot/src/os/bsd/vm/osThread_bsd.cpp @@ -49,7 +49,7 @@ @@ -1122,6 +1442,15 @@ // Add the appropriate client or server subdir len = strlen(buf); +@@ -2817,7 +2941,7 @@ + } + + void os::free_memory(char *addr, size_t bytes, size_t alignment_hint) { +- ::madvise(addr, bytes, MADV_DONTNEED); ++ commit_memory(addr, bytes, false); + } + + void os::numa_make_global(char *addr, size_t bytes) { @@ -2997,9 +3121,10 @@ flags |= MAP_FIXED; } @@ -1136,18 +1465,39 @@ flags, -1, 0); if (addr != MAP_FAILED) { -@@ -3156,7 +3281,9 @@ - static size_t _large_page_size = 0; +@@ -3244,9 +3369,11 @@ + #endif - void os::large_page_init() { --#ifndef _ALLBSD_SOURCE + char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { ++#ifndef _ALLBSD_SOURCE + // "exec" is passed in but not used. Creating the shared image for + // the code cache doesn't have an SHM_X executable permission to check. + assert(UseLargePages && UseSHM, "only for SHM large pages"); ++#endif + + key_t key = IPC_PRIVATE; + char *addr; +@@ -3321,11 +3448,19 @@ + // with SysV SHM the entire memory region must be allocated as shared + // memory. + bool os::can_commit_large_page_memory() { ++#ifdef _ALLBSD_SOURCE ++ return false; ++#else + return UseHugeTLBFS; ++#endif + } + + bool os::can_execute_large_page_memory() { +#ifdef _ALLBSD_SOURCE -+ UseLargePages = UseHugeTLBFS = UseSHM = false; ++ return false; +#else - if (!UseLargePages) { - UseHugeTLBFS = false; - UseSHM = false; -@@ -3654,8 +3781,8 @@ + return UseHugeTLBFS; ++#endif + } + + // Reserve memory at an arbitrary address, only if that area is +@@ -3654,8 +3789,8 @@ return OS_OK; #else int ret = setpriority(PRIO_PROCESS, thread->osthread()->thread_id(), newpri); @@ -1157,7 +1507,7 @@ } OSReturn os::get_native_priority(const Thread* const thread, int *priority_ptr) { -@@ -4171,7 +4298,7 @@ +@@ -4171,7 +4306,7 @@ } } @@ -1166,7 +1516,71 @@ // This is the fastest way to get thread cpu time on Bsd. // Returns cpu time (user+sys) for any thread, not only for current. // POSIX compliant clocks are implemented in the kernels 2.6.16+. -@@ -4450,7 +4577,7 @@ +@@ -4188,6 +4323,7 @@ + } + #endif + ++#ifndef _ALLBSD_SOURCE + ///// + // glibc on Bsd platform uses non-documented flag + // to indicate, that some special sort of signal +@@ -4198,6 +4334,7 @@ + #undef SIGNIFICANT_SIGNAL_MASK + #endif + #define SIGNIFICANT_SIGNAL_MASK (~0x04000000) ++#endif + + static const char* get_signal_handler_name(address handler, + char* buf, int buflen) { +@@ -4222,8 +4359,10 @@ + + sigaction(sig, NULL, &sa); + ++#ifndef _ALLBSD_SOURCE + // See comment for SIGNIFICANT_SIGNAL_MASK define + sa.sa_flags &= SIGNIFICANT_SIGNAL_MASK; ++#endif + + st->print("%s: ", os::exception_name(sig, buf, buflen)); + +@@ -4245,7 +4384,11 @@ + // May be, handler was resetted by VMError? + if(rh != NULL) { + handler = rh; ++#ifdef _ALLBSD_SOURCE ++ sa.sa_flags = VMError::get_resetted_sigflags(sig); ++#else + sa.sa_flags = VMError::get_resetted_sigflags(sig) & SIGNIFICANT_SIGNAL_MASK; ++#endif + } + + st->print(", sa_flags=" PTR32_FORMAT, sa.sa_flags); +@@ -4320,7 +4463,9 @@ + os_sigaction(sig, (struct sigaction*)NULL, &act); + + ++#ifndef _ALLBSD_SOURCE + act.sa_flags &= SIGNIFICANT_SIGNAL_MASK; ++#endif + + address thisHandler = (act.sa_flags & SA_SIGINFO) + ? CAST_FROM_FN_PTR(address, act.sa_sigaction) +@@ -4381,6 +4526,14 @@ + + extern bool signal_name(int signo, char* buf, size_t len); + ++#ifndef SIGRTMAX ++#ifdef __OpenBSD__ ++#define SIGRTMAX 31 ++#else ++#define SIGRTMAX 63 ++#endif ++#endif ++ + const char* os::exception_name(int exception_code, char* buf, size_t size) { + if (0 < exception_code && exception_code <= SIGRTMAX) { + // signal +@@ -4450,7 +4603,7 @@ // this is called _after_ the global arguments have been parsed jint os::init_2(void) { @@ -1175,7 +1589,7 @@ Bsd::fast_thread_clock_init(); #endif -@@ -4634,6 +4761,20 @@ +@@ -4634,6 +4787,20 @@ int os::active_processor_count() { #ifdef _ALLBSD_SOURCE @@ -1196,7 +1610,7 @@ return _processor_count; #else // Bsd doesn't yet have a (official) notion of processor sets, -@@ -5033,7 +5174,7 @@ +@@ -5033,7 +5200,7 @@ return munmap(addr, bytes) == 0; } @@ -1205,7 +1619,7 @@ static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time); static clockid_t thread_cpu_clockid(Thread* thread) { -@@ -5057,7 +5198,7 @@ +@@ -5057,7 +5224,7 @@ jlong os::current_thread_cpu_time() { #ifdef __APPLE__ return os::thread_cpu_time(Thread::current(), true /* user + sys */); @@ -1214,7 +1628,7 @@ if (os::Bsd::supports_fast_thread_cpu_time()) { return os::Bsd::fast_thread_cpu_time(CLOCK_THREAD_CPUTIME_ID); } else { -@@ -5068,7 +5209,7 @@ +@@ -5068,7 +5235,7 @@ } jlong os::thread_cpu_time(Thread* thread) { @@ -1223,7 +1637,7 @@ // consistent with what current_thread_cpu_time() returns if (os::Bsd::supports_fast_thread_cpu_time()) { return os::Bsd::fast_thread_cpu_time(thread_cpu_clockid(thread)); -@@ -5081,7 +5222,7 @@ +@@ -5081,7 +5248,7 @@ jlong os::current_thread_cpu_time(bool user_sys_cpu_time) { #ifdef __APPLE__ return os::thread_cpu_time(Thread::current(), user_sys_cpu_time); @@ -1232,7 +1646,7 @@ if (user_sys_cpu_time && os::Bsd::supports_fast_thread_cpu_time()) { return os::Bsd::fast_thread_cpu_time(CLOCK_THREAD_CPUTIME_ID); } else { -@@ -5110,7 +5251,7 @@ +@@ -5110,7 +5277,7 @@ } else { return ((jlong)tinfo.user_time.seconds * 1000000000) + ((jlong)tinfo.user_time.microseconds * (jlong)1000); } @@ -1241,7 +1655,7 @@ if (user_sys_cpu_time && os::Bsd::supports_fast_thread_cpu_time()) { return os::Bsd::fast_thread_cpu_time(thread_cpu_clockid(thread)); } else { -@@ -5119,12 +5260,15 @@ +@@ -5119,12 +5286,15 @@ #endif } @@ -1258,7 +1672,7 @@ static bool proc_pid_cpu_avail = true; static bool proc_task_unchecked = true; static const char *proc_stat_path = "/proc/%d/stat"; -@@ -5208,6 +5352,7 @@ +@@ -5208,6 +5378,7 @@ } else { return (jlong)user_time * (1000000000 / clock_tics_per_sec); } @@ -1266,7 +1680,7 @@ } #endif -@@ -5226,7 +5371,7 @@ +@@ -5226,7 +5397,7 @@ } bool os::is_thread_cpu_time_supported() { @@ -1731,6 +2145,35 @@ return arena->Amalloc(size); } void operator delete(void* p) {} // nothing to do +--- hotspot/src/share/vm/c1/c1_IR.cpp ++++ hotspot/src/share/vm/c1/c1_IR.cpp +@@ -499,7 +499,7 @@ + _loop_map(0, 0), // initialized later with correct size + _compilation(c) + { +- TRACE_LINEAR_SCAN(2, "***** computing linear-scan block order"); ++ TRACE_LINEAR_SCAN(2, tty->print_cr("***** computing linear-scan block order")); + + init_visited(); + count_edges(start_block, NULL); +@@ -665,7 +665,7 @@ + } + + void ComputeLinearScanOrder::assign_loop_depth(BlockBegin* start_block) { +- TRACE_LINEAR_SCAN(3, "----- computing loop-depth and weight"); ++ TRACE_LINEAR_SCAN(3, tty->print_cr("----- computing loop-depth and weight")); + init_visited(); + + assert(_work_list.is_empty(), "work list must be empty before processing"); +@@ -839,7 +839,7 @@ + } + + void ComputeLinearScanOrder::compute_order(BlockBegin* start_block) { +- TRACE_LINEAR_SCAN(3, "----- computing final block order"); ++ TRACE_LINEAR_SCAN(3, tty->print_cr("----- computing final block order")); + + // the start block is always the first block in the linear scan order + _linear_scan_order = new BlockList(_num_blocks); --- hotspot/src/share/vm/c1/c1_Instruction.hpp +++ hotspot/src/share/vm/c1/c1_Instruction.hpp @@ -311,7 +311,7 @@ @@ -1751,6 +2194,40 @@ Compilation* c = Compilation::current(); void* res = c->arena()->Amalloc(size); ((BlockBegin*)res)->_id = c->get_next_id(); +--- hotspot/src/share/vm/ci/ciUtilities.hpp ++++ hotspot/src/share/vm/ci/ciUtilities.hpp +@@ -93,7 +93,7 @@ + CLEAR_PENDING_EXCEPTION; \ + return (result); \ + } \ +- (0 ++ (void)(0 + + #define KILL_COMPILE_ON_ANY \ + THREAD); \ +@@ -101,7 +101,7 @@ + fatal("unhandled ci exception"); \ + CLEAR_PENDING_EXCEPTION; \ + } \ +-(0 ++(void)(0 + + + inline const char* bool_to_str(bool b) { +--- hotspot/src/share/vm/classfile/verifier.hpp ++++ hotspot/src/share/vm/classfile/verifier.hpp +@@ -84,9 +84,9 @@ + // These macros are used similarly to CHECK macros but also check + // the status of the verifier and return if that has an error. + #define CHECK_VERIFY(verifier) \ +- CHECK); if ((verifier)->has_error()) return; (0 ++ CHECK); if ((verifier)->has_error()) return; ((void)0 + #define CHECK_VERIFY_(verifier, result) \ +- CHECK_(result)); if ((verifier)->has_error()) return (result); (0 ++ CHECK_(result)); if ((verifier)->has_error()) return (result); ((void)0 + + // A new instance of this class is created for each class being verified + class ClassVerifier : public StackObj { --- hotspot/src/share/vm/code/codeBlob.cpp +++ hotspot/src/share/vm/code/codeBlob.cpp @@ -242,7 +242,7 @@ @@ -1819,6 +2296,17 @@ assert(ignore == sizeof(DIR_Chunk), ""); if (dir->_next_chunk >= dir->_next_chunk_limit) { const int CHUNK = 100; +--- hotspot/src/share/vm/code/dependencies.cpp ++++ hotspot/src/share/vm/code/dependencies.cpp +@@ -932,7 +932,7 @@ + assert(changes.involves_context(context_type), "irrelevant dependency"); + klassOop new_type = changes.new_type(); + +- count_find_witness_calls(); ++ (void)count_find_witness_calls(); + NOT_PRODUCT(deps_find_witness_singles++); + + // Current thread must be in VM (not native mode, as in CI): --- hotspot/src/share/vm/code/nmethod.cpp +++ hotspot/src/share/vm/code/nmethod.cpp @@ -784,7 +784,7 @@ @@ -1830,6 +2318,16 @@ // Always leave some room in the CodeCache for I2C/C2I adapters if (CodeCache::largest_free_block() < CodeCacheMinimumFreeSpace) return NULL; return CodeCache::allocate(nmethod_size); +@@ -2488,7 +2488,8 @@ + relocation_begin()-1+ip[1]); + for (; ip < index_end; ip++) + tty->print_cr(" (%d ?)", ip[0]); +- tty->print_cr(" @" INTPTR_FORMAT ": index_size=%d", ip, *ip++); ++ tty->print_cr(" @" INTPTR_FORMAT ": index_size=%d", ip, *ip); ++ ip++; + tty->print_cr("reloc_end @" INTPTR_FORMAT ":", ip); + } + } --- hotspot/src/share/vm/code/nmethod.hpp +++ hotspot/src/share/vm/code/nmethod.hpp @@ -263,7 +263,7 @@ @@ -1843,6 +2341,24 @@ // Returns true if this thread changed the state of the nmethod or --- hotspot/src/share/vm/code/relocInfo.hpp +++ hotspot/src/share/vm/code/relocInfo.hpp +@@ -371,7 +371,7 @@ + // "immediate" in the prefix header word itself. This optimization + // is invisible outside this module.) + +- inline friend relocInfo prefix_relocInfo(int datalen = 0); ++ inline friend relocInfo prefix_relocInfo(int datalen); + + protected: + // an immediate relocInfo optimizes a prefix with one 10-bit unsigned value +@@ -466,7 +466,7 @@ + return relocInfo(relocInfo::none, relocInfo::offset_limit() - relocInfo::offset_unit); + } + +-inline relocInfo prefix_relocInfo(int datalen) { ++inline relocInfo prefix_relocInfo(int datalen = 0) { + assert(relocInfo::fits_into_immediate(datalen), "datalen in limits"); + return relocInfo(relocInfo::data_prefix_tag, relocInfo::RAW_BITS, relocInfo::datalen_tag | datalen); + } @@ -686,7 +686,7 @@ } @@ -1874,6 +2390,20 @@ VtableStub(bool is_vtable_stub, int index) : _next(NULL), _is_vtable_stub(is_vtable_stub), +--- hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp ++++ hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp +@@ -1858,8 +1858,9 @@ + _cm->grayRegionIfNecessary(MemRegion(_real_start_word, _real_end_word)); + + #ifndef PRODUCT +- if (use_local_bitmaps && verify_local_bitmaps) +- verify(); ++#if (use_local_bitmaps && verify_local_bitmaps) ++ verify(); ++#endif + #endif // PRODUCT + } else { + assert(_real_start_word == NULL && _real_end_word == NULL, "invariant"); --- hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp +++ hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp @@ -144,9 +144,9 @@ @@ -2013,6 +2543,17 @@ address res = (address)resource_allocate_bytes(size, AllocFailStrategy::RETURN_NULL); DEBUG_ONLY(if (res != NULL) set_allocation_type(res, RESOURCE_AREA);) return res; +--- hotspot/src/share/vm/memory/cardTableModRefBS.cpp ++++ hotspot/src/share/vm/memory/cardTableModRefBS.cpp +@@ -389,7 +389,7 @@ + } + // Touch the last card of the covered region to show that it + // is committed (or SEGV). +- debug_only(*byte_for(_covered[ind].last());) ++ debug_only((void) (*byte_for(_covered[ind].last()));) + debug_only(verify_guard();) + } + --- hotspot/src/share/vm/memory/memRegion.hpp +++ hotspot/src/share/vm/memory/memRegion.hpp @@ -99,13 +99,13 @@ @@ -2032,6 +2573,19 @@ return ResourceObj::operator new(size); } +--- hotspot/src/share/vm/memory/universe.cpp ++++ hotspot/src/share/vm/memory/universe.cpp +@@ -657,7 +657,9 @@ + if (vt) vt->initialize_vtable(false, CHECK); + if (ko->oop_is_instance()) { + instanceKlass* ik = (instanceKlass*)ko; +- for (KlassHandle s_h(THREAD, ik->subklass()); s_h() != NULL; s_h = (THREAD, s_h()->klass_part()->next_sibling())) { ++ for (KlassHandle s_h(THREAD, ik->subklass()); ++ s_h() != NULL; ++ s_h = KlassHandle(THREAD, s_h()->klass_part()->next_sibling())) { + reinitialize_vtable_of(s_h, CHECK); + } + } --- hotspot/src/share/vm/oops/klass.cpp +++ hotspot/src/share/vm/oops/klass.cpp @@ -181,7 +181,7 @@ @@ -2109,6 +2663,53 @@ // Opcode virtual uint opcode() const = 0; +--- hotspot/src/share/vm/opto/memnode.cpp ++++ hotspot/src/share/vm/opto/memnode.cpp +@@ -1933,6 +1933,11 @@ + if (t != NULL) { + // constant oop => constant klass + if (offset == java_lang_Class::array_klass_offset_in_bytes()) { ++ if (t->is_void()) { ++ // We cannot create a void array. Since void is a primitive type return null ++ // klass. Users of this result need to do a null check on the returned klass. ++ return TypePtr::NULL_PTR; ++ } + return TypeKlassPtr::make(ciArrayKlass::make(t)); + } + if (!t->is_klass()) { +@@ -4164,7 +4169,7 @@ + } + } + #else // !ASSERT +-#define verify_memory_slice(m,i,n) (0) // PRODUCT version is no-op ++#define verify_memory_slice(m,i,n) (void)(0) // PRODUCT version is no-op + #endif + + +--- hotspot/src/share/vm/opto/node.cpp ++++ hotspot/src/share/vm/opto/node.cpp +@@ -284,6 +284,10 @@ + #ifdef _MSC_VER // the IDX_INIT hack falls foul of warning C4355 + #pragma warning( disable:4355 ) // 'this' : used in base member initializer list + #endif ++#ifdef __clang__ ++#pragma clang diagnostic push ++#pragma GCC diagnostic ignored "-Wuninitialized" ++#endif + + // Out-of-line code from node constructors. + // Executed only when extra debug info. is being passed around. +@@ -459,6 +463,10 @@ + _in[6] = n6; if (n6 != NULL) n6->add_out((Node *)this); + } + ++#ifdef __clang__ ++#pragma clang diagnostic pop ++#endif ++ + + //------------------------------clone------------------------------------------ + // Clone a Node. --- hotspot/src/share/vm/opto/node.hpp +++ hotspot/src/share/vm/opto/node.hpp @@ -207,7 +207,7 @@ @@ -2129,6 +2730,18 @@ Node* n = (Node*)C->node_arena()->Amalloc_D(x + y*sizeof(void*)); n->_in = (Node**)(((char*)n) + x); #ifdef ASSERT +--- hotspot/src/share/vm/opto/parse3.cpp ++++ hotspot/src/share/vm/opto/parse3.cpp +@@ -487,7 +487,8 @@ + fun, NULL, TypeRawPtr::BOTTOM, + makecon(TypeKlassPtr::make(array_klass)), + length[0], length[1], length[2], +- length[3], length[4]); ++ (ndimensions > 2) ? length[3] : NULL, ++ (ndimensions > 3) ? length[4] : NULL); + } else { + // Create a java array for dimension sizes + Node* dims = NULL; --- hotspot/src/share/vm/opto/type.hpp +++ hotspot/src/share/vm/opto/type.hpp @@ -144,7 +144,7 @@ @@ -2140,6 +2753,40 @@ Compile* compile = Compile::current(); compile->set_type_last_size(x); void *temp = compile->type_arena()->Amalloc_D(x); +--- hotspot/src/share/vm/prims/forte.cpp ++++ hotspot/src/share/vm/prims/forte.cpp +@@ -635,7 +635,7 @@ + void* null_argument_3); + #pragma weak collector_func_load + #define collector_func_load(x0,x1,x2,x3,x4,x5,x6) \ +- ( collector_func_load ? collector_func_load(x0,x1,x2,x3,x4,x5,x6),0 : 0 ) ++ ( collector_func_load ? collector_func_load(x0,x1,x2,x3,x4,x5,x6),(void)0 : (void)0 ) + #endif // __APPLE__ + #endif // !_WINDOWS + +--- hotspot/src/share/vm/runtime/arguments.cpp ++++ hotspot/src/share/vm/runtime/arguments.cpp +@@ -2499,7 +2499,9 @@ + FLAG_SET_CMDLINE(uintx, MaxNewSize, NewSize); + } + ++#ifndef _ALLBSD_SOURCE // UseLargePages is not yet supported on BSD. + FLAG_SET_DEFAULT(UseLargePages, true); ++#endif + + // Increase some data structure sizes for efficiency + FLAG_SET_CMDLINE(uintx, BaseFootPrintEstimate, MaxHeapSize); +@@ -3046,6 +3048,10 @@ + UNSUPPORTED_OPTION(UseG1GC, "G1 GC"); + #endif + ++#ifdef _ALLBSD_SOURCE // UseLargePages is not yet supported on BSD. ++ UNSUPPORTED_OPTION(UseLargePages, "-XX:+UseLargePages"); ++#endif ++ + #ifndef PRODUCT + if (TraceBytecodesAt != 0) { + TraceBytecodes = true; --- hotspot/src/share/vm/runtime/fprofiler.cpp +++ hotspot/src/share/vm/runtime/fprofiler.cpp @@ -264,7 +264,7 @@ @@ -2204,6 +2851,17 @@ void operator delete (void * a) ; public: +--- hotspot/src/share/vm/runtime/sharedRuntime.cpp ++++ hotspot/src/share/vm/runtime/sharedRuntime.cpp +@@ -2778,7 +2778,7 @@ + // ResourceObject, so do not put any ResourceMarks in here. + char *s = sig->as_C_string(); + int len = (int)strlen(s); +- *s++; len--; // Skip opening paren ++ s++; len--; // Skip opening paren + char *t = s+len; + while( *(--t) != ')' ) ; // Find close paren + --- hotspot/src/share/vm/runtime/thread.cpp +++ hotspot/src/share/vm/runtime/thread.cpp @@ -170,7 +170,7 @@ @@ -2226,6 +2884,70 @@ void operator delete(void* p); private: +--- hotspot/src/share/vm/services/diagnosticArgument.cpp ++++ hotspot/src/share/vm/services/diagnosticArgument.cpp +@@ -191,7 +191,7 @@ + } else { + _value._time = 0; + _value._nanotime = 0; +- strcmp(_value._unit, "ns"); ++ strcpy(_value._unit, "ns"); + } + } + +--- hotspot/src/share/vm/utilities/exceptions.hpp ++++ hotspot/src/share/vm/utilities/exceptions.hpp +@@ -182,15 +182,15 @@ + #define HAS_PENDING_EXCEPTION (((ThreadShadow*)THREAD)->has_pending_exception()) + #define CLEAR_PENDING_EXCEPTION (((ThreadShadow*)THREAD)->clear_pending_exception()) + +-#define CHECK THREAD); if (HAS_PENDING_EXCEPTION) return ; (0 +-#define CHECK_(result) THREAD); if (HAS_PENDING_EXCEPTION) return result; (0 ++#define CHECK THREAD); if (HAS_PENDING_EXCEPTION) return ; (void)(0 ++#define CHECK_(result) THREAD); if (HAS_PENDING_EXCEPTION) return result; (void)(0 + #define CHECK_0 CHECK_(0) + #define CHECK_NH CHECK_(Handle()) + #define CHECK_NULL CHECK_(NULL) + #define CHECK_false CHECK_(false) + +-#define CHECK_AND_CLEAR THREAD); if (HAS_PENDING_EXCEPTION) { CLEAR_PENDING_EXCEPTION; return; } (0 +-#define CHECK_AND_CLEAR_(result) THREAD); if (HAS_PENDING_EXCEPTION) { CLEAR_PENDING_EXCEPTION; return result; } (0 ++#define CHECK_AND_CLEAR THREAD); if (HAS_PENDING_EXCEPTION) { CLEAR_PENDING_EXCEPTION; return; } (void)(0 ++#define CHECK_AND_CLEAR_(result) THREAD); if (HAS_PENDING_EXCEPTION) { CLEAR_PENDING_EXCEPTION; return result; } (void)(0 + #define CHECK_AND_CLEAR_0 CHECK_AND_CLEAR_(0) + #define CHECK_AND_CLEAR_NH CHECK_AND_CLEAR_(Handle()) + #define CHECK_AND_CLEAR_NULL CHECK_AND_CLEAR_(NULL) +@@ -263,7 +263,7 @@ + CLEAR_PENDING_EXCEPTION; \ + ex->print(); \ + ShouldNotReachHere(); \ +- } (0 ++ } (void)(0 + + // ExceptionMark is a stack-allocated helper class for local exception handling. + // It is used with the EXCEPTION_MARK macro. +--- hotspot/src/share/vm/utilities/globalDefinitions.hpp ++++ hotspot/src/share/vm/utilities/globalDefinitions.hpp +@@ -421,7 +421,7 @@ + // Utility macros for compilers + // used to silence compiler warnings + +-#define Unused_Variable(var) var ++#define Unused_Variable(var) (void)(var) + + + //---------------------------------------------------------------------------------------------------- +--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp ++++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp +@@ -260,7 +260,7 @@ + #endif + + // GCC 4.3 does not allow 0.0/0.0 to produce a NAN value +-#if (__GNUC__ == 4) && (__GNUC_MINOR__ > 2) ++#if defined(__clang__) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 2)) + #define CAN_USE_NAN_DEFINE 1 + #endif + --- hotspot/src/share/vm/utilities/macros.hpp +++ hotspot/src/share/vm/utilities/macros.hpp @@ -177,6 +177,14 @@ @@ -2243,6 +2965,96 @@ #if defined(IA32) || defined(AMD64) #define X86 #define X86_ONLY(code) code +--- hotspot/src/share/vm/utilities/taskqueue.hpp ++++ hotspot/src/share/vm/utilities/taskqueue.hpp +@@ -334,8 +334,12 @@ bool GenericTaskQueue<E, N>::push_slow(E + if (dirty_n_elems == N - 1) { + // Actually means 0, so do the push. + uint localBot = _bottom; +- // g++ complains if the volatile result of the assignment is unused. +- const_cast<E&>(_elems[localBot] = t); ++ // g++ complains if the volatile result of the assignment is ++ // unused, so we cast the volatile away. We cannot cast directly ++ // to void, because gcc treats that as not using the result of the ++ // assignment. However, casting to E& means that we trigger an ++ // unused-value warning. So, we cast the E& to void. ++ (void)const_cast<E&>(_elems[localBot] = t); + OrderAccess::release_store(&_bottom, increment_index(localBot)); + TASKQUEUE_STATS_ONLY(stats.record_push()); + return true; +@@ -385,13 +389,24 @@ bool GenericTaskQueue<E, N>::pop_local_s + template<class E, unsigned int N> + bool GenericTaskQueue<E, N>::pop_global(E& t) { + Age oldAge = _age.get(); +- uint localBot = _bottom; ++ // Architectures with weak memory model require a barrier here ++ // to guarantee that bottom is not older than age, ++ // which is crucial for the correctness of the algorithm. ++#if !(defined SPARC || defined IA32 || defined AMD64) ++ OrderAccess::fence(); ++#endif ++ uint localBot = OrderAccess::load_acquire((volatile juint*)&_bottom); + uint n_elems = size(localBot, oldAge.top()); + if (n_elems == 0) { + return false; + } + +- const_cast<E&>(t = _elems[oldAge.top()]); ++ // g++ complains if the volatile result of the assignment is ++ // unused, so we cast the volatile away. We cannot cast directly ++ // to void, because gcc treats that as not using the result of the ++ // assignment. However, casting to E& means that we trigger an ++ // unused-value warning. So, we cast the E& to void. ++ (void) const_cast<E&>(t = _elems[oldAge.top()]); + Age newAge(oldAge); + newAge.increment(); + Age resAge = _age.cmpxchg(newAge, oldAge); +@@ -668,13 +683,17 @@ public: + template<class E, unsigned int N> inline bool + GenericTaskQueue<E, N>::push(E t) { + uint localBot = _bottom; +- assert((localBot >= 0) && (localBot < N), "_bottom out of range."); ++ assert(localBot < N, "_bottom out of range."); + idx_t top = _age.top(); + uint dirty_n_elems = dirty_size(localBot, top); + assert(dirty_n_elems < N, "n_elems out of range."); + if (dirty_n_elems < max_elems()) { +- // g++ complains if the volatile result of the assignment is unused. +- const_cast<E&>(_elems[localBot] = t); ++ // g++ complains if the volatile result of the assignment is ++ // unused, so we cast the volatile away. We cannot cast directly ++ // to void, because gcc treats that as not using the result of the ++ // assignment. However, casting to E& means that we trigger an ++ // unused-value warning. So, we cast the E& to void. ++ (void) const_cast<E&>(_elems[localBot] = t); + OrderAccess::release_store(&_bottom, increment_index(localBot)); + TASKQUEUE_STATS_ONLY(stats.record_push()); + return true; +@@ -698,7 +717,12 @@ GenericTaskQueue<E, N>::pop_local(E& t) + // This is necessary to prevent any read below from being reordered + // before the store just above. + OrderAccess::fence(); +- const_cast<E&>(t = _elems[localBot]); ++ // g++ complains if the volatile result of the assignment is ++ // unused, so we cast the volatile away. We cannot cast directly ++ // to void, because gcc treats that as not using the result of the ++ // assignment. However, casting to E& means that we trigger an ++ // unused-value warning. So, we cast the E& to void. ++ (void) const_cast<E&>(t = _elems[localBot]); + // This is a second read of "age"; the "size()" above is the first. + // If there's still at least one element in the queue, based on the + // "_bottom" and "age" we've read, then there can be no interference with +--- hotspot/src/share/vm/utilities/vmError.cpp ++++ hotspot/src/share/vm/utilities/vmError.cpp +@@ -1043,7 +1043,7 @@ + const char* ptr = OnOutOfMemoryError; + while ((cmd = next_OnError_command(buffer, sizeof(buffer), &ptr)) != NULL){ + tty->print("# Executing "); +-#if defined(LINUX) ++#if defined(LINUX) || defined(_ALLBSD_SOURCE) + tty->print ("/bin/sh -c "); + #elif defined(SOLARIS) + tty->print ("/usr/bin/sh -c "); --- jdk/make/com/sun/java/pack/Makefile +++ jdk/make/com/sun/java/pack/Makefile @@ -61,6 +61,7 @@ @@ -2530,17 +3342,6 @@ # # Japanese manpages # ---- jdk/make/common/Defs-linux.gmk -+++ jdk/make/common/Defs-linux.gmk -@@ -318,7 +318,7 @@ - override LIBTHREAD = - override MOOT_PRIORITIES = true - override NO_INTERRUPTIBLE_IO = true --override OPENWIN_HOME = /usr/X11R6 -+override OPENWIN_HOME = $(X11_PATH) - ifeq ($(ARCH), amd64) - override OPENWIN_LIB = $(OPENWIN_HOME)/lib64 - else --- jdk/make/common/Defs.gmk +++ jdk/make/common/Defs.gmk @@ -117,6 +117,24 @@ |