# HG changeset patch
# User aefimov
# Date 1384507901 -14400
# Node ID 579913f11d3d6b4293f23562f172c5de4d1e1554
# Parent ef183875fcc6b0e47a8e4b2764da90e5e6b5d176
8027370: Support tzdata2013h
Reviewed-by: sherman, coffeys
diff -r ef183875fcc6 -r 579913f11d3d make/sun/javazic/tzdata/VERSION
--- a/make/sun/javazic/tzdata/VERSION Thu Oct 24 10:07:51 2013 -0700
+++ b/make/sun/javazic/tzdata/VERSION Fri Nov 15 13:31:41 2013 +0400
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2013g
+tzdata2013h
diff -r ef183875fcc6 -r 579913f11d3d make/sun/javazic/tzdata/africa
--- a/make/sun/javazic/tzdata/africa Thu Oct 24 10:07:51 2013 -0700
+++ b/make/sun/javazic/tzdata/africa Fri Nov 15 13:31:41 2013 +0400
@@ -474,6 +474,14 @@
# (either two days before them or five days after them, so as to fall on
# lastFri instead of lastSun).
+# From Even Scharning (2013-10-25):
+# The scheduled end of DST in Libya on Friday, October 25, 2013 was
+# cancelled yesterday....
+# http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/
+#
+# From Paul Eggert (2013-10-25):
+# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2.
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Libya 1951 only - Oct 14 2:00 1:00 S
Rule Libya 1952 only - Jan 1 0:00 0 -
@@ -490,19 +498,21 @@
Rule Libya 1987 1989 - Oct 1 0:00 0 -
Rule Libya 1997 only - Apr 4 0:00 1:00 S
Rule Libya 1997 only - Oct 4 0:00 0 -
-Rule Libya 2013 max - Mar lastFri 1:00 1:00 S
-Rule Libya 2013 max - Oct lastFri 2:00 0 -
+Rule Libya 2013 only - Mar lastFri 1:00 1:00 S
+Rule Libya 2013 only - Oct lastFri 2:00 0 -
+
+# The 1996 and 1997 entries are from Shanks & Pottenger;
+# the IATA SSIM data contain some obvious errors.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Tripoli 0:52:44 - LMT 1920
1:00 Libya CE%sT 1959
2:00 - EET 1982
1:00 Libya CE%sT 1990 May 4
-# The 1996 and 1997 entries are from Shanks & Pottenger;
-# the IATA SSIM data contain some obvious errors.
2:00 - EET 1996 Sep 30
1:00 Libya CE%sT 1997 Oct 4
2:00 - EET 2012 Nov 10 2:00
- 1:00 Libya CE%sT
+ 1:00 Libya CE%sT 2013 Oct 25 2:00
+ 2:00 - EET
# Madagascar
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -707,15 +717,6 @@
# http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
#
-# From Alex Krivenyshev (2008-05-09):
-# Is Western Sahara (part which administrated by Morocco) going to follow
-# Morocco DST changes? Any information? What about other part of
-# Western Sahara - under administration of POLISARIO Front (also named
-# SADR Saharawi Arab Democratic Republic)?
-
-# From Arthur David Olson (2008-05-09):
-# XXX--guess that it is only Morocco for now; guess only 2008 for now.
-
# From Steffen Thorsen (2008-08-27):
# Morocco will change the clocks back on the midnight between August 31
# and September 1. They originally planned to observe DST to near the end
@@ -891,13 +892,13 @@
# Another source (specifying the time for start and end in the decree):
# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html
-# From Paul Eggert (2013-09-30):
+# From Paul Eggert (2013-10-03):
# To estimate what the Moroccan government will do in future years,
-# transition dates for 2014 through 2037 were determined by running
+# transition dates for 2014 through 2038 were determined by running
# the following program under GNU Emacs 24.3:
#
# (let ((islamic-year 1435))
-# (while (< islamic-year 1460)
+# (while (< islamic-year 1461)
# (let ((a
# (calendar-gregorian-from-absolute
# (calendar-islamic-to-absolute (list 9 1 islamic-year))))
@@ -917,9 +918,13 @@
# all transitions removed for 2026-2035, where the estimated Ramadan
# falls entirely outside daylight-saving time; and with fall-back
# transitions removed for 2036-2037, where the normal fall-back
-# date falls during the estimated Ramadan. Problems continue after that,
-# but 32-bit time_t values roll around in 2038 so for now do not worry
-# about dates after 2037.
+# date falls during the estimated Ramadan. Normally, the table would
+# stop after 2037 because 32-bit time_t values roll around early in 2038,
+# but that would imply a prediction of perpetual DST after March 2038
+# due to the year-2037 glitches. So, this table instead stops after
+# 2038, the first non-glitchy year after the 32-bit rollover.
+# An advantage of stopping after 2038 is that it lets zic guess
+# TZ='WET0WEST,M3.5.0,M10.5.0/3' for time stamps far in the future.
# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
@@ -987,10 +992,21 @@
0:00 Morocco WE%sT 1984 Mar 16
1:00 - CET 1986
0:00 Morocco WE%sT
+
# Western Sahara
+#
+# From Gwillim Law (2013-10-22):
+# A correspondent who is usually well informed about time zone matters
+# ... says that Western Sahara observes daylight saving time, just as
+# Morocco does.
+#
+# From Paul Eggert (2013-10-23):
+# Assume that this has been true since Western Sahara switched to GMT,
+# since most of it was then controlled by Morocco.
+
Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan
-1:00 - WAT 1976 Apr 14
- 0:00 - WET
+ 0:00 Morocco WE%sT
# Mozambique
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
diff -r ef183875fcc6 -r 579913f11d3d make/sun/javazic/tzdata/southamerica
--- a/make/sun/javazic/tzdata/southamerica Thu Oct 24 10:07:51 2013 -0700
+++ b/make/sun/javazic/tzdata/southamerica Fri Nov 15 13:31:41 2013 +0400
@@ -874,6 +874,15 @@
# We will keep this article updated when this is confirmed:
# http://www.timeanddate.com/news/time/brazil-starts-dst-2013.html
+# From Steffen Thorsen (2013-10-17):
+# http://www.timeanddate.com/news/time/acre-amazonas-change-time-zone.html
+# Senator Jorge Viana announced that Acre will change time zone on November 10.
+# He did not specify the time of the change, nor if western parts of Amazonas
+# will change as well.
+#
+# From Paul Eggert (2013-10-17):
+# For now, assume western Amazonas will change as well.
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
# Decree 20,466 (1931-10-01)
# Decree 21,896 (1932-01-10)
@@ -1162,13 +1171,15 @@
-5:00 - ACT 1993 Sep 28
-5:00 Brazil AC%sT 1994 Sep 22
-5:00 - ACT 2008 Jun 24 00:00
- -4:00 - AMT
+ -4:00 - AMT 2013 Nov 10
+ -5:00 - ACT
#
# Acre (AC)
Zone America/Rio_Branco -4:31:12 - LMT 1914
-5:00 Brazil AC%sT 1988 Sep 12
-5:00 - ACT 2008 Jun 24 00:00
- -4:00 - AMT
+ -4:00 - AMT 2013 Nov 10
+ -5:00 - ACT
# Chile
diff -r ef183875fcc6 -r 579913f11d3d src/share/classes/sun/util/resources/TimeZoneNames.java
--- a/src/share/classes/sun/util/resources/TimeZoneNames.java Thu Oct 24 10:07:51 2013 -0700
+++ b/src/share/classes/sun/util/resources/TimeZoneNames.java Fri Nov 15 13:31:41 2013 +0400
@@ -43,6 +43,8 @@
public final class TimeZoneNames extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Acre Time", "ACT",
+ "Acre Summer Time", "ACST"};
String ADELAIDE[] = new String[] {"Central Standard Time (South Australia)", "CST",
"Central Summer Time (South Australia)", "CST"};
String AGT[] = new String[] {"Argentine Time", "ART",
@@ -289,7 +291,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -347,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},
@@ -424,7 +426,7 @@
"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},
@@ -432,7 +434,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -635,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},
@@ -753,7 +755,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"Middle Europe Time", "MET",
"Middle Europe Summer Time", "MEST"}},
{"Mexico/BajaNorte", PST},
diff -r ef183875fcc6 -r 579913f11d3d src/share/classes/sun/util/resources/TimeZoneNames_de.java
--- a/src/share/classes/sun/util/resources/TimeZoneNames_de.java Thu Oct 24 10:07:51 2013 -0700
+++ b/src/share/classes/sun/util/resources/TimeZoneNames_de.java Fri Nov 15 13:31:41 2013 +0400
@@ -43,6 +43,8 @@
public final class TimeZoneNames_de extends TimeZoneNamesBundle {
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 AGT[] = new String[] {"Argentinische Zeit", "ART",
@@ -289,7 +291,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -347,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},
@@ -424,7 +426,7 @@
"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},
@@ -432,7 +434,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -635,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},
@@ -753,7 +755,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"Zentraleurop\u00e4ische Zeit", "MET",
"Zentraleurop\u00e4ische Sommerzeit", "MEST"}},
{"Mexico/BajaNorte", PST},
diff -r ef183875fcc6 -r 579913f11d3d src/share/classes/sun/util/resources/TimeZoneNames_es.java
--- a/src/share/classes/sun/util/resources/TimeZoneNames_es.java Thu Oct 24 10:07:51 2013 -0700
+++ b/src/share/classes/sun/util/resources/TimeZoneNames_es.java Fri Nov 15 13:31:41 2013 +0400
@@ -43,6 +43,8 @@
public final class TimeZoneNames_es extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Hora de Acre", "ACT",
+ "Hora de verano de Acre", "ACST"};
String ADELAIDE[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia)", "CST",
"Hora de verano Central (Sur de Australia)", "CST"};
String AGT[] = new String[] {"Hora de Argentina", "ART",
@@ -289,7 +291,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -347,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},
@@ -424,7 +426,7 @@
"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},
@@ -432,7 +434,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -635,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},
@@ -753,7 +755,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"Hora de Europa Central", "MET",
"Hora de verano de Europa Central", "MEST"}},
{"Mexico/BajaNorte", PST},
diff -r ef183875fcc6 -r 579913f11d3d src/share/classes/sun/util/resources/TimeZoneNames_fr.java
--- a/src/share/classes/sun/util/resources/TimeZoneNames_fr.java Thu Oct 24 10:07:51 2013 -0700
+++ b/src/share/classes/sun/util/resources/TimeZoneNames_fr.java Fri Nov 15 13:31:41 2013 +0400
@@ -43,6 +43,8 @@
public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Heure de l'Acre", "ACT",
+ "Heure d'\u00e9t\u00e9 de l'Acre", "ACST"};
String ADELAIDE[] = new String[] {"Heure standard d'Australie centrale (Australie du sud)", "CST",
"Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud)", "CST"};
String AGT[] = new String[] {"Heure D'Argentine", "ART",
@@ -289,7 +291,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -347,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},
@@ -424,7 +426,7 @@
"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},
@@ -432,7 +434,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -635,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},
@@ -753,7 +755,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"Heure de l'Europe centrale", "MET",
"Heure d'\u00e9t\u00e9 de l'Europe centrale", "MEST"}},
{"Mexico/BajaNorte", PST},
diff -r ef183875fcc6 -r 579913f11d3d src/share/classes/sun/util/resources/TimeZoneNames_it.java
--- a/src/share/classes/sun/util/resources/TimeZoneNames_it.java Thu Oct 24 10:07:51 2013 -0700
+++ b/src/share/classes/sun/util/resources/TimeZoneNames_it.java Fri Nov 15 13:31:41 2013 +0400
@@ -43,6 +43,8 @@
public final class TimeZoneNames_it extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Ora di Acre", "ACT",
+ "Ora estiva di Acre", "ACST"};
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",
@@ -289,7 +291,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -347,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},
@@ -424,7 +426,7 @@
"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},
@@ -432,7 +434,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -635,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},
@@ -753,7 +755,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"Ora dell'Europa centrale", "MET",
"Ora estiva dell'Europa centrale", "MEST"}},
{"Mexico/BajaNorte", PST},
diff -r ef183875fcc6 -r 579913f11d3d src/share/classes/sun/util/resources/TimeZoneNames_ja.java
--- a/src/share/classes/sun/util/resources/TimeZoneNames_ja.java Thu Oct 24 10:07:51 2013 -0700
+++ b/src/share/classes/sun/util/resources/TimeZoneNames_ja.java Fri Nov 15 13:31:41 2013 +0400
@@ -43,6 +43,8 @@
public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
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 AGT[] = new String[] {"\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "ART",
@@ -289,7 +291,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -347,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},
@@ -424,7 +426,7 @@
"\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},
@@ -432,7 +434,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -635,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},
@@ -753,7 +755,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "MET",
"\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "MEST"}},
{"Mexico/BajaNorte", PST},
diff -r ef183875fcc6 -r 579913f11d3d src/share/classes/sun/util/resources/TimeZoneNames_ko.java
--- a/src/share/classes/sun/util/resources/TimeZoneNames_ko.java Thu Oct 24 10:07:51 2013 -0700
+++ b/src/share/classes/sun/util/resources/TimeZoneNames_ko.java Fri Nov 15 13:31:41 2013 +0400
@@ -43,6 +43,8 @@
public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
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(\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",
@@ -289,7 +291,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -347,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},
@@ -424,7 +426,7 @@
"\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},
@@ -432,7 +434,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -635,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},
@@ -753,7 +755,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"\uc911\ubd80 \uc720\ub7fd \uc2dc\uac04", "MET",
"\uc911\ubd80 \uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MEST"}},
{"Mexico/BajaNorte", PST},
diff -r ef183875fcc6 -r 579913f11d3d src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java
--- a/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Thu Oct 24 10:07:51 2013 -0700
+++ b/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Fri Nov 15 13:31:41 2013 +0400
@@ -43,6 +43,8 @@
public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Fuso hor\u00e1rio do Acre", "ACT",
+ "Fuso hor\u00e1rio de ver\u00e3o do Acre", "ACST"};
String ADELAIDE[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Austr\u00E1lia do Sul)", "CST",
"Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul)", "CST"};
String AGT[] = new String[] {"Fuso hor\u00e1rio da Argentina", "ART",
@@ -289,7 +291,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -347,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},
@@ -424,7 +426,7 @@
"Fuso hor\u00e1rio de ver\u00e3o do 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},
@@ -432,7 +434,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -635,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},
@@ -753,7 +755,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"Fuso hor\u00e1rio da Europa M\u00e9dia", "MET",
"Fuso hor\u00e1rio de ver\u00e3o da Europa M\u00e9dia", "MEST"}},
{"Mexico/BajaNorte", PST},
diff -r ef183875fcc6 -r 579913f11d3d src/share/classes/sun/util/resources/TimeZoneNames_sv.java
--- a/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Thu Oct 24 10:07:51 2013 -0700
+++ b/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Fri Nov 15 13:31:41 2013 +0400
@@ -43,6 +43,8 @@
public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
protected final Object[][] getContents() {
+ String ACT[] = new String[] {"Acre, normaltid", "ACT",
+ "Acre, sommartid", "ACST"};
String ADELAIDE[] = new String[] {"Central standardtid (Sydaustralien)", "CST",
"Central sommartid (South Australia)", "CST"};
String AGT[] = new String[] {"Argentina, normaltid", "ART",
@@ -289,7 +291,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -347,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},
@@ -424,7 +426,7 @@
"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},
@@ -432,7 +434,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -635,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},
@@ -753,7 +755,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"Mellaneuropeisk tid", "MET",
"Mellaneuropeisk sommartid", "MEST"}},
{"Mexico/BajaNorte", PST},
diff -r ef183875fcc6 -r 579913f11d3d src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java
--- a/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java Thu Oct 24 10:07:51 2013 -0700
+++ b/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java Fri Nov 15 13:31:41 2013 +0400
@@ -43,6 +43,8 @@
public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
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 (\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",
@@ -289,7 +291,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -347,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},
@@ -424,7 +426,7 @@
"\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},
@@ -432,7 +434,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -635,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},
@@ -753,7 +755,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"\u4e2d\u6b27\u65f6\u95f4", "MET",
"\u4e2d\u6b27\u590f\u4ee4\u65f6", "MEST"}},
{"Mexico/BajaNorte", PST},
diff -r ef183875fcc6 -r 579913f11d3d src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java
--- a/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java Thu Oct 24 10:07:51 2013 -0700
+++ b/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java Fri Nov 15 13:31:41 2013 +0400
@@ -43,6 +43,8 @@
public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
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\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",
@@ -289,7 +291,7 @@
{"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT},
- {"Africa/Tripoli", CET},
+ {"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", WAT},
{"America/Adak", HAST},
@@ -347,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},
@@ -424,7 +426,7 @@
"\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},
@@ -432,7 +434,7 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", CST},
- {"America/Rio_Branco", AMT},
+ {"America/Rio_Branco", ACT},
{"America/Rosario", AGT},
{"America/Santa_Isabel", PST},
{"America/Santarem", BRT},
@@ -636,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},
@@ -754,7 +756,7 @@
{"Jamaica", EST},
{"Japan", JST},
{"Kwajalein", MHT},
- {"Libya", CET},
+ {"Libya", EET},
{"MET", new String[] {"\u4e2d\u6b50\u6642\u9593", "MET",
"\u4e2d\u6b50\u590f\u4ee4\u6642\u9593", "MEST"}},
{"Mexico/BajaNorte", PST},