Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

通知 4
Star 2
Fork 0
D
dragonwell8_jdk
提交 447e7b17 编写于 作者: A aefimov
浏览文件
操作

8027370: Support tzdata2013h 

Reviewed-by: sherman, coffeys
上级 805f8f1c
隐藏空白更改
内联 并排
Showing with 191 addition and 114 deletion
make/data/tzdata/VERSION
浏览文件 @ 447e7b17
...@@ -21,4 +21,4 @@ ...@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any # or visit www.oracle.com if you need additional information or have any
# questions. # questions.
# #
tzdata2013g tzdata2013h
make/data/tzdata/africa
浏览文件 @ 447e7b17
...@@ -474,6 +474,14 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 ...@@ -474,6 +474,14 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882
# (either two days before them or five days after them, so as to fall on # (either two days before them or five days after them, so as to fall on
# lastFri instead of lastSun). # 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 NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Libya 1951 only - Oct 14 2:00 1:00 S Rule Libya 1951 only - Oct 14 2:00 1:00 S
Rule Libya 1952 only - Jan 1 0:00 0 - Rule Libya 1952 only - Jan 1 0:00 0 -
...@@ -490,19 +498,21 @@ Rule Libya 1987 1989 - Apr 1 0:00 1:00 S ...@@ -490,19 +498,21 @@ Rule Libya 1987 1989 - Apr 1 0:00 1:00 S
Rule Libya 1987 1989 - Oct 1 0:00 0 - Rule Libya 1987 1989 - Oct 1 0:00 0 -
Rule Libya 1997 only - Apr 4 0:00 1:00 S Rule Libya 1997 only - Apr 4 0:00 1:00 S
Rule Libya 1997 only - Oct 4 0:00 0 - Rule Libya 1997 only - Oct 4 0:00 0 -
Rule Libya 2013 max - Mar lastFri 1:00 1:00 S Rule Libya 2013 only - Mar lastFri 1:00 1:00 S
Rule Libya 2013 max - Oct lastFri 2:00 0 - 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 NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Tripoli 0:52:44 - LMT 1920 Zone Africa/Tripoli 0:52:44 - LMT 1920
1:00 Libya CE%sT 1959 1:00 Libya CE%sT 1959
2:00 - EET 1982 2:00 - EET 1982
1:00 Libya CE%sT 1990 May 4 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 2:00 - EET 1996 Sep 30
1:00 Libya CE%sT 1997 Oct 4 1:00 Libya CE%sT 1997 Oct 4
2:00 - EET 2012 Nov 10 2:00 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 # Madagascar
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
...@@ -707,15 +717,6 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou ...@@ -707,15 +717,6 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou
# http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search # http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
# </a> # </a>
# 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): # From Steffen Thorsen (2008-08-27):
# Morocco will change the clocks back on the midnight between August 31 # 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 # and September 1. They originally planned to observe DST to near the end
...@@ -891,13 +892,13 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou ...@@ -891,13 +892,13 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou
# Another source (specifying the time for start and end in the decree): # 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 # 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, # 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: # the following program under GNU Emacs 24.3:
# #
# (let ((islamic-year 1435)) # (let ((islamic-year 1435))
# (while (< islamic-year 1460) # (while (< islamic-year 1461)
# (let ((a # (let ((a
# (calendar-gregorian-from-absolute # (calendar-gregorian-from-absolute
# (calendar-islamic-to-absolute (list 9 1 islamic-year)))) # (calendar-islamic-to-absolute (list 9 1 islamic-year))))
...@@ -917,9 +918,13 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou ...@@ -917,9 +918,13 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou
# all transitions removed for 2026-2035, where the estimated Ramadan # all transitions removed for 2026-2035, where the estimated Ramadan
# falls entirely outside daylight-saving time; and with fall-back # falls entirely outside daylight-saving time; and with fall-back
# transitions removed for 2036-2037, where the normal fall-back # transitions removed for 2036-2037, where the normal fall-back
# date falls during the estimated Ramadan. Problems continue after that, # date falls during the estimated Ramadan. Normally, the table would
# but 32-bit time_t values roll around in 2038 so for now do not worry # stop after 2037 because 32-bit time_t values roll around early in 2038,
# about dates after 2037. # 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 # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
...@@ -987,10 +992,21 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 ...@@ -987,10 +992,21 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
0:00 Morocco WE%sT 1984 Mar 16 0:00 Morocco WE%sT 1984 Mar 16
1:00 - CET 1986 1:00 - CET 1986
0:00 Morocco WE%sT 0:00 Morocco WE%sT
# Western Sahara # 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 Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan
-1:00 - WAT 1976 Apr 14 -1:00 - WAT 1976 Apr 14
0:00 - WET 0:00 Morocco WE%sT
# Mozambique # Mozambique
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
......
make/data/tzdata/southamerica
浏览文件 @ 447e7b17
...@@ -874,6 +874,15 @@ Zone America/La_Paz -4:32:36 - LMT 1890 ...@@ -874,6 +874,15 @@ Zone America/La_Paz -4:32:36 - LMT 1890
# We will keep this article updated when this is confirmed: # We will keep this article updated when this is confirmed:
# http://www.timeanddate.com/news/time/brazil-starts-dst-2013.html # 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 # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
# Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01) # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
# Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10) # Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10)
...@@ -1162,13 +1171,15 @@ Zone America/Eirunepe -4:39:28 - LMT 1914 ...@@ -1162,13 +1171,15 @@ Zone America/Eirunepe -4:39:28 - LMT 1914
-5:00 - ACT 1993 Sep 28 -5:00 - ACT 1993 Sep 28
-5:00 Brazil AC%sT 1994 Sep 22 -5:00 Brazil AC%sT 1994 Sep 22
-5:00 - ACT 2008 Jun 24 00:00 -5:00 - ACT 2008 Jun 24 00:00
-4:00 - AMT -4:00 - AMT 2013 Nov 10
-5:00 - ACT
# #
# Acre (AC) # Acre (AC)
Zone America/Rio_Branco -4:31:12 - LMT 1914 Zone America/Rio_Branco -4:31:12 - LMT 1914
-5:00 Brazil AC%sT 1988 Sep 12 -5:00 Brazil AC%sT 1988 Sep 12
-5:00 - ACT 2008 Jun 24 00:00 -5:00 - ACT 2008 Jun 24 00:00
-4:00 - AMT -4:00 - AMT 2013 Nov 10
-5:00 - ACT
# Chile # Chile
......
src/share/classes/sun/util/resources/TimeZoneNames.java
浏览文件 @ 447e7b17
...@@ -44,6 +44,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -44,6 +44,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
protected final Object[][] getContents() { protected final Object[][] getContents() {
// Note: generic names came from CLDR with some adjustments. // Note: generic names came from CLDR with some adjustments.
String ACT[] = new String[] {"Acre Time", "ACT",
"Acre Summer Time", "ACST",
"Acre Time", "ACT"};
String ADELAIDE[] = new String[] {"Central Standard Time (South Australia)", "CST", String ADELAIDE[] = new String[] {"Central Standard Time (South Australia)", "CST",
"Central Summer Time (South Australia)", "CST", "Central Summer Time (South Australia)", "CST",
"Central Time (South Australia)", "CT"}; "Central Time (South Australia)", "CT"};
...@@ -362,7 +365,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -362,7 +365,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", CET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
{"Africa/Windhoek", WAT}, {"Africa/Windhoek", WAT},
{"America/Adak", HAST}, {"America/Adak", HAST},
...@@ -424,7 +427,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -424,7 +427,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"America/Detroit", EST}, {"America/Detroit", EST},
{"America/Dominica", AST}, {"America/Dominica", AST},
{"America/Edmonton", MST}, {"America/Edmonton", MST},
{"America/Eirunepe", AMT}, {"America/Eirunepe", ACT},
{"America/El_Salvador", CST}, {"America/El_Salvador", CST},
{"America/Ensenada", PST}, {"America/Ensenada", PST},
{"America/Fort_Wayne", EST}, {"America/Fort_Wayne", EST},
...@@ -510,7 +513,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -510,7 +513,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
"Suriname Time", "SRT"}}, "Suriname Time", "SRT"}},
{"America/Port-au-Prince", EST}, {"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST}, {"America/Port_of_Spain", AST},
{"America/Porto_Acre", AMT}, {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT}, {"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST}, {"America/Puerto_Rico", AST},
{"America/Rainy_River", CST}, {"America/Rainy_River", CST},
...@@ -518,7 +521,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -518,7 +521,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"America/Recife", BRT}, {"America/Recife", BRT},
{"America/Regina", CST}, {"America/Regina", CST},
{"America/Resolute", CST}, {"America/Resolute", CST},
{"America/Rio_Branco", AMT}, {"America/Rio_Branco", ACT},
{"America/Rosario", AGT}, {"America/Rosario", AGT},
{"America/Santa_Isabel", PST}, {"America/Santa_Isabel", PST},
{"America/Santarem", BRT}, {"America/Santarem", BRT},
...@@ -765,7 +768,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -765,7 +768,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Australia/Yancowinna", BROKEN_HILL}, {"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT}, {"BET", BRT},
{"BST", BDT}, {"BST", BDT},
{"Brazil/Acre", AMT}, {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA}, {"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT}, {"Brazil/East", BRT},
{"Brazil/West", AMT}, {"Brazil/West", AMT},
...@@ -893,7 +896,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -893,7 +896,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Jamaica", EST}, {"Jamaica", EST},
{"Japan", JST}, {"Japan", JST},
{"Kwajalein", MHT}, {"Kwajalein", MHT},
{"Libya", CET}, {"Libya", EET},
{"MET", new String[] {"Middle Europe Time", "MET", {"MET", new String[] {"Middle Europe Time", "MET",
"Middle Europe Summer Time", "MEST", "Middle Europe Summer Time", "MEST",
"Middle Europe Time", "MET"}}, "Middle Europe Time", "MET"}},
......
src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
浏览文件 @ 447e7b17
...@@ -45,6 +45,8 @@ import sun.util.resources.TimeZoneNamesBundle; ...@@ -45,6 +45,8 @@ import sun.util.resources.TimeZoneNamesBundle;
public final class TimeZoneNames_de extends TimeZoneNamesBundle { public final class TimeZoneNames_de extends TimeZoneNamesBundle {
protected final Object[][] getContents() { protected final Object[][] getContents() {
String ACT[] = new String[] {"Acre Normalzeit", "ACT",
"Acre Sommerzeit", "ACST"};
String ADELAIDE[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien)", "CST", String ADELAIDE[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien)", "CST",
"Zentrale Sommerzeit (S\u00FCdaustralien)", "CST"}; "Zentrale Sommerzeit (S\u00FCdaustralien)", "CST"};
String AGT[] = new String[] {"Argentinische Zeit", "ART", String AGT[] = new String[] {"Argentinische Zeit", "ART",
...@@ -287,7 +289,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle { ...@@ -287,7 +289,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", CET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
{"Africa/Windhoek", WAT}, {"Africa/Windhoek", WAT},
{"America/Adak", HAST}, {"America/Adak", HAST},
...@@ -345,7 +347,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle { ...@@ -345,7 +347,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{"America/Detroit", EST}, {"America/Detroit", EST},
{"America/Dominica", AST}, {"America/Dominica", AST},
{"America/Edmonton", MST}, {"America/Edmonton", MST},
{"America/Eirunepe", AMT}, {"America/Eirunepe", ACT},
{"America/El_Salvador", CST}, {"America/El_Salvador", CST},
{"America/Ensenada", PST}, {"America/Ensenada", PST},
{"America/Fort_Wayne", EST}, {"America/Fort_Wayne", EST},
...@@ -422,7 +424,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle { ...@@ -422,7 +424,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
"Suriname Sommerzeit", "SRST"}}, "Suriname Sommerzeit", "SRST"}},
{"America/Port-au-Prince", EST}, {"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST}, {"America/Port_of_Spain", AST},
{"America/Porto_Acre", AMT}, {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT}, {"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST}, {"America/Puerto_Rico", AST},
{"America/Rainy_River", CST}, {"America/Rainy_River", CST},
...@@ -430,7 +432,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle { ...@@ -430,7 +432,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{"America/Recife", BRT}, {"America/Recife", BRT},
{"America/Regina", CST}, {"America/Regina", CST},
{"America/Resolute", CST}, {"America/Resolute", CST},
{"America/Rio_Branco", AMT}, {"America/Rio_Branco", ACT},
{"America/Rosario", AGT}, {"America/Rosario", AGT},
{"America/Santa_Isabel", PST}, {"America/Santa_Isabel", PST},
{"America/Santarem", BRT}, {"America/Santarem", BRT},
...@@ -635,7 +637,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle { ...@@ -635,7 +637,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{"Australia/Yancowinna", BROKEN_HILL}, {"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT}, {"BET", BRT},
{"BST", BDT}, {"BST", BDT},
{"Brazil/Acre", AMT}, {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA}, {"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT}, {"Brazil/East", BRT},
{"Brazil/West", AMT}, {"Brazil/West", AMT},
...@@ -753,7 +755,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle { ...@@ -753,7 +755,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{"Jamaica", EST}, {"Jamaica", EST},
{"Japan", JST}, {"Japan", JST},
{"Kwajalein", MHT}, {"Kwajalein", MHT},
{"Libya", CET}, {"Libya", EET},
{"MET", new String[] {"Zentraleurop\u00e4ische Zeit", "MET", {"MET", new String[] {"Zentraleurop\u00e4ische Zeit", "MET",
"Zentraleurop\u00e4ische Sommerzeit", "MEST"}}, "Zentraleurop\u00e4ische Sommerzeit", "MEST"}},
{"Mexico/BajaNorte", PST}, {"Mexico/BajaNorte", PST},
......
src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
浏览文件 @ 447e7b17
...@@ -45,6 +45,8 @@ import sun.util.resources.TimeZoneNamesBundle; ...@@ -45,6 +45,8 @@ import sun.util.resources.TimeZoneNamesBundle;
public final class TimeZoneNames_es extends TimeZoneNamesBundle { public final class TimeZoneNames_es extends TimeZoneNamesBundle {
protected final Object[][] getContents() { 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"}; "Hora de verano Central (Sur de Australia)", "CST"};
String AGT[] = new String[] {"Hora de Argentina", "ART", String AGT[] = new String[] {"Hora de Argentina", "ART",
...@@ -287,7 +289,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle { ...@@ -287,7 +289,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", CET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
{"Africa/Windhoek", WAT}, {"Africa/Windhoek", WAT},
{"America/Adak", HAST}, {"America/Adak", HAST},
...@@ -345,7 +347,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle { ...@@ -345,7 +347,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
{"America/Detroit", EST}, {"America/Detroit", EST},
{"America/Dominica", AST}, {"America/Dominica", AST},
{"America/Edmonton", MST}, {"America/Edmonton", MST},
{"America/Eirunepe", AMT}, {"America/Eirunepe", ACT},
{"America/El_Salvador", CST}, {"America/El_Salvador", CST},
{"America/Ensenada", PST}, {"America/Ensenada", PST},
{"America/Fort_Wayne", EST}, {"America/Fort_Wayne", EST},
...@@ -422,7 +424,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle { ...@@ -422,7 +424,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
"Hora de verano de Surinam", "SRST"}}, "Hora de verano de Surinam", "SRST"}},
{"America/Port-au-Prince", EST}, {"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST}, {"America/Port_of_Spain", AST},
{"America/Porto_Acre", AMT}, {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT}, {"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST}, {"America/Puerto_Rico", AST},
{"America/Rainy_River", CST}, {"America/Rainy_River", CST},
...@@ -430,7 +432,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle { ...@@ -430,7 +432,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
{"America/Recife", BRT}, {"America/Recife", BRT},
{"America/Regina", CST}, {"America/Regina", CST},
{"America/Resolute", CST}, {"America/Resolute", CST},
{"America/Rio_Branco", AMT}, {"America/Rio_Branco", ACT},
{"America/Rosario", AGT}, {"America/Rosario", AGT},
{"America/Santa_Isabel", PST}, {"America/Santa_Isabel", PST},
{"America/Santarem", BRT}, {"America/Santarem", BRT},
...@@ -635,7 +637,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle { ...@@ -635,7 +637,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
{"Australia/Yancowinna", BROKEN_HILL}, {"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT}, {"BET", BRT},
{"BST", BDT}, {"BST", BDT},
{"Brazil/Acre", AMT}, {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA}, {"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT}, {"Brazil/East", BRT},
{"Brazil/West", AMT}, {"Brazil/West", AMT},
...@@ -753,7 +755,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle { ...@@ -753,7 +755,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
{"Jamaica", EST}, {"Jamaica", EST},
{"Japan", JST}, {"Japan", JST},
{"Kwajalein", MHT}, {"Kwajalein", MHT},
{"Libya", CET}, {"Libya", EET},
{"MET", new String[] {"Hora de Europa Central", "MET", {"MET", new String[] {"Hora de Europa Central", "MET",
"Hora de verano de Europa Central", "MEST"}}, "Hora de verano de Europa Central", "MEST"}},
{"Mexico/BajaNorte", PST}, {"Mexico/BajaNorte", PST},
......
src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
浏览文件 @ 447e7b17
...@@ -45,6 +45,8 @@ import sun.util.resources.TimeZoneNamesBundle; ...@@ -45,6 +45,8 @@ import sun.util.resources.TimeZoneNamesBundle;
public final class TimeZoneNames_fr extends TimeZoneNamesBundle { public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
protected final Object[][] getContents() { 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", 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", String AGT[] = new String[] {"Heure D'Argentine", "ART",
...@@ -287,7 +289,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle { ...@@ -287,7 +289,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", CET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
{"Africa/Windhoek", WAT}, {"Africa/Windhoek", WAT},
{"America/Adak", HAST}, {"America/Adak", HAST},
...@@ -345,7 +347,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle { ...@@ -345,7 +347,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{"America/Detroit", EST}, {"America/Detroit", EST},
{"America/Dominica", AST}, {"America/Dominica", AST},
{"America/Edmonton", MST}, {"America/Edmonton", MST},
{"America/Eirunepe", AMT}, {"America/Eirunepe", ACT},
{"America/El_Salvador", CST}, {"America/El_Salvador", CST},
{"America/Ensenada", PST}, {"America/Ensenada", PST},
{"America/Fort_Wayne", EST}, {"America/Fort_Wayne", EST},
...@@ -422,7 +424,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle { ...@@ -422,7 +424,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
"Heure d'\u00e9t\u00e9 du Surinam", "SRST"}}, "Heure d'\u00e9t\u00e9 du Surinam", "SRST"}},
{"America/Port-au-Prince", EST}, {"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST}, {"America/Port_of_Spain", AST},
{"America/Porto_Acre", AMT}, {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT}, {"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST}, {"America/Puerto_Rico", AST},
{"America/Rainy_River", CST}, {"America/Rainy_River", CST},
...@@ -430,7 +432,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle { ...@@ -430,7 +432,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{"America/Recife", BRT}, {"America/Recife", BRT},
{"America/Regina", CST}, {"America/Regina", CST},
{"America/Resolute", CST}, {"America/Resolute", CST},
{"America/Rio_Branco", AMT}, {"America/Rio_Branco", ACT},
{"America/Rosario", AGT}, {"America/Rosario", AGT},
{"America/Santa_Isabel", PST}, {"America/Santa_Isabel", PST},
{"America/Santarem", BRT}, {"America/Santarem", BRT},
...@@ -635,7 +637,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle { ...@@ -635,7 +637,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{"Australia/Yancowinna", BROKEN_HILL}, {"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT}, {"BET", BRT},
{"BST", BDT}, {"BST", BDT},
{"Brazil/Acre", AMT}, {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA}, {"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT}, {"Brazil/East", BRT},
{"Brazil/West", AMT}, {"Brazil/West", AMT},
...@@ -753,7 +755,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle { ...@@ -753,7 +755,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{"Jamaica", EST}, {"Jamaica", EST},
{"Japan", JST}, {"Japan", JST},
{"Kwajalein", MHT}, {"Kwajalein", MHT},
{"Libya", CET}, {"Libya", EET},
{"MET", new String[] {"Heure de l'Europe centrale", "MET", {"MET", new String[] {"Heure de l'Europe centrale", "MET",
"Heure d'\u00e9t\u00e9 de l'Europe centrale", "MEST"}}, "Heure d'\u00e9t\u00e9 de l'Europe centrale", "MEST"}},
{"Mexico/BajaNorte", PST}, {"Mexico/BajaNorte", PST},
......
src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
浏览文件 @ 447e7b17
...@@ -45,6 +45,8 @@ import sun.util.resources.TimeZoneNamesBundle; ...@@ -45,6 +45,8 @@ import sun.util.resources.TimeZoneNamesBundle;
public final class TimeZoneNames_it extends TimeZoneNamesBundle { public final class TimeZoneNames_it extends TimeZoneNamesBundle {
protected final Object[][] getContents() { 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", String ADELAIDE[] = new String[] {"Ora standard centrale (Australia del Sud)", "CST",
"Ora estiva centrale (Australia del Sud)", "CST"}; "Ora estiva centrale (Australia del Sud)", "CST"};
String AGT[] = new String[] {"Ora dell'Argentina", "ART", String AGT[] = new String[] {"Ora dell'Argentina", "ART",
...@@ -287,7 +289,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle { ...@@ -287,7 +289,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", CET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
{"Africa/Windhoek", WAT}, {"Africa/Windhoek", WAT},
{"America/Adak", HAST}, {"America/Adak", HAST},
...@@ -345,7 +347,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle { ...@@ -345,7 +347,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{"America/Detroit", EST}, {"America/Detroit", EST},
{"America/Dominica", AST}, {"America/Dominica", AST},
{"America/Edmonton", MST}, {"America/Edmonton", MST},
{"America/Eirunepe", AMT}, {"America/Eirunepe", ACT},
{"America/El_Salvador", CST}, {"America/El_Salvador", CST},
{"America/Ensenada", PST}, {"America/Ensenada", PST},
{"America/Fort_Wayne", EST}, {"America/Fort_Wayne", EST},
...@@ -422,7 +424,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle { ...@@ -422,7 +424,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
"Ora estiva di Suriname", "SRST"}}, "Ora estiva di Suriname", "SRST"}},
{"America/Port-au-Prince", EST}, {"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST}, {"America/Port_of_Spain", AST},
{"America/Porto_Acre", AMT}, {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT}, {"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST}, {"America/Puerto_Rico", AST},
{"America/Rainy_River", CST}, {"America/Rainy_River", CST},
...@@ -430,7 +432,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle { ...@@ -430,7 +432,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{"America/Recife", BRT}, {"America/Recife", BRT},
{"America/Regina", CST}, {"America/Regina", CST},
{"America/Resolute", CST}, {"America/Resolute", CST},
{"America/Rio_Branco", AMT}, {"America/Rio_Branco", ACT},
{"America/Rosario", AGT}, {"America/Rosario", AGT},
{"America/Santa_Isabel", PST}, {"America/Santa_Isabel", PST},
{"America/Santarem", BRT}, {"America/Santarem", BRT},
...@@ -635,7 +637,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle { ...@@ -635,7 +637,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{"Australia/Yancowinna", BROKEN_HILL}, {"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT}, {"BET", BRT},
{"BST", BDT}, {"BST", BDT},
{"Brazil/Acre", AMT}, {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA}, {"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT}, {"Brazil/East", BRT},
{"Brazil/West", AMT}, {"Brazil/West", AMT},
...@@ -753,7 +755,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle { ...@@ -753,7 +755,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{"Jamaica", EST}, {"Jamaica", EST},
{"Japan", JST}, {"Japan", JST},
{"Kwajalein", MHT}, {"Kwajalein", MHT},
{"Libya", CET}, {"Libya", EET},
{"MET", new String[] {"Ora dell'Europa centrale", "MET", {"MET", new String[] {"Ora dell'Europa centrale", "MET",
"Ora estiva dell'Europa centrale", "MEST"}}, "Ora estiva dell'Europa centrale", "MEST"}},
{"Mexico/BajaNorte", PST}, {"Mexico/BajaNorte", PST},
......
src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
浏览文件 @ 447e7b17
...@@ -45,6 +45,8 @@ import sun.util.resources.TimeZoneNamesBundle; ...@@ -45,6 +45,8 @@ import sun.util.resources.TimeZoneNamesBundle;
public final class TimeZoneNames_ja extends TimeZoneNamesBundle { public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
protected final Object[][] getContents() { 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", 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"}; "\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", String AGT[] = new String[] {"\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "ART",
...@@ -287,7 +289,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle { ...@@ -287,7 +289,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", CET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
{"Africa/Windhoek", WAT}, {"Africa/Windhoek", WAT},
{"America/Adak", HAST}, {"America/Adak", HAST},
...@@ -345,7 +347,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle { ...@@ -345,7 +347,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{"America/Detroit", EST}, {"America/Detroit", EST},
{"America/Dominica", AST}, {"America/Dominica", AST},
{"America/Edmonton", MST}, {"America/Edmonton", MST},
{"America/Eirunepe", AMT}, {"America/Eirunepe", ACT},
{"America/El_Salvador", CST}, {"America/El_Salvador", CST},
{"America/Ensenada", PST}, {"America/Ensenada", PST},
{"America/Fort_Wayne", EST}, {"America/Fort_Wayne", EST},
...@@ -422,7 +424,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle { ...@@ -422,7 +424,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
"\u30b9\u30ea\u30ca\u30e0\u590f\u6642\u9593", "SRST"}}, "\u30b9\u30ea\u30ca\u30e0\u590f\u6642\u9593", "SRST"}},
{"America/Port-au-Prince", EST}, {"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST}, {"America/Port_of_Spain", AST},
{"America/Porto_Acre", AMT}, {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT}, {"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST}, {"America/Puerto_Rico", AST},
{"America/Rainy_River", CST}, {"America/Rainy_River", CST},
...@@ -430,7 +432,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle { ...@@ -430,7 +432,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{"America/Recife", BRT}, {"America/Recife", BRT},
{"America/Regina", CST}, {"America/Regina", CST},
{"America/Resolute", CST}, {"America/Resolute", CST},
{"America/Rio_Branco", AMT}, {"America/Rio_Branco", ACT},
{"America/Rosario", AGT}, {"America/Rosario", AGT},
{"America/Santa_Isabel", PST}, {"America/Santa_Isabel", PST},
{"America/Santarem", BRT}, {"America/Santarem", BRT},
...@@ -635,7 +637,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle { ...@@ -635,7 +637,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{"Australia/Yancowinna", BROKEN_HILL}, {"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT}, {"BET", BRT},
{"BST", BDT}, {"BST", BDT},
{"Brazil/Acre", AMT}, {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA}, {"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT}, {"Brazil/East", BRT},
{"Brazil/West", AMT}, {"Brazil/West", AMT},
...@@ -753,7 +755,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle { ...@@ -753,7 +755,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{"Jamaica", EST}, {"Jamaica", EST},
{"Japan", JST}, {"Japan", JST},
{"Kwajalein", MHT}, {"Kwajalein", MHT},
{"Libya", CET}, {"Libya", EET},
{"MET", new String[] {"\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "MET", {"MET", new String[] {"\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "MET",
"\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "MEST"}}, "\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "MEST"}},
{"Mexico/BajaNorte", PST}, {"Mexico/BajaNorte", PST},
......
src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
浏览文件 @ 447e7b17
...@@ -45,6 +45,8 @@ import sun.util.resources.TimeZoneNamesBundle; ...@@ -45,6 +45,8 @@ import sun.util.resources.TimeZoneNamesBundle;
public final class TimeZoneNames_ko extends TimeZoneNamesBundle { public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
protected final Object[][] getContents() { 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", 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"}; "\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", String AGT[] = new String[] {"\uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "ART",
...@@ -287,7 +289,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle { ...@@ -287,7 +289,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", CET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
{"Africa/Windhoek", WAT}, {"Africa/Windhoek", WAT},
{"America/Adak", HAST}, {"America/Adak", HAST},
...@@ -345,7 +347,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle { ...@@ -345,7 +347,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{"America/Detroit", EST}, {"America/Detroit", EST},
{"America/Dominica", AST}, {"America/Dominica", AST},
{"America/Edmonton", MST}, {"America/Edmonton", MST},
{"America/Eirunepe", AMT}, {"America/Eirunepe", ACT},
{"America/El_Salvador", CST}, {"America/El_Salvador", CST},
{"America/Ensenada", PST}, {"America/Ensenada", PST},
{"America/Fort_Wayne", EST}, {"America/Fort_Wayne", EST},
...@@ -422,7 +424,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle { ...@@ -422,7 +424,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
"\uc218\ub9ac\ub0a8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SRST"}}, "\uc218\ub9ac\ub0a8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SRST"}},
{"America/Port-au-Prince", EST}, {"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST}, {"America/Port_of_Spain", AST},
{"America/Porto_Acre", AMT}, {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT}, {"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST}, {"America/Puerto_Rico", AST},
{"America/Rainy_River", CST}, {"America/Rainy_River", CST},
...@@ -430,7 +432,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle { ...@@ -430,7 +432,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{"America/Recife", BRT}, {"America/Recife", BRT},
{"America/Regina", CST}, {"America/Regina", CST},
{"America/Resolute", CST}, {"America/Resolute", CST},
{"America/Rio_Branco", AMT}, {"America/Rio_Branco", ACT},
{"America/Rosario", AGT}, {"America/Rosario", AGT},
{"America/Santa_Isabel", PST}, {"America/Santa_Isabel", PST},
{"America/Santarem", BRT}, {"America/Santarem", BRT},
...@@ -635,7 +637,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle { ...@@ -635,7 +637,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{"Australia/Yancowinna", BROKEN_HILL}, {"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT}, {"BET", BRT},
{"BST", BDT}, {"BST", BDT},
{"Brazil/Acre", AMT}, {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA}, {"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT}, {"Brazil/East", BRT},
{"Brazil/West", AMT}, {"Brazil/West", AMT},
...@@ -753,7 +755,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle { ...@@ -753,7 +755,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{"Jamaica", EST}, {"Jamaica", EST},
{"Japan", JST}, {"Japan", JST},
{"Kwajalein", MHT}, {"Kwajalein", MHT},
{"Libya", CET}, {"Libya", EET},
{"MET", new String[] {"\uc911\ubd80 \uc720\ub7fd \uc2dc\uac04", "MET", {"MET", new String[] {"\uc911\ubd80 \uc720\ub7fd \uc2dc\uac04", "MET",
"\uc911\ubd80 \uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MEST"}}, "\uc911\ubd80 \uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MEST"}},
{"Mexico/BajaNorte", PST}, {"Mexico/BajaNorte", PST},
......
src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
浏览文件 @ 447e7b17
...@@ -45,6 +45,8 @@ import sun.util.resources.TimeZoneNamesBundle; ...@@ -45,6 +45,8 @@ import sun.util.resources.TimeZoneNamesBundle;
public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle { public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
protected final Object[][] getContents() { 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", 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"}; "Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul)", "CST"};
String AGT[] = new String[] {"Fuso hor\u00e1rio da Argentina", "ART", String AGT[] = new String[] {"Fuso hor\u00e1rio da Argentina", "ART",
...@@ -287,7 +289,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle { ...@@ -287,7 +289,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", CET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
{"Africa/Windhoek", WAT}, {"Africa/Windhoek", WAT},
{"America/Adak", HAST}, {"America/Adak", HAST},
...@@ -345,7 +347,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle { ...@@ -345,7 +347,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{"America/Detroit", EST}, {"America/Detroit", EST},
{"America/Dominica", AST}, {"America/Dominica", AST},
{"America/Edmonton", MST}, {"America/Edmonton", MST},
{"America/Eirunepe", AMT}, {"America/Eirunepe", ACT},
{"America/El_Salvador", CST}, {"America/El_Salvador", CST},
{"America/Ensenada", PST}, {"America/Ensenada", PST},
{"America/Fort_Wayne", EST}, {"America/Fort_Wayne", EST},
...@@ -422,7 +424,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle { ...@@ -422,7 +424,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
"Fuso hor\u00e1rio de ver\u00e3o do Suriname", "SRST"}}, "Fuso hor\u00e1rio de ver\u00e3o do Suriname", "SRST"}},
{"America/Port-au-Prince", EST}, {"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST}, {"America/Port_of_Spain", AST},
{"America/Porto_Acre", AMT}, {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT}, {"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST}, {"America/Puerto_Rico", AST},
{"America/Rainy_River", CST}, {"America/Rainy_River", CST},
...@@ -430,7 +432,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle { ...@@ -430,7 +432,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{"America/Recife", BRT}, {"America/Recife", BRT},
{"America/Regina", CST}, {"America/Regina", CST},
{"America/Resolute", CST}, {"America/Resolute", CST},
{"America/Rio_Branco", AMT}, {"America/Rio_Branco", ACT},
{"America/Rosario", AGT}, {"America/Rosario", AGT},
{"America/Santa_Isabel", PST}, {"America/Santa_Isabel", PST},
{"America/Santarem", BRT}, {"America/Santarem", BRT},
...@@ -635,7 +637,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle { ...@@ -635,7 +637,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{"Australia/Yancowinna", BROKEN_HILL}, {"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT}, {"BET", BRT},
{"BST", BDT}, {"BST", BDT},
{"Brazil/Acre", AMT}, {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA}, {"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT}, {"Brazil/East", BRT},
{"Brazil/West", AMT}, {"Brazil/West", AMT},
...@@ -753,7 +755,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle { ...@@ -753,7 +755,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{"Jamaica", EST}, {"Jamaica", EST},
{"Japan", JST}, {"Japan", JST},
{"Kwajalein", MHT}, {"Kwajalein", MHT},
{"Libya", CET}, {"Libya", EET},
{"MET", new String[] {"Fuso hor\u00e1rio da Europa M\u00e9dia", "MET", {"MET", new String[] {"Fuso hor\u00e1rio da Europa M\u00e9dia", "MET",
"Fuso hor\u00e1rio de ver\u00e3o da Europa M\u00e9dia", "MEST"}}, "Fuso hor\u00e1rio de ver\u00e3o da Europa M\u00e9dia", "MEST"}},
{"Mexico/BajaNorte", PST}, {"Mexico/BajaNorte", PST},
......
src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
浏览文件 @ 447e7b17
...@@ -45,6 +45,8 @@ import sun.util.resources.TimeZoneNamesBundle; ...@@ -45,6 +45,8 @@ import sun.util.resources.TimeZoneNamesBundle;
public final class TimeZoneNames_sv extends TimeZoneNamesBundle { public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
protected final Object[][] getContents() { protected final Object[][] getContents() {
String ACT[] = new String[] {"Acre, normaltid", "ACT",
"Acre, sommartid", "ACST"};
String ADELAIDE[] = new String[] {"Central standardtid (Sydaustralien)", "CST", String ADELAIDE[] = new String[] {"Central standardtid (Sydaustralien)", "CST",
"Central sommartid (South Australia)", "CST"}; "Central sommartid (South Australia)", "CST"};
String AGT[] = new String[] {"Argentina, normaltid", "ART", String AGT[] = new String[] {"Argentina, normaltid", "ART",
...@@ -287,7 +289,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle { ...@@ -287,7 +289,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", CET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
{"Africa/Windhoek", WAT}, {"Africa/Windhoek", WAT},
{"America/Adak", HAST}, {"America/Adak", HAST},
...@@ -345,7 +347,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle { ...@@ -345,7 +347,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{"America/Detroit", EST}, {"America/Detroit", EST},
{"America/Dominica", AST}, {"America/Dominica", AST},
{"America/Edmonton", MST}, {"America/Edmonton", MST},
{"America/Eirunepe", AMT}, {"America/Eirunepe", ACT},
{"America/El_Salvador", CST}, {"America/El_Salvador", CST},
{"America/Ensenada", PST}, {"America/Ensenada", PST},
{"America/Fort_Wayne", EST}, {"America/Fort_Wayne", EST},
...@@ -422,7 +424,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle { ...@@ -422,7 +424,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
"Surinam, sommartid", "SRST"}}, "Surinam, sommartid", "SRST"}},
{"America/Port-au-Prince", EST}, {"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST}, {"America/Port_of_Spain", AST},
{"America/Porto_Acre", AMT}, {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT}, {"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST}, {"America/Puerto_Rico", AST},
{"America/Rainy_River", CST}, {"America/Rainy_River", CST},
...@@ -430,7 +432,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle { ...@@ -430,7 +432,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{"America/Recife", BRT}, {"America/Recife", BRT},
{"America/Regina", CST}, {"America/Regina", CST},
{"America/Resolute", CST}, {"America/Resolute", CST},
{"America/Rio_Branco", AMT}, {"America/Rio_Branco", ACT},
{"America/Rosario", AGT}, {"America/Rosario", AGT},
{"America/Santa_Isabel", PST}, {"America/Santa_Isabel", PST},
{"America/Santarem", BRT}, {"America/Santarem", BRT},
...@@ -635,7 +637,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle { ...@@ -635,7 +637,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{"Australia/Yancowinna", BROKEN_HILL}, {"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT}, {"BET", BRT},
{"BST", BDT}, {"BST", BDT},
{"Brazil/Acre", AMT}, {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA}, {"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT}, {"Brazil/East", BRT},
{"Brazil/West", AMT}, {"Brazil/West", AMT},
...@@ -753,7 +755,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle { ...@@ -753,7 +755,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{"Jamaica", EST}, {"Jamaica", EST},
{"Japan", JST}, {"Japan", JST},
{"Kwajalein", MHT}, {"Kwajalein", MHT},
{"Libya", CET}, {"Libya", EET},
{"MET", new String[] {"Mellaneuropeisk tid", "MET", {"MET", new String[] {"Mellaneuropeisk tid", "MET",
"Mellaneuropeisk sommartid", "MEST"}}, "Mellaneuropeisk sommartid", "MEST"}},
{"Mexico/BajaNorte", PST}, {"Mexico/BajaNorte", PST},
......
src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
浏览文件 @ 447e7b17
...@@ -45,6 +45,8 @@ import sun.util.resources.TimeZoneNamesBundle; ...@@ -45,6 +45,8 @@ import sun.util.resources.TimeZoneNamesBundle;
public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle { public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
protected final Object[][] getContents() { 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", 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"}; "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A)", "CST"};
String AGT[] = new String[] {"\u963f\u6839\u5ef7\u65f6\u95f4", "ART", String AGT[] = new String[] {"\u963f\u6839\u5ef7\u65f6\u95f4", "ART",
...@@ -287,7 +289,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle { ...@@ -287,7 +289,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", CET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
{"Africa/Windhoek", WAT}, {"Africa/Windhoek", WAT},
{"America/Adak", HAST}, {"America/Adak", HAST},
...@@ -345,7 +347,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle { ...@@ -345,7 +347,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{"America/Detroit", EST}, {"America/Detroit", EST},
{"America/Dominica", AST}, {"America/Dominica", AST},
{"America/Edmonton", MST}, {"America/Edmonton", MST},
{"America/Eirunepe", AMT}, {"America/Eirunepe", ACT},
{"America/El_Salvador", CST}, {"America/El_Salvador", CST},
{"America/Ensenada", PST}, {"America/Ensenada", PST},
{"America/Fort_Wayne", EST}, {"America/Fort_Wayne", EST},
...@@ -422,7 +424,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle { ...@@ -422,7 +424,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
"\u82cf\u5229\u5357\u590f\u4ee4\u65f6", "SRST"}}, "\u82cf\u5229\u5357\u590f\u4ee4\u65f6", "SRST"}},
{"America/Port-au-Prince", EST}, {"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST}, {"America/Port_of_Spain", AST},
{"America/Porto_Acre", AMT}, {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT}, {"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST}, {"America/Puerto_Rico", AST},
{"America/Rainy_River", CST}, {"America/Rainy_River", CST},
...@@ -430,7 +432,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle { ...@@ -430,7 +432,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{"America/Recife", BRT}, {"America/Recife", BRT},
{"America/Regina", CST}, {"America/Regina", CST},
{"America/Resolute", CST}, {"America/Resolute", CST},
{"America/Rio_Branco", AMT}, {"America/Rio_Branco", ACT},
{"America/Rosario", AGT}, {"America/Rosario", AGT},
{"America/Santa_Isabel", PST}, {"America/Santa_Isabel", PST},
{"America/Santarem", BRT}, {"America/Santarem", BRT},
...@@ -635,7 +637,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle { ...@@ -635,7 +637,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{"Australia/Yancowinna", BROKEN_HILL}, {"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT}, {"BET", BRT},
{"BST", BDT}, {"BST", BDT},
{"Brazil/Acre", AMT}, {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA}, {"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT}, {"Brazil/East", BRT},
{"Brazil/West", AMT}, {"Brazil/West", AMT},
...@@ -753,7 +755,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle { ...@@ -753,7 +755,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{"Jamaica", EST}, {"Jamaica", EST},
{"Japan", JST}, {"Japan", JST},
{"Kwajalein", MHT}, {"Kwajalein", MHT},
{"Libya", CET}, {"Libya", EET},
{"MET", new String[] {"\u4e2d\u6b27\u65f6\u95f4", "MET", {"MET", new String[] {"\u4e2d\u6b27\u65f6\u95f4", "MET",
"\u4e2d\u6b27\u590f\u4ee4\u65f6", "MEST"}}, "\u4e2d\u6b27\u590f\u4ee4\u65f6", "MEST"}},
{"Mexico/BajaNorte", PST}, {"Mexico/BajaNorte", PST},
......
src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
浏览文件 @ 447e7b17
...@@ -45,6 +45,8 @@ import sun.util.resources.TimeZoneNamesBundle; ...@@ -45,6 +45,8 @@ import sun.util.resources.TimeZoneNamesBundle;
public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle { public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
protected final Object[][] getContents() { 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", 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"}; "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340)", "CST"};
String AGT[] = new String[] {"\u963f\u6839\u5ef7\u6642\u9593", "ART", String AGT[] = new String[] {"\u963f\u6839\u5ef7\u6642\u9593", "ART",
...@@ -287,7 +289,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle { ...@@ -287,7 +289,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", GMT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", CET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
{"Africa/Windhoek", WAT}, {"Africa/Windhoek", WAT},
{"America/Adak", HAST}, {"America/Adak", HAST},
...@@ -345,7 +347,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle { ...@@ -345,7 +347,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{"America/Detroit", EST}, {"America/Detroit", EST},
{"America/Dominica", AST}, {"America/Dominica", AST},
{"America/Edmonton", MST}, {"America/Edmonton", MST},
{"America/Eirunepe", AMT}, {"America/Eirunepe", ACT},
{"America/El_Salvador", CST}, {"America/El_Salvador", CST},
{"America/Ensenada", PST}, {"America/Ensenada", PST},
{"America/Fort_Wayne", EST}, {"America/Fort_Wayne", EST},
...@@ -422,7 +424,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle { ...@@ -422,7 +424,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
"\u8607\u5229\u5357\u590f\u4ee4\u6642\u9593", "SRST"}}, "\u8607\u5229\u5357\u590f\u4ee4\u6642\u9593", "SRST"}},
{"America/Port-au-Prince", EST}, {"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST}, {"America/Port_of_Spain", AST},
{"America/Porto_Acre", AMT}, {"America/Porto_Acre", ACT},
{"America/Porto_Velho", AMT}, {"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST}, {"America/Puerto_Rico", AST},
{"America/Rainy_River", CST}, {"America/Rainy_River", CST},
...@@ -430,7 +432,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle { ...@@ -430,7 +432,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{"America/Recife", BRT}, {"America/Recife", BRT},
{"America/Regina", CST}, {"America/Regina", CST},
{"America/Resolute", CST}, {"America/Resolute", CST},
{"America/Rio_Branco", AMT}, {"America/Rio_Branco", ACT},
{"America/Rosario", AGT}, {"America/Rosario", AGT},
{"America/Santa_Isabel", PST}, {"America/Santa_Isabel", PST},
{"America/Santarem", BRT}, {"America/Santarem", BRT},
...@@ -636,7 +638,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle { ...@@ -636,7 +638,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{"Australia/Yancowinna", BROKEN_HILL}, {"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT}, {"BET", BRT},
{"BST", BDT}, {"BST", BDT},
{"Brazil/Acre", AMT}, {"Brazil/Acre", ACT},
{"Brazil/DeNoronha", NORONHA}, {"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT}, {"Brazil/East", BRT},
{"Brazil/West", AMT}, {"Brazil/West", AMT},
...@@ -754,7 +756,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle { ...@@ -754,7 +756,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{"Jamaica", EST}, {"Jamaica", EST},
{"Japan", JST}, {"Japan", JST},
{"Kwajalein", MHT}, {"Kwajalein", MHT},
{"Libya", CET}, {"Libya", EET},
{"MET", new String[] {"\u4e2d\u6b50\u6642\u9593", "MET", {"MET", new String[] {"\u4e2d\u6b50\u6642\u9593", "MET",
"\u4e2d\u6b50\u590f\u4ee4\u6642\u9593", "MEST"}}, "\u4e2d\u6b50\u590f\u4ee4\u6642\u9593", "MEST"}},
{"Mexico/BajaNorte", PST}, {"Mexico/BajaNorte", PST},
......
test/sun/util/calendar/zi/tzdata/VERSION
浏览文件 @ 447e7b17
...@@ -21,4 +21,4 @@ ...@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any # or visit www.oracle.com if you need additional information or have any
# questions. # questions.
# #
tzdata2013g tzdata2013h
test/sun/util/calendar/zi/tzdata/africa
浏览文件 @ 447e7b17
...@@ -474,6 +474,14 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 ...@@ -474,6 +474,14 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882
# (either two days before them or five days after them, so as to fall on # (either two days before them or five days after them, so as to fall on
# lastFri instead of lastSun). # 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 NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Libya 1951 only - Oct 14 2:00 1:00 S Rule Libya 1951 only - Oct 14 2:00 1:00 S
Rule Libya 1952 only - Jan 1 0:00 0 - Rule Libya 1952 only - Jan 1 0:00 0 -
...@@ -490,19 +498,21 @@ Rule Libya 1987 1989 - Apr 1 0:00 1:00 S ...@@ -490,19 +498,21 @@ Rule Libya 1987 1989 - Apr 1 0:00 1:00 S
Rule Libya 1987 1989 - Oct 1 0:00 0 - Rule Libya 1987 1989 - Oct 1 0:00 0 -
Rule Libya 1997 only - Apr 4 0:00 1:00 S Rule Libya 1997 only - Apr 4 0:00 1:00 S
Rule Libya 1997 only - Oct 4 0:00 0 - Rule Libya 1997 only - Oct 4 0:00 0 -
Rule Libya 2013 max - Mar lastFri 1:00 1:00 S Rule Libya 2013 only - Mar lastFri 1:00 1:00 S
Rule Libya 2013 max - Oct lastFri 2:00 0 - 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 NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Tripoli 0:52:44 - LMT 1920 Zone Africa/Tripoli 0:52:44 - LMT 1920
1:00 Libya CE%sT 1959 1:00 Libya CE%sT 1959
2:00 - EET 1982 2:00 - EET 1982
1:00 Libya CE%sT 1990 May 4 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 2:00 - EET 1996 Sep 30
1:00 Libya CE%sT 1997 Oct 4 1:00 Libya CE%sT 1997 Oct 4
2:00 - EET 2012 Nov 10 2:00 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 # Madagascar
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
...@@ -707,15 +717,6 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou ...@@ -707,15 +717,6 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou
# http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search # http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
# </a> # </a>
# 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): # From Steffen Thorsen (2008-08-27):
# Morocco will change the clocks back on the midnight between August 31 # 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 # and September 1. They originally planned to observe DST to near the end
...@@ -891,13 +892,13 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou ...@@ -891,13 +892,13 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou
# Another source (specifying the time for start and end in the decree): # 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 # 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, # 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: # the following program under GNU Emacs 24.3:
# #
# (let ((islamic-year 1435)) # (let ((islamic-year 1435))
# (while (< islamic-year 1460) # (while (< islamic-year 1461)
# (let ((a # (let ((a
# (calendar-gregorian-from-absolute # (calendar-gregorian-from-absolute
# (calendar-islamic-to-absolute (list 9 1 islamic-year)))) # (calendar-islamic-to-absolute (list 9 1 islamic-year))))
...@@ -917,9 +918,13 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou ...@@ -917,9 +918,13 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou
# all transitions removed for 2026-2035, where the estimated Ramadan # all transitions removed for 2026-2035, where the estimated Ramadan
# falls entirely outside daylight-saving time; and with fall-back # falls entirely outside daylight-saving time; and with fall-back
# transitions removed for 2036-2037, where the normal fall-back # transitions removed for 2036-2037, where the normal fall-back
# date falls during the estimated Ramadan. Problems continue after that, # date falls during the estimated Ramadan. Normally, the table would
# but 32-bit time_t values roll around in 2038 so for now do not worry # stop after 2037 because 32-bit time_t values roll around early in 2038,
# about dates after 2037. # 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 # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
...@@ -987,10 +992,21 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 ...@@ -987,10 +992,21 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
0:00 Morocco WE%sT 1984 Mar 16 0:00 Morocco WE%sT 1984 Mar 16
1:00 - CET 1986 1:00 - CET 1986
0:00 Morocco WE%sT 0:00 Morocco WE%sT
# Western Sahara # 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 Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan
-1:00 - WAT 1976 Apr 14 -1:00 - WAT 1976 Apr 14
0:00 - WET 0:00 Morocco WE%sT
# Mozambique # Mozambique
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
......
test/sun/util/calendar/zi/tzdata/southamerica
浏览文件 @ 447e7b17
...@@ -874,6 +874,15 @@ Zone America/La_Paz -4:32:36 - LMT 1890 ...@@ -874,6 +874,15 @@ Zone America/La_Paz -4:32:36 - LMT 1890
# We will keep this article updated when this is confirmed: # We will keep this article updated when this is confirmed:
# http://www.timeanddate.com/news/time/brazil-starts-dst-2013.html # 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 # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
# Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01) # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
# Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10) # Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10)
...@@ -1162,13 +1171,15 @@ Zone America/Eirunepe -4:39:28 - LMT 1914 ...@@ -1162,13 +1171,15 @@ Zone America/Eirunepe -4:39:28 - LMT 1914
-5:00 - ACT 1993 Sep 28 -5:00 - ACT 1993 Sep 28
-5:00 Brazil AC%sT 1994 Sep 22 -5:00 Brazil AC%sT 1994 Sep 22
-5:00 - ACT 2008 Jun 24 00:00 -5:00 - ACT 2008 Jun 24 00:00
-4:00 - AMT -4:00 - AMT 2013 Nov 10
-5:00 - ACT
# #
# Acre (AC) # Acre (AC)
Zone America/Rio_Branco -4:31:12 - LMT 1914 Zone America/Rio_Branco -4:31:12 - LMT 1914
-5:00 Brazil AC%sT 1988 Sep 12 -5:00 Brazil AC%sT 1988 Sep 12
-5:00 - ACT 2008 Jun 24 00:00 -5:00 - ACT 2008 Jun 24 00:00
-4:00 - AMT -4:00 - AMT 2013 Nov 10
-5:00 - ACT
# Chile # Chile
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或