--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/TimeZoneNames_es.java Fri Aug 29 14:50:15 2014 -0700
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/TimeZoneNames_es.java Sun Sep 07 23:04:09 2014 +0400
@@ -48,9 +48,9 @@
String ACT[] = new String[] {"Hora de Acre", "ACT",
"Hora de verano de Acre", "ACST",
"Hora de Acre", "ACT"};
- String ADELAIDE[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia)", "CST",
- "Hora de verano Central (Sur de Australia)", "CST",
- "Hora Central (Australia del Sur)", "CT"};
+ String ADELAIDE[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia)", "ACST",
+ "Hora de verano Central (Sur de Australia)", "ACDT",
+ "Hora Central (Australia del Sur)", "ACT"};
String AGT[] = new String[] {"Hora de Argentina", "ART",
"Hora de verano de Argentina", "ARST",
"Hora de Argentina", "ART"};
@@ -72,12 +72,12 @@
String BDT[] = new String[] {"Hora de Bangladesh", "BDT",
"Hora de verano de Bangladesh", "BDST",
"Hora de Bangladesh", "BDT"};
- String BRISBANE[] = new String[] {"Hora est\u00E1ndar del Este (Queensland)", "EST",
- "Hora est\u00E1ndar de verano del Este (Queensland)", "EST",
- "Hora Oriental (Queensland)", "ET"};
- String BROKEN_HILL[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia/Nueva Gales del Sur)", "CST",
- "Hora de verano Central (Sur de Australia/Nueva Gales del Sur)", "CST",
- "Hora Central (Australia del Sur/Nueva Gales del Sur)", "CT"};
+ String BRISBANE[] = new String[] {"Hora est\u00E1ndar del Este (Queensland)", "AEST",
+ "Hora est\u00E1ndar de verano del Este (Queensland)", "AEDT",
+ "Hora Oriental (Queensland)", "AET"};
+ String BROKEN_HILL[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia/Nueva Gales del Sur)", "ACST",
+ "Hora de verano Central (Sur de Australia/Nueva Gales del Sur)", "ACDT",
+ "Hora Central (Australia del Sur/Nueva Gales del Sur)", "ACT"};
String BRT[] = new String[] {"Hora de Brasil", "BRT",
"Hora de verano de Brasil", "BRST",
"Hora de Brasil", "BRT"};
@@ -111,9 +111,9 @@
String CUBA[] = new String[] {"Hora est\u00e1ndar de Cuba", "CST",
"Hora de verano de Cuba", "CDT",
"Hora de Cuba", "CT"};
- String DARWIN[] = new String[] {"Hora est\u00E1ndar Central (territorio del Norte)", "CST",
- "Hora de verano Central (territorio del Norte)", "CST",
- "Hora Central (Territorio Septentrional)", "CT"};
+ String DARWIN[] = new String[] {"Hora est\u00E1ndar Central (territorio del Norte)", "ACST",
+ "Hora de verano Central (territorio del Norte)", "ACDT",
+ "Hora Central (Territorio Septentrional)", "ACT"};
String DUBLIN[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
"Hora de verano de Irlanda", "IST",
"Hora de Irlanda", "IT"};
@@ -132,9 +132,9 @@
String EST[] = new String[] {"Hora est\u00e1ndar Oriental", "EST",
"Hora de verano Oriental", "EDT",
"Hora Oriental", "ET"};
- String EST_NSW[] = new String[] {"Hora est\u00E1ndar Oriental (Nueva Gales del Sur)", "EST",
- "Hora de verano Oriental (Nueva Gales del Sur)", "EST",
- "Hora Oriental (Nueva Gales del Sur)", "ET"};
+ String EST_NSW[] = new String[] {"Hora est\u00E1ndar Oriental (Nueva Gales del Sur)", "AEST",
+ "Hora de verano Oriental (Nueva Gales del Sur)", "AEDT",
+ "Hora Oriental (Nueva Gales del Sur)", "AET"};
String FET[] = new String[] {"Hora de Europa m\u00E1s Oriental", "FET",
"Hora de verano de Europa m\u00E1s Oriental", "FEST",
"Hora de Europa m\u00E1s Oriental", "FET"};
@@ -165,6 +165,9 @@
String ICT[] = new String[] {"Hora de Indochina", "ICT",
"Hora de verano de Indochina", "ICST",
"Hora de Indochina", "ICT"};
+ String IRKT[] = new String[] {"Hora de Irkutsk", "IRKT",
+ "Hora de verano de Irkutsk", "IRKST",
+ "Hora de Irkutsk", "IRKT"};
String IRT[] = new String[] {"Hora est\u00e1ndar de Ir\u00e1n", "IRST",
"Hora de verano de Ir\u00e1n", "IRDT",
"Hora de Ir\u00E1n", "IRT"};
@@ -177,11 +180,14 @@
String JST[] = new String[] {"Hora est\u00e1ndar de Jap\u00f3n", "JST",
"Hora de verano de Jap\u00f3n", "JDT",
"Hora de Jap\u00F3n", "JT"};
+ String KRAT[] = new String[] {"Hora de Krasnoyarsk", "KRAT",
+ "Hora de verano de Krasnoyarsk", "KRAST",
+ "Hora de Krasnoyarsk", "KRAT"};
String KST[] = new String[] {"Hora est\u00e1ndar de Corea", "KST",
"Hora de verano de Corea", "KDT",
"Hora de Corea", "KT"};
String LORD_HOWE[] = new String[] {"Hora est\u00e1ndar de Lord Howe", "LHST",
- "Hora de verano de Lord Howe", "LHST",
+ "Hora de verano de Lord Howe", "LHDT",
"Hora de Lord Howe", "LHT"};
String MHT[] = new String[] {"Hora de las Islas Marshall", "MHT",
"Hora de verano de las Islas Marshall", "MHST",
@@ -231,20 +237,15 @@
String SGT[] = new String[] {"Hora de Singapur", "SGT",
"Hora de verano de Singapur", "SGST",
"Hora de Singapur", "SGT"};
- String SLST[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
- "Hora de verano de Sierra Leona", "SLST",
- "Horario de Sierra Leona", "SLT"};
- String TASMANIA[] = new String[] {"Hora est\u00E1ndar del Este (Tasmania)", "EST",
- "Hora de verano del Este (Tasmania)", "EST",
- "Hora Oriental (Tasmania)", "ET"};
+ String TASMANIA[] = new String[] {"Hora est\u00E1ndar del Este (Tasmania)", "AEST",
+ "Hora de verano del Este (Tasmania)", "AEDT",
+ "Hora Oriental (Tasmania)", "AET"};
String TMT[] = new String[] {"Hora de Turkmenist\u00e1n", "TMT",
"Hora de verano de Turkmenist\u00e1n", "TMST",
"Hora de Turkmenist\u00E1n", "TMT"};
String ULAT[]= new String[] {"Hora de Ulan Bator", "ULAT",
"Hora de verano de Ulan Bator", "ULAST",
"Hora de Ulan Bator", "ULAT"};
- 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",
"Hora de \u00C1frica Occidental", "WAT"};
@@ -254,27 +255,30 @@
String WIT[] = new String[] {"Hora de Indonesia Occidental", "WIB",
"Indonesia Hora de verano de Indonesia Occidental", "WIST",
"Hora de Indonesia Occidental", "WIB"};
- String WST_AUS[] = new String[] {"Hora est\u00E1ndar Occidental (Australia)", "WST",
- "Hora de verano Occidental (Australia)", "WST",
- "Hora Occidental (Australia)", "WT"};
+ String WST_AUS[] = new String[] {"Hora est\u00E1ndar Occidental (Australia)", "AWST",
+ "Hora de verano Occidental (Australia)", "AWDT",
+ "Hora Occidental (Australia)", "AWT"};
String SAMOA[] = new String[] {"Hora est\u00e1ndar de Samoa", "SST",
"Hora de verano de Samoa", "SDT",
"Hora de Samoa", "ST"};
- String WST_SAMOA[] = new String[] {"Hora de Samoa Occidental", "WST",
+ String WST_SAMOA[] = new String[] {"Hora de Samoa Occidental", "WSST",
"Hora de verano de Samoa Occidental", "WSDT",
"Hora de Samoa Occidental", "WST"};
String ChST[] = new String[] {"Hora est\u00e1ndar de Chamorro", "ChST",
"Hora de verano de Chamorro", "ChDT",
"Hora de Chamorro", "ChT"};
- String VICTORIA[] = new String[] {"Hora est\u00E1ndar del Este (Victoria)", "EST",
- "Hora de verano del Este (Victoria)", "EST",
- "Hora Oriental (Victoria)", "ET"};
+ String VICTORIA[] = new String[] {"Hora est\u00E1ndar del Este (Victoria)", "AEST",
+ "Hora de verano del Este (Victoria)", "AEDT",
+ "Hora Oriental (Victoria)", "AET"};
String UTC[] = new String[] {"Hora Universal Coordinada", "UTC",
"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 Uzbekist\u00E1n", "UZT"};
+ String XJT[] = new String[] {"Hora est\u00e1ndar de China", "XJT",
+ "Hora de verano de China", "XJDT",
+ "Hora de China", "XJT"};
return new Object[][] {
{"America/Los_Angeles", PST},
@@ -336,7 +340,7 @@
{"Africa/Djibouti", EAT},
{"Africa/Douala", WAT},
{"Africa/El_Aaiun", WET},
- {"Africa/Freetown", SLST},
+ {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT},
{"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST},
@@ -437,7 +441,7 @@
"Hora de verano de Groenlandia Occidental", "WGST",
"Hora de Groenlandia Occidental", "WGT"}},
{"America/Goose_Bay", AST},
- {"America/Grand_Turk", EST},
+ {"America/Grand_Turk", AST},
{"America/Grenada", AST},
{"America/Guadeloupe", AST},
{"America/Guatemala", CST},
@@ -484,9 +488,7 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", new String[] {"Hora de Metlakatla", "MeST",
- "Hora de verano de Metlakatla", "MeDT",
- "Metlakatla Time", "MeT"}},
+ {"America/Metlakatla", PST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Hora est\u00e1ndar de Pierre & Miquelon", "PMST",
"Hora de verano de Pierre & Miquelon", "PMDT",
@@ -607,6 +609,7 @@
"Hora de verano de Brunei", "BNST",
"Hora de Brunei", "BNT"}},
{"Asia/Calcutta", IST},
+ {"Asia/Chita", IRKT},
{"Asia/Choibalsan", new String[] {"Hora de Choibalsan", "CHOT",
"Hora de verano de Choibalsan", "CHOST",
"Hora de Choibalsan", "CHOT"}},
@@ -631,9 +634,7 @@
{"Asia/Hovd", new String[] {"Hora de Hovd", "HOVT",
"Hora de verano de Hovd", "HOVST",
"Hora de Hovd", "HOVT"}},
- {"Asia/Irkutsk", new String[] {"Hora de Irkutsk", "IRKT",
- "Hora de verano de Irkutsk", "IRKST",
- "Hora de Irkutsk", "IRKT"}},
+ {"Asia/Irkutsk", IRKT},
{"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT},
{"Asia/Jayapura", new String[] {"Hora de Indonesia Oriental", "WIT",
@@ -646,16 +647,14 @@
"Hora de verano de Petropavlovsk-Kamchatski", "PETST",
"Hora de Petropavlovsk-Kamchatski", "PETT"}},
{"Asia/Karachi", PKT},
- {"Asia/Kashgar", CTT},
+ {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
{"Asia/Khandyga", new String[] {"Hora de Khandyga", "YAKT",
"Hora de verano de Khandyga", "YAKST",
"Hora de Khandyga", "YAKT"}},
{"Asia/Kolkata", IST},
- {"Asia/Krasnoyarsk", new String[] {"Hora de Krasnoyarsk", "KRAT",
- "Hora de verano de Krasnoyarsk", "KRAST",
- "Hora de Krasnoyarsk", "KRAT"}},
+ {"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
{"Asia/Kuching", MYT},
{"Asia/Kuwait", ARAST},
@@ -670,7 +669,7 @@
"Hora de Filipinas", "PHT"}},
{"Asia/Muscat", GST},
{"Asia/Nicosia", EET},
- {"Asia/Novokuznetsk", NOVT},
+ {"Asia/Novokuznetsk", KRAT},
{"Asia/Novosibirsk", NOVT},
{"Asia/Oral", new String[] {"Hora de Uralsk", "ORAT",
"Hora de verano de Uralsk", "ORAST",
@@ -696,6 +695,9 @@
{"Asia/Samarkand", UZT},
{"Asia/Seoul", KST},
{"Asia/Singapore", SGT},
+ {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
+ "Srednekolymsk Daylight Time", "SREDT",
+ "Srednekolymsk Time", "SRET"}},
{"Asia/Taipei", CTT},
{"Asia/Tel_Aviv", ISRAEL},
{"Asia/Tashkent", UZT},
@@ -708,7 +710,7 @@
{"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT},
- {"Asia/Urumqi", CTT},
+ {"Asia/Urumqi", XJT},
{"Asia/Ust-Nera", new String[] {"Hora de Ust-Nera", "VLAT",
"Hora de verano de Ust-Nera", "VLAST",
"Hora de Ust-Nera", "VLAT"}},
@@ -750,9 +752,9 @@
{"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN},
- {"Australia/Eucla", new String[] {"Hora est\u00E1ndar de Australia Central y Occidental", "CWST",
- "Hora est\u00E1ndar de verano de Australia Central y Occidental", "CWST",
- "Hora de Australia Central y Occidental", "CWT"}},
+ {"Australia/Eucla", new String[] {"Hora est\u00E1ndar de Australia Central y Occidental", "ACWST",
+ "Hora est\u00E1ndar de verano de Australia Central y Occidental", "ACWDT",
+ "Hora de Australia Central y Occidental", "ACWT"}},
{"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE},
@@ -818,7 +820,7 @@
{"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST},
- {"Europe/Kaliningrad", FET},
+ {"Europe/Kaliningrad", EET},
{"Europe/Kiev", EET},
{"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET},
@@ -853,9 +855,7 @@
{"Europe/Vatican", CET},
{"Europe/Vienna", CET},
{"Europe/Vilnius", EET},
- {"Europe/Volgograd", new String[] {"Hora de Volgogrado", "VOLT",
- "Hora de verano de Volgogrado", "VOLST",
- "Hora de Volgogrado", "VOLT"}},
+ {"Europe/Volgograd", MSK},
{"Europe/Warsaw", CET},
{"Europe/Zagreb", CET},
{"Europe/Zaporozhye", EET},