Date: Mon, 3 Mar 2014 23:45:26 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346976 - in head/java: openjdk6 openjdk6-jre openjdk6/files Message-ID: <201403032345.s23NjQTR084286@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Mon Mar 3 23:45:26 2014 New Revision: 346976 URL: http://svnweb.freebsd.org/changeset/ports/346976 QAT: https://qat.redports.org/buildarchive/r346976/ Log: - 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. Added: head/java/openjdk6/files/patch-TimeZoneNames (contents, props changed) Modified: head/java/openjdk6-jre/Makefile head/java/openjdk6/Makefile head/java/openjdk6/files/patch-set Modified: head/java/openjdk6-jre/Makefile ============================================================================== --- head/java/openjdk6-jre/Makefile Mon Mar 3 23:30:56 2014 (r346975) +++ head/java/openjdk6-jre/Makefile Mon Mar 3 23:45:26 2014 (r346976) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= java devel PKGNAMESUFFIX= -jre Modified: head/java/openjdk6/Makefile ============================================================================== --- head/java/openjdk6/Makefile Mon Mar 3 23:30:56 2014 (r346975) +++ head/java/openjdk6/Makefile Mon Mar 3 23:45:26 2014 (r346976) @@ -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_L 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: Added: head/java/openjdk6/files/patch-TimeZoneNames ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk6/files/patch-TimeZoneNames Mon Mar 3 23:45:26 2014 (r346976) @@ -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}, *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403032345.s23NjQTR084286>