stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8049343: (tz) Support tzdata2014g

Browse Source 
Reviewed-by: mfang, okutsu
This commit is contained in:
Aleksei Efimov 2014-09-07 23:04:09 +04:00
parent 95a1c8965d
commit 5e87931875
46 changed files with 5933 additions and 5897 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/make/data/tzdata/VERSION
View File

@ -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.
# #
tzdata2014c tzdata2014g

615
jdk/make/data/tzdata/africa
View File

File diff suppressed because it is too large Load Diff

126
jdk/make/data/tzdata/antarctica
View File

@ -21,19 +21,16 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
# From Paul Eggert (1999-11-15): # From Paul Eggert (1999-11-15):
# To keep things manageable, we list only locations occupied year-round; see # To keep things manageable, we list only locations occupied year-round; see
# <a href="http://www.comnap.aq/comnap/comnap.nsf/P/Stations/">
# COMNAP - Stations and Bases # COMNAP - Stations and Bases
# </a> # http://www.comnap.aq/comnap/comnap.nsf/P/Stations/
# and # and
# <a href="http://www.spri.cam.ac.uk/bob/periant.htm">
# Summary of the Peri-Antarctic Islands (1998-07-23) # Summary of the Peri-Antarctic Islands (1998-07-23)
# </a> # http://www.spri.cam.ac.uk/bob/periant.htm
# for information. # for information.
# Unless otherwise specified, we have no time zone information. # Unless otherwise specified, we have no time zone information.
# #
@ -78,19 +75,19 @@ Rule ChileAQ 2012 max - Sep Sun>=2 4:00u 1:00 S
# Argentina - year-round bases # Argentina - year-round bases
# Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05 # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
# Esperanza, San Martin Land, -6323-05659, since 1952-12-17 # Carlini, Potter Cove, King George Island, -6414-0602320, since 1982-01
# Jubany, Potter Peninsula, King George Island, -6414-0602320, since 1982-01 # Esperanza, Hope Bay, -6323-05659, since 1952-12-17
# Marambio, Seymour I, -6414-05637, since 1969-10-29 # Marambio, -6414-05637, since 1969-10-29
# Orcadas, Laurie I, -6016-04444, since 1904-02-22 # Orcadas, Laurie I, -6016-04444, since 1904-02-22
# San Martin, Debenham I, -6807-06708, since 1951-03-21 # San Martín, Barry I, -6808-06706, since 1951-03-21
# (except 1960-03 / 1976-03-21) # (except 1960-03 / 1976-03-21)
# Australia - territories # Australia - territories
# Heard Island, McDonald Islands (uninhabited) # Heard Island, McDonald Islands (uninhabited)
# previously sealers and scientific personnel wintered # previously sealers and scientific personnel wintered
# <a href="http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html">
# Margaret Turner reports # Margaret Turner reports
# </a> (1999-09-30) that they're UTC+5, with no DST; # http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html
# (1999-09-30) that they're UTC+5, with no DST;
# presumably this is when they have visitors. # presumably this is when they have visitors.
# #
# year-round bases # year-round bases
@ -107,14 +104,10 @@ Rule ChileAQ 2012 max - Sep Sun>=2 4:00u 1:00 S
# The changes occurred on 2009-10-18 at 02:00 (local times). # The changes occurred on 2009-10-18 at 02:00 (local times).
# #
# Government source: (Australian Antarctic Division) # Government source: (Australian Antarctic Division)
# <a href="http://www.aad.gov.au/default.asp?casid=37079">
# http://www.aad.gov.au/default.asp?casid=37079 # http://www.aad.gov.au/default.asp?casid=37079
# </a>
# #
# We have more background information here: # We have more background information here:
# <a href="http://www.timeanddate.com/news/time/antarctica-new-times.html">
# http://www.timeanddate.com/news/time/antarctica-new-times.html # http://www.timeanddate.com/news/time/antarctica-new-times.html
# </a>
# From Steffen Thorsen (2010-03-10): # From Steffen Thorsen (2010-03-10):
# We got these changes from the Australian Antarctic Division: ... # We got these changes from the Australian Antarctic Division: ...
@ -129,19 +122,16 @@ Rule ChileAQ 2012 max - Sep Sun>=2 4:00u 1:00 S
# - Mawson station stays on UTC+5. # - Mawson station stays on UTC+5.
# #
# Background: # Background:
# <a href="http://www.timeanddate.com/news/time/antartica-time-changes-2010.html">
# http://www.timeanddate.com/news/time/antartica-time-changes-2010.html # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
# </a>
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Antarctica/Casey 0 - zzz 1969 Zone Antarctica/Casey 0 - zzz 1969
8:00 - WST 2009 Oct 18 2:00 8:00 - AWST 2009 Oct 18 2:00
# Western (Aus) Standard Time # Australian Western Std Time
11:00 - CAST 2010 Mar 5 2:00 11:00 - CAST 2010 Mar 5 2:00 # Casey Time
# Casey Time 8:00 - AWST 2011 Oct 28 2:00
8:00 - WST 2011 Oct 28 2:00
11:00 - CAST 2012 Feb 21 17:00u 11:00 - CAST 2012 Feb 21 17:00u
8:00 - WST 8:00 - AWST
Zone Antarctica/Davis 0 - zzz 1957 Jan 13 Zone Antarctica/Davis 0 - zzz 1957 Jan 13
7:00 - DAVT 1964 Nov # Davis Time 7:00 - DAVT 1964 Nov # Davis Time
0 - zzz 1969 Feb 0 - zzz 1969 Feb
@ -151,28 +141,30 @@ Zone Antarctica/Davis 0 - zzz 1957 Jan 13
5:00 - DAVT 2012 Feb 21 20:00u 5:00 - DAVT 2012 Feb 21 20:00u
7:00 - DAVT 7:00 - DAVT
Zone Antarctica/Mawson 0 - zzz 1954 Feb 13 Zone Antarctica/Mawson 0 - zzz 1954 Feb 13
6:00 - MAWT 2009 Oct 18 2:00 6:00 - MAWT 2009 Oct 18 2:00 # Mawson Time
# Mawson Time
5:00 - MAWT 5:00 - MAWT
# References: # References:
# <a href="http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html">
# Casey Weather (1998-02-26) # Casey Weather (1998-02-26)
# </a> # http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html
# <a href="http://www.antdiv.gov.au/aad/exop/sfo/davis/video.html">
# Davis Station, Antarctica (1998-02-26) # Davis Station, Antarctica (1998-02-26)
# </a> # http://www.antdiv.gov.au/aad/exop/sfo/davis/video.html
# <a href="http://www.antdiv.gov.au/aad/exop/sfo/mawson/video.html">
# Mawson Station, Antarctica (1998-02-25) # Mawson Station, Antarctica (1998-02-25)
# </a> # http://www.antdiv.gov.au/aad/exop/sfo/mawson/video.html
# Belgium - year-round base
# Princess Elisabeth, Queen Maud Land, -713412+0231200, since 2007
# Brazil - year-round base # Brazil - year-round base
# Comandante Ferraz, King George Island, -6205+05824, since 1983/4 # Ferraz, King George Island, -6205+05824, since 1983/4
# Bulgaria - year-round base
# St. Kliment Ohridski, Livingston Island, -623829-0602153, since 1988
# Chile - year-round bases and towns # Chile - year-round bases and towns
# Escudero, South Shetland Is, -621157-0585735, since 1994 # Escudero, South Shetland Is, -621157-0585735, since 1994
# Presidente Eduadro Frei, King George Island, -6214-05848, since 1969-03-07 # Frei Montalva, King George Island, -6214-05848, since 1969-03-07
# General Bernardo O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02 # O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
# Capitan Arturo Prat, -6230-05941 # Prat, -6230-05941
# Villa Las Estrellas (a town), around the Frei base, since 1984-04-09 # Villa Las Estrellas (a town), around the Frei base, since 1984-04-09
# These locations have always used Santiago time; use TZ='America/Santiago'. # These locations have always used Santiago time; use TZ='America/Santiago'.
@ -180,31 +172,35 @@ Zone Antarctica/Mawson 0 - zzz 1954 Feb 13
# Great Wall, King George Island, -6213-05858, since 1985-02-20 # Great Wall, King George Island, -6213-05858, since 1985-02-20
# Zhongshan, Larsemann Hills, Prydz Bay, -6922+07623, since 1989-02-26 # Zhongshan, Larsemann Hills, Prydz Bay, -6922+07623, since 1989-02-26
# France - year-round bases # France - year-round bases (also see "France & Italy")
# #
# From Antoine Leca (1997-01-20): # From Antoine Leca (1997-01-20):
# Time data are from Nicole Pailleau at the IFRTP # Time data entries are from Nicole Pailleau at the IFRTP
# (French Institute for Polar Research and Technology). # (French Institute for Polar Research and Technology).
# She confirms that French Southern Territories and Terre Adelie bases # She confirms that French Southern Territories and Terre Adélie bases
# don't observe daylight saving time, even if Terre Adelie supplies came # don't observe daylight saving time, even if Terre Adélie supplies came
# from Tasmania. # from Tasmania.
# #
# French Southern Territories with year-round inhabitants # French Southern Territories with year-round inhabitants
# #
# Martin-de-Vivies Base, Amsterdam Island, -374105+0773155, since 1950 # Alfred Faure, Possession Island, Crozet Islands, -462551+0515152, since 1964;
# Alfred-Faure Base, Crozet Islands, -462551+0515152, since 1964 # sealing & whaling stations operated variously 1802/1911+;
# Port-aux-Francais, Kerguelen Islands, -492110+0701303, since 1951; # see Indian/Reunion.
#
# Martin-de-Viviès, Amsterdam Island, -374105+0773155, since 1950
# Port-aux-Français, Kerguelen Islands, -492110+0701303, since 1951;
# whaling & sealing station operated 1908/1914, 1920/1929, and 1951/1956 # whaling & sealing station operated 1908/1914, 1920/1929, and 1951/1956
# #
# St Paul Island - near Amsterdam, uninhabited # St Paul Island - near Amsterdam, uninhabited
# fishing stations operated variously 1819/1931 # fishing stations operated variously 1819/1931
# #
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Indian/Kerguelen 0 - zzz 1950 # Port-aux-Francais Zone Indian/Kerguelen 0 - zzz 1950 # Port-aux-Français
5:00 - TFT # ISO code TF Time 5:00 - TFT # ISO code TF Time
# #
# year-round base in the main continent # year-round base in the main continent
# Dumont-d'Urville, Ile des Petrels, -6640+14001, since 1956-11 # Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
# <http://en.wikipedia.org/wiki/Dumont_d'Urville_Station> (2005-12-05)
# #
# Another base at Port-Martin, 50km east, began operation in 1947. # Another base at Port-Martin, 50km east, began operation in 1947.
# It was destroyed by fire on 1952-01-14. # It was destroyed by fire on 1952-01-14.
@ -214,20 +210,22 @@ Zone Antarctica/DumontDUrville 0 - zzz 1947
10:00 - PMT 1952 Jan 14 # Port-Martin Time 10:00 - PMT 1952 Jan 14 # Port-Martin Time
0 - zzz 1956 Nov 0 - zzz 1956 Nov
10:00 - DDUT # Dumont-d'Urville Time 10:00 - DDUT # Dumont-d'Urville Time
# Reference:
# <a href="http://en.wikipedia.org/wiki/Dumont_d'Urville_Station"> # France & Italy - year-round base
# Dumont d'Urville Station (2005-12-05) # Concordia, -750600+1232000, since 2005
# </a>
# Germany - year-round base # Germany - year-round base
# Georg von Neumayer, -7039-00815 # Neumayer III, -704080-0081602, since 2009
# India - year-round base # India - year-round bases
# Dakshin Gangotri, -7005+01200 # Bharati, -692428+0761114, since 2012
# Maitri, -704558+0114356, since 1989
# Italy - year-round base (also see "France & Italy")
# Zuchelli, Terra Nova Bay, -744140+1640647, since 1986
# Japan - year-round bases # Japan - year-round bases
# Dome Fuji, -7719+03942 # Syowa (also known as Showa), -690022+0393524, since 1957
# Syowa, -690022+0393524
# #
# From Hideyuki Suzuki (1999-02-06): # From Hideyuki Suzuki (1999-02-06):
# In all Japanese stations, +0300 is used as the standard time. # In all Japanese stations, +0300 is used as the standard time.
@ -239,11 +237,11 @@ Zone Antarctica/DumontDUrville 0 - zzz 1947
Zone Antarctica/Syowa 0 - zzz 1957 Jan 29 Zone Antarctica/Syowa 0 - zzz 1957 Jan 29
3:00 - SYOT # Syowa Time 3:00 - SYOT # Syowa Time
# See: # See:
# <a href="http://www.nipr.ac.jp/english/ara01.html">
# NIPR Antarctic Research Activities (1999-08-17) # NIPR Antarctic Research Activities (1999-08-17)
# </a> # http://www.nipr.ac.jp/english/ara01.html
# S Korea - year-round base # S Korea - year-round base
# Jang Bogo, Terra Nova Bay, -743700+1641205 since 2014
# King Sejong, King George Island, -6213-05847, since 1988 # King Sejong, King George Island, -6213-05847, since 1988
# New Zealand - claims # New Zealand - claims
@ -292,6 +290,9 @@ Zone Antarctica/Troll 0 - zzz 2005 Feb 12
# Poland - year-round base # Poland - year-round base
# Arctowski, King George Island, -620945-0582745, since 1977 # Arctowski, King George Island, -620945-0582745, since 1977
# Romania - year-bound base
# Law-Racoviță, Larsemann Hills, -692319+0762251, since 1986
# Russia - year-round bases # Russia - year-round bases
# Bellingshausen, King George Island, -621159-0585337, since 1968-02-22 # Bellingshausen, King George Island, -621159-0585337, since 1968-02-22
# Mirny, Davis coast, -6633+09301, since 1956-02 # Mirny, Davis coast, -6633+09301, since 1956-02
@ -301,8 +302,8 @@ Zone Antarctica/Troll 0 - zzz 2005 Feb 12
# year-round from 1960/61 to 1992 # year-round from 1960/61 to 1992
# Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11 # Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11
# <a href="http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP"> # From Craig Mundell (1994-12-15):
# From Craig Mundell (1994-12-15)</a>: # http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP
# Vostok, which is one of the Russian stations, is set on the same # Vostok, which is one of the Russian stations, is set on the same
# time as Moscow, Russia. # time as Moscow, Russia.
# #
@ -317,7 +318,7 @@ Zone Antarctica/Troll 0 - zzz 2005 Feb 12
# #
# From Paul Eggert (2001-05-04): # From Paul Eggert (2001-05-04):
# This seems to be hopelessly confusing, so I asked Lee Hotz about it # This seems to be hopelessly confusing, so I asked Lee Hotz about it
# in person. He said that some Antartic locations set their local # in person. He said that some Antarctic locations set their local
# time so that noon is the warmest part of the day, and that this # time so that noon is the warmest part of the day, and that this
# changes during the year and does not necessarily correspond to mean # changes during the year and does not necessarily correspond to mean
# solar noon. So the Vostok time might have been whatever the clocks # solar noon. So the Vostok time might have been whatever the clocks
@ -329,9 +330,12 @@ Zone Antarctica/Vostok 0 - zzz 1957 Dec 16
# S Africa - year-round bases # S Africa - year-round bases
# Marion Island, -4653+03752 # Marion Island, -4653+03752
# Sanae, -7141-00250 # SANAE IV, Vesleskarvet, Queen Maud Land, -714022-0025026, since 1997
# UK # Ukraine - year-round base
# Vernadsky (formerly Faraday), Galindez Island, -651445-0641526, since 1954
# United Kingdom
# #
# British Antarctic Territories (BAT) claims # British Antarctic Territories (BAT) claims
# South Orkney Islands # South Orkney Islands
@ -387,7 +391,7 @@ Zone Antarctica/Palmer 0 - zzz 1965
# but that he found it more convenient to keep GMT+12 # but that he found it more convenient to keep GMT+12
# as supplies for the station were coming from McMurdo Sound, # as supplies for the station were coming from McMurdo Sound,
# which was on GMT+12 because New Zealand was on GMT+12 all year # which was on GMT+12 because New Zealand was on GMT+12 all year
# at that time (1957). (Source: Siple's book 90 degrees SOUTH.) # at that time (1957). (Source: Siple's book 90 Degrees South.)
# #
# From Susan Smith # From Susan Smith
# http://www.cybertours.com/whs/pole10.html # http://www.cybertours.com/whs/pole10.html

818
jdk/make/data/tzdata/asia
View File

File diff suppressed because it is too large Load Diff

836
jdk/make/data/tzdata/australasia
View File

File diff suppressed because it is too large Load Diff

9
jdk/make/data/tzdata/backward
View File

@ -21,15 +21,15 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
# This file provides links between current names for time zones # This file provides links between current names for time zones
# and their old names. Many names changed in late 1993. # and their old names. Many names changed in late 1993.
# Link TARGET LINK-NAME
Link Africa/Asmara Africa/Asmera Link Africa/Asmara Africa/Asmera
Link Africa/Bamako Africa/Timbuktu Link Africa/Abidjan Africa/Timbuktu
Link America/Argentina/Catamarca America/Argentina/ComodRivadavia Link America/Argentina/Catamarca America/Argentina/ComodRivadavia
Link America/Adak America/Atka Link America/Adak America/Atka
Link America/Argentina/Buenos_Aires America/Buenos_Aires Link America/Argentina/Buenos_Aires America/Buenos_Aires
@ -50,8 +50,11 @@ Link America/Port_of_Spain America/Virgin
Link Pacific/Auckland Antarctica/South_Pole Link Pacific/Auckland Antarctica/South_Pole
Link Asia/Ashgabat Asia/Ashkhabad Link Asia/Ashgabat Asia/Ashkhabad
Link Asia/Kolkata Asia/Calcutta Link Asia/Kolkata Asia/Calcutta
Link Asia/Chongqing Asia/Chungking Link Asia/Shanghai Asia/Chongqing
Link Asia/Shanghai Asia/Chungking
Link Asia/Dhaka Asia/Dacca Link Asia/Dhaka Asia/Dacca
Link Asia/Shanghai Asia/Harbin
Link Asia/Urumqi Asia/Kashgar
Link Asia/Kathmandu Asia/Katmandu Link Asia/Kathmandu Asia/Katmandu
Link Asia/Macau Asia/Macao Link Asia/Macau Asia/Macao
Link Asia/Ho_Chi_Minh Asia/Saigon Link Asia/Ho_Chi_Minh Asia/Saigon

3
jdk/make/data/tzdata/etcetera
View File

@ -21,7 +21,6 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
@ -37,7 +36,7 @@ Zone Etc/UTC 0 - UTC
Zone Etc/UCT 0 - UCT Zone Etc/UCT 0 - UCT
# The following link uses older naming conventions, # The following link uses older naming conventions,
# but it belongs here, not in the file `backward', # but it belongs here, not in the file 'backward',
# as functions like gmtime load the "GMT" file to handle leap seconds properly. # as functions like gmtime load the "GMT" file to handle leap seconds properly.
# We want this to work even on installations that omit the other older names. # We want this to work even on installations that omit the other older names.
Link Etc/GMT GMT Link Etc/GMT GMT

1050
jdk/make/data/tzdata/europe
View File

File diff suppressed because it is too large Load Diff

1
jdk/make/data/tzdata/factory
View File

@ -21,7 +21,6 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.

12
jdk/make/data/tzdata/iso3166.tab
View File

@ -26,21 +26,21 @@
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
# #
# From Paul Eggert (2013-05-27): # From Paul Eggert (2014-07-18):
# This file contains a table of two-letter country codes. Columns are
# separated by a single tab. Lines beginning with '#' are comments.
# Although all text currently uses ASCII encoding, this is planned to
# change to UTF-8 soon. The columns of the table are as follows:
# #
# This file contains a table with the following columns:
# 1. ISO 3166-1 alpha-2 country code, current as of # 1. ISO 3166-1 alpha-2 country code, current as of
# ISO 3166-1 Newsletter VI-15 (2013-05-10). See: Updates on ISO 3166 # ISO 3166-1 Newsletter VI-16 (2013-07-11). See: Updates on ISO 3166
# http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm # http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
# 2. The usual English name for the coded region, # 2. The usual English name for the coded region,
# chosen so that alphabetic sorting of subsets produces helpful lists. # chosen so that alphabetic sorting of subsets produces helpful lists.
# This is not the same as the English name in the ISO 3166 tables. # This is not the same as the English name in the ISO 3166 tables.
# #
# Columns are separated by a single tab.
# The table is sorted by country code. # The table is sorted by country code.
# #
# Lines beginning with `#' are comments.
#
# This table is intended as an aid for users, to help them select time # This table is intended as an aid for users, to help them select time
# zone data appropriate for their practical needs. It is not intended # zone data appropriate for their practical needs. It is not intended
# to take or endorse any position on legal or territorial claims. # to take or endorse any position on legal or territorial claims.

2
jdk/make/data/tzdata/leapseconds
View File

@ -31,7 +31,7 @@
# you should be able to pick up leap-seconds.list from a secondary NIST server. # you should be able to pick up leap-seconds.list from a secondary NIST server.
# For more about leap-seconds.list, please see # For more about leap-seconds.list, please see
# The NTP Timescale and Leap Seconds # The NTP Timescale and Leap Seconds
# <http://www.eecis.udel.edu/~mills/leap.html>. # http://www.eecis.udel.edu/~mills/leap.html
# The International Earth Rotation Service periodically uses leap seconds # The International Earth Rotation Service periodically uses leap seconds
# to keep UTC to within 0.9 s of UT1 # to keep UTC to within 0.9 s of UT1

471
jdk/make/data/tzdata/northamerica
View File

File diff suppressed because it is too large Load Diff

1
jdk/make/data/tzdata/pacificnew
View File

@ -21,7 +21,6 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.

446
jdk/make/data/tzdata/southamerica
View File

File diff suppressed because it is too large Load Diff

1
jdk/make/data/tzdata/systemv
View File

@ -21,7 +21,6 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.

69
jdk/make/data/tzdata/zone.tab
View File

@ -21,39 +21,27 @@
# 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.
# #
# TZ zone descriptions # tz zone descriptions (deprecated version)
# #
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
# #
# From Paul Eggert (2013-08-14): # From Paul Eggert (2014-07-31):
# This file is intended as a backward-compatibility aid for older programs.
# New programs should use zone1970.tab. This file is like zone1970.tab (see
# zone1970.tab's comments), but with the following additional restrictions:
# #
# This file contains a table where each row stands for an area that is # 1. This file contains only ASCII characters.
# the intersection of a region identified by a country code and of a # 2. The first data column contains exactly one country code.
# zone where civil clocks have agreed since 1970. The columns of the
# table are as follows:
# #
# 1. ISO 3166 2-character country code. See the file 'iso3166.tab'. # Because of (2), each row stands for an area that is the intersection
# 2. Latitude and longitude of the area's principal location # of a region identified by a country code and of a zone where civil
# in ISO 6709 sign-degrees-minutes-seconds format, # clocks have agreed since 1970; this is a narrower definition than
# either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS, # that of zone1970.tab.
# first latitude (+ is north), then longitude (+ is east).
# 3. Zone name used in value of TZ environment variable.
# Please see the 'Theory' file for how zone names are chosen.
# If multiple zones overlap a country, each has a row in the
# table, with column 1 being duplicated.
# 4. Comments; present if and only if the country has multiple rows.
#
# Columns are separated by a single tab.
# The table is sorted first by country, then an order within the country that
# (1) makes some geographical sense, and
# (2) puts the most populous areas first, where that does not contradict (1).
#
# Lines beginning with '#' are comments.
# #
# This table is intended as an aid for users, to help them select time # This table is intended as an aid for users, to help them select time
# zone data appropriate for their practical needs. It is not intended # zone data entries appropriate for their practical needs. It is not
# to take or endorse any position on legal or territorial claims. # intended to take or endorse any position on legal or territorial claims.
# #
#country- #country-
#code coordinates TZ comments #code coordinates TZ comments
@ -72,7 +60,7 @@ AQ -6736+06253 Antarctica/Mawson Mawson Station, Holme Bay
AQ -6835+07758 Antarctica/Davis Davis Station, Vestfold Hills AQ -6835+07758 Antarctica/Davis Davis Station, Vestfold Hills
AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula
AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok
AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Adelie Land
AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I
AQ -720041+0023206 Antarctica/Troll Troll Station, Queen Maud Land AQ -720041+0023206 Antarctica/Troll Troll Station, Queen Maud Land
AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF)
@ -151,7 +139,7 @@ CA +4901-08816 America/Nipigon Eastern Time - Ontario & Quebec - places that did
CA +4823-08915 America/Thunder_Bay Eastern Time - Thunder Bay, Ontario CA +4823-08915 America/Thunder_Bay Eastern Time - Thunder Bay, Ontario
CA +6344-06828 America/Iqaluit Eastern Time - east Nunavut - most locations CA +6344-06828 America/Iqaluit Eastern Time - east Nunavut - most locations
CA +6608-06544 America/Pangnirtung Eastern Time - Pangnirtung, Nunavut CA +6608-06544 America/Pangnirtung Eastern Time - Pangnirtung, Nunavut
CA +744144-0944945 America/Resolute Central Standard Time - Resolute, Nunavut CA +744144-0944945 America/Resolute Central Time - Resolute, Nunavut
CA +484531-0913718 America/Atikokan Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut CA +484531-0913718 America/Atikokan Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
CA +624900-0920459 America/Rankin_Inlet Central Time - central Nunavut CA +624900-0920459 America/Rankin_Inlet Central Time - central Nunavut
CA +4953-09709 America/Winnipeg Central Time - Manitoba & west Ontario CA +4953-09709 America/Winnipeg Central Time - Manitoba & west Ontario
@ -176,13 +164,10 @@ CH +4723+00832 Europe/Zurich
CI +0519-00402 Africa/Abidjan CI +0519-00402 Africa/Abidjan
CK -2114-15946 Pacific/Rarotonga CK -2114-15946 Pacific/Rarotonga
CL -3327-07040 America/Santiago most locations CL -3327-07040 America/Santiago most locations
CL -2709-10926 Pacific/Easter Easter Island & Sala y Gomez CL -2709-10926 Pacific/Easter Easter Island
CM +0403+00942 Africa/Douala CM +0403+00942 Africa/Douala
CN +3114+12128 Asia/Shanghai east China - Beijing, Guangdong, Shanghai, etc. CN +3114+12128 Asia/Shanghai Beijing Time
CN +4545+12641 Asia/Harbin Heilongjiang (except Mohe), Jilin CN +4348+08735 Asia/Urumqi Xinjiang Time
CN +2934+10635 Asia/Chongqing central China - Sichuan, Yunnan, Guangxi, Shaanxi, Guizhou, etc.
CN +4348+08735 Asia/Urumqi most of Tibet & Xinjiang
CN +3929+07559 Asia/Kashgar west Tibet & Xinjiang
CO +0436-07405 America/Bogota CO +0436-07405 America/Bogota
CR +0956-08405 America/Costa_Rica CR +0956-08405 America/Costa_Rica
CU +2308-08222 America/Havana CU +2308-08222 America/Havana
@ -364,24 +349,26 @@ RE -2052+05528 Indian/Reunion
RO +4426+02606 Europe/Bucharest RO +4426+02606 Europe/Bucharest
RS +4450+02030 Europe/Belgrade RS +4450+02030 Europe/Belgrade
RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad
RU +5545+03735 Europe/Moscow Moscow+00 - west Russia RU +554521+0373704 Europe/Moscow Moscow+00 - west Russia
RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea
RU +5312+05009 Europe/Samara Moscow+00 - Samara, Udmurtia
RU +4457+03406 Europe/Simferopol Moscow+00 - Crimea RU +4457+03406 Europe/Simferopol Moscow+00 - Crimea
RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea
RU +5312+05009 Europe/Samara Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals
RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia
RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk
RU +5345+08707 Asia/Novokuznetsk Moscow+03 - Novokuznetsk RU +5345+08707 Asia/Novokuznetsk Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
RU +5601+09250 Asia/Krasnoyarsk Moscow+04 - Yenisei River RU +5601+09250 Asia/Krasnoyarsk Moscow+04 - Yenisei River
RU +5216+10420 Asia/Irkutsk Moscow+05 - Lake Baikal RU +5216+10420 Asia/Irkutsk Moscow+05 - Lake Baikal
RU +5203+11328 Asia/Chita Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
RU +6200+12940 Asia/Yakutsk Moscow+06 - Lena River RU +6200+12940 Asia/Yakutsk Moscow+06 - Lena River
RU +623923+1353314 Asia/Khandyga Moscow+06 - Tomponsky, Ust-Maysky RU +623923+1353314 Asia/Khandyga Moscow+06 - Tomponsky, Ust-Maysky
RU +4310+13156 Asia/Vladivostok Moscow+07 - Amur River RU +4310+13156 Asia/Vladivostok Moscow+07 - Amur River
RU +4658+14242 Asia/Sakhalin Moscow+07 - Sakhalin Island RU +4658+14242 Asia/Sakhalin Moscow+07 - Sakhalin Island
RU +643337+1431336 Asia/Ust-Nera Moscow+07 - Oymyakonsky RU +643337+1431336 Asia/Ust-Nera Moscow+07 - Oymyakonsky
RU +5934+15048 Asia/Magadan Moscow+08 - Magadan RU +5934+15048 Asia/Magadan Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
RU +5301+15839 Asia/Kamchatka Moscow+08 - Kamchatka RU +6728+15343 Asia/Srednekolymsk Moscow+08 - E Sakha, N Kuril Is
RU +6445+17729 Asia/Anadyr Moscow+08 - Bering Sea RU +5301+15839 Asia/Kamchatka Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
RU +6445+17729 Asia/Anadyr Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
RW -0157+03004 Africa/Kigali RW -0157+03004 Africa/Kigali
SA +2438+04643 Asia/Riyadh SA +2438+04643 Asia/Riyadh
SB -0932+16012 Pacific/Guadalcanal SB -0932+16012 Pacific/Guadalcanal
@ -448,13 +435,13 @@ US +394421-1045903 America/Denver Mountain Time
US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon
US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona (except Navajo) US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona (except Navajo)
US +340308-1181434 America/Los_Angeles Pacific Time US +340308-1181434 America/Los_Angeles Pacific Time
US +550737-1313435 America/Metlakatla Pacific Standard Time - Annette Island, Alaska
US +611305-1495401 America/Anchorage Alaska Time US +611305-1495401 America/Anchorage Alaska Time
US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle
US +571035-1351807 America/Sitka Alaska Time - southeast Alaska panhandle US +571035-1351807 America/Sitka Alaska Time - southeast Alaska panhandle
US +593249-1394338 America/Yakutat Alaska Time - Alaska panhandle neck US +593249-1394338 America/Yakutat Alaska Time - Alaska panhandle neck
US +643004-1652423 America/Nome Alaska Time - west Alaska US +643004-1652423 America/Nome Alaska Time - west Alaska
US +515248-1763929 America/Adak Aleutian Islands US +515248-1763929 America/Adak Aleutian Islands
US +550737-1313435 America/Metlakatla Metlakatla Time - Annette Island
US +211825-1575130 Pacific/Honolulu Hawaii US +211825-1575130 Pacific/Honolulu Hawaii
UY -3453-05611 America/Montevideo UY -3453-05611 America/Montevideo
UZ +3940+06648 Asia/Samarkand west Uzbekistan UZ +3940+06648 Asia/Samarkand west Uzbekistan

11
jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
View File

@ -615,7 +615,9 @@ public final class ZoneInfoFile {
// startTime=86400000 <= 24 hours // startTime=86400000 <= 24 hours
// This: startDayOfWeek=6 // This: startDayOfWeek=6
// startTime=0 // startTime=0
// Below is the workaround, it probably slows down everyone a little // Similar workaround needs to be applied to Africa/Cairo and
// its endDayOfWeek and endTime
// Below is the workarounds, it probably slows down everyone a little
if (params[2] == 6 && params[3] == 0 && if (params[2] == 6 && params[3] == 0 &&
(zoneId.equals("Asia/Amman") || (zoneId.equals("Asia/Amman") ||
zoneId.equals("Asia/Gaza") || zoneId.equals("Asia/Gaza") ||
@ -623,6 +625,13 @@ public final class ZoneInfoFile {
params[2] = 5; params[2] = 5;
params[3] = 86400000; params[3] = 86400000;
} }
//endDayOfWeek and endTime workaround
if (params[7] == 6 && params[8] == 0 &&
(zoneId.equals("Africa/Cairo"))) {
params[7] = 5;
params[8] = 86400000;
}
} else if (nTrans > 0) { // only do this if there is something in table already } else if (nTrans > 0) { // only do this if there is something in table already
if (lastyear < LASTYEAR) { if (lastyear < LASTYEAR) {
// ZoneInfo has an ending entry for 2037 // ZoneInfo has an ending entry for 2037

109
jdk/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java
View File

@ -47,9 +47,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
String ACT[] = new String[] {"Acre Time", "ACT", String ACT[] = new String[] {"Acre Time", "ACT",
"Acre Summer Time", "ACST", "Acre Summer Time", "ACST",
"Acre Time", "ACT"}; "Acre Time", "ACT"};
String ADELAIDE[] = new String[] {"Central Standard Time (South Australia)", "CST", String ADELAIDE[] = new String[] {"Australian Central Standard Time (South Australia)", "ACST",
"Central Summer Time (South Australia)", "CST", "Australian Central Daylight Time (South Australia)", "ACDT",
"Central Time (South Australia)", "CT"}; "Australian Central Time (South Australia)", "ACT"};
String AGT[] = new String[] {"Argentine Time", "ART", String AGT[] = new String[] {"Argentine Time", "ART",
"Argentine Summer Time", "ARST", "Argentine Summer Time", "ARST",
"Argentine Time", "ART"}; "Argentine Time", "ART"};
@ -71,12 +71,12 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
String BDT[] = new String[] {"Bangladesh Time", "BDT", String BDT[] = new String[] {"Bangladesh Time", "BDT",
"Bangladesh Summer Time", "BDST", "Bangladesh Summer Time", "BDST",
"Bangladesh Time", "BDT"}; "Bangladesh Time", "BDT"};
String BRISBANE[] = new String[] {"Eastern Standard Time (Queensland)", "EST", String BRISBANE[] = new String[] {"Australian Eastern Standard Time (Queensland)", "AEST",
"Eastern Summer Time (Queensland)", "EST", "Australian Eastern Daylight Time (Queensland)", "AEDT",
"Eastern Time (Queensland)", "ET"}; "Australian Eastern Time (Queensland)", "AET"};
String BROKEN_HILL[] = new String[] {"Central Standard Time (South Australia/New South Wales)", "CST", String BROKEN_HILL[] = new String[] {"Australian Central Standard Time (South Australia/New South Wales)", "ACST",
"Central Summer Time (South Australia/New South Wales)", "CST", "Australian Central Daylight Time (South Australia/New South Wales)", "ACDT",
"Central Time (South Australia/New South Wales)", "CT"}; "Australian Central Time (South Australia/New South Wales)", "ACT"};
String BRT[] = new String[] {"Brasilia Time", "BRT", String BRT[] = new String[] {"Brasilia Time", "BRT",
"Brasilia Summer Time", "BRST", "Brasilia Summer Time", "BRST",
"Brasilia Time", "BRT"}; "Brasilia Time", "BRT"};
@ -110,9 +110,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
String CUBA[] = new String[] {"Cuba Standard Time", "CST", String CUBA[] = new String[] {"Cuba Standard Time", "CST",
"Cuba Daylight Time", "CDT", "Cuba Daylight Time", "CDT",
"Cuba Time", "CT"}; "Cuba Time", "CT"};
String DARWIN[] = new String[] {"Central Standard Time (Northern Territory)", "CST", String DARWIN[] = new String[] {"Australian Central Standard Time (Northern Territory)", "ACST",
"Central Summer Time (Northern Territory)", "CST", "Australian Central Daylight Time (Northern Territory)", "ACDT",
"Central Time (Northern Territory)", "CT"}; "Australian Central Time (Northern Territory)", "ACT"};
String DUBLIN[] = new String[] {"Greenwich Mean Time", "GMT", String DUBLIN[] = new String[] {"Greenwich Mean Time", "GMT",
"Irish Summer Time", "IST", "Irish Summer Time", "IST",
"Irish Time", "IT"}; "Irish Time", "IT"};
@ -131,9 +131,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
String EST[] = new String[] {"Eastern Standard Time", "EST", String EST[] = new String[] {"Eastern Standard Time", "EST",
"Eastern Daylight Time", "EDT", "Eastern Daylight Time", "EDT",
"Eastern Time", "ET"}; "Eastern Time", "ET"};
String EST_NSW[] = new String[] {"Eastern Standard Time (New South Wales)", "EST", String EST_NSW[] = new String[] {"Australian Eastern Standard Time (New South Wales)", "AEST",
"Eastern Summer Time (New South Wales)", "EST", "Australian Eastern Daylight Time (New South Wales)", "AEDT",
"Eastern Time (New South Wales)", "ET"}; "Australian Eastern Time (New South Wales)", "AET"};
String FET[] = new String[] {"Further-eastern European Time", "FET", String FET[] = new String[] {"Further-eastern European Time", "FET",
"Further-eastern European Summer Time", "FEST", "Further-eastern European Summer Time", "FEST",
"Further-eastern European Time", "FET"}; "Further-eastern European Time", "FET"};
@ -167,6 +167,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
String IRT[] = new String[] {"Iran Standard Time", "IRST", String IRT[] = new String[] {"Iran Standard Time", "IRST",
"Iran Daylight Time", "IRDT", "Iran Daylight Time", "IRDT",
"Iran Time", "IRT"}; "Iran Time", "IRT"};
String IRKT[] = new String[] {"Irkutsk Time", "IRKT",
"Irkutsk Summer Time", "IRKST",
"Irkutsk Time", "IRKT"};
String ISRAEL[] = new String[] {"Israel Standard Time", "IST", String ISRAEL[] = new String[] {"Israel Standard Time", "IST",
"Israel Daylight Time", "IDT", "Israel Daylight Time", "IDT",
"Israel Time", "IT"}; "Israel Time", "IT"};
@ -176,11 +179,14 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
String JST[] = new String[] {"Japan Standard Time", "JST", String JST[] = new String[] {"Japan Standard Time", "JST",
"Japan Daylight Time", "JDT", "Japan Daylight Time", "JDT",
"Japan Time", "JT"}; "Japan Time", "JT"};
String KRAT[] = new String[] {"Krasnoyarsk Time", "KRAT",
"Krasnoyarsk Summer Time", "KRAST",
"Krasnoyarsk Time", "KRAT"};
String KST[] = new String[] {"Korea Standard Time", "KST", String KST[] = new String[] {"Korea Standard Time", "KST",
"Korea Daylight Time", "KDT", "Korea Daylight Time", "KDT",
"Korea Time", "KT"}; "Korea Time", "KT"};
String LORD_HOWE[] = new String[] {"Lord Howe Standard Time", "LHST", String LORD_HOWE[] = new String[] {"Lord Howe Standard Time", "LHST",
"Lord Howe Summer Time", "LHST", "Lord Howe Daylight Time", "LHDT",
"Lord Howe Time", "LHT"}; "Lord Howe Time", "LHT"};
String MHT[] = new String[] {"Marshall Islands Time", "MHT", String MHT[] = new String[] {"Marshall Islands Time", "MHT",
"Marshall Islands Summer Time", "MHST", "Marshall Islands Summer Time", "MHST",
@ -230,21 +236,15 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
String SGT[] = new String[] {"Singapore Time", "SGT", String SGT[] = new String[] {"Singapore Time", "SGT",
"Singapore Summer Time", "SGST", "Singapore Summer Time", "SGST",
"Singapore Time", "SGT"}; "Singapore Time", "SGT"};
String SLST[] = new String[] {"Greenwich Mean Time", "GMT", String TASMANIA[] = new String[] {"Australian Eastern Standard Time (Tasmania)", "AEST",
"Sierra Leone Summer Time", "SLST", "Australian Eastern Daylight Time (Tasmania)", "AEDT",
"Sierra Leone Time", "SLT"}; "Australian Eastern Time (Tasmania)", "AET"};
String TASMANIA[] = new String[] {"Eastern Standard Time (Tasmania)", "EST",
"Eastern Summer Time (Tasmania)", "EST",
"Eastern Time (Tasmania)", "ET"};
String TMT[] = new String[] {"Turkmenistan Time", "TMT", String TMT[] = new String[] {"Turkmenistan Time", "TMT",
"Turkmenistan Summer Time", "TMST", "Turkmenistan Summer Time", "TMST",
"Turkmenistan Time", "TMT"}; "Turkmenistan Time", "TMT"};
String ULAT[]= new String[] {"Ulaanbaatar Time", "ULAT", String ULAT[]= new String[] {"Ulaanbaatar Time", "ULAT",
"Ulaanbaatar Summer Time", "ULAST", "Ulaanbaatar Summer Time", "ULAST",
"Ulaanbaatar Time", "ULAT"}; "Ulaanbaatar Time", "ULAT"};
String WART[] = new String[] {"Western Argentine Time", "WART",
"Western Argentine Summer Time", "WARST",
"Western Argentine Time", "WART"};
String WAT[] = new String[] {"Western African Time", "WAT", String WAT[] = new String[] {"Western African Time", "WAT",
"Western African Summer Time", "WAST", "Western African Summer Time", "WAST",
"Western African Time", "WAT"}; "Western African Time", "WAT"};
@ -254,27 +254,30 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
String WIT[] = new String[] {"West Indonesia Time", "WIB", String WIT[] = new String[] {"West Indonesia Time", "WIB",
"West Indonesia Summer Time", "WIST", "West Indonesia Summer Time", "WIST",
"West Indonesia Time", "WIB"}; "West Indonesia Time", "WIB"};
String WST_AUS[] = new String[] {"Western Standard Time (Australia)", "WST", String WST_AUS[] = new String[] {"Australian Western Standard Time", "AWST",
"Western Summer Time (Australia)", "WST", "Australian Western Daylight Time", "AWDT",
"Western Time (Australia)", "WT"}; "Australian Western Time", "AWT"};
String SAMOA[] = new String[] {"Samoa Standard Time", "SST", String SAMOA[] = new String[] {"Samoa Standard Time", "SST",
"Samoa Daylight Time", "SDT", "Samoa Daylight Time", "SDT",
"Samoa Time", "ST"}; "Samoa Time", "ST"};
String WST_SAMOA[] = new String[] {"West Samoa Time", "WST", String WST_SAMOA[] = new String[] {"West Samoa Standard Time", "WSST",
"West Samoa Daylight Time", "WSDT", "West Samoa Daylight Time", "WSDT",
"West Samoa Time", "WST"}; "West Samoa Time", "WST"};
String ChST[] = new String[] {"Chamorro Standard Time", "ChST", String ChST[] = new String[] {"Chamorro Standard Time", "ChST",
"Chamorro Daylight Time", "ChDT", "Chamorro Daylight Time", "ChDT",
"Chamorro Time", "ChT"}; "Chamorro Time", "ChT"};
String VICTORIA[] = new String[] {"Eastern Standard Time (Victoria)", "EST", String VICTORIA[] = new String[] {"Australian Eastern Standard Time (Victoria)", "AEST",
"Eastern Summer Time (Victoria)", "EST", "Australian Eastern Daylight Time (Victoria)", "AEDT",
"Eastern Time (Victoria)", "ET"}; "Australian Eastern Time (Victoria)", "AET"};
String UTC[] = new String[] {"Coordinated Universal Time", "UTC", String UTC[] = new String[] {"Coordinated Universal Time", "UTC",
"Coordinated Universal Time", "UTC", "Coordinated Universal Time", "UTC",
"Coordinated Universal Time", "UTC"}; "Coordinated Universal Time", "UTC"};
String UZT[] = new String[] {"Uzbekistan Time", "UZT", String UZT[] = new String[] {"Uzbekistan Time", "UZT",
"Uzbekistan Summer Time", "UZST", "Uzbekistan Summer Time", "UZST",
"Uzbekistan Time", "UZT"}; "Uzbekistan Time", "UZT"};
String XJT[] = new String[] {"Xinjiang Standard Time", "XJT",
"Xinjiang Daylight Time", "XJDT",
"Xinjiang Time", "XJT"};
return new Object[][] { return new Object[][] {
{"America/Los_Angeles", PST}, {"America/Los_Angeles", PST},
@ -336,7 +339,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Africa/Djibouti", EAT}, {"Africa/Djibouti", EAT},
{"Africa/Douala", WAT}, {"Africa/Douala", WAT},
{"Africa/El_Aaiun", WET}, {"Africa/El_Aaiun", WET},
{"Africa/Freetown", SLST}, {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT}, {"Africa/Gaborone", CAT},
{"Africa/Harare", CAT}, {"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST}, {"Africa/Johannesburg", SAST},
@ -437,7 +440,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
"Western Greenland Summer Time", "WGST", "Western Greenland Summer Time", "WGST",
"Western Greenland Time", "WGT"}}, "Western Greenland Time", "WGT"}},
{"America/Goose_Bay", AST}, {"America/Goose_Bay", AST},
{"America/Grand_Turk", EST}, {"America/Grand_Turk", AST},
{"America/Grenada", AST}, {"America/Grenada", AST},
{"America/Guadeloupe", AST}, {"America/Guadeloupe", AST},
{"America/Guatemala", CST}, {"America/Guatemala", CST},
@ -484,9 +487,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"America/Mendoza", AGT}, {"America/Mendoza", AGT},
{"America/Menominee", CST}, {"America/Menominee", CST},
{"America/Merida", CST}, {"America/Merida", CST},
{"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST", {"America/Metlakatla", PST},
"Metlakatla Daylight Time", "MeDT",
"Metlakatla Time", "MeT"}},
{"America/Mexico_City", CST}, {"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Pierre & Miquelon Standard Time", "PMST", {"America/Miquelon", new String[] {"Pierre & Miquelon Standard Time", "PMST",
"Pierre & Miquelon Daylight Time", "PMDT", "Pierre & Miquelon Daylight Time", "PMDT",
@ -555,8 +556,8 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville Time", "DDUT", {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville Time", "DDUT",
"Dumont-d'Urville Summer Time", "DDUST", "Dumont-d'Urville Summer Time", "DDUST",
"Dumont-d'Urville Time", "DDUT"}}, "Dumont-d'Urville Time", "DDUT"}},
{"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", {"Antarctica/Macquarie", new String[] {"Macquarie Island Standard Time", "MIST",
"Macquarie Island Summer Time", "MIST", "Macquarie Island Daylight Time", "MIDT",
"Macquarie Island Time", "MIST"}}, "Macquarie Island Time", "MIST"}},
{"Antarctica/Mawson", new String[] {"Mawson Time", "MAWT", {"Antarctica/Mawson", new String[] {"Mawson Time", "MAWT",
"Mawson Summer Time", "MAWST", "Mawson Summer Time", "MAWST",
@ -607,6 +608,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
"Brunei Summer Time", "BNST", "Brunei Summer Time", "BNST",
"Brunei Time", "BNT"}}, "Brunei Time", "BNT"}},
{"Asia/Calcutta", IST}, {"Asia/Calcutta", IST},
{"Asia/Chita", IRKT},
{"Asia/Choibalsan", new String[] {"Choibalsan Time", "CHOT", {"Asia/Choibalsan", new String[] {"Choibalsan Time", "CHOT",
"Choibalsan Summer Time", "CHOST", "Choibalsan Summer Time", "CHOST",
"Choibalsan Time", "CHOT"}}, "Choibalsan Time", "CHOT"}},
@ -631,9 +633,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Asia/Hovd", new String[] {"Hovd Time", "HOVT", {"Asia/Hovd", new String[] {"Hovd Time", "HOVT",
"Hovd Summer Time", "HOVST", "Hovd Summer Time", "HOVST",
"Hovd Time", "HOVT"}}, "Hovd Time", "HOVT"}},
{"Asia/Irkutsk", new String[] {"Irkutsk Time", "IRKT", {"Asia/Irkutsk", IRKT},
"Irkutsk Summer Time", "IRKST",
"Irkutsk Time", "IRKT"}},
{"Asia/Istanbul", EET}, {"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT}, {"Asia/Jakarta", WIT},
{"Asia/Jayapura", new String[] {"East Indonesia Time", "WIT", {"Asia/Jayapura", new String[] {"East Indonesia Time", "WIT",
@ -646,7 +646,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
"Petropavlovsk-Kamchatski Summer Time", "PETST", "Petropavlovsk-Kamchatski Summer Time", "PETST",
"Petropavlovsk-Kamchatski Time", "PETT"}}, "Petropavlovsk-Kamchatski Time", "PETT"}},
{"Asia/Karachi", PKT}, {"Asia/Karachi", PKT},
{"Asia/Kashgar", CTT}, {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT}, {"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT}, {"Asia/Katmandu", NPT},
{"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT", {"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT",
@ -654,9 +654,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
"Khandyga Time", "YAKT"}}, "Khandyga Time", "YAKT"}},
{"Asia/Kolkata", IST}, {"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"Krasnoyarsk Time", "KRAT", {"Asia/Krasnoyarsk", KRAT},
"Krasnoyarsk Summer Time", "KRAST",
"Krasnoyarsk Time", "KRAT"}},
{"Asia/Kuala_Lumpur", MYT}, {"Asia/Kuala_Lumpur", MYT},
{"Asia/Kuching", MYT}, {"Asia/Kuching", MYT},
{"Asia/Kuwait", ARAST}, {"Asia/Kuwait", ARAST},
@ -671,7 +669,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
"Philippines Time", "PHT"}}, "Philippines Time", "PHT"}},
{"Asia/Muscat", GST}, {"Asia/Muscat", GST},
{"Asia/Nicosia", EET}, {"Asia/Nicosia", EET},
{"Asia/Novokuznetsk", NOVT}, {"Asia/Novokuznetsk", KRAT},
{"Asia/Novosibirsk", NOVT}, {"Asia/Novosibirsk", NOVT},
{"Asia/Oral", new String[] {"Oral Time", "ORAT", {"Asia/Oral", new String[] {"Oral Time", "ORAT",
"Oral Summer Time", "ORAST", "Oral Summer Time", "ORAST",
@ -697,6 +695,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Asia/Samarkand", UZT}, {"Asia/Samarkand", UZT},
{"Asia/Seoul", KST}, {"Asia/Seoul", KST},
{"Asia/Singapore", SGT}, {"Asia/Singapore", SGT},
{"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
"Srednekolymsk Daylight Time", "SREDT",
"Srednekolymsk Time", "SRET"}},
{"Asia/Taipei", CTT}, {"Asia/Taipei", CTT},
{"Asia/Tel_Aviv", ISRAEL}, {"Asia/Tel_Aviv", ISRAEL},
{"Asia/Tashkent", UZT}, {"Asia/Tashkent", UZT},
@ -709,7 +710,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Asia/Ujung_Pandang", CIT}, {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT}, {"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT}, {"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT}, {"Asia/Urumqi", XJT},
{"Asia/Ust-Nera", new String[] {"Ust-Nera Time", "VLAT", {"Asia/Ust-Nera", new String[] {"Ust-Nera Time", "VLAT",
"Ust-Nera Summer Time", "VLAST", "Ust-Nera Summer Time", "VLAST",
"Ust-Nera Time", "VLAT"}}, "Ust-Nera Time", "VLAT"}},
@ -751,9 +752,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Australia/Canberra", EST_NSW}, {"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW}, {"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN}, {"Australia/Darwin", DARWIN},
{"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", {"Australia/Eucla", new String[] {"Australian Central Western Standard Time", "ACWST",
"Central Western Summer Time (Australia)", "CWST", "Australian Central Western Daylight Time", "ACWDT",
"Central Western Time (Australia)", "CWT"}}, "Australian Central Western Time", "ACWT"}},
{"Australia/Hobart", TASMANIA}, {"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE}, {"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE}, {"Australia/Lindeman", BRISBANE},
@ -819,7 +820,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST}, {"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET}, {"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST}, {"Europe/Jersey", GMTBST},
{"Europe/Kaliningrad", FET}, {"Europe/Kaliningrad", EET},
{"Europe/Kiev", EET}, {"Europe/Kiev", EET},
{"Europe/Lisbon", WET}, {"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET}, {"Europe/Ljubljana", CET},
@ -854,9 +855,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Europe/Vatican", CET}, {"Europe/Vatican", CET},
{"Europe/Vienna", CET}, {"Europe/Vienna", CET},
{"Europe/Vilnius", EET}, {"Europe/Vilnius", EET},
{"Europe/Volgograd", new String[] {"Volgograd Time", "VOLT", {"Europe/Volgograd", MSK},
"Volgograd Summer Time", "VOLST",
"Volgograd Time", "VOLT"}},
{"Europe/Warsaw", CET}, {"Europe/Warsaw", CET},
{"Europe/Zagreb", CET}, {"Europe/Zagreb", CET},
{"Europe/Zaporozhye", EET}, {"Europe/Zaporozhye", EET},

104
jdk/src/jdk.localedata/share/classes/sun/util/resources/de/TimeZoneNames_de.java
View File

@ -48,9 +48,9 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
String ACT[] = new String[] {"Acre Normalzeit", "ACT", String ACT[] = new String[] {"Acre Normalzeit", "ACT",
"Acre Sommerzeit", "ACST", "Acre Sommerzeit", "ACST",
"Acre Normalzeit", "ACT"}; "Acre Normalzeit", "ACT"};
String ADELAIDE[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien)", "CST", String ADELAIDE[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien)", "ACST",
"Zentrale Sommerzeit (S\u00FCdaustralien)", "CST", "Zentrale Sommerzeit (S\u00FCdaustralien)", "ACDT",
"Zentrale Zeitzone (S\u00FCdaustralien)", "CT"}; "Zentrale Zeitzone (S\u00FCdaustralien)", "ACT"};
String AGT[] = new String[] {"Argentinische Zeit", "ART", String AGT[] = new String[] {"Argentinische Zeit", "ART",
"Argentinische Sommerzeit", "ARST", "Argentinische Sommerzeit", "ARST",
"Argentinische Zeit", "ART"}; "Argentinische Zeit", "ART"};
@ -72,12 +72,12 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
String BDT[] = new String[] {"Bangladesch Zeit", "BDT", String BDT[] = new String[] {"Bangladesch Zeit", "BDT",
"Bangladesch Sommerzeit", "BDST", "Bangladesch Sommerzeit", "BDST",
"Bangladesch Zeit", "BDT"}; "Bangladesch Zeit", "BDT"};
String BRISBANE[] = new String[] {"\u00D6stliche Normalzeit (Queensland)", "EST", String BRISBANE[] = new String[] {"\u00D6stliche Normalzeit (Queensland)", "AEST",
"\u00D6stliche Sommerzeit (Queensland)", "EST", "\u00D6stliche Sommerzeit (Queensland)", "AEDT",
"\u00D6stliche Zeitzone (Queensland)", "ET"}; "\u00D6stliche Zeitzone (Queensland)", "AET"};
String BROKEN_HILL[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien/New South Wales)", "CST", String BROKEN_HILL[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien/New South Wales)", "ACST",
"Zentrale Sommerzeit (S\u00FCdaustralien/New South Wales)", "CST", "Zentrale Sommerzeit (S\u00FCdaustralien/New South Wales)", "ACDT",
"Zentrale Zeitzone (S\u00FCdaustralien/New South Wales)", "CT"}; "Zentrale Zeitzone (S\u00FCdaustralien/New South Wales)", "ACT"};
String BRT[] = new String[] {"Brasilianische Zeit", "BRT", String BRT[] = new String[] {"Brasilianische Zeit", "BRT",
"Brasilianische Sommerzeit", "BRST", "Brasilianische Sommerzeit", "BRST",
"Brasilianische Zeit", "BRT"}; "Brasilianische Zeit", "BRT"};
@ -111,9 +111,9 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
String CUBA[] = new String[] {"Kubanische Normalzeit", "CST", String CUBA[] = new String[] {"Kubanische Normalzeit", "CST",
"Kubanische Sommerzeit", "CDT", "Kubanische Sommerzeit", "CDT",
"Kubanische Normalzeit", "CT"}; "Kubanische Normalzeit", "CT"};
String DARWIN[] = new String[] {"Zentrale Normalzeit (Northern Territory)", "CST", String DARWIN[] = new String[] {"Zentrale Normalzeit (Northern Territory)", "ACST",
"Zentrale Sommerzeit (Northern Territory)", "CST", "Zentrale Sommerzeit (Northern Territory)", "ACDT",
"Zentrale Zeitzone (Northern Territory)", "CT"}; "Zentrale Zeitzone (Northern Territory)", "ACT"};
String DUBLIN[] = new String[] {"Greenwich Zeit", "GMT", String DUBLIN[] = new String[] {"Greenwich Zeit", "GMT",
"Irische Sommerzeit", "IST", "Irische Sommerzeit", "IST",
"Irische Zeit", "IT"}; "Irische Zeit", "IT"};
@ -132,9 +132,9 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
String EST[] = new String[] {"\u00d6stliche Normalzeit", "EST", String EST[] = new String[] {"\u00d6stliche Normalzeit", "EST",
"\u00d6stliche Sommerzeit", "EDT", "\u00d6stliche Sommerzeit", "EDT",
"\u00D6stliche Zeitzone", "ET"}; "\u00D6stliche Zeitzone", "ET"};
String EST_NSW[] = new String[] {"\u00D6stliche Normalzeit (New South Wales)", "EST", String EST_NSW[] = new String[] {"\u00D6stliche Normalzeit (New South Wales)", "AEST",
"\u00D6stliche Sommerzeit (New South Wales)", "EST", "\u00D6stliche Sommerzeit (New South Wales)", "AEDT",
"\u00D6stliche Zeitzone (New South Wales)", "ET"}; "\u00D6stliche Zeitzone (New South Wales)", "AET"};
String FET[] = new String[] {"Kaliningrader Zeit", "FET", String FET[] = new String[] {"Kaliningrader Zeit", "FET",
"Kaliningrader Sommerzeit", "FEST", "Kaliningrader Sommerzeit", "FEST",
"Kaliningrader Zeit", "FET"}; "Kaliningrader Zeit", "FET"};
@ -165,6 +165,9 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
String ICT[] = new String[] {"Indochina Zeit", "ICT", String ICT[] = new String[] {"Indochina Zeit", "ICT",
"Indochina Sommerzeit", "ICST", "Indochina Sommerzeit", "ICST",
"Indochina Zeit", "ICT"}; "Indochina Zeit", "ICT"};
String IRKT[] = new String[] {"Irkutsk Zeit", "IRKT",
"Irkutsk Sommerzeit", "IRKST",
"Irkutsk Zeit", "IRKT"};
String IRT[] = new String[] {"Iranische Normalzeit", "IRST", String IRT[] = new String[] {"Iranische Normalzeit", "IRST",
"Iranische Sommerzeit", "IRDT", "Iranische Sommerzeit", "IRDT",
"Iranische Zeit", "IRT"}; "Iranische Zeit", "IRT"};
@ -177,11 +180,14 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
String JST[] = new String[] {"Japanische Normalzeit", "JST", String JST[] = new String[] {"Japanische Normalzeit", "JST",
"Japanische Sommerzeit", "JDT", "Japanische Sommerzeit", "JDT",
"Zeitzone f\u00FCr Japan", "JT"}; "Zeitzone f\u00FCr Japan", "JT"};
String KRAT[] = new String[] {"Krasnojarsker Zeit", "KRAT",
"Krasnojarsker Sommerzeit", "KRAST",
"Krasnojarsker Zeit", "KRAT"};
String KST[] = new String[] {"Koreanische Normalzeit", "KST", String KST[] = new String[] {"Koreanische Normalzeit", "KST",
"Koreanische Sommerzeit", "KDT", "Koreanische Sommerzeit", "KDT",
"Zeitzone f\u00FCr Korea", "KT"}; "Zeitzone f\u00FCr Korea", "KT"};
String LORD_HOWE[] = new String[] {"Lord Howe Normalzeit", "LHST", String LORD_HOWE[] = new String[] {"Lord Howe Normalzeit", "LHST",
"Lord Howe Sommerzeit", "LHST", "Lord Howe Sommerzeit", "LHDT",
"Lord-Howe Normalzeit", "LHT"}; "Lord-Howe Normalzeit", "LHT"};
String MHT[] = new String[] {"Marshallinseln Zeit", "MHT", String MHT[] = new String[] {"Marshallinseln Zeit", "MHT",
"Marshallinseln Sommerzeit", "MHST", "Marshallinseln Sommerzeit", "MHST",
@ -231,20 +237,15 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
String SGT[] = new String[] {"Singapur Zeit", "SGT", String SGT[] = new String[] {"Singapur Zeit", "SGT",
"Singapur Sommerzeit", "SGST", "Singapur Sommerzeit", "SGST",
"Singapur Zeit", "SGT"}; "Singapur Zeit", "SGT"};
String SLST[] = new String[] {"Greenwich Normalzeit", "GMT", String TASMANIA[] = new String[] {"\u00D6stliche Normalzeit (Tasmanien)", "AEST",
"Sierra Leone Sommerzeit", "SLST", "\u00D6stliche Sommerzeit (Tasmanien)", "AEDT",
"Sierra Leone Zeit", "SLT"}; "\u00D6stliche Zeitzone (Tasmanien)", "AET"};
String TASMANIA[] = new String[] {"\u00D6stliche Normalzeit (Tasmanien)", "EST",
"\u00D6stliche Sommerzeit (Tasmanien)", "EST",
"\u00D6stliche Zeitzone (Tasmanien)", "ET"};
String TMT[] = new String[] {"Turkmenische Zeit", "TMT", String TMT[] = new String[] {"Turkmenische Zeit", "TMT",
"Turkmenische Sommerzeit", "TMST", "Turkmenische Sommerzeit", "TMST",
"Turkmenische Zeit", "TMT"}; "Turkmenische Zeit", "TMT"};
String ULAT[]= new String[] {"Ulaanbaatar Zeit", "ULAT", String ULAT[]= new String[] {"Ulaanbaatar Zeit", "ULAT",
"Ulaanbaatar Sommerzeit", "ULAST", "Ulaanbaatar Sommerzeit", "ULAST",
"Ulaanbaatar Zeit", "ULAT"}; "Ulaanbaatar Zeit", "ULAT"};
String WART[] = new String[] {"Westargentinische Zeit", "WART",
"Westargentinische Sommerzeit", "WARST"};
String WAT[] = new String[] {"Westafrikanische Zeit", "WAT", String WAT[] = new String[] {"Westafrikanische Zeit", "WAT",
"Westafrikanische Sommerzeit", "WAST", "Westafrikanische Sommerzeit", "WAST",
"Westafrikanische Zeit", "WAT"}; "Westafrikanische Zeit", "WAT"};
@ -254,27 +255,30 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
String WIT[] = new String[] {"Westindonesische Zeit", "WIB", String WIT[] = new String[] {"Westindonesische Zeit", "WIB",
"Westindonesische Sommerzeit", "WIST", "Westindonesische Sommerzeit", "WIST",
"Westindonesische Zeit", "WIB"}; "Westindonesische Zeit", "WIB"};
String WST_AUS[] = new String[] {"Westliche Normalzeit (Australien)", "WST", String WST_AUS[] = new String[] {"Westliche Normalzeit (Australien)", "AWST",
"Westliche Sommerzeit (Australien)", "WST", "Westliche Sommerzeit (Australien)", "AWDT",
"Westliche Zeitzone (Australien)", "WT"}; "Westliche Zeitzone (Australien)", "AWT"};
String SAMOA[] = new String[] {"Samoa Normalzeit", "SST", String SAMOA[] = new String[] {"Samoa Normalzeit", "SST",
"Samoa Sommerzeit", "SDT", "Samoa Sommerzeit", "SDT",
"Zeitzone f\u00FCr Samoa", "ST"}; "Zeitzone f\u00FCr Samoa", "ST"};
String WST_SAMOA[] = new String[] {"West Samoa Zeit", "WST", String WST_SAMOA[] = new String[] {"West Samoa Zeit", "WSST",
"West Samoa Sommerzeit", "WSDT", "West Samoa Sommerzeit", "WSDT",
"West Samoa Zeit", "WST"}; "West Samoa Zeit", "WST"};
String ChST[] = new String[] {"Chamorro Normalzeit", "ChST", String ChST[] = new String[] {"Chamorro Normalzeit", "ChST",
"Chamorro Sommerzeit", "ChDT", "Chamorro Sommerzeit", "ChDT",
"Zeitzone f\u00FCr die Marianen", "ChT"}; "Zeitzone f\u00FCr die Marianen", "ChT"};
String VICTORIA[] = new String[] {"\u00D6stliche Normalzeit (Victoria)", "EST", String VICTORIA[] = new String[] {"\u00D6stliche Normalzeit (Victoria)", "AEST",
"\u00D6stliche Sommerzeit (Victoria)", "EST", "\u00D6stliche Sommerzeit (Victoria)", "AEDT",
"\u00D6stliche Zeitzone (Victoria)", "ET"}; "\u00D6stliche Zeitzone (Victoria)", "AET"};
String UTC[] = new String[] {"Koordinierte Universalzeit", "UTC", String UTC[] = new String[] {"Koordinierte Universalzeit", "UTC",
"Koordinierte Universalzeit", "UTC", "Koordinierte Universalzeit", "UTC",
"Koordinierte Universalzeit", "UTC"}; "Koordinierte Universalzeit", "UTC"};
String UZT[] = new String[] {"Usbekistan Zeit", "UZT", String UZT[] = new String[] {"Usbekistan Zeit", "UZT",
"Usbekistan Sommerzeit", "UZST", "Usbekistan Sommerzeit", "UZST",
"Usbekistan Zeit", "UZT"}; "Usbekistan Zeit", "UZT"};
String XJT[] = new String[] {"Chinesische Normalzeit", "XJT",
"Chinesische Sommerzeit", "XJDT",
"Zeitzone f\u00FCr China", "XJT"};
return new Object[][] { return new Object[][] {
{"America/Los_Angeles", PST}, {"America/Los_Angeles", PST},
@ -336,7 +340,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{"Africa/Djibouti", EAT}, {"Africa/Djibouti", EAT},
{"Africa/Douala", WAT}, {"Africa/Douala", WAT},
{"Africa/El_Aaiun", WET}, {"Africa/El_Aaiun", WET},
{"Africa/Freetown", SLST}, {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT}, {"Africa/Gaborone", CAT},
{"Africa/Harare", CAT}, {"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST}, {"Africa/Johannesburg", SAST},
@ -437,7 +441,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
"Westgr\u00f6nl\u00e4ndische Sommerzeit", "WGST", "Westgr\u00f6nl\u00e4ndische Sommerzeit", "WGST",
"Westgr\u00F6nl\u00E4ndische Zeit", "WGT"}}, "Westgr\u00F6nl\u00E4ndische Zeit", "WGT"}},
{"America/Goose_Bay", AST}, {"America/Goose_Bay", AST},
{"America/Grand_Turk", EST}, {"America/Grand_Turk", AST},
{"America/Grenada", AST}, {"America/Grenada", AST},
{"America/Guadeloupe", AST}, {"America/Guadeloupe", AST},
{"America/Guatemala", CST}, {"America/Guatemala", CST},
@ -484,9 +488,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{"America/Mendoza", AGT}, {"America/Mendoza", AGT},
{"America/Menominee", CST}, {"America/Menominee", CST},
{"America/Merida", CST}, {"America/Merida", CST},
{"America/Metlakatla", new String[] {"Metlakatla Normalzeit", "MeST", {"America/Metlakatla", PST},
"Metlakatla Sommerzeit", "MeDT",
"Metlakatla Normalzeit", "MeT"}},
{"America/Mexico_City", CST}, {"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Pierre & Miquelon Normalzeit", "PMST", {"America/Miquelon", new String[] {"Pierre & Miquelon Normalzeit", "PMST",
"Pierre & Miquelon Sommerzeit", "PMDT", "Pierre & Miquelon Sommerzeit", "PMDT",
@ -607,6 +609,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
"Brunei Sommerzeit", "BNST", "Brunei Sommerzeit", "BNST",
"Brunei Zeit", "BNT"}}, "Brunei Zeit", "BNT"}},
{"Asia/Calcutta", IST}, {"Asia/Calcutta", IST},
{"Asia/Chita", IRKT},
{"Asia/Choibalsan", new String[] {"Choibalsan Zeit", "CHOT", {"Asia/Choibalsan", new String[] {"Choibalsan Zeit", "CHOT",
"Choibalsan Sommerzeit", "CHOST", "Choibalsan Sommerzeit", "CHOST",
"Choibalsan Zeit", "CHOT"}}, "Choibalsan Zeit", "CHOT"}},
@ -631,9 +634,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{"Asia/Hovd", new String[] {"Hovd Zeit", "HOVT", {"Asia/Hovd", new String[] {"Hovd Zeit", "HOVT",
"Hovd Sommerzeit", "HOVST", "Hovd Sommerzeit", "HOVST",
"Hovd Zeit", "HOVT"}}, "Hovd Zeit", "HOVT"}},
{"Asia/Irkutsk", new String[] {"Irkutsk Zeit", "IRKT", {"Asia/Irkutsk", IRKT},
"Irkutsk Sommerzeit", "IRKST",
"Irkutsk Zeit", "IRKT"}},
{"Asia/Istanbul", EET}, {"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT}, {"Asia/Jakarta", WIT},
{"Asia/Jayapura", new String[] {"Ostindonesische Zeit", "WIT", {"Asia/Jayapura", new String[] {"Ostindonesische Zeit", "WIT",
@ -646,16 +647,14 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
"Petropawlowsk-Kamtschatkische Sommerzeit", "PETST", "Petropawlowsk-Kamtschatkische Sommerzeit", "PETST",
"Petropawlowsk-Kamtschatkische Zeit", "PETT"}}, "Petropawlowsk-Kamtschatkische Zeit", "PETT"}},
{"Asia/Karachi", PKT}, {"Asia/Karachi", PKT},
{"Asia/Kashgar", CTT}, {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT}, {"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT}, {"Asia/Katmandu", NPT},
{"Asia/Khandyga", new String[] {"Chandyga Zeit", "YAKT", {"Asia/Khandyga", new String[] {"Chandyga Zeit", "YAKT",
"Chandyga Sommerzeit", "YAKST", "Chandyga Sommerzeit", "YAKST",
"Chandyga Zeit", "YAKT"}}, "Chandyga Zeit", "YAKT"}},
{"Asia/Kolkata", IST}, {"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"Krasnojarsker Zeit", "KRAT", {"Asia/Krasnoyarsk", KRAT},
"Krasnojarsker Sommerzeit", "KRAST",
"Krasnojarsker Zeit", "KRAT"}},
{"Asia/Kuala_Lumpur", MYT}, {"Asia/Kuala_Lumpur", MYT},
{"Asia/Kuching", MYT}, {"Asia/Kuching", MYT},
{"Asia/Kuwait", ARAST}, {"Asia/Kuwait", ARAST},
@ -670,7 +669,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
"Philippinische Zeit", "PHT"}}, "Philippinische Zeit", "PHT"}},
{"Asia/Muscat", GST}, {"Asia/Muscat", GST},
{"Asia/Nicosia", EET}, {"Asia/Nicosia", EET},
{"Asia/Novokuznetsk", NOVT}, {"Asia/Novokuznetsk", KRAT},
{"Asia/Novosibirsk", NOVT}, {"Asia/Novosibirsk", NOVT},
{"Asia/Oral", new String[] {"Oral Zeit", "ORAT", {"Asia/Oral", new String[] {"Oral Zeit", "ORAT",
"Oral Sommerzeit", "ORAST", "Oral Sommerzeit", "ORAST",
@ -696,6 +695,9 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{"Asia/Samarkand", UZT}, {"Asia/Samarkand", UZT},
{"Asia/Seoul", KST}, {"Asia/Seoul", KST},
{"Asia/Singapore", SGT}, {"Asia/Singapore", SGT},
{"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
"Srednekolymsk Daylight Time", "SREDT",
"Srednekolymsk Time", "SRET"}},
{"Asia/Taipei", CTT}, {"Asia/Taipei", CTT},
{"Asia/Tel_Aviv", ISRAEL}, {"Asia/Tel_Aviv", ISRAEL},
{"Asia/Tashkent", UZT}, {"Asia/Tashkent", UZT},
@ -708,7 +710,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{"Asia/Ujung_Pandang", CIT}, {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT}, {"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT}, {"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT}, {"Asia/Urumqi", XJT},
{"Asia/Ust-Nera", new String[] {"Ust-Nera Zeit", "VLAT", {"Asia/Ust-Nera", new String[] {"Ust-Nera Zeit", "VLAT",
"Ust-Nera Sommerzeit", "VLAST", "Ust-Nera Sommerzeit", "VLAST",
"Ust-Nera Zeit", "VLAT"}}, "Ust-Nera Zeit", "VLAT"}},
@ -750,9 +752,9 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{"Australia/Canberra", EST_NSW}, {"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW}, {"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN}, {"Australia/Darwin", DARWIN},
{"Australia/Eucla", new String[] {"Zentral-Westliche Normalzeit (Australien)", "CWST", {"Australia/Eucla", new String[] {"Zentral-Westliche Normalzeit (Australien)", "ACWST",
"Zentral-Westliche Sommerzeit (Australien)", "CWST", "Zentral-Westliche Sommerzeit (Australien)", "ACWDT",
"Zentral-Westliche Normalzeit (Australien)", "CWT"}}, "Zentral-Westliche Normalzeit (Australien)", "ACWT"}},
{"Australia/Hobart", TASMANIA}, {"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE}, {"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE}, {"Australia/Lindeman", BRISBANE},
@ -818,7 +820,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST}, {"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET}, {"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST}, {"Europe/Jersey", GMTBST},
{"Europe/Kaliningrad", FET}, {"Europe/Kaliningrad", EET},
{"Europe/Kiev", EET}, {"Europe/Kiev", EET},
{"Europe/Lisbon", WET}, {"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET}, {"Europe/Ljubljana", CET},
@ -853,9 +855,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{"Europe/Vatican", CET}, {"Europe/Vatican", CET},
{"Europe/Vienna", CET}, {"Europe/Vienna", CET},
{"Europe/Vilnius", EET}, {"Europe/Vilnius", EET},
{"Europe/Volgograd", new String[] {"Wolgograder Zeit", "VOLT", {"Europe/Volgograd", MSK},
"Wolgograder Sommerzeit", "VOLST",
"Wolgograder Zeit", "VOLT"}},
{"Europe/Warsaw", CET}, {"Europe/Warsaw", CET},
{"Europe/Zagreb", CET}, {"Europe/Zagreb", CET},
{"Europe/Zaporozhye", EET}, {"Europe/Zaporozhye", EET},

104
jdk/src/jdk.localedata/share/classes/sun/util/resources/es/TimeZoneNames_es.java
View File

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

104
jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
View File

@ -48,9 +48,9 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
String ACT[] = new String[] {"Heure de l'Acre", "ACT", String ACT[] = new String[] {"Heure de l'Acre", "ACT",
"Heure d'\u00e9t\u00e9 de l'Acre", "ACST", "Heure d'\u00e9t\u00e9 de l'Acre", "ACST",
"Heure de l'Acre", "ACT"}; "Heure de l'Acre", "ACT"};
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)", "ACST",
"Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud)", "CST", "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud)", "ACDT",
"Centre (Australie-M\u00E9ridionale)", "CT"}; "Centre (Australie-M\u00E9ridionale)", "ACT"};
String AGT[] = new String[] {"Heure D'Argentine", "ART", String AGT[] = new String[] {"Heure D'Argentine", "ART",
"Heure d'\u00e9t\u00e9 D'Argentine", "ARST", "Heure d'\u00e9t\u00e9 D'Argentine", "ARST",
"Heure d'Argentine", "ART"} ; "Heure d'Argentine", "ART"} ;
@ -72,12 +72,12 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
String BDT[] = new String[] {"Heure du Bangladesh", "BDT", String BDT[] = new String[] {"Heure du Bangladesh", "BDT",
"Heure d'\u00e9t\u00e9 du Bangladesh", "BDST", "Heure d'\u00e9t\u00e9 du Bangladesh", "BDST",
"Heure du Bangladesh", "BDT"} ; "Heure du Bangladesh", "BDT"} ;
String BRISBANE[] = new String[] {"Heure standard d'Australie orientale (Queensland)", "EST", String BRISBANE[] = new String[] {"Heure standard d'Australie orientale (Queensland)", "AEST",
"Heure d'\u00E9t\u00E9 d'Australie orientale (Queensland)", "EST", "Heure d'\u00E9t\u00E9 d'Australie orientale (Queensland)", "AEDT",
"C\u00F4te Est (Queensland)", "ET"}; "C\u00F4te Est (Queensland)", "AET"};
String BROKEN_HILL[] = new String[] {"Heure standard d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "CST", String BROKEN_HILL[] = new String[] {"Heure standard d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "ACST",
"Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "CST", "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "ACDT",
"Centre (Australie-M\u00E9ridionale/Nouvelle-Galles du Sud)", "CT"}; "Centre (Australie-M\u00E9ridionale/Nouvelle-Galles du Sud)", "ACT"};
String BRT[] = new String[] {"Heure du Br\u00e9sil", "BRT", String BRT[] = new String[] {"Heure du Br\u00e9sil", "BRT",
"Heure d'\u00e9t\u00e9 du Br\u00e9sil", "BRST", "Heure d'\u00e9t\u00e9 du Br\u00e9sil", "BRST",
"Heure du Br\u00E9sil", "BRT"} ; "Heure du Br\u00E9sil", "BRT"} ;
@ -111,9 +111,9 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
String CUBA[] = new String[] {"Heure standard de Cuba", "CST", String CUBA[] = new String[] {"Heure standard de Cuba", "CST",
"Heure d'\u00e9t\u00e9 de Cuba", "CDT", "Heure d'\u00e9t\u00e9 de Cuba", "CDT",
"Heure de Cuba", "CT"}; "Heure de Cuba", "CT"};
String DARWIN[] = new String[] {"Heure standard d'Australie centrale (Territoire du Nord)", "CST", String DARWIN[] = new String[] {"Heure standard d'Australie centrale (Territoire du Nord)", "ACST",
"Heure d'\u00E9t\u00E9 d'Australie centrale (Territoire du Nord)", "CST", "Heure d'\u00E9t\u00E9 d'Australie centrale (Territoire du Nord)", "ACDT",
"Centre (Territoire du Nord)", "CT"}; "Centre (Territoire du Nord)", "ACT"};
String DUBLIN[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT", String DUBLIN[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT",
"Heure d'\u00e9t\u00e9 irlandaise", "IST", "Heure d'\u00e9t\u00e9 irlandaise", "IST",
"Heure irlandaise", "IT"}; "Heure irlandaise", "IT"};
@ -132,9 +132,9 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
String EST[] = new String[] {"Heure normale de l'Est", "EST", String EST[] = new String[] {"Heure normale de l'Est", "EST",
"Heure avanc\u00e9e de l'Est", "EDT", "Heure avanc\u00e9e de l'Est", "EDT",
"C\u00F4te Est", "ET"} ; "C\u00F4te Est", "ET"} ;
String EST_NSW[] = new String[] {"Heure normale de l'Est (Nouvelle-Galles du Sud)", "EST", String EST_NSW[] = new String[] {"Heure normale de l'Est (Nouvelle-Galles du Sud)", "AEST",
"Heure d'\u00E9t\u00E9 de l'Est (Nouvelle-Galles du Sud)", "EST", "Heure d'\u00E9t\u00E9 de l'Est (Nouvelle-Galles du Sud)", "AEDT",
"C\u00F4te Est (Nouvelle-Galles du Sud)", "ET"} ; "C\u00F4te Est (Nouvelle-Galles du Sud)", "AET"} ;
String FET[] = new String[] {"Heure d'Europe de l'Est UTC+3", "FET", String FET[] = new String[] {"Heure d'Europe de l'Est UTC+3", "FET",
"Heure d'\u00E9t\u00E9 d'Europe de l'Est UTC+3", "FEST", "Heure d'\u00E9t\u00E9 d'Europe de l'Est UTC+3", "FEST",
"Heure d'Europe de l'Est UTC+3", "FET"}; "Heure d'Europe de l'Est UTC+3", "FET"};
@ -165,6 +165,9 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
String ICT[] = new String[] {"Heure d'Indochine", "ICT", String ICT[] = new String[] {"Heure d'Indochine", "ICT",
"Heure d'\u00e9t\u00e9 d'Indochine", "ICST", "Heure d'\u00e9t\u00e9 d'Indochine", "ICST",
"Heure d'Indochine", "ICT"} ; "Heure d'Indochine", "ICT"} ;
String IRKT[] = new String[] {"Heure d'Irkutsk", "IRKT",
"Heure d'\u00e9t\u00e9 d'Irkutsk", "IRKST",
"Heure d'Irkutsk", "IRKT"};
String IRT[] = new String[] {"Heure normale d'Iran", "IRST", String IRT[] = new String[] {"Heure normale d'Iran", "IRST",
"Heure avanc\u00e9e d'Iran", "IRDT", "Heure avanc\u00e9e d'Iran", "IRDT",
"Heure d'Iran", "IRT"} ; "Heure d'Iran", "IRT"} ;
@ -177,11 +180,14 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
String JST[] = new String[] {"Heure normale du Japon", "JST", String JST[] = new String[] {"Heure normale du Japon", "JST",
"Heure avanc\u00e9e du Japon", "JDT", "Heure avanc\u00e9e du Japon", "JDT",
"Japon", "JT"} ; "Japon", "JT"} ;
String KRAT[] = new String[] {"Heure de Krasno\u00efarsk", "KRAT",
"Heure d'\u00e9t\u00e9 de Krasno\u00efarsk", "KRAST",
"Heure de Krasno\u00EFarsk", "KRAT"};
String KST[] = new String[] {"Heure normale de Cor\u00e9e", "KST", String KST[] = new String[] {"Heure normale de Cor\u00e9e", "KST",
"Heure avanc\u00e9e de Cor\u00e9e", "KDT", "Heure avanc\u00e9e de Cor\u00e9e", "KDT",
"Cor\u00E9e", "KT"} ; "Cor\u00E9e", "KT"} ;
String LORD_HOWE[] = new String[] {"Heure standard de Lord Howe", "LHST", String LORD_HOWE[] = new String[] {"Heure standard de Lord Howe", "LHST",
"Heure d'\u00e9t\u00e9 de Lord Howe", "LHST", "Heure d'\u00e9t\u00e9 de Lord Howe", "LHDT",
"Heure de Lord Howe", "LHT"}; "Heure de Lord Howe", "LHT"};
String MHT[] = new String[] {"Heure des Iles Marshall", "MHT", String MHT[] = new String[] {"Heure des Iles Marshall", "MHT",
"Heure d'\u00e9t\u00e9 des Iles Marshall", "MHST", "Heure d'\u00e9t\u00e9 des Iles Marshall", "MHST",
@ -231,20 +237,15 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
String SGT[] = new String[] {"Heure de Singapour", "SGT", String SGT[] = new String[] {"Heure de Singapour", "SGT",
"Heure d'\u00e9t\u00e9 de Singapour", "SGST", "Heure d'\u00e9t\u00e9 de Singapour", "SGST",
"Heure de Singapour", "SGT"}; "Heure de Singapour", "SGT"};
String SLST[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT", String TASMANIA[] = new String[] {"Heure standard d'Australie orientale (Tasmanie)", "AEST",
"Heure d'\u00e9t\u00e9 de Sierra Leone", "SLST", "Heure d'\u00E9t\u00E9 d'Australie orientale (Tasmanie)", "AEDT",
"Heure de Sierra Leone", "SLT"}; "C\u00F4te Est (Tasmanie)", "AET"};
String TASMANIA[] = new String[] {"Heure standard d'Australie orientale (Tasmanie)", "EST",
"Heure d'\u00E9t\u00E9 d'Australie orientale (Tasmanie)", "EST",
"C\u00F4te Est (Tasmanie)", "ET"};
String TMT[] = new String[] {"Heure du Turkm\u00e9nistan", "TMT", String TMT[] = new String[] {"Heure du Turkm\u00e9nistan", "TMT",
"Heure d'\u00e9t\u00e9 du Turkm\u00e9nistan", "TMST", "Heure d'\u00e9t\u00e9 du Turkm\u00e9nistan", "TMST",
"Heure du Turkm\u00E9nistan", "TMT"} ; "Heure du Turkm\u00E9nistan", "TMT"} ;
String ULAT[]= new String[] {"Heure de l'Ulaanbaatar", "ULAT", String ULAT[]= new String[] {"Heure de l'Ulaanbaatar", "ULAT",
"Heure d'\u00e9t\u00e9 de l'Ulaanbaatar", "ULAST", "Heure d'\u00e9t\u00e9 de l'Ulaanbaatar", "ULAST",
"Heure de l'Ulaanbaatar", "ULAT"} ; "Heure de l'Ulaanbaatar", "ULAT"} ;
String WART[] = new String[] {"Heure D'Argentine de l'Ouest", "WART",
"Heure d'\u00e9t\u00e9 D'Argentine de l'Ouest", "WARST"} ;
String WAT[] = new String[] {"Heure d'Afrique de l'Ouest", "WAT", String WAT[] = new String[] {"Heure d'Afrique de l'Ouest", "WAT",
"Heure d'\u00e9t\u00e9 d'Afrique de l'Ouest", "WAST", "Heure d'\u00e9t\u00e9 d'Afrique de l'Ouest", "WAST",
"Heure d'Afrique de l'Ouest", "WAT"} ; "Heure d'Afrique de l'Ouest", "WAT"} ;
@ -254,27 +255,30 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
String WIT[] = new String[] {"Heure de l'Indon\u00e9sie occidentale", "WIB", String WIT[] = new String[] {"Heure de l'Indon\u00e9sie occidentale", "WIB",
"Heure d'\u00e9t\u00e9 de l'Indon\u00e9sie occidentale", "WIST", "Heure d'\u00e9t\u00e9 de l'Indon\u00e9sie occidentale", "WIST",
"Heure de l'Indon\u00E9sie occidentale", "WIB"}; "Heure de l'Indon\u00E9sie occidentale", "WIB"};
String WST_AUS[] = new String[] {"Heure normale de l'Ouest (Australie)", "WST", String WST_AUS[] = new String[] {"Heure normale de l'Ouest (Australie)", "AWST",
"Heure d'\u00E9t\u00E9 de l'Ouest (Australie)", "WST", "Heure d'\u00E9t\u00E9 de l'Ouest (Australie)", "AWDT",
"Ouest (Australie)", "WT"} ; "Ouest (Australie)", "AWT"} ;
String SAMOA[] = new String[] {"Heure standard de Samoa", "SST", String SAMOA[] = new String[] {"Heure standard de Samoa", "SST",
"Heure avanc\u00e9e de Samoa", "SDT", "Heure avanc\u00e9e de Samoa", "SDT",
"Samoa", "ST"}; "Samoa", "ST"};
String WST_SAMOA[] = new String[] {"Heure des Samoas occidentales", "WST", String WST_SAMOA[] = new String[] {"Heure des Samoas occidentales", "WSST",
"Heure d'\u00e9t\u00e9 des Samoas occidentales", "WSDT", "Heure d'\u00e9t\u00e9 des Samoas occidentales", "WSDT",
"Heure des Samoas occidentales", "WST"} ; "Heure des Samoas occidentales", "WST"} ;
String ChST[] = new String[] {"Heure normale des \u00eeles Mariannes", "ChST", String ChST[] = new String[] {"Heure normale des \u00eeles Mariannes", "ChST",
"Heure d'\u00e9t\u00e9 des \u00eeles Mariannes", "ChDT", "Heure d'\u00e9t\u00e9 des \u00eeles Mariannes", "ChDT",
"Chamorro", "ChT"}; "Chamorro", "ChT"};
String VICTORIA[] = new String[] {"Heure standard d'Australie orientale (Victoria)", "EST", String VICTORIA[] = new String[] {"Heure standard d'Australie orientale (Victoria)", "AEST",
"Heure d'\u00E9t\u00E9 d'Australie orientale (Victoria)", "EST", "Heure d'\u00E9t\u00E9 d'Australie orientale (Victoria)", "AEDT",
"C\u00F4te Est (Victoria)", "ET"}; "C\u00F4te Est (Victoria)", "AET"};
String UTC[] = new String[] {"Temps universel coordonn\u00e9", "UTC", String UTC[] = new String[] {"Temps universel coordonn\u00e9", "UTC",
"Temps universel coordonn\u00e9", "UTC", "Temps universel coordonn\u00e9", "UTC",
"Temps universel coordonn\u00E9", "UTC"}; "Temps universel coordonn\u00E9", "UTC"};
String UZT[] = new String[] {"Heure de l'Ouzb\u00e9kistan", "UZT", String UZT[] = new String[] {"Heure de l'Ouzb\u00e9kistan", "UZT",
"Heure d'\u00e9t\u00e9 de l'Ouzb\u00e9kistan", "UZST", "Heure d'\u00e9t\u00e9 de l'Ouzb\u00e9kistan", "UZST",
"Heure de l'Ouzb\u00E9kistan", "UZT"}; "Heure de l'Ouzb\u00E9kistan", "UZT"};
String XJT[] = new String[] {"Heure normale de Chine", "XJT",
"Heure avanc\u00e9e de Chine", "XJDT",
"Chine", "XJT"};
return new Object[][] { return new Object[][] {
{"America/Los_Angeles", PST}, {"America/Los_Angeles", PST},
@ -336,7 +340,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{"Africa/Djibouti", EAT}, {"Africa/Djibouti", EAT},
{"Africa/Douala", WAT}, {"Africa/Douala", WAT},
{"Africa/El_Aaiun", WET}, {"Africa/El_Aaiun", WET},
{"Africa/Freetown", SLST}, {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT}, {"Africa/Gaborone", CAT},
{"Africa/Harare", CAT}, {"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST}, {"Africa/Johannesburg", SAST},
@ -437,7 +441,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
"Heure d'\u00e9t\u00e9 du Groenland de l'Ouest", "WGST", "Heure d'\u00e9t\u00e9 du Groenland de l'Ouest", "WGST",
"Heure du Groenland de l'Ouest", "WGT"}}, "Heure du Groenland de l'Ouest", "WGT"}},
{"America/Goose_Bay", AST}, {"America/Goose_Bay", AST},
{"America/Grand_Turk", EST}, {"America/Grand_Turk", AST},
{"America/Grenada", AST}, {"America/Grenada", AST},
{"America/Guadeloupe", AST}, {"America/Guadeloupe", AST},
{"America/Guatemala", CST}, {"America/Guatemala", CST},
@ -484,9 +488,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{"America/Mendoza", AGT}, {"America/Mendoza", AGT},
{"America/Menominee", CST}, {"America/Menominee", CST},
{"America/Merida", CST}, {"America/Merida", CST},
{"America/Metlakatla", new String[] {"Heure normale de Metlakatla", "MeST", {"America/Metlakatla", PST},
"Heure avanc\u00E9e de Metlakatla", "MeDT",
"Heure de Metlakatla", "MeT"}},
{"America/Mexico_City", CST}, {"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Heure normale de Saint-Pierre et Miquelon", "PMST", {"America/Miquelon", new String[] {"Heure normale de Saint-Pierre et Miquelon", "PMST",
"Heure avanc\u00e9e de Saint-Pierre et Miquelon", "PMDT", "Heure avanc\u00e9e de Saint-Pierre et Miquelon", "PMDT",
@ -607,6 +609,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
"Heure d'\u00e9t\u00e9 du Brunei", "BNST", "Heure d'\u00e9t\u00e9 du Brunei", "BNST",
"Heure du Brunei", "BNT"}}, "Heure du Brunei", "BNT"}},
{"Asia/Calcutta", IST}, {"Asia/Calcutta", IST},
{"Asia/Chita", IRKT},
{"Asia/Choibalsan", new String[] {"Heure de Choibalsan", "CHOT", {"Asia/Choibalsan", new String[] {"Heure de Choibalsan", "CHOT",
"Heure d'\u00e9t\u00e9 de Choibalsan", "CHOST", "Heure d'\u00e9t\u00e9 de Choibalsan", "CHOST",
"Heure de Choibalsan", "CHOT"}}, "Heure de Choibalsan", "CHOT"}},
@ -631,9 +634,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{"Asia/Hovd", new String[] {"Heure de Hovd", "HOVT", {"Asia/Hovd", new String[] {"Heure de Hovd", "HOVT",
"Heure d'\u00e9t\u00e9 de Hovd", "HOVST", "Heure d'\u00e9t\u00e9 de Hovd", "HOVST",
"Heure de Hovd", "HOVT"}}, "Heure de Hovd", "HOVT"}},
{"Asia/Irkutsk", new String[] {"Heure d'Irkutsk", "IRKT", {"Asia/Irkutsk", IRKT},
"Heure d'\u00e9t\u00e9 d'Irkutsk", "IRKST",
"Heure d'Irkutsk", "IRKT"}},
{"Asia/Istanbul", EET}, {"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT}, {"Asia/Jakarta", WIT},
{"Asia/Jayapura", new String[] {"Heure d'Indon\u00e9sie orientale", "WIT", {"Asia/Jayapura", new String[] {"Heure d'Indon\u00e9sie orientale", "WIT",
@ -646,16 +647,14 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
"Heure d'\u00e9t\u00e9 de Petropavlovsk-Kamchatski", "PETST", "Heure d'\u00e9t\u00e9 de Petropavlovsk-Kamchatski", "PETST",
"Heure de Petropavlovsk-Kamchatski", "PETT"}}, "Heure de Petropavlovsk-Kamchatski", "PETT"}},
{"Asia/Karachi", PKT}, {"Asia/Karachi", PKT},
{"Asia/Kashgar", CTT}, {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT}, {"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT}, {"Asia/Katmandu", NPT},
{"Asia/Khandyga", new String[] {"Heure de Khandyga", "YAKT", {"Asia/Khandyga", new String[] {"Heure de Khandyga", "YAKT",
"Heure d'\u00E9t\u00E9 de Khandyga", "YAKST", "Heure d'\u00E9t\u00E9 de Khandyga", "YAKST",
"Heure de Khandyga", "YAKT"}}, "Heure de Khandyga", "YAKT"}},
{"Asia/Kolkata", IST}, {"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"Heure de Krasno\u00efarsk", "KRAT", {"Asia/Krasnoyarsk", KRAT},
"Heure d'\u00e9t\u00e9 de Krasno\u00efarsk", "KRAST",
"Heure de Krasno\u00EFarsk", "KRAT"}},
{"Asia/Kuala_Lumpur", MYT}, {"Asia/Kuala_Lumpur", MYT},
{"Asia/Kuching", MYT}, {"Asia/Kuching", MYT},
{"Asia/Kuwait", ARAST}, {"Asia/Kuwait", ARAST},
@ -670,7 +669,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
"Heure des Philippines", "PHT"}}, "Heure des Philippines", "PHT"}},
{"Asia/Muscat", GST}, {"Asia/Muscat", GST},
{"Asia/Nicosia", EET}, {"Asia/Nicosia", EET},
{"Asia/Novokuznetsk", NOVT}, {"Asia/Novokuznetsk", KRAT},
{"Asia/Novosibirsk", NOVT}, {"Asia/Novosibirsk", NOVT},
{"Asia/Oral", new String[] {"Heure d'Oral", "ORAT", {"Asia/Oral", new String[] {"Heure d'Oral", "ORAT",
"Heure d'\u00e9t\u00e9 d'Oral", "ORAST", "Heure d'\u00e9t\u00e9 d'Oral", "ORAST",
@ -696,6 +695,9 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{"Asia/Samarkand", UZT}, {"Asia/Samarkand", UZT},
{"Asia/Seoul", KST}, {"Asia/Seoul", KST},
{"Asia/Singapore", SGT}, {"Asia/Singapore", SGT},
{"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
"Srednekolymsk Daylight Time", "SREDT",
"Srednekolymsk Time", "SRET"}},
{"Asia/Taipei", CTT}, {"Asia/Taipei", CTT},
{"Asia/Tel_Aviv", ISRAEL}, {"Asia/Tel_Aviv", ISRAEL},
{"Asia/Tashkent", UZT}, {"Asia/Tashkent", UZT},
@ -708,7 +710,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{"Asia/Ujung_Pandang", CIT}, {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT}, {"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT}, {"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT}, {"Asia/Urumqi", XJT},
{"Asia/Ust-Nera", new String[] {"Heure d'Ust-Nera", "VLAT", {"Asia/Ust-Nera", new String[] {"Heure d'Ust-Nera", "VLAT",
"Heure d'\u00E9t\u00E9 d'Ust-Nera", "VLAST", "Heure d'\u00E9t\u00E9 d'Ust-Nera", "VLAST",
"Heure d'Ust-Nera", "VLAT"}}, "Heure d'Ust-Nera", "VLAT"}},
@ -750,9 +752,9 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{"Australia/Canberra", EST_NSW}, {"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW}, {"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN}, {"Australia/Darwin", DARWIN},
{"Australia/Eucla", new String[] {"Heure standard de l'Australie occidentale (centre)", "CWST", {"Australia/Eucla", new String[] {"Heure standard de l'Australie occidentale (centre)", "ACWST",
"Heure d'\u00E9t\u00E9 de l'Australie occidentale (centre)", "CWST", "Heure d'\u00E9t\u00E9 de l'Australie occidentale (centre)", "ACWDT",
"Heure de l'Australie occidentale (centre)", "CWT"}}, "Heure de l'Australie occidentale (centre)", "ACWT"}},
{"Australia/Hobart", TASMANIA}, {"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE}, {"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE}, {"Australia/Lindeman", BRISBANE},
@ -818,7 +820,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST}, {"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET}, {"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST}, {"Europe/Jersey", GMTBST},
{"Europe/Kaliningrad", FET}, {"Europe/Kaliningrad", EET},
{"Europe/Kiev", EET}, {"Europe/Kiev", EET},
{"Europe/Lisbon", WET}, {"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET}, {"Europe/Ljubljana", CET},
@ -853,9 +855,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{"Europe/Vatican", CET}, {"Europe/Vatican", CET},
{"Europe/Vienna", CET}, {"Europe/Vienna", CET},
{"Europe/Vilnius", EET}, {"Europe/Vilnius", EET},
{"Europe/Volgograd", new String[] {"Heure de Volgograd", "VOLT", {"Europe/Volgograd", MSK},
"Heure d'\u00e9t\u00e9 de Volgograd", "VOLST",
"Heure de Volgograd", "VOLT"}},
{"Europe/Warsaw", CET}, {"Europe/Warsaw", CET},
{"Europe/Zagreb", CET}, {"Europe/Zagreb", CET},
{"Europe/Zaporozhye", EET}, {"Europe/Zaporozhye", EET},

104
jdk/src/jdk.localedata/share/classes/sun/util/resources/it/TimeZoneNames_it.java
View File

@ -48,9 +48,9 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
String ACT[] = new String[] {"Ora di Acre", "ACT", String ACT[] = new String[] {"Ora di Acre", "ACT",
"Ora estiva di Acre", "ACST", "Ora estiva di Acre", "ACST",
"Ora di Acre", "ACT"}; "Ora di Acre", "ACT"};
String ADELAIDE[] = new String[] {"Ora standard centrale (Australia del Sud)", "CST", String ADELAIDE[] = new String[] {"Ora standard centrale (Australia del Sud)", "ACST",
"Ora estiva centrale (Australia del Sud)", "CST", "Ora estiva centrale (Australia del Sud)", "ACDT",
"Ora fuso centrale (Australia del Sud)", "CT"}; "Ora fuso centrale (Australia del Sud)", "ACT"};
String AGT[] = new String[] {"Ora dell'Argentina", "ART", String AGT[] = new String[] {"Ora dell'Argentina", "ART",
"Ora estiva dell'Argentina", "ARST", "Ora estiva dell'Argentina", "ARST",
"Ora dell'Argentina", "ART"}; "Ora dell'Argentina", "ART"};
@ -72,12 +72,12 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
String BDT[] = new String[] {"Ora del Bangladesh", "BDT", String BDT[] = new String[] {"Ora del Bangladesh", "BDT",
"Ora estiva del Bangladesh", "BDST", "Ora estiva del Bangladesh", "BDST",
"Ora del Bangladesh", "BDT"}; "Ora del Bangladesh", "BDT"};
String BRISBANE[] = new String[] {"Ora standard orientale (Queensland)", "EST", String BRISBANE[] = new String[] {"Ora standard orientale (Queensland)", "AEST",
"Ora estiva orientale (Queensland)", "EST", "Ora estiva orientale (Queensland)", "AEDT",
"Ora fuso orientale (Queensland)", "ET"}; "Ora fuso orientale (Queensland)", "AET"};
String BROKEN_HILL[] = new String[] {"Ora standard centrale (Australia del Sud/Nuovo Galles del Sud)", "CST", String BROKEN_HILL[] = new String[] {"Ora standard centrale (Australia del Sud/Nuovo Galles del Sud)", "ACST",
"Ora estiva centrale (Australia del Sud/Nuovo Galles del Sud)", "CST", "Ora estiva centrale (Australia del Sud/Nuovo Galles del Sud)", "ACDT",
"Ora fuso centrale (Australia del Sud/Nuovo Galles del Sud)", "CT"}; "Ora fuso centrale (Australia del Sud/Nuovo Galles del Sud)", "ACT"};
String BRT[] = new String[] {"Ora del Brasile", "BRT", String BRT[] = new String[] {"Ora del Brasile", "BRT",
"Ora estiva del Brasile", "BRST", "Ora estiva del Brasile", "BRST",
"Ora di Brasilia", "BRT"}; "Ora di Brasilia", "BRT"};
@ -111,9 +111,9 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
String CUBA[] = new String[] {"Ora solare Cuba", "CST", String CUBA[] = new String[] {"Ora solare Cuba", "CST",
"Ora legale Cuba", "CDT", "Ora legale Cuba", "CDT",
"Ora di Cuba", "CT"}; "Ora di Cuba", "CT"};
String DARWIN[] = new String[] {"Ora standard centrale (Territori del Nord)", "CST", String DARWIN[] = new String[] {"Ora standard centrale (Territori del Nord)", "ACST",
"Ora estiva centrale (Territori del Nord)", "CST", "Ora estiva centrale (Territori del Nord)", "ACDT",
"Ora fuso centrale (Territori del Nord)", "CT"}; "Ora fuso centrale (Territori del Nord)", "ACT"};
String DUBLIN[] = new String[] {"Ora media di Greenwich", "GMT", String DUBLIN[] = new String[] {"Ora media di Greenwich", "GMT",
"Ora estiva irlandese", "IST", "Ora estiva irlandese", "IST",
"Ora irlandese", "IT"}; "Ora irlandese", "IT"};
@ -132,9 +132,9 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
String EST[] = new String[] {"Ora solare USA orientale", "EST", String EST[] = new String[] {"Ora solare USA orientale", "EST",
"Ora legale USA orientale", "EDT", "Ora legale USA orientale", "EDT",
"Fuso orientale", "ET"}; "Fuso orientale", "ET"};
String EST_NSW[] = new String[] {"Ora standard dell'Australia orientale (Nuovo Galles del Sud)", "EST", String EST_NSW[] = new String[] {"Ora standard dell'Australia orientale (Nuovo Galles del Sud)", "AEST",
"Ora estiva dell'Australia orientale (Nuovo Galles del Sud)", "EST", "Ora estiva dell'Australia orientale (Nuovo Galles del Sud)", "AEDT",
"Ora fuso orientale (Nuovo Galles del Sud)", "ET"}; "Ora fuso orientale (Nuovo Galles del Sud)", "AET"};
String FET[] = new String[] {"Ora dei paesi europei pi\u00F9 orientali", "FET", String FET[] = new String[] {"Ora dei paesi europei pi\u00F9 orientali", "FET",
"Ora estiva dei paesi europei pi\u00F9 orientali", "FEST", "Ora estiva dei paesi europei pi\u00F9 orientali", "FEST",
"Ora dei paesi europei pi\u00F9 orientali", "FET"}; "Ora dei paesi europei pi\u00F9 orientali", "FET"};
@ -165,6 +165,9 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
String ICT[] = new String[] {"Ora dell'Indocina", "ICT", String ICT[] = new String[] {"Ora dell'Indocina", "ICT",
"Ora estiva dell'Indocina", "ICST", "Ora estiva dell'Indocina", "ICST",
"Ora dell'Indocina", "ICT"}; "Ora dell'Indocina", "ICT"};
String IRKT[] = new String[] {"Ora di Irkutsk", "IRKT",
"Ora estiva di Irkutsk", "IRKST",
"Ora di Irkutsk", "IRKT"};
String IRT[] = new String[] {"Ora solare Iran", "IRST", String IRT[] = new String[] {"Ora solare Iran", "IRST",
"Ora legale Iran", "IRDT", "Ora legale Iran", "IRDT",
"Ora Iran", "IRT"}; "Ora Iran", "IRT"};
@ -177,11 +180,14 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
String JST[] = new String[] {"Ora solare del Giappone", "JST", String JST[] = new String[] {"Ora solare del Giappone", "JST",
"Ora legale del Giappone", "JDT", "Ora legale del Giappone", "JDT",
"Ora Giappone", "JT"}; "Ora Giappone", "JT"};
String KRAT[] = new String[] {"Ora di Krasnojarsk", "KRAT",
"Ora estiva di Krasnojarsk", "KRAST",
"Ora di Krasnojarsk", "KRAT"};
String KST[] = new String[] {"Ora solare della Corea", "KST", String KST[] = new String[] {"Ora solare della Corea", "KST",
"Ora legale della Corea", "KDT", "Ora legale della Corea", "KDT",
"Ora Corea", "KT"}; "Ora Corea", "KT"};
String LORD_HOWE[] = new String[] {"Ora standard di Lord Howe", "LHST", String LORD_HOWE[] = new String[] {"Ora standard di Lord Howe", "LHST",
"Ora estiva di Lord Howe", "LHST", "Ora estiva di Lord Howe", "LHDT",
"Ora di Lord Howe", "LHT"}; "Ora di Lord Howe", "LHT"};
String MHT[] = new String[] {"Ora delle Isole Marshall", "MHT", String MHT[] = new String[] {"Ora delle Isole Marshall", "MHT",
"Ora estiva delle Isole Marshall", "MHST", "Ora estiva delle Isole Marshall", "MHST",
@ -231,20 +237,15 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
String SGT[] = new String[] {"Ora di Singapore", "SGT", String SGT[] = new String[] {"Ora di Singapore", "SGT",
"Ora estiva di Singapore", "SGST", "Ora estiva di Singapore", "SGST",
"Ora di Singapore", "SGT"}; "Ora di Singapore", "SGT"};
String SLST[] = new String[] {"Ora media di Greenwich", "GMT", String TASMANIA[] = new String[] {"Ora standard orientale (Tasmania)", "AEST",
"Ora legale della Sierra Leone", "SLST", "Ora estiva orientale (Tasmania)", "AEDT",
"Ora della Sierra Leone", "SLT"}; "Ora fuso orientale (Tasmania)", "AET"};
String TASMANIA[] = new String[] {"Ora standard orientale (Tasmania)", "EST",
"Ora estiva orientale (Tasmania)", "EST",
"Ora fuso orientale (Tasmania)", "ET"};
String TMT[] = new String[] {"Ora del Turkmenistan", "TMT", String TMT[] = new String[] {"Ora del Turkmenistan", "TMT",
"Ora estiva del Turkmenistan", "TMST", "Ora estiva del Turkmenistan", "TMST",
"Ora del Turkmenistan", "TMT"}; "Ora del Turkmenistan", "TMT"};
String ULAT[]= new String[] {"Ora di Ulaanbaatar", "ULAT", String ULAT[]= new String[] {"Ora di Ulaanbaatar", "ULAT",
"Ora estiva di Ulaanbaatar", "ULAST", "Ora estiva di Ulaanbaatar", "ULAST",
"Ora di Ulaanbaatar", "ULAT"}; "Ora di Ulaanbaatar", "ULAT"};
String WART[] = new String[] {"Ora dell'Argentina occidentale", "WART",
"Ora estiva dell'Argentina occidentale", "WARST"};
String WAT[] = new String[] {"Ora dell'Africa occidentale", "WAT", String WAT[] = new String[] {"Ora dell'Africa occidentale", "WAT",
"Ora estiva dell'Africa occidentale", "WAST", "Ora estiva dell'Africa occidentale", "WAST",
"Ora dell'Africa occidentale", "WAT"}; "Ora dell'Africa occidentale", "WAT"};
@ -254,27 +255,30 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
String WIT[] = new String[] {"Ora dell'Indonesia occidentale", "WIB", String WIT[] = new String[] {"Ora dell'Indonesia occidentale", "WIB",
"Ora estiva dell'Indonesia occidentale", "WIST", "Ora estiva dell'Indonesia occidentale", "WIST",
"Ora dell'Indonesia occidentale", "WIB"}; "Ora dell'Indonesia occidentale", "WIB"};
String WST_AUS[] = new String[] {"Ora standard dell'Australia occidentale", "WST", String WST_AUS[] = new String[] {"Ora standard dell'Australia occidentale", "AWST",
"Ora estiva dell'Australia occidentale", "WST", "Ora estiva dell'Australia occidentale", "AWDT",
"Ora Australia occidentale", "WT"}; "Ora Australia occidentale", "AWT"};
String SAMOA[] = new String[] {"Ora standard di Samoa", "SST", String SAMOA[] = new String[] {"Ora standard di Samoa", "SST",
"Ora legale di Samoa", "SDT", "Ora legale di Samoa", "SDT",
"Ora Samoa", "ST"}; "Ora Samoa", "ST"};
String WST_SAMOA[] = new String[] {"Ora di Samoa", "WST", String WST_SAMOA[] = new String[] {"Ora di Samoa", "WSST",
"Ora estiva di Samoa", "WSDT", "Ora estiva di Samoa", "WSDT",
"Ora di Samoa occidentale", "WST"}; "Ora di Samoa occidentale", "WST"};
String ChST[] = new String[] {"Ora standard di Chamorro", "ChST", String ChST[] = new String[] {"Ora standard di Chamorro", "ChST",
"Ora legale di Chamorro", "ChDT", "Ora legale di Chamorro", "ChDT",
"Ora Chamorro", "ChT"}; "Ora Chamorro", "ChT"};
String VICTORIA[] = new String[] {"Ora standard orientale (Victoria)", "EST", String VICTORIA[] = new String[] {"Ora standard orientale (Victoria)", "AEST",
"Ora estiva orientale (Victoria)", "EST", "Ora estiva orientale (Victoria)", "AEDT",
"Ora fuso orientale (Victoria)", "ET"}; "Ora fuso orientale (Victoria)", "AET"};
String UTC[] = new String[] {"Tempo universale coordinato", "UTC", String UTC[] = new String[] {"Tempo universale coordinato", "UTC",
"Tempo universale coordinato", "UTC", "Tempo universale coordinato", "UTC",
"Tempo universale coordinato", "UTC"}; "Tempo universale coordinato", "UTC"};
String UZT[] = new String[] {"Ora dell'Uzbekistan", "UZT", String UZT[] = new String[] {"Ora dell'Uzbekistan", "UZT",
"Ora estiva dell'Uzbekistan", "UZST", "Ora estiva dell'Uzbekistan", "UZST",
"Ora dell'Uzbekistan", "UZT"}; "Ora dell'Uzbekistan", "UZT"};
String XJT[] = new String[] {"Ora solare della Cina", "XJT",
"Ora legale della Cina", "XJDT",
"Ora Cina", "XJT"};
return new Object[][] { return new Object[][] {
{"America/Los_Angeles", PST}, {"America/Los_Angeles", PST},
@ -336,7 +340,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{"Africa/Djibouti", EAT}, {"Africa/Djibouti", EAT},
{"Africa/Douala", WAT}, {"Africa/Douala", WAT},
{"Africa/El_Aaiun", WET}, {"Africa/El_Aaiun", WET},
{"Africa/Freetown", SLST}, {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT}, {"Africa/Gaborone", CAT},
{"Africa/Harare", CAT}, {"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST}, {"Africa/Johannesburg", SAST},
@ -437,7 +441,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
"Ora estiva della Groenlandia occidentale", "WGST", "Ora estiva della Groenlandia occidentale", "WGST",
"Ora della Groenlandia occidentale", "WGT"}}, "Ora della Groenlandia occidentale", "WGT"}},
{"America/Goose_Bay", AST}, {"America/Goose_Bay", AST},
{"America/Grand_Turk", EST}, {"America/Grand_Turk", AST},
{"America/Grenada", AST}, {"America/Grenada", AST},
{"America/Guadeloupe", AST}, {"America/Guadeloupe", AST},
{"America/Guatemala", CST}, {"America/Guatemala", CST},
@ -484,9 +488,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{"America/Mendoza", AGT}, {"America/Mendoza", AGT},
{"America/Menominee", CST}, {"America/Menominee", CST},
{"America/Merida", CST}, {"America/Merida", CST},
{"America/Metlakatla", new String[] {"Ora standard di Metlakatla", "MeST", {"America/Metlakatla", PST},
"Ora legale di Metlakatla", "MeDT",
"Ora di Metlakatla", "MeT"}},
{"America/Mexico_City", CST}, {"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Ora solare di Saint-Pierre e Miquelon", "PMST", {"America/Miquelon", new String[] {"Ora solare di Saint-Pierre e Miquelon", "PMST",
"Ora legale di Saint-Pierre e Miquelon", "PMDT", "Ora legale di Saint-Pierre e Miquelon", "PMDT",
@ -607,6 +609,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
"Ora estiva del Brunei", "BNST", "Ora estiva del Brunei", "BNST",
"Ora del Brunei", "BNT"}}, "Ora del Brunei", "BNT"}},
{"Asia/Calcutta", IST}, {"Asia/Calcutta", IST},
{"Asia/Chita", IRKT},
{"Asia/Choibalsan", new String[] {"Ora di Choibalsan", "CHOT", {"Asia/Choibalsan", new String[] {"Ora di Choibalsan", "CHOT",
"Ora estiva di Choibalsan", "CHOST", "Ora estiva di Choibalsan", "CHOST",
"Ora di Choibalsan", "CHOT"}}, "Ora di Choibalsan", "CHOT"}},
@ -631,9 +634,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{"Asia/Hovd", new String[] {"Ora di Hovd", "HOVT", {"Asia/Hovd", new String[] {"Ora di Hovd", "HOVT",
"Ora estiva di Hovd", "HOVST", "Ora estiva di Hovd", "HOVST",
"Ora di Hovd", "HOVT"}}, "Ora di Hovd", "HOVT"}},
{"Asia/Irkutsk", new String[] {"Ora di Irkutsk", "IRKT", {"Asia/Irkutsk", IRKT},
"Ora estiva di Irkutsk", "IRKST",
"Ora di Irkutsk", "IRKT"}},
{"Asia/Istanbul", EET}, {"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT}, {"Asia/Jakarta", WIT},
{"Asia/Jayapura", new String[] {"Ora dell'Indonesia orientale", "WIT", {"Asia/Jayapura", new String[] {"Ora dell'Indonesia orientale", "WIT",
@ -646,16 +647,14 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
"Ora estiva di Petropavlovsk-Kamchatski", "PETST", "Ora estiva di Petropavlovsk-Kamchatski", "PETST",
"Ora di Petropavlovsk-Kamchatski", "PETT"}}, "Ora di Petropavlovsk-Kamchatski", "PETT"}},
{"Asia/Karachi", PKT}, {"Asia/Karachi", PKT},
{"Asia/Kashgar", CTT}, {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT}, {"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT}, {"Asia/Katmandu", NPT},
{"Asia/Kolkata", IST}, {"Asia/Kolkata", IST},
{"Asia/Khandyga", new String[] {"Ora di Khandyga", "YAKT", {"Asia/Khandyga", new String[] {"Ora di Khandyga", "YAKT",
"Ora estiva di Khandyga", "YAKST", "Ora estiva di Khandyga", "YAKST",
"Ora di Khandyga", "YAKT"}}, "Ora di Khandyga", "YAKT"}},
{"Asia/Krasnoyarsk", new String[] {"Ora di Krasnojarsk", "KRAT", {"Asia/Krasnoyarsk", KRAT},
"Ora estiva di Krasnojarsk", "KRAST",
"Ora di Krasnojarsk", "KRAT"}},
{"Asia/Kuala_Lumpur", MYT}, {"Asia/Kuala_Lumpur", MYT},
{"Asia/Kuching", MYT}, {"Asia/Kuching", MYT},
{"Asia/Kuwait", ARAST}, {"Asia/Kuwait", ARAST},
@ -670,7 +669,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
"Ora delle Filippine", "PHT"}}, "Ora delle Filippine", "PHT"}},
{"Asia/Muscat", GST}, {"Asia/Muscat", GST},
{"Asia/Nicosia", EET}, {"Asia/Nicosia", EET},
{"Asia/Novokuznetsk", NOVT}, {"Asia/Novokuznetsk", KRAT},
{"Asia/Novosibirsk", NOVT}, {"Asia/Novosibirsk", NOVT},
{"Asia/Oral", new String[] {"Ora di Oral", "ORAT", {"Asia/Oral", new String[] {"Ora di Oral", "ORAT",
"Ora estiva di Oral", "ORAST", "Ora estiva di Oral", "ORAST",
@ -696,6 +695,9 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{"Asia/Samarkand", UZT}, {"Asia/Samarkand", UZT},
{"Asia/Seoul", KST}, {"Asia/Seoul", KST},
{"Asia/Singapore", SGT}, {"Asia/Singapore", SGT},
{"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
"Srednekolymsk Daylight Time", "SREDT",
"Srednekolymsk Time", "SRET"}},
{"Asia/Taipei", CTT}, {"Asia/Taipei", CTT},
{"Asia/Tel_Aviv", ISRAEL}, {"Asia/Tel_Aviv", ISRAEL},
{"Asia/Tashkent", UZT}, {"Asia/Tashkent", UZT},
@ -708,7 +710,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{"Asia/Ujung_Pandang", CIT}, {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT}, {"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT}, {"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT}, {"Asia/Urumqi", XJT},
{"Asia/Ust-Nera", new String[] {"Ora di Ust-Nera", "VLAT", {"Asia/Ust-Nera", new String[] {"Ora di Ust-Nera", "VLAT",
"Ora estiva di Ust-Nera", "VLAST", "Ora estiva di Ust-Nera", "VLAST",
"Ora di Ust-Nera", "VLAT"}}, "Ora di Ust-Nera", "VLAT"}},
@ -750,9 +752,9 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{"Australia/Canberra", EST_NSW}, {"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW}, {"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN}, {"Australia/Darwin", DARWIN},
{"Australia/Eucla", new String[] {"Ora standard Australia centro-occidentale", "CWST", {"Australia/Eucla", new String[] {"Ora standard Australia centro-occidentale", "ACWST",
"Ora estiva Australia centro-occidentale", "CWST", "Ora estiva Australia centro-occidentale", "ACWDT",
"Ora Australia centro-occidentale", "CWT"}}, "Ora Australia centro-occidentale", "ACWT"}},
{"Australia/Hobart", TASMANIA}, {"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE}, {"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE}, {"Australia/Lindeman", BRISBANE},
@ -818,7 +820,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST}, {"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET}, {"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST}, {"Europe/Jersey", GMTBST},
{"Europe/Kaliningrad", FET}, {"Europe/Kaliningrad", EET},
{"Europe/Kiev", EET}, {"Europe/Kiev", EET},
{"Europe/Lisbon", WET}, {"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET}, {"Europe/Ljubljana", CET},
@ -853,9 +855,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{"Europe/Vatican", CET}, {"Europe/Vatican", CET},
{"Europe/Vienna", CET}, {"Europe/Vienna", CET},
{"Europe/Vilnius", EET}, {"Europe/Vilnius", EET},
{"Europe/Volgograd", new String[] {"Ora di Volgograd", "VOLT", {"Europe/Volgograd", MSK},
"Ora estiva di Volgograd", "VOLST",
"Ora di Volgograd", "VOLT"}},
{"Europe/Warsaw", CET}, {"Europe/Warsaw", CET},
{"Europe/Zagreb", CET}, {"Europe/Zagreb", CET},
{"Europe/Zaporozhye", EET}, {"Europe/Zaporozhye", EET},

104
jdk/src/jdk.localedata/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
View File

@ -48,9 +48,9 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
String ACT[] = new String[] {"\u30a2\u30af\u30ec\u6642\u9593", "ACT", String ACT[] = new String[] {"\u30a2\u30af\u30ec\u6642\u9593", "ACT",
"\u30a2\u30af\u30ec\u590f\u6642\u9593", "ACST", "\u30a2\u30af\u30ec\u590f\u6642\u9593", "ACST",
"\u30a2\u30af\u30ec\u6642\u9593", "ACT"}; "\u30a2\u30af\u30ec\u6642\u9593", "ACT"};
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)", "ACST",
"\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)", "ACDT",
"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CT"}; "\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "ACT"};
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",
"\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u590f\u6642\u9593", "ARST", "\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u590f\u6642\u9593", "ARST",
"\u30A2\u30EB\u30BC\u30F3\u30C1\u30F3\u6642\u9593", "ART"}; "\u30A2\u30EB\u30BC\u30F3\u30C1\u30F3\u6642\u9593", "ART"};
@ -72,12 +72,12 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
String BDT[] = new String[] {"\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5\u6642\u9593", "BDT", String BDT[] = new String[] {"\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5\u6642\u9593", "BDT",
"\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5\u590f\u6642\u9593", "BDST", "\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5\u590f\u6642\u9593", "BDST",
"\u30D0\u30F3\u30B0\u30E9\u30C7\u30B7\u30E5\u6642\u9593", "BDT"}; "\u30D0\u30F3\u30B0\u30E9\u30C7\u30B7\u30E5\u6642\u9593", "BDT"};
String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "EST", String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "AEST",
"\u6771\u90E8\u590F\u6642\u9593(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "EST", "\u6771\u90E8\u590F\u6642\u9593(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "AEDT",
"\u6771\u90E8\u6A19\u6E96\u6642(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "ET"}; "\u6771\u90E8\u6A19\u6E96\u6642(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "AET"};
String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "CST", String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "ACST",
"\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "CST", "\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "ACDT",
"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "CT"}; "\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "ACT"};
String BRT[] = new String[] {"\u30d6\u30e9\u30b8\u30eb\u6642\u9593", "BRT", String BRT[] = new String[] {"\u30d6\u30e9\u30b8\u30eb\u6642\u9593", "BRT",
"\u30d6\u30e9\u30b8\u30eb\u590f\u6642\u9593", "BRST", "\u30d6\u30e9\u30b8\u30eb\u590f\u6642\u9593", "BRST",
"\u30D6\u30E9\u30B8\u30EA\u30A2\u6642\u9593", "BRT"}; "\u30D6\u30E9\u30B8\u30EA\u30A2\u6642\u9593", "BRT"};
@ -111,9 +111,9 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
String CUBA[] = new String[] {"\u30ad\u30e5\u30fc\u30d0\u6a19\u6e96\u6642", "CST", String CUBA[] = new String[] {"\u30ad\u30e5\u30fc\u30d0\u6a19\u6e96\u6642", "CST",
"\u30ad\u30e5\u30fc\u30d0\u590f\u6642\u9593", "CDT", "\u30ad\u30e5\u30fc\u30d0\u590f\u6642\u9593", "CDT",
"\u30AD\u30E5\u30FC\u30D0\u6642\u9593", "CT"}; "\u30AD\u30E5\u30FC\u30D0\u6642\u9593", "CT"};
String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "CST", String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "ACST",
"\u4E2D\u90E8\u590F\u6642\u9593(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "CST", "\u4E2D\u90E8\u590F\u6642\u9593(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "ACDT",
"\u4E2D\u90E8\u6A19\u6E96\u6642(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "CT"}; "\u4E2D\u90E8\u6A19\u6E96\u6642(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "ACT"};
String DUBLIN[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT", String DUBLIN[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT",
"\u30a2\u30a4\u30eb\u30e9\u30f3\u30c9\u590f\u6642\u9593", "IST", "\u30a2\u30a4\u30eb\u30e9\u30f3\u30c9\u590f\u6642\u9593", "IST",
"\u30A2\u30A4\u30EB\u30E9\u30F3\u30C9\u6642\u9593", "IT"}; "\u30A2\u30A4\u30EB\u30E9\u30F3\u30C9\u6642\u9593", "IT"};
@ -132,9 +132,9 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
String EST[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642", "EST", String EST[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642", "EST",
"\u6771\u90e8\u590f\u6642\u9593", "EDT", "\u6771\u90e8\u590f\u6642\u9593", "EDT",
"\u6771\u90E8\u6A19\u6E96\u6642", "ET"}; "\u6771\u90E8\u6A19\u6E96\u6642", "ET"};
String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "EST", String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "AEST",
"\u6771\u90E8\u590F\u6642\u9593(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "EST", "\u6771\u90E8\u590F\u6642\u9593(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "AEDT",
"\u6771\u90E8\u6A19\u6E96\u6642(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "ET"}; "\u6771\u90E8\u6A19\u6E96\u6642(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "AET"};
String FET[] = new String[] {"\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u6642\u9593", "FET", String FET[] = new String[] {"\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u6642\u9593", "FET",
"\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u590F\u6642\u9593", "FEST", "\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u590F\u6642\u9593", "FEST",
"\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u6642\u9593", "FET"}; "\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u6642\u9593", "FET"};
@ -165,6 +165,9 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
String ICT[] = new String[] {"\u30a4\u30f3\u30c9\u30b7\u30ca\u6642\u9593", "ICT", String ICT[] = new String[] {"\u30a4\u30f3\u30c9\u30b7\u30ca\u6642\u9593", "ICT",
"\u30a4\u30f3\u30c9\u30b7\u30ca\u590f\u6642\u9593", "ICST", "\u30a4\u30f3\u30c9\u30b7\u30ca\u590f\u6642\u9593", "ICST",
"\u30A4\u30F3\u30C9\u30B7\u30CA\u6642\u9593", "ICT"}; "\u30A4\u30F3\u30C9\u30B7\u30CA\u6642\u9593", "ICT"};
String IRKT[] = new String[] {"\u30a4\u30eb\u30af\u30fc\u30c4\u30af\u6642\u9593", "IRKT",
"\u30a4\u30eb\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "IRKST",
"\u30A4\u30EB\u30AF\u30FC\u30C4\u30AF\u6642\u9593", "IRKT"};
String IRT[] = new String[] {"\u30a4\u30e9\u30f3\u6a19\u6e96\u6642", "IRST", String IRT[] = new String[] {"\u30a4\u30e9\u30f3\u6a19\u6e96\u6642", "IRST",
"\u30a4\u30e9\u30f3\u590f\u6642\u9593", "IRDT", "\u30a4\u30e9\u30f3\u590f\u6642\u9593", "IRDT",
"\u30A4\u30E9\u30F3\u6642\u9593", "IRT"}; "\u30A4\u30E9\u30F3\u6642\u9593", "IRT"};
@ -177,11 +180,14 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
String JST[] = new String[] {"\u65e5\u672c\u6a19\u6e96\u6642", "JST", String JST[] = new String[] {"\u65e5\u672c\u6a19\u6e96\u6642", "JST",
"\u65e5\u672c\u590f\u6642\u9593", "JDT", "\u65e5\u672c\u590f\u6642\u9593", "JDT",
"\u65E5\u672C\u6642\u9593", "JT"}; "\u65E5\u672C\u6642\u9593", "JT"};
String KRAT[] = new String[] {"\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u6642\u9593", "KRAT",
"\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u590f\u6642\u9593", "KRAST",
"\u30AF\u30E9\u30B9\u30CE\u30E4\u30EB\u30B9\u30AF\u6642\u9593", "KRAT"};
String KST[] = new String[] {"\u97d3\u56fd\u6a19\u6e96\u6642", "KST", String KST[] = new String[] {"\u97d3\u56fd\u6a19\u6e96\u6642", "KST",
"\u97d3\u56fd\u590f\u6642\u9593", "KDT", "\u97d3\u56fd\u590f\u6642\u9593", "KDT",
"\u97D3\u56FD\u6642\u9593", "KT"}; "\u97D3\u56FD\u6642\u9593", "KT"};
String LORD_HOWE[] = new String[] {"\u30ed\u30fc\u30c9\u30cf\u30a6\u5cf6\u6a19\u6e96\u6642", "LHST", String LORD_HOWE[] = new String[] {"\u30ed\u30fc\u30c9\u30cf\u30a6\u5cf6\u6a19\u6e96\u6642", "LHST",
"\u30ed\u30fc\u30c9\u30cf\u30a6\u5cf6\u590f\u6642\u9593", "LHST", "\u30ed\u30fc\u30c9\u30cf\u30a6\u5cf6\u590f\u6642\u9593", "LHDT",
"\u30ED\u30FC\u30C9\u30CF\u30A6\u6642\u9593", "LHT"}; "\u30ED\u30FC\u30C9\u30CF\u30A6\u6642\u9593", "LHT"};
String MHT[] = new String[] {"\u30de\u30fc\u30b7\u30e3\u30eb\u5cf6\u6642\u9593", "MHT", String MHT[] = new String[] {"\u30de\u30fc\u30b7\u30e3\u30eb\u5cf6\u6642\u9593", "MHT",
"\u30de\u30fc\u30b7\u30e3\u30eb\u5cf6\u590f\u6642\u9593", "MHST", "\u30de\u30fc\u30b7\u30e3\u30eb\u5cf6\u590f\u6642\u9593", "MHST",
@ -231,20 +237,15 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
String SGT[] = new String[] {"\u30b7\u30f3\u30ac\u30dd\u30fc\u30eb\u6642\u9593", "SGT", String SGT[] = new String[] {"\u30b7\u30f3\u30ac\u30dd\u30fc\u30eb\u6642\u9593", "SGT",
"\u30b7\u30f3\u30ac\u30dd\u30fc\u30eb\u590f\u6642\u9593", "SGST", "\u30b7\u30f3\u30ac\u30dd\u30fc\u30eb\u590f\u6642\u9593", "SGST",
"\u30B7\u30F3\u30AC\u30DD\u30FC\u30EB\u6642\u9593", "SGT"}; "\u30B7\u30F3\u30AC\u30DD\u30FC\u30EB\u6642\u9593", "SGT"};
String SLST[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT", String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30BF\u30B9\u30DE\u30CB\u30A2)", "AEST",
"\u30b7\u30a8\u30e9\u30ec\u30aa\u30cd\u590f\u6642\u9593", "SLST", "\u6771\u90E8\u590F\u6642\u9593(\u30BF\u30B9\u30DE\u30CB\u30A2)", "AEDT",
"\u30B7\u30A8\u30E9\u30EC\u30AA\u30CD\u6642\u9593", "SLT"}; "\u6771\u90E8\u6A19\u6E96\u6642(\u30BF\u30B9\u30DE\u30CB\u30A2)", "AET"};
String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30BF\u30B9\u30DE\u30CB\u30A2)", "EST",
"\u6771\u90E8\u590F\u6642\u9593(\u30BF\u30B9\u30DE\u30CB\u30A2)", "EST",
"\u6771\u90E8\u6A19\u6E96\u6642(\u30BF\u30B9\u30DE\u30CB\u30A2)", "ET"};
String TMT[] = new String[] {"\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u6642\u9593", "TMT", String TMT[] = new String[] {"\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u6642\u9593", "TMT",
"\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u590f\u6642\u9593", "TMST", "\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u590f\u6642\u9593", "TMST",
"\u30C8\u30EB\u30AF\u30E1\u30CB\u30B9\u30BF\u30F3\u6642\u9593", "TMT"}; "\u30C8\u30EB\u30AF\u30E1\u30CB\u30B9\u30BF\u30F3\u6642\u9593", "TMT"};
String ULAT[]= new String[] {"\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u6642\u9593", "ULAT", String ULAT[]= new String[] {"\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u6642\u9593", "ULAT",
"\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u590f\u6642\u9593", "ULAST", "\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u590f\u6642\u9593", "ULAST",
"\u30A6\u30E9\u30F3\u30D0\u30FC\u30C8\u30EB\u6642\u9593", "ULAT"}; "\u30A6\u30E9\u30F3\u30D0\u30FC\u30C8\u30EB\u6642\u9593", "ULAT"};
String WART[] = new String[] {"\u897f\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "WART",
"\u897f\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u590f\u6642\u9593", "WARST"};
String WAT[] = new String[] {"\u897f\u30a2\u30d5\u30ea\u30ab\u6642\u9593", "WAT", String WAT[] = new String[] {"\u897f\u30a2\u30d5\u30ea\u30ab\u6642\u9593", "WAT",
"\u897f\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "WAST", "\u897f\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "WAST",
"\u897F\u90E8\u30A2\u30D5\u30EA\u30AB\u6642\u9593", "WAT"}; "\u897F\u90E8\u30A2\u30D5\u30EA\u30AB\u6642\u9593", "WAT"};
@ -254,27 +255,30 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
String WIT[] = new String[] {"\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIB", String WIT[] = new String[] {"\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIB",
"\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "WIST", "\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "WIST",
"\u897F\u90E8\u30A4\u30F3\u30C9\u30CD\u30B7\u30A2\u6642\u9593", "WIB"}; "\u897F\u90E8\u30A4\u30F3\u30C9\u30CD\u30B7\u30A2\u6642\u9593", "WIB"};
String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "WST", String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "AWST",
"\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "WST", "\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "AWDT",
"\u897F\u90E8\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "WT"}; "\u897F\u90E8\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "AWT"};
String SAMOA[] = new String[] {"\u30b5\u30e2\u30a2\u6a19\u6e96\u6642", "SST", String SAMOA[] = new String[] {"\u30b5\u30e2\u30a2\u6a19\u6e96\u6642", "SST",
"\u30b5\u30e2\u30a2\u590f\u6642\u9593", "SDT", "\u30b5\u30e2\u30a2\u590f\u6642\u9593", "SDT",
"\u30B5\u30E2\u30A2\u6642\u9593", "ST"}; "\u30B5\u30E2\u30A2\u6642\u9593", "ST"};
String WST_SAMOA[] = new String[] {"\u897f\u30b5\u30e2\u30a2\u6642\u9593", "WST", String WST_SAMOA[] = new String[] {"\u897f\u30b5\u30e2\u30a2\u6642\u9593", "WSST",
"\u897f\u30b5\u30e2\u30a2\u590f\u6642\u9593", "WSDT", "\u897f\u30b5\u30e2\u30a2\u590f\u6642\u9593", "WSDT",
"\u897F\u30B5\u30E2\u30A2\u6642\u9593", "WST"}; "\u897F\u30B5\u30E2\u30A2\u6642\u9593", "WST"};
String ChST[] = new String[] {"\u30b0\u30a2\u30e0\u6a19\u6e96\u6642", "ChST", String ChST[] = new String[] {"\u30b0\u30a2\u30e0\u6a19\u6e96\u6642", "ChST",
"\u30b0\u30a2\u30e0\u590f\u6642\u9593", "ChDT", "\u30b0\u30a2\u30e0\u590f\u6642\u9593", "ChDT",
"\u30C1\u30E3\u30E2\u30ED\u6642\u9593", "ChT"}; "\u30C1\u30E3\u30E2\u30ED\u6642\u9593", "ChT"};
String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30D3\u30AF\u30C8\u30EA\u30A2)", "EST", String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30D3\u30AF\u30C8\u30EA\u30A2)", "AEST",
"\u6771\u90E8\u590F\u6642\u9593(\u30D3\u30AF\u30C8\u30EA\u30A2)", "EST", "\u6771\u90E8\u590F\u6642\u9593(\u30D3\u30AF\u30C8\u30EA\u30A2)", "AEDT",
"\u6771\u90E8\u6A19\u6E96\u6642(\u30D3\u30AF\u30C8\u30EA\u30A2)", "ET"}; "\u6771\u90E8\u6A19\u6E96\u6642(\u30D3\u30AF\u30C8\u30EA\u30A2)", "AET"};
String UTC[] = new String[] {"\u5354\u5b9a\u4e16\u754c\u6642", "UTC", String UTC[] = new String[] {"\u5354\u5b9a\u4e16\u754c\u6642", "UTC",
"\u5354\u5b9a\u4e16\u754c\u6642", "UTC", "\u5354\u5b9a\u4e16\u754c\u6642", "UTC",
"\u5354\u5B9A\u4E16\u754C\u6642", "UTC"}; "\u5354\u5B9A\u4E16\u754C\u6642", "UTC"};
String UZT[] = new String[] {"\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u6642\u9593", "UZT", String UZT[] = new String[] {"\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u6642\u9593", "UZT",
"\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "UZST", "\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "UZST",
"\u30A6\u30BA\u30D9\u30AD\u30B9\u30BF\u30F3\u6642\u9593", "UZT"}; "\u30A6\u30BA\u30D9\u30AD\u30B9\u30BF\u30F3\u6642\u9593", "UZT"};
String XJT[] = new String[] {"\u4e2d\u56fd\u6a19\u6e96\u6642", "XJT",
"\u4e2d\u56fd\u590f\u6642\u9593", "XJDT",
"\u4E2D\u56FD\u6642\u9593", "XJT"};
return new Object[][] { return new Object[][] {
{"America/Los_Angeles", PST}, {"America/Los_Angeles", PST},
@ -336,7 +340,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{"Africa/Djibouti", EAT}, {"Africa/Djibouti", EAT},
{"Africa/Douala", WAT}, {"Africa/Douala", WAT},
{"Africa/El_Aaiun", WET}, {"Africa/El_Aaiun", WET},
{"Africa/Freetown", SLST}, {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT}, {"Africa/Gaborone", CAT},
{"Africa/Harare", CAT}, {"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST}, {"Africa/Johannesburg", SAST},
@ -437,7 +441,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
"\u897f\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9\u590f\u6642\u9593", "WGST", "\u897f\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9\u590f\u6642\u9593", "WGST",
"\u897F\u90E8\u30B0\u30EA\u30FC\u30F3\u30E9\u30F3\u30C9\u6642\u9593", "WGT"}}, "\u897F\u90E8\u30B0\u30EA\u30FC\u30F3\u30E9\u30F3\u30C9\u6642\u9593", "WGT"}},
{"America/Goose_Bay", AST}, {"America/Goose_Bay", AST},
{"America/Grand_Turk", EST}, {"America/Grand_Turk", AST},
{"America/Grenada", AST}, {"America/Grenada", AST},
{"America/Guadeloupe", AST}, {"America/Guadeloupe", AST},
{"America/Guatemala", CST}, {"America/Guatemala", CST},
@ -484,9 +488,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{"America/Mendoza", AGT}, {"America/Mendoza", AGT},
{"America/Menominee", CST}, {"America/Menominee", CST},
{"America/Merida", CST}, {"America/Merida", CST},
{"America/Metlakatla", new String[] {"\u30E1\u30C8\u30E9\u30AB\u30C8\u30E9\u6A19\u6E96\u6642\u9593", "MeST", {"America/Metlakatla", PST},
"\u30E1\u30C8\u30E9\u30AB\u30C8\u30E9\u590F\u6642\u9593", "MeDT",
"\u30E1\u30C8\u30E9\u30AB\u30C8\u30E9\u6642\u9593", "MeT"}},
{"America/Mexico_City", CST}, {"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u6a19\u6e96\u6642", "PMST", {"America/Miquelon", new String[] {"\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u6a19\u6e96\u6642", "PMST",
"\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u590f\u6642\u9593", "PMDT", "\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u590f\u6642\u9593", "PMDT",
@ -607,6 +609,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
"\u30d6\u30eb\u30cd\u30a4\u590f\u6642\u9593", "BNST", "\u30d6\u30eb\u30cd\u30a4\u590f\u6642\u9593", "BNST",
"\u30D6\u30EB\u30CD\u30A4\u6642\u9593", "BNT"}}, "\u30D6\u30EB\u30CD\u30A4\u6642\u9593", "BNT"}},
{"Asia/Calcutta", IST}, {"Asia/Calcutta", IST},
{"Asia/Chita", IRKT},
{"Asia/Choibalsan", new String[] {"\u30c1\u30e7\u30a4\u30d0\u30eb\u30b5\u30f3\u6642\u9593", "CHOT", {"Asia/Choibalsan", new String[] {"\u30c1\u30e7\u30a4\u30d0\u30eb\u30b5\u30f3\u6642\u9593", "CHOT",
"\u30c1\u30e7\u30a4\u30d0\u30eb\u30b5\u30f3\u590f\u6642\u9593", "CHOST", "\u30c1\u30e7\u30a4\u30d0\u30eb\u30b5\u30f3\u590f\u6642\u9593", "CHOST",
"\u30C1\u30E7\u30A4\u30D0\u30EB\u30B5\u30F3\u6642\u9593", "CHOT"}}, "\u30C1\u30E7\u30A4\u30D0\u30EB\u30B5\u30F3\u6642\u9593", "CHOT"}},
@ -631,9 +634,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{"Asia/Hovd", new String[] {"\u30db\u30d6\u30c9\u6642\u9593", "HOVT", {"Asia/Hovd", new String[] {"\u30db\u30d6\u30c9\u6642\u9593", "HOVT",
"\u30db\u30d6\u30c9\u590f\u6642\u9593", "HOVST", "\u30db\u30d6\u30c9\u590f\u6642\u9593", "HOVST",
"\u30DB\u30D6\u30C9\u6642\u9593", "HOVT"}}, "\u30DB\u30D6\u30C9\u6642\u9593", "HOVT"}},
{"Asia/Irkutsk", new String[] {"\u30a4\u30eb\u30af\u30fc\u30c4\u30af\u6642\u9593", "IRKT", {"Asia/Irkutsk", IRKT},
"\u30a4\u30eb\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "IRKST",
"\u30A4\u30EB\u30AF\u30FC\u30C4\u30AF\u6642\u9593", "IRKT"}},
{"Asia/Istanbul", EET}, {"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT}, {"Asia/Jakarta", WIT},
{"Asia/Jayapura", new String[] {"\u6771\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIT", {"Asia/Jayapura", new String[] {"\u6771\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIT",
@ -646,16 +647,14 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
"\u30da\u30c8\u30ed\u30d1\u30d6\u30ed\u30d5\u30b9\u30af\u30ab\u30e0\u30c1\u30e3\u30c4\u30ad\u30fc\u590f\u6642\u9593", "PETST", "\u30da\u30c8\u30ed\u30d1\u30d6\u30ed\u30d5\u30b9\u30af\u30ab\u30e0\u30c1\u30e3\u30c4\u30ad\u30fc\u590f\u6642\u9593", "PETST",
"\u30DA\u30C8\u30ED\u30D1\u30D6\u30ED\u30D5\u30B9\u30AF\u30FB\u30AB\u30E0\u30C1\u30E3\u30C4\u30AD\u30FC\u6642\u9593", "PETT"}}, "\u30DA\u30C8\u30ED\u30D1\u30D6\u30ED\u30D5\u30B9\u30AF\u30FB\u30AB\u30E0\u30C1\u30E3\u30C4\u30AD\u30FC\u6642\u9593", "PETT"}},
{"Asia/Karachi", PKT}, {"Asia/Karachi", PKT},
{"Asia/Kashgar", CTT}, {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT}, {"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT}, {"Asia/Katmandu", NPT},
{"Asia/Khandyga", new String[] {"\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u6642\u9593", "YAKT", {"Asia/Khandyga", new String[] {"\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u6642\u9593", "YAKT",
"\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u590F\u6642\u9593", "YAKST", "\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u590F\u6642\u9593", "YAKST",
"\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u6642\u9593", "YAKT"}}, "\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u6642\u9593", "YAKT"}},
{"Asia/Kolkata", IST}, {"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u6642\u9593", "KRAT", {"Asia/Krasnoyarsk", KRAT},
"\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u590f\u6642\u9593", "KRAST",
"\u30AF\u30E9\u30B9\u30CE\u30E4\u30EB\u30B9\u30AF\u6642\u9593", "KRAT"}},
{"Asia/Kuala_Lumpur", MYT}, {"Asia/Kuala_Lumpur", MYT},
{"Asia/Kuching", MYT}, {"Asia/Kuching", MYT},
{"Asia/Kuwait", ARAST}, {"Asia/Kuwait", ARAST},
@ -670,7 +669,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
"\u30D5\u30A3\u30EA\u30D4\u30F3\u6642\u9593", "PHT"}}, "\u30D5\u30A3\u30EA\u30D4\u30F3\u6642\u9593", "PHT"}},
{"Asia/Muscat", GST}, {"Asia/Muscat", GST},
{"Asia/Nicosia", EET}, {"Asia/Nicosia", EET},
{"Asia/Novokuznetsk", NOVT}, {"Asia/Novokuznetsk", KRAT},
{"Asia/Novosibirsk", NOVT}, {"Asia/Novosibirsk", NOVT},
{"Asia/Oral", new String[] {"\u30aa\u30e9\u30eb\u6642\u9593", "ORAT", {"Asia/Oral", new String[] {"\u30aa\u30e9\u30eb\u6642\u9593", "ORAT",
"\u30aa\u30e9\u30eb\u590f\u6642\u9593", "ORAST", "\u30aa\u30e9\u30eb\u590f\u6642\u9593", "ORAST",
@ -696,6 +695,9 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{"Asia/Samarkand", UZT}, {"Asia/Samarkand", UZT},
{"Asia/Seoul", KST}, {"Asia/Seoul", KST},
{"Asia/Singapore", SGT}, {"Asia/Singapore", SGT},
{"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
"Srednekolymsk Daylight Time", "SREDT",
"Srednekolymsk Time", "SRET"}},
{"Asia/Taipei", CTT}, {"Asia/Taipei", CTT},
{"Asia/Tel_Aviv", ISRAEL}, {"Asia/Tel_Aviv", ISRAEL},
{"Asia/Tashkent", UZT}, {"Asia/Tashkent", UZT},
@ -708,7 +710,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{"Asia/Ujung_Pandang", CIT}, {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT}, {"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT}, {"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT}, {"Asia/Urumqi", XJT},
{"Asia/Ust-Nera", new String[] {"\u30A6\u30B9\u30C1\u30CD\u30E9\u6642\u9593", "VLAT", {"Asia/Ust-Nera", new String[] {"\u30A6\u30B9\u30C1\u30CD\u30E9\u6642\u9593", "VLAT",
"\u30A6\u30B9\u30C1\u30CD\u30E9\u590F\u6642\u9593", "VLAST", "\u30A6\u30B9\u30C1\u30CD\u30E9\u590F\u6642\u9593", "VLAST",
"\u30A6\u30B9\u30C1\u30CD\u30E9\u6642\u9593", "VLAT"}}, "\u30A6\u30B9\u30C1\u30CD\u30E9\u6642\u9593", "VLAT"}},
@ -750,9 +752,9 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{"Australia/Canberra", EST_NSW}, {"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW}, {"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN}, {"Australia/Darwin", DARWIN},
{"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CWST", {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "ACWST",
"\u4E2D\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CWST", "\u4E2D\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "ACWDT",
"\u4E2D\u897F\u90E8\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CWT"}}, "\u4E2D\u897F\u90E8\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "ACWT"}},
{"Australia/Hobart", TASMANIA}, {"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE}, {"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE}, {"Australia/Lindeman", BRISBANE},
@ -818,7 +820,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST}, {"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET}, {"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST}, {"Europe/Jersey", GMTBST},
{"Europe/Kaliningrad", FET}, {"Europe/Kaliningrad", EET},
{"Europe/Kiev", EET}, {"Europe/Kiev", EET},
{"Europe/Lisbon", WET}, {"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET}, {"Europe/Ljubljana", CET},
@ -853,9 +855,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{"Europe/Vatican", CET}, {"Europe/Vatican", CET},
{"Europe/Vienna", CET}, {"Europe/Vienna", CET},
{"Europe/Vilnius", EET}, {"Europe/Vilnius", EET},
{"Europe/Volgograd", new String[] {"\u30dc\u30eb\u30b4\u30b0\u30e9\u30fc\u30c9\u6642\u9593", "VOLT", {"Europe/Volgograd", MSK},
"\u30dc\u30eb\u30b4\u30b0\u30e9\u30fc\u30c9\u590f\u6642\u9593", "VOLST",
"\u30DC\u30EB\u30B4\u30B0\u30E9\u30FC\u30C9\u6642\u9593", "VOLT"}},
{"Europe/Warsaw", CET}, {"Europe/Warsaw", CET},
{"Europe/Zagreb", CET}, {"Europe/Zagreb", CET},
{"Europe/Zaporozhye", EET}, {"Europe/Zaporozhye", EET},

104
jdk/src/jdk.localedata/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
View File

@ -48,9 +48,9 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
String ACT[] = new String[] {"\uc5d0\uc774\ucee4 \uc2dc\uac04", "ACT", String ACT[] = new String[] {"\uc5d0\uc774\ucee4 \uc2dc\uac04", "ACT",
"\uc5d0\uc774\ucee4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ACST", "\uc5d0\uc774\ucee4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ACST",
"\uc5d0\uc774\ucee4 \uc2dc\uac04", "ACT"}; "\uc5d0\uc774\ucee4 \uc2dc\uac04", "ACT"};
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)", "ACST",
"\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)", "ACDT",
"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CT"}; "\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "ACT"};
String AGT[] = new String[] {"\uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "ART", String AGT[] = new String[] {"\uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "ART",
"\uc544\ub974\ud5e8\ud2f0\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ARST", "\uc544\ub974\ud5e8\ud2f0\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ARST",
"\uC544\uB974\uD5E8\uD2F0\uB098 \uD45C\uC900\uC2DC", "ART"}; "\uC544\uB974\uD5E8\uD2F0\uB098 \uD45C\uC900\uC2DC", "ART"};
@ -72,12 +72,12 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
String BDT[] = new String[] {"\ubc29\uae00\ub77c\ub370\uc2dc \uc2dc\uac04", "BDT", String BDT[] = new String[] {"\ubc29\uae00\ub77c\ub370\uc2dc \uc2dc\uac04", "BDT",
"\ubc29\uae00\ub77c\ub370\uc2dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BDST", "\ubc29\uae00\ub77c\ub370\uc2dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BDST",
"\uBC29\uAE00\uB77C\uB370\uC2DC \uD45C\uC900\uC2DC", "BDT"}; "\uBC29\uAE00\uB77C\uB370\uC2DC \uD45C\uC900\uC2DC", "BDT"};
String BRISBANE[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD038\uC990\uB79C\uB4DC)", "EST", String BRISBANE[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD038\uC990\uB79C\uB4DC)", "AEST",
"\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD038\uC990\uB79C\uB4DC)", "EST", "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD038\uC990\uB79C\uB4DC)", "AEDT",
"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD038\uC990\uB79C\uB4DC)", "ET"}; "\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD038\uC990\uB79C\uB4DC)", "AET"};
String BROKEN_HILL[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "CST", String BROKEN_HILL[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "ACST",
"\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "CST", "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "ACDT",
"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "CT"}; "\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "ACT"};
String BRT[] = new String[] {"\ube0c\ub77c\uc9c8\ub9ac\uc544 \uc2dc\uac04", "BRT", String BRT[] = new String[] {"\ube0c\ub77c\uc9c8\ub9ac\uc544 \uc2dc\uac04", "BRT",
"\ube0c\ub77c\uc9c8\ub9ac\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BRST", "\ube0c\ub77c\uc9c8\ub9ac\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BRST",
"\uBE0C\uB77C\uC9C8\uB9AC\uC544 \uD45C\uC900\uC2DC", "BRT"}; "\uBE0C\uB77C\uC9C8\uB9AC\uC544 \uD45C\uC900\uC2DC", "BRT"};
@ -111,9 +111,9 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
String CUBA[] = new String[] {"\ucfe0\ubc14 \ud45c\uc900\uc2dc", "CST", String CUBA[] = new String[] {"\ucfe0\ubc14 \ud45c\uc900\uc2dc", "CST",
"\ucfe0\ubc14 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT", "\ucfe0\ubc14 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT",
"\uCFE0\uBC14 \uD45C\uC900\uC2DC", "CT"}; "\uCFE0\uBC14 \uD45C\uC900\uC2DC", "CT"};
String DARWIN[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uBD81\uBD80 \uC9C0\uC5ED)", "CST", String DARWIN[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uBD81\uBD80 \uC9C0\uC5ED)", "ACST",
"\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBD81\uBD80 \uC9C0\uC5ED)", "CST", "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBD81\uBD80 \uC9C0\uC5ED)", "ACDT",
"\uC911\uBD80 \uD45C\uC900\uC2DC(\uBD81\uBD80 \uC9C0\uC5ED)", "CT"}; "\uC911\uBD80 \uD45C\uC900\uC2DC(\uBD81\uBD80 \uC9C0\uC5ED)", "ACT"};
String DUBLIN[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT", String DUBLIN[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT",
"\uc544\uc77c\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IST", "\uc544\uc77c\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IST",
"\uC544\uC77C\uB79C\uB4DC \uD45C\uC900\uC2DC", "IT"}; "\uC544\uC77C\uB79C\uB4DC \uD45C\uC900\uC2DC", "IT"};
@ -132,9 +132,9 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
String EST[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc", "EST", String EST[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc", "EST",
"\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EDT", "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EDT",
"\uB3D9\uBD80 \uD45C\uC900\uC2DC", "ET"}; "\uB3D9\uBD80 \uD45C\uC900\uC2DC", "ET"};
String EST_NSW[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "EST", String EST_NSW[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "AEST",
"\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "EST", "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "AEDT",
"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "ET"}; "\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "AET"};
String FET[] = new String[] {"\uADF9\uB3D9 \uC720\uB7FD \uD45C\uC900\uC2DC", "FET", String FET[] = new String[] {"\uADF9\uB3D9 \uC720\uB7FD \uD45C\uC900\uC2DC", "FET",
"\uADF9\uB3D9 \uC720\uB7FD \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "FEST", "\uADF9\uB3D9 \uC720\uB7FD \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "FEST",
"\uADF9\uB3D9 \uC720\uB7FD \uD45C\uC900\uC2DC", "FET"}; "\uADF9\uB3D9 \uC720\uB7FD \uD45C\uC900\uC2DC", "FET"};
@ -165,6 +165,9 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
String ICT[] = new String[] {"\uc778\ub3c4\ucc28\uc774\ub098 \ubc18\ub3c4 \uc2dc\uac04", "ICT", String ICT[] = new String[] {"\uc778\ub3c4\ucc28\uc774\ub098 \ubc18\ub3c4 \uc2dc\uac04", "ICT",
"\uc778\ub3c4\ucc28\uc774\ub098 \ubc18\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ICST", "\uc778\ub3c4\ucc28\uc774\ub098 \ubc18\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ICST",
"\uC778\uB3C4\uCC28\uC774\uB098 \uBC18\uB3C4 \uD45C\uC900\uC2DC", "ICT"}; "\uC778\uB3C4\uCC28\uC774\uB098 \uBC18\uB3C4 \uD45C\uC900\uC2DC", "ICT"};
String IRKT[] = new String[] {"\uc774\ub974\ucfe0\uce20\ud06c \uc2dc\uac04", "IRKT",
"\uc774\ub974\ucfe0\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IRKST",
"\uC774\uB974\uCFE0\uCE20\uD06C \uD45C\uC900\uC2DC", "IRKT"};
String IRT[] = new String[] {"\uc774\ub780 \ud45c\uc900\uc2dc", "IRST", String IRT[] = new String[] {"\uc774\ub780 \ud45c\uc900\uc2dc", "IRST",
"\uc774\ub780 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IRDT", "\uc774\ub780 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IRDT",
"\uC774\uB780 \uD45C\uC900\uC2DC", "IRT"}; "\uC774\uB780 \uD45C\uC900\uC2DC", "IRT"};
@ -177,11 +180,14 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
String JST[] = new String[] {"\uc77c\ubcf8 \ud45c\uc900\uc2dc", "JST", String JST[] = new String[] {"\uc77c\ubcf8 \ud45c\uc900\uc2dc", "JST",
"\uc77c\ubcf8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "JDT", "\uc77c\ubcf8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "JDT",
"\uC77C\uBCF8 \uD45C\uC900\uC2DC", "JT"}; "\uC77C\uBCF8 \uD45C\uC900\uC2DC", "JT"};
String KRAT[] = new String[] {"\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc2dc\uac04", "KRAT",
"\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KRAST",
"\uD06C\uB77C\uC2A4\uB178\uC57C\uB974\uC2A4\uD06C \uD45C\uC900\uC2DC", "KRAT"};
String KST[] = new String[] {"\ud55c\uad6d \ud45c\uc900\uc2dc", "KST", String KST[] = new String[] {"\ud55c\uad6d \ud45c\uc900\uc2dc", "KST",
"\ud55c\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KDT", "\ud55c\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KDT",
"\uB300\uD55C\uBBFC\uAD6D \uD45C\uC900\uC2DC", "KT"}; "\uB300\uD55C\uBBFC\uAD6D \uD45C\uC900\uC2DC", "KT"};
String LORD_HOWE[] = new String[] {"\ub85c\ub4dc \ud558\uc6b0 \ud45c\uc900\uc2dc", "LHST", String LORD_HOWE[] = new String[] {"\ub85c\ub4dc \ud558\uc6b0 \ud45c\uc900\uc2dc", "LHST",
"\ub85c\ub4dc \ud558\uc6b0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "LHST", "\ub85c\ub4dc \ud558\uc6b0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "LHDT",
"\uB85C\uB4DC\uD558\uC6B0 \uD45C\uC900\uC2DC", "LHT"}; "\uB85C\uB4DC\uD558\uC6B0 \uD45C\uC900\uC2DC", "LHT"};
String MHT[] = new String[] {"\ub9c8\uc15c\uc81c\ub3c4 \uc2dc\uac04", "MHT", String MHT[] = new String[] {"\ub9c8\uc15c\uc81c\ub3c4 \uc2dc\uac04", "MHT",
"\ub9c8\uc15c\uc81c\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MHST", "\ub9c8\uc15c\uc81c\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MHST",
@ -231,20 +237,15 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
String SGT[] = new String[] {"\uc2f1\uac00\ud3ec\ub974 \uc2dc\uac04", "SGT", String SGT[] = new String[] {"\uc2f1\uac00\ud3ec\ub974 \uc2dc\uac04", "SGT",
"\uc2f1\uac00\ud3ec\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SGST", "\uc2f1\uac00\ud3ec\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SGST",
"\uC2F1\uAC00\uD3EC\uB974 \uD45C\uC900\uC2DC", "SGT"}; "\uC2F1\uAC00\uD3EC\uB974 \uD45C\uC900\uC2DC", "SGT"};
String SLST[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT", String TASMANIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "AEST",
"\uc2dc\uc5d0\ub77c\ub9ac\uc628 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SLST", "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "AEDT",
"\uC2DC\uC5D0\uB77C\uB9AC\uC628 \uD45C\uC900\uC2DC", "SLT"}; "\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "AET"};
String TASMANIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "EST",
"\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "EST",
"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "ET"};
String TMT[] = new String[] {"\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc2dc\uac04", "TMT", String TMT[] = new String[] {"\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc2dc\uac04", "TMT",
"\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TMST", "\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TMST",
"\uD22C\uB974\uD06C\uBA54\uB2C8\uC2A4\uD0C4 \uD45C\uC900\uC2DC", "TMT"}; "\uD22C\uB974\uD06C\uBA54\uB2C8\uC2A4\uD0C4 \uD45C\uC900\uC2DC", "TMT"};
String ULAT[]= new String[] {"\uc6b8\ub780\ubc14\ud0c0\ub974 \uc2dc\uac04", "ULAT", String ULAT[]= new String[] {"\uc6b8\ub780\ubc14\ud0c0\ub974 \uc2dc\uac04", "ULAT",
"\uc6b8\ub780\ubc14\ud0c0\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ULAST", "\uc6b8\ub780\ubc14\ud0c0\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ULAST",
"\uC6B8\uB780\uBC14\uD1A0\uB974 \uD45C\uC900\uC2DC", "ULAT"}; "\uC6B8\uB780\uBC14\uD1A0\uB974 \uD45C\uC900\uC2DC", "ULAT"};
String WART[] = new String[] {"\uc11c\ubd80 \uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "WART",
"\uc11c\ubd80 \uc544\ub974\ud5e8\ud2f0\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WARST"};
String WAT[] = new String[] {"\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc2dc\uac04", "WAT", String WAT[] = new String[] {"\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc2dc\uac04", "WAT",
"\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WAST", "\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WAST",
"\uC11C\uBD80 \uC544\uD504\uB9AC\uCE74 \uD45C\uC900\uC2DC", "WAT"}; "\uC11C\uBD80 \uC544\uD504\uB9AC\uCE74 \uD45C\uC900\uC2DC", "WAT"};
@ -254,27 +255,30 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
String WIT[] = new String[] {"\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIB", String WIT[] = new String[] {"\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIB",
"\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WIST", "\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WIST",
"\uC11C\uBD80 \uC778\uB3C4\uB124\uC2DC\uC544 \uD45C\uC900\uC2DC", "WIB"}; "\uC11C\uBD80 \uC778\uB3C4\uB124\uC2DC\uC544 \uD45C\uC900\uC2DC", "WIB"};
String WST_AUS[] = new String[] {"\uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "WST", String WST_AUS[] = new String[] {"\uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "AWST",
"\uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "WST", "\uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "AWDT",
"\uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "WT"}; "\uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "AWT"};
String SAMOA[] = new String[] {"\uc0ac\ubaa8\uc544 \ud45c\uc900\uc2dc", "SST", String SAMOA[] = new String[] {"\uc0ac\ubaa8\uc544 \ud45c\uc900\uc2dc", "SST",
"\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SDT", "\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SDT",
"\uC0AC\uBAA8\uC544 \uD45C\uC900\uC2DC", "ST"}; "\uC0AC\uBAA8\uC544 \uD45C\uC900\uC2DC", "ST"};
String WST_SAMOA[] = new String[] {"\uc11c\uc0ac\ubaa8\uc544 \uc2dc\uac04", "WST", String WST_SAMOA[] = new String[] {"\uc11c\uc0ac\ubaa8\uc544 \uc2dc\uac04", "WSST",
"\uc11c\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WSDT", "\uc11c\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WSDT",
"\uC11C\uC0AC\uBAA8\uC544 \uD45C\uC900\uC2DC", "WST"}; "\uC11C\uC0AC\uBAA8\uC544 \uD45C\uC900\uC2DC", "WST"};
String ChST[] = new String[] {"\ucc28\ubaa8\ub85c \ud45c\uc900\uc2dc", "ChST", String ChST[] = new String[] {"\ucc28\ubaa8\ub85c \ud45c\uc900\uc2dc", "ChST",
"\ucc28\ubaa8\ub85c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ChDT", "\ucc28\ubaa8\ub85c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ChDT",
"\uCC28\uBAA8\uB974 \uD45C\uC900\uC2DC", "ChT"}; "\uCC28\uBAA8\uB974 \uD45C\uC900\uC2DC", "ChT"};
String VICTORIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uBE45\uD1A0\uB9AC\uC544)", "EST", String VICTORIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uBE45\uD1A0\uB9AC\uC544)", "AEST",
"\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBE45\uD1A0\uB9AC\uC544)", "EST", "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBE45\uD1A0\uB9AC\uC544)", "AEDT",
"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uBE45\uD1A0\uB9AC\uC544)", "ET"}; "\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uBE45\uD1A0\uB9AC\uC544)", "AET"};
String UTC[] = new String[] {"\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC", String UTC[] = new String[] {"\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC",
"\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC", "\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC",
"\uC9C0\uC5ED \uD45C\uC900\uC2DC", "UTC"}; "\uC9C0\uC5ED \uD45C\uC900\uC2DC", "UTC"};
String UZT[] = new String[] {"\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc2dc\uac04", "UZT", String UZT[] = new String[] {"\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc2dc\uac04", "UZT",
"\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "UZST", "\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "UZST",
"\uC6B0\uC988\uBCA0\uD0A4\uC2A4\uD0C4 \uD45C\uC900\uC2DC", "UZT"}; "\uC6B0\uC988\uBCA0\uD0A4\uC2A4\uD0C4 \uD45C\uC900\uC2DC", "UZT"};
String XJT[] = new String[] {"\uc911\uad6d \ud45c\uc900\uc2dc", "XJT",
"\uc911\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "XJDT",
"\uC911\uAD6D \uD45C\uC900\uC2DC", "XJT"};
return new Object[][] { return new Object[][] {
{"America/Los_Angeles", PST}, {"America/Los_Angeles", PST},
@ -336,7 +340,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{"Africa/Djibouti", EAT}, {"Africa/Djibouti", EAT},
{"Africa/Douala", WAT}, {"Africa/Douala", WAT},
{"Africa/El_Aaiun", WET}, {"Africa/El_Aaiun", WET},
{"Africa/Freetown", SLST}, {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT}, {"Africa/Gaborone", CAT},
{"Africa/Harare", CAT}, {"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST}, {"Africa/Johannesburg", SAST},
@ -437,7 +441,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
"\uc11c\ubd80 \uadf8\ub9b0\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WGST", "\uc11c\ubd80 \uadf8\ub9b0\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WGST",
"\uC11C\uBD80 \uADF8\uB9B0\uB780\uB4DC \uD45C\uC900\uC2DC", "WGT"}}, "\uC11C\uBD80 \uADF8\uB9B0\uB780\uB4DC \uD45C\uC900\uC2DC", "WGT"}},
{"America/Goose_Bay", AST}, {"America/Goose_Bay", AST},
{"America/Grand_Turk", EST}, {"America/Grand_Turk", AST},
{"America/Grenada", AST}, {"America/Grenada", AST},
{"America/Guadeloupe", AST}, {"America/Guadeloupe", AST},
{"America/Guatemala", CST}, {"America/Guatemala", CST},
@ -484,9 +488,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{"America/Mendoza", AGT}, {"America/Mendoza", AGT},
{"America/Menominee", CST}, {"America/Menominee", CST},
{"America/Merida", CST}, {"America/Merida", CST},
{"America/Metlakatla", new String[] {"\uBA54\uD2B8\uB77C\uCE74\uD2B8\uB77C \uD45C\uC900\uC2DC", "MeST", {"America/Metlakatla", PST},
"\uBA54\uD2B8\uB77C\uCE74\uD2B8\uB77C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "MeDT",
"\uBA54\uD2B8\uB77C\uCE74\uD2B8\uB77C \uD45C\uC900\uC2DC", "MeT"}},
{"America/Mexico_City", CST}, {"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \ud45c\uc900\uc2dc", "PMST", {"America/Miquelon", new String[] {"\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \ud45c\uc900\uc2dc", "PMST",
"\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PMDT", "\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PMDT",
@ -607,6 +609,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
"\ube0c\ub8e8\ub098\uc774 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BNST", "\ube0c\ub8e8\ub098\uc774 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BNST",
"\uBE0C\uB8E8\uB098\uC774 \uD45C\uC900\uC2DC", "BNT"}}, "\uBE0C\uB8E8\uB098\uC774 \uD45C\uC900\uC2DC", "BNT"}},
{"Asia/Calcutta", IST}, {"Asia/Calcutta", IST},
{"Asia/Chita", IRKT},
{"Asia/Choibalsan", new String[] {"Choibalsan \uc2dc\uac04", "CHOT", {"Asia/Choibalsan", new String[] {"Choibalsan \uc2dc\uac04", "CHOT",
"Choibalsan \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CHOST", "Choibalsan \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CHOST",
"\uCD08\uC774\uBC1C\uC0B0 \uD45C\uC900\uC2DC", "CHOT"}}, "\uCD08\uC774\uBC1C\uC0B0 \uD45C\uC900\uC2DC", "CHOT"}},
@ -631,9 +634,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{"Asia/Hovd", new String[] {"Hovd \uc2dc\uac04", "HOVT", {"Asia/Hovd", new String[] {"Hovd \uc2dc\uac04", "HOVT",
"Hovd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "HOVST", "Hovd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "HOVST",
"\uD638\uBE0C\uB4DC \uD45C\uC900\uC2DC", "HOVT"}}, "\uD638\uBE0C\uB4DC \uD45C\uC900\uC2DC", "HOVT"}},
{"Asia/Irkutsk", new String[] {"\uc774\ub974\ucfe0\uce20\ud06c \uc2dc\uac04", "IRKT", {"Asia/Irkutsk", IRKT},
"\uc774\ub974\ucfe0\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IRKST",
"\uC774\uB974\uCFE0\uCE20\uD06C \uD45C\uC900\uC2DC", "IRKT"}},
{"Asia/Istanbul", EET}, {"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT}, {"Asia/Jakarta", WIT},
{"Asia/Jayapura", new String[] {"\ub3d9\ubd80 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIT", {"Asia/Jayapura", new String[] {"\ub3d9\ubd80 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIT",
@ -646,16 +647,14 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
"\ud398\ud2b8\ub85c\ud30c\ube14\ub85c\ud504\uc2a4\ud06c-\uce84\ucc28\uce20\ud0a4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PETST", "\ud398\ud2b8\ub85c\ud30c\ube14\ub85c\ud504\uc2a4\ud06c-\uce84\ucc28\uce20\ud0a4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PETST",
"\uD398\uD2B8\uB85C\uD30C\uBE0C\uB85C\uD504\uC2A4\uD06C-\uCE84\uCC28\uCE20\uD0A4 \uD45C\uC900\uC2DC", "PETT"}}, "\uD398\uD2B8\uB85C\uD30C\uBE0C\uB85C\uD504\uC2A4\uD06C-\uCE84\uCC28\uCE20\uD0A4 \uD45C\uC900\uC2DC", "PETT"}},
{"Asia/Karachi", PKT}, {"Asia/Karachi", PKT},
{"Asia/Kashgar", CTT}, {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT}, {"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT}, {"Asia/Katmandu", NPT},
{"Asia/Khandyga", new String[] {"\uD55C\uB514\uAC00 \uD45C\uC900\uC2DC", "YAKT", {"Asia/Khandyga", new String[] {"\uD55C\uB514\uAC00 \uD45C\uC900\uC2DC", "YAKT",
"\uD55C\uB514\uAC00 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "YAKST", "\uD55C\uB514\uAC00 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "YAKST",
"\uD55C\uB514\uAC00 \uD45C\uC900\uC2DC", "YAKT"}}, "\uD55C\uB514\uAC00 \uD45C\uC900\uC2DC", "YAKT"}},
{"Asia/Kolkata", IST}, {"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc2dc\uac04", "KRAT", {"Asia/Krasnoyarsk", KRAT},
"\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KRAST",
"\uD06C\uB77C\uC2A4\uB178\uC57C\uB974\uC2A4\uD06C \uD45C\uC900\uC2DC", "KRAT"}},
{"Asia/Kuala_Lumpur", MYT}, {"Asia/Kuala_Lumpur", MYT},
{"Asia/Kuching", MYT}, {"Asia/Kuching", MYT},
{"Asia/Kuwait", ARAST}, {"Asia/Kuwait", ARAST},
@ -670,7 +669,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
"\uD544\uB9AC\uD540 \uD45C\uC900\uC2DC", "PHT"}}, "\uD544\uB9AC\uD540 \uD45C\uC900\uC2DC", "PHT"}},
{"Asia/Muscat", GST}, {"Asia/Muscat", GST},
{"Asia/Nicosia", EET}, {"Asia/Nicosia", EET},
{"Asia/Novokuznetsk", NOVT}, {"Asia/Novokuznetsk", KRAT},
{"Asia/Novosibirsk", NOVT}, {"Asia/Novosibirsk", NOVT},
{"Asia/Oral", new String[] {"Oral \ud45c\uc900\uc2dc", "ORAT", {"Asia/Oral", new String[] {"Oral \ud45c\uc900\uc2dc", "ORAT",
"Oral \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ORAST", "Oral \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ORAST",
@ -696,6 +695,9 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{"Asia/Samarkand", UZT}, {"Asia/Samarkand", UZT},
{"Asia/Seoul", KST}, {"Asia/Seoul", KST},
{"Asia/Singapore", SGT}, {"Asia/Singapore", SGT},
{"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
"Srednekolymsk Daylight Time", "SREDT",
"Srednekolymsk Time", "SRET"}},
{"Asia/Taipei", CTT}, {"Asia/Taipei", CTT},
{"Asia/Tel_Aviv", ISRAEL}, {"Asia/Tel_Aviv", ISRAEL},
{"Asia/Tashkent", UZT}, {"Asia/Tashkent", UZT},
@ -708,7 +710,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{"Asia/Ujung_Pandang", CIT}, {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT}, {"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT}, {"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT}, {"Asia/Urumqi", XJT},
{"Asia/Ust-Nera", new String[] {"\uC6B0\uC2A4\uD2F0\uB124\uB77C \uD45C\uC900\uC2DC", "VLAT", {"Asia/Ust-Nera", new String[] {"\uC6B0\uC2A4\uD2F0\uB124\uB77C \uD45C\uC900\uC2DC", "VLAT",
"\uC6B0\uC2A4\uD2F0\uB124\uB77C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "VLAST" , "\uC6B0\uC2A4\uD2F0\uB124\uB77C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "VLAST" ,
"\uC6B0\uC2A4\uD2F0\uB124\uB77C \uD45C\uC900\uC2DC", "VLAT"}}, "\uC6B0\uC2A4\uD2F0\uB124\uB77C \uD45C\uC900\uC2DC", "VLAT"}},
@ -750,9 +752,9 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{"Australia/Canberra", EST_NSW}, {"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW}, {"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN}, {"Australia/Darwin", DARWIN},
{"Australia/Eucla", new String[] {"\uC911\uC559 \uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CWST", {"Australia/Eucla", new String[] {"\uC911\uC559 \uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "ACWST",
"\uC911\uC559 \uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CWST", "\uC911\uC559 \uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "ACWDT",
"\uC911\uC559 \uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CWT"}}, "\uC911\uC559 \uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "ACWT"}},
{"Australia/Hobart", TASMANIA}, {"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE}, {"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE}, {"Australia/Lindeman", BRISBANE},
@ -818,7 +820,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST}, {"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET}, {"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST}, {"Europe/Jersey", GMTBST},
{"Europe/Kaliningrad", FET}, {"Europe/Kaliningrad", EET},
{"Europe/Kiev", EET}, {"Europe/Kiev", EET},
{"Europe/Lisbon", WET}, {"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET}, {"Europe/Ljubljana", CET},
@ -853,9 +855,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{"Europe/Vatican", CET}, {"Europe/Vatican", CET},
{"Europe/Vienna", CET}, {"Europe/Vienna", CET},
{"Europe/Vilnius", EET}, {"Europe/Vilnius", EET},
{"Europe/Volgograd", new String[] {"\ubcfc\uace0\uadf8\ub77c\ub4dc \uc2dc\uac04", "VOLT", {"Europe/Volgograd", MSK},
"\ubcfc\uace0\uadf8\ub77c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VOLST",
"\uBCFC\uACE0\uADF8\uB77C\uB4DC \uD45C\uC900\uC2DC", "VOLT"}},
{"Europe/Warsaw", CET}, {"Europe/Warsaw", CET},
{"Europe/Zagreb", CET}, {"Europe/Zagreb", CET},
{"Europe/Zaporozhye", EET}, {"Europe/Zaporozhye", EET},

104
jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
View File

@ -48,9 +48,9 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
String ACT[] = new String[] {"Fuso hor\u00e1rio do Acre", "ACT", String ACT[] = new String[] {"Fuso hor\u00e1rio do Acre", "ACT",
"Fuso hor\u00e1rio de ver\u00e3o do Acre", "ACST", "Fuso hor\u00e1rio de ver\u00e3o do Acre", "ACST",
"Fuso hor\u00e1rio do Acre", "ACT"}; "Fuso hor\u00e1rio do Acre", "ACT"};
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)", "ACST",
"Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul)", "CST", "Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul)", "ACDT",
"Hor\u00E1rio Central (Austr\u00E1lia do Sul)", "CT"}; "Hor\u00E1rio Central (Austr\u00E1lia do Sul)", "ACT"};
String AGT[] = new String[] {"Fuso hor\u00e1rio da Argentina", "ART", String AGT[] = new String[] {"Fuso hor\u00e1rio da Argentina", "ART",
"Fuso hor\u00e1rio de ver\u00e3o da Argentina", "ARST", "Fuso hor\u00e1rio de ver\u00e3o da Argentina", "ARST",
"Hor\u00E1rio da Argentina", "ART"}; "Hor\u00E1rio da Argentina", "ART"};
@ -72,12 +72,12 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
String BDT[] = new String[] {"Fuso hor\u00e1rio de Bangladesh", "BDT", String BDT[] = new String[] {"Fuso hor\u00e1rio de Bangladesh", "BDT",
"Fuso hor\u00e1rio de ver\u00e3o de Bangladesh", "BDST", "Fuso hor\u00e1rio de ver\u00e3o de Bangladesh", "BDST",
"Hor\u00E1rio de Bangladesh", "BDT"}; "Hor\u00E1rio de Bangladesh", "BDT"};
String BRISBANE[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Queensland)", "EST", String BRISBANE[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Queensland)", "AEST",
"Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Queensland)", "EST", "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Queensland)", "AEDT",
"Hor\u00E1rio do Leste (Queensland)", "ET"}; "Hor\u00E1rio do Leste (Queensland)", "AET"};
String BROKEN_HILL[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "CST", String BROKEN_HILL[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "ACST",
"Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "CST", "Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "ACDT",
"Hor\u00E1rio Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "CT"}; "Hor\u00E1rio Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "ACT"};
String BRT[] = new String[] {"Fuso hor\u00e1rio de Bras\u00edlia", "BRT", String BRT[] = new String[] {"Fuso hor\u00e1rio de Bras\u00edlia", "BRT",
"Fuso hor\u00e1rio de ver\u00e3o de Bras\u00edlia", "BRST", "Fuso hor\u00e1rio de ver\u00e3o de Bras\u00edlia", "BRST",
"Hor\u00E1rio de Bras\u00EDlia", "BRT"}; "Hor\u00E1rio de Bras\u00EDlia", "BRT"};
@ -108,9 +108,9 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
String CUBA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Cuba", "CST", String CUBA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Cuba", "CST",
"Hor\u00e1rio de luz natural de Cuba", "CDT", "Hor\u00e1rio de luz natural de Cuba", "CDT",
"Hor\u00E1rio de Cuba", "CT"}; "Hor\u00E1rio de Cuba", "CT"};
String DARWIN[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Territ\u00F3rio do Norte)", "CST", String DARWIN[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Territ\u00F3rio do Norte)", "ACST",
"Fuso Hor\u00E1rio de Ver\u00E3o Central (Territ\u00F3rio do Norte)", "CST", "Fuso Hor\u00E1rio de Ver\u00E3o Central (Territ\u00F3rio do Norte)", "ACDT",
"Hor\u00E1rio Central (Territ\u00F3rio do Norte)", "CT"}; "Hor\u00E1rio Central (Territ\u00F3rio do Norte)", "ACT"};
String DUBLIN[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT", String DUBLIN[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT",
"Fuso hor\u00e1rio de ver\u00e3o da Irlanda", "IST", "Fuso hor\u00e1rio de ver\u00e3o da Irlanda", "IST",
"Hor\u00E1rio da Rep\u00FAblica da Irlanda", "IT"}; "Hor\u00E1rio da Rep\u00FAblica da Irlanda", "IT"};
@ -129,9 +129,9 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
String EST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental", "EST", String EST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental", "EST",
"Hor\u00e1rio de luz natural oriental", "EDT", "Hor\u00e1rio de luz natural oriental", "EDT",
"Hor\u00E1rio do Leste", "ET"}; "Hor\u00E1rio do Leste", "ET"};
String EST_NSW[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Oriental (Nova Gales do Sul)", "EST", String EST_NSW[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Oriental (Nova Gales do Sul)", "AEST",
"Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Nova Gales do Sul)", "EST", "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Nova Gales do Sul)", "AEDT",
"Hor\u00E1rio Oriental (Nova Gales do Sul)", "ET"}; "Hor\u00E1rio Oriental (Nova Gales do Sul)", "AET"};
String FET[] = new String[] {"Hor\u00E1rio do Extremo Leste Europeu (FET)", "FET", String FET[] = new String[] {"Hor\u00E1rio do Extremo Leste Europeu (FET)", "FET",
"Fuso Hor\u00E1rio de Ver\u00E3o do Extremo Leste Europeu", "FEST", "Fuso Hor\u00E1rio de Ver\u00E3o do Extremo Leste Europeu", "FEST",
"Hor\u00E1rio do Extremo Leste Europeu (FET)", "FET"}; "Hor\u00E1rio do Extremo Leste Europeu (FET)", "FET"};
@ -162,6 +162,9 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
String ICT[] = new String[] {"Fuso hor\u00e1rio da Indochina", "ICT", String ICT[] = new String[] {"Fuso hor\u00e1rio da Indochina", "ICT",
"Fuso hor\u00e1rio de ver\u00e3o da Indochina", "ICST", "Fuso hor\u00e1rio de ver\u00e3o da Indochina", "ICST",
"Hor\u00E1rio da Indochina", "ICT"}; "Hor\u00E1rio da Indochina", "ICT"};
String IRKT[] = new String[] {"Fuso hor\u00e1rio de Irkutsk", "IRKT",
"Fuso hor\u00e1rio de ver\u00e3o de Irkutsk", "IRKST",
"Hor\u00E1rio de Irkutsk", "IRKT"};
String IRT[] = new String[] {"Fuso hor\u00e1rio do Ir\u00e3", "IRST", String IRT[] = new String[] {"Fuso hor\u00e1rio do Ir\u00e3", "IRST",
"Hor\u00e1rio de luz natural do Ir\u00e3", "IRDT", "Hor\u00e1rio de luz natural do Ir\u00e3", "IRDT",
"Hor\u00E1rio do Ir\u00E3", "IRT"}; "Hor\u00E1rio do Ir\u00E3", "IRT"};
@ -174,11 +177,14 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
String JST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Jap\u00e3o", "JST", String JST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Jap\u00e3o", "JST",
"Hor\u00e1rio de luz natural do Jap\u00e3o", "JDT", "Hor\u00e1rio de luz natural do Jap\u00e3o", "JDT",
"Hor\u00E1rio do Jap\u00E3o", "JT"}; "Hor\u00E1rio do Jap\u00E3o", "JT"};
String KRAT[] = new String[] {"Fuso hor\u00e1rio de Krasnoyarsk", "KRAT",
"Fuso hor\u00e1rio de ver\u00e3o de Krasnoyarsk", "KRAST",
"Hor\u00E1rio de Krasnoyarsk", "KRAT"};
String KST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da Coreia", "KST", String KST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da Coreia", "KST",
"Hor\u00e1rio de luz natural da Coreia", "KDT", "Hor\u00e1rio de luz natural da Coreia", "KDT",
"Hor\u00E1rio da Coreia", "KT"}; "Hor\u00E1rio da Coreia", "KT"};
String LORD_HOWE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Lord Howe", "LHST", String LORD_HOWE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Lord Howe", "LHST",
"Fuso hor\u00e1rio de ver\u00e3o de Lord Howe", "LHST", "Fuso hor\u00e1rio de ver\u00e3o de Lord Howe", "LHDT",
"Hor\u00E1rio de Lord Howe", "LHT"}; "Hor\u00E1rio de Lord Howe", "LHT"};
String MHT[] = new String[] {"Fuso hor\u00e1rio das Ilhas Marshall", "MHT", String MHT[] = new String[] {"Fuso hor\u00e1rio das Ilhas Marshall", "MHT",
"Fuso hor\u00e1rio de ver\u00e3o das Ilhas Marshall", "MHST", "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Marshall", "MHST",
@ -228,12 +234,9 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
String SGT[] = new String[] {"Fuso hor\u00e1rio de Cingapura", "SGT", String SGT[] = new String[] {"Fuso hor\u00e1rio de Cingapura", "SGT",
"Fuso hor\u00e1rio de ver\u00e1 de Cingapura", "SGST", "Fuso hor\u00e1rio de ver\u00e1 de Cingapura", "SGST",
"Hor\u00E1rio de Cingapura", "SGT"}; "Hor\u00E1rio de Cingapura", "SGT"};
String SLST[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT", String TASMANIA[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Tasm\u00E2nia)", "AEST",
"Fuso hor\u00e1rio de ver\u00e3o de Serra Leoa", "SLST", "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Tasm\u00E2nia)", "AEDT",
"Hor\u00E1rio de Serra Leoa", "SLT"}; "Hor\u00E1rio do Leste (Tasm\u00E2nia)", "AET"};
String TASMANIA[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Tasm\u00E2nia)", "EST",
"Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Tasm\u00E2nia)", "EST",
"Hor\u00E1rio do Leste (Tasm\u00E2nia)", "ET"};
String TMT[] = new String[] {"Fuso hor\u00e1rio do Turcomenist\u00e3o", "TMT", String TMT[] = new String[] {"Fuso hor\u00e1rio do Turcomenist\u00e3o", "TMT",
"Fuso hor\u00e1rio de ver\u00e3o do Turcomenist\u00e3o", "TMST", "Fuso hor\u00e1rio de ver\u00e3o do Turcomenist\u00e3o", "TMST",
"Hor\u00E1rio do Turcomenist\u00E3o", "TMT"}; "Hor\u00E1rio do Turcomenist\u00E3o", "TMT"};
@ -252,29 +255,30 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
String WIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Ocidental", "WIB", String WIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Ocidental", "WIB",
"Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Ocidental", "WIST", "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Ocidental", "WIST",
"Hor\u00E1rio da Indon\u00E9sia Ocidental", "WIB"}; "Hor\u00E1rio da Indon\u00E9sia Ocidental", "WIB"};
String WST_AUS[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Ocidental (Austr\u00E1lia)", "WST", String WST_AUS[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Ocidental (Austr\u00E1lia)", "AWST",
"Fuso Hor\u00E1rio de Ver\u00E3o Ocidental (Austr\u00E1lia)", "WST", "Fuso Hor\u00E1rio de Ver\u00E3o Ocidental (Austr\u00E1lia)", "AWDT",
"Hor\u00E1rio Ocidental (Austr\u00E1lia)", "WT"}; "Hor\u00E1rio Ocidental (Austr\u00E1lia)", "AWT"};
String SAMOA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Samoa", "SST", String SAMOA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Samoa", "SST",
"Hor\u00e1rio de luz natural de Samoa", "SDT", "Hor\u00e1rio de luz natural de Samoa", "SDT",
"Hor\u00E1rio da Samoa", "ST"}; "Hor\u00E1rio da Samoa", "ST"};
String WST_SAMOA[] = new String[] {"Fuso hor\u00e1rio de Samoa Ocidental", "WST", String WST_SAMOA[] = new String[] {"Fuso hor\u00e1rio de Samoa Ocidental", "WSST",
"Fuso hor\u00e1rio de ver\u00e3o de Samoa Ocidental", "WSDT", "Fuso hor\u00e1rio de ver\u00e3o de Samoa Ocidental", "WSDT",
"Fuso Hor\u00E1rio de Samoa Ocidental", "WST"}; "Fuso Hor\u00E1rio de Samoa Ocidental", "WST"};
String ChST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Chamorro", "ChST", String ChST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Chamorro", "ChST",
"Hor\u00e1rio de luz natural de Chamorro", "ChDT", "Hor\u00e1rio de luz natural de Chamorro", "ChDT",
"Hor\u00E1rio de Chamorro", "ChT"}; "Hor\u00E1rio de Chamorro", "ChT"};
String VICTORIA[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Victoria)", "EST", String VICTORIA[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Victoria)", "AEST",
"Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Victoria)", "EST", "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Victoria)", "AEDT",
"Hor\u00E1rio do Leste (Victoria)", "ET"}; "Hor\u00E1rio do Leste (Victoria)", "AET"};
String UTC[] = new String[] {"Tempo universal coordenado", "UTC", String UTC[] = new String[] {"Tempo universal coordenado", "UTC",
"Tempo universal coordenado", "UTC", "Tempo universal coordenado", "UTC",
"Hor\u00E1rio Universal Coordenado", "UTC"}; "Hor\u00E1rio Universal Coordenado", "UTC"};
String UZT[] = new String[] {"Fuso hor\u00e1rio do Uzbequist\u00e3o", "UZT", String UZT[] = new String[] {"Fuso hor\u00e1rio do Uzbequist\u00e3o", "UZT",
"Fuso hor\u00e1rio de ver\u00e3o do Uzbequist\u00e3o", "UZST", "Fuso hor\u00e1rio de ver\u00e3o do Uzbequist\u00e3o", "UZST",
"Hor\u00E1rio do Uzbequist\u00E3o", "UZT"}; "Hor\u00E1rio do Uzbequist\u00E3o", "UZT"};
String WART[] = new String[] {"Fuso hor\u00e1rio da Argentina Ocidental", "WART", String XJT[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da China", "XJT",
"Fuso hor\u00e1rio de ver\u00e3o da Argentina Ocidental", "WARST"}; "Hor\u00e1rio de luz natural da China", "XJDT",
"Hor\u00E1rio da China", "XJT"};
return new Object[][] { return new Object[][] {
{"America/Los_Angeles", PST}, {"America/Los_Angeles", PST},
@ -336,7 +340,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{"Africa/Djibouti", EAT}, {"Africa/Djibouti", EAT},
{"Africa/Douala", WAT}, {"Africa/Douala", WAT},
{"Africa/El_Aaiun", WET}, {"Africa/El_Aaiun", WET},
{"Africa/Freetown", SLST}, {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT}, {"Africa/Gaborone", CAT},
{"Africa/Harare", CAT}, {"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST}, {"Africa/Johannesburg", SAST},
@ -437,7 +441,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
"Fuso hor\u00e1rio de ver\u00e3o da Groenl\u00e2ndia Ocidental", "WGST", "Fuso hor\u00e1rio de ver\u00e3o da Groenl\u00e2ndia Ocidental", "WGST",
"Hor\u00E1rio da Groenl\u00E2ndia Ocidental", "WGT"}}, "Hor\u00E1rio da Groenl\u00E2ndia Ocidental", "WGT"}},
{"America/Goose_Bay", AST}, {"America/Goose_Bay", AST},
{"America/Grand_Turk", EST}, {"America/Grand_Turk", AST},
{"America/Grenada", AST}, {"America/Grenada", AST},
{"America/Guadeloupe", AST}, {"America/Guadeloupe", AST},
{"America/Guatemala", CST}, {"America/Guatemala", CST},
@ -484,9 +488,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{"America/Mendoza", AGT}, {"America/Mendoza", AGT},
{"America/Menominee", CST}, {"America/Menominee", CST},
{"America/Merida", CST}, {"America/Merida", CST},
{"America/Metlakatla", new String[] {"Hor\u00E1rio Padr\u00E3o de Metlakatla", "MeST", {"America/Metlakatla", PST},
"Hor\u00E1rio de Luz Natural de Metlakatla", "MeDT",
"Hor\u00E1rio de Metlakatla", "MeT"}},
{"America/Mexico_City", CST}, {"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Fuso hor\u00e1rio padr\u00e3o de S\u00e3o Pedro e Miquelon", "PMST", {"America/Miquelon", new String[] {"Fuso hor\u00e1rio padr\u00e3o de S\u00e3o Pedro e Miquelon", "PMST",
"Hor\u00e1rio de luz natural de S\u00e3o Pedro e Miquelon", "PMDT", "Hor\u00e1rio de luz natural de S\u00e3o Pedro e Miquelon", "PMDT",
@ -607,6 +609,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
"Fuso hor\u00e1rio de ver\u00e3o de Brunei", "BNST", "Fuso hor\u00e1rio de ver\u00e3o de Brunei", "BNST",
"Hor\u00E1rio de Brunei", "BNT"}}, "Hor\u00E1rio de Brunei", "BNT"}},
{"Asia/Calcutta", IST}, {"Asia/Calcutta", IST},
{"Asia/Chita", IRKT},
{"Asia/Choibalsan", new String[] {"Fuso hor\u00e1rio de Choibalsan", "CHOT", {"Asia/Choibalsan", new String[] {"Fuso hor\u00e1rio de Choibalsan", "CHOT",
"Fuso hor\u00e1rio de ver\u00e3o de Choibalsan", "CHOST", "Fuso hor\u00e1rio de ver\u00e3o de Choibalsan", "CHOST",
"Hor\u00E1rio de Choibalsan", "CHOT"}}, "Hor\u00E1rio de Choibalsan", "CHOT"}},
@ -631,9 +634,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{"Asia/Hovd", new String[] {"Fuso hor\u00e1rio de Hovd", "HOVT", {"Asia/Hovd", new String[] {"Fuso hor\u00e1rio de Hovd", "HOVT",
"Fuso hor\u00e1rio de ver\u00e3o de Hovd", "HOVST", "Fuso hor\u00e1rio de ver\u00e3o de Hovd", "HOVST",
"Hor\u00E1rio de Hovd", "HOVT"}}, "Hor\u00E1rio de Hovd", "HOVT"}},
{"Asia/Irkutsk", new String[] {"Fuso hor\u00e1rio de Irkutsk", "IRKT", {"Asia/Irkutsk", IRKT},
"Fuso hor\u00e1rio de ver\u00e3o de Irkutsk", "IRKST",
"Hor\u00E1rio de Irkutsk", "IRKT"}},
{"Asia/Istanbul", EET}, {"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT}, {"Asia/Jakarta", WIT},
{"Asia/Jayapura", new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Oriental", "WIT", {"Asia/Jayapura", new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Oriental", "WIT",
@ -646,16 +647,14 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
"Fuso hor\u00e1rio de ver\u00e3o de Petropavlovsk-Kamchatski", "PETST", "Fuso hor\u00e1rio de ver\u00e3o de Petropavlovsk-Kamchatski", "PETST",
"Hor\u00E1rio de Petropavlovsk-Kamchatski", "PETT"}}, "Hor\u00E1rio de Petropavlovsk-Kamchatski", "PETT"}},
{"Asia/Karachi", PKT}, {"Asia/Karachi", PKT},
{"Asia/Kashgar", CTT}, {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT}, {"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT}, {"Asia/Katmandu", NPT},
{"Asia/Khandyga", new String[] {"Hor\u00E1rio de Khandyga", "YAKT", {"Asia/Khandyga", new String[] {"Hor\u00E1rio de Khandyga", "YAKT",
"Hor\u00E1rio de Ver\u00E3o de Khandyga", "YAKST", "Hor\u00E1rio de Ver\u00E3o de Khandyga", "YAKST",
"Hor\u00E1rio de Khandyga", "YAKT"}}, "Hor\u00E1rio de Khandyga", "YAKT"}},
{"Asia/Kolkata", IST}, {"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"Fuso hor\u00e1rio de Krasnoyarsk", "KRAT", {"Asia/Krasnoyarsk", KRAT},
"Fuso hor\u00e1rio de ver\u00e3o de Krasnoyarsk", "KRAST",
"Hor\u00E1rio de Krasnoyarsk", "KRAT"}},
{"Asia/Kuala_Lumpur", MYT}, {"Asia/Kuala_Lumpur", MYT},
{"Asia/Kuching", MYT}, {"Asia/Kuching", MYT},
{"Asia/Kuwait", ARAST}, {"Asia/Kuwait", ARAST},
@ -670,7 +669,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
"Hor\u00E1rio das Filipinas", "PHT"}}, "Hor\u00E1rio das Filipinas", "PHT"}},
{"Asia/Muscat", GST}, {"Asia/Muscat", GST},
{"Asia/Nicosia", EET}, {"Asia/Nicosia", EET},
{"Asia/Novokuznetsk", NOVT}, {"Asia/Novokuznetsk", KRAT},
{"Asia/Novosibirsk", NOVT}, {"Asia/Novosibirsk", NOVT},
{"Asia/Oral", new String[] {"Fuso hor\u00e1rio de Uralsk", "ORAT", {"Asia/Oral", new String[] {"Fuso hor\u00e1rio de Uralsk", "ORAT",
"Fuso hor\u00e1rio de ver\u00e3o de Uralsk", "ORAST", "Fuso hor\u00e1rio de ver\u00e3o de Uralsk", "ORAST",
@ -696,6 +695,9 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{"Asia/Samarkand", UZT}, {"Asia/Samarkand", UZT},
{"Asia/Seoul", KST}, {"Asia/Seoul", KST},
{"Asia/Singapore", SGT}, {"Asia/Singapore", SGT},
{"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
"Srednekolymsk Daylight Time", "SREDT",
"Srednekolymsk Time", "SRET"}},
{"Asia/Taipei", CTT}, {"Asia/Taipei", CTT},
{"Asia/Tel_Aviv", ISRAEL}, {"Asia/Tel_Aviv", ISRAEL},
{"Asia/Tashkent", UZT}, {"Asia/Tashkent", UZT},
@ -708,7 +710,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{"Asia/Ujung_Pandang", CIT}, {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT}, {"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT}, {"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT}, {"Asia/Urumqi", XJT},
{"Asia/Ust-Nera", new String[] {"Hor\u00E1rio de Ust-Nera", "VLAT", {"Asia/Ust-Nera", new String[] {"Hor\u00E1rio de Ust-Nera", "VLAT",
"Hor\u00E1rio de Ver\u00E3o de Ust-Nera", "VLAST", "Hor\u00E1rio de Ver\u00E3o de Ust-Nera", "VLAST",
"Hor\u00E1rio de Ust-Nera", "VLAT"}}, "Hor\u00E1rio de Ust-Nera", "VLAT"}},
@ -750,9 +752,9 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{"Australia/Canberra", EST_NSW}, {"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW}, {"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN}, {"Australia/Darwin", DARWIN},
{"Australia/Eucla", new String[] {"Fuso Hor\u00E1rio Ocidental Central (Austr\u00E1lia)", "CWST", {"Australia/Eucla", new String[] {"Fuso Hor\u00E1rio Ocidental Central (Austr\u00E1lia)", "ACWST",
"Fuso Hor\u00E1rio de Ver\u00E3o Ocidental Central (Austr\u00E1lia)", "CWST", "Fuso Hor\u00E1rio de Ver\u00E3o Ocidental Central (Austr\u00E1lia)", "ACWDT",
"Hor\u00E1rio Ocidental Central (Austr\u00E1lia)", "CWT"}}, "Hor\u00E1rio Ocidental Central (Austr\u00E1lia)", "ACWT"}},
{"Australia/Hobart", TASMANIA}, {"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE}, {"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE}, {"Australia/Lindeman", BRISBANE},
@ -818,7 +820,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST}, {"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET}, {"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST}, {"Europe/Jersey", GMTBST},
{"Europe/Kaliningrad", FET}, {"Europe/Kaliningrad", EET},
{"Europe/Kiev", EET}, {"Europe/Kiev", EET},
{"Europe/Lisbon", WET}, {"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET}, {"Europe/Ljubljana", CET},
@ -853,9 +855,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{"Europe/Vatican", CET}, {"Europe/Vatican", CET},
{"Europe/Vienna", CET}, {"Europe/Vienna", CET},
{"Europe/Vilnius", EET}, {"Europe/Vilnius", EET},
{"Europe/Volgograd", new String[] {"Fuso hor\u00e1rio de Volgogrado", "VOLT", {"Europe/Volgograd", MSK},
"Fuso hor\u00e1rio de ver\u00e3o de Volgogrado", "VOLST",
"Hor\u00E1rio de Volgogrado", "VOLT"}},
{"Europe/Warsaw", CET}, {"Europe/Warsaw", CET},
{"Europe/Zagreb", CET}, {"Europe/Zagreb", CET},
{"Europe/Zaporozhye", EET}, {"Europe/Zaporozhye", EET},

104
jdk/src/jdk.localedata/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
View File

@ -48,9 +48,9 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
String ACT[] = new String[] {"Acre, normaltid", "ACT", String ACT[] = new String[] {"Acre, normaltid", "ACT",
"Acre, sommartid", "ACST", "Acre, sommartid", "ACST",
"Acre, normaltid", "ACT"}; "Acre, normaltid", "ACT"};
String ADELAIDE[] = new String[] {"Central standardtid (Sydaustralien)", "CST", String ADELAIDE[] = new String[] {"Central standardtid (Sydaustralien)", "ACST",
"Central sommartid (South Australia)", "CST", "Central sommartid (South Australia)", "ACDT",
"Central tid (Sydaustralien)", "CT"}; "Central tid (Sydaustralien)", "ACT"};
String AGT[] = new String[] {"Argentina, normaltid", "ART", String AGT[] = new String[] {"Argentina, normaltid", "ART",
"Argentina, sommartid", "ARST", "Argentina, sommartid", "ARST",
"Argentinsk tid", "ART"}; "Argentinsk tid", "ART"};
@ -72,12 +72,12 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
String BDT[] = new String[] {"Bangladesh, normaltid", "BDT", String BDT[] = new String[] {"Bangladesh, normaltid", "BDT",
"Bangladesh, sommartid", "BDST", "Bangladesh, sommartid", "BDST",
"Bangladeshisk tid", "BDT"}; "Bangladeshisk tid", "BDT"};
String BRISBANE[] = new String[] {"\u00D6stlig standardtid (Queensland)", "EST", String BRISBANE[] = new String[] {"\u00D6stlig standardtid (Queensland)", "AEST",
"\u00D6stlig sommartid (Queensland)", "EST", "\u00D6stlig sommartid (Queensland)", "AEDT",
"\u00D6stlig tid (Queensland)", "ET"}; "\u00D6stlig tid (Queensland)", "AET"};
String BROKEN_HILL[] = new String[] {"Central standardtid (Sydaustralien/New South Wales)", "CST", String BROKEN_HILL[] = new String[] {"Central standardtid (Sydaustralien/New South Wales)", "ACST",
"Central sommartid (South Australia/New South Wales)", "CST", "Central sommartid (South Australia/New South Wales)", "ACDT",
"Central tid (Sydaustralien/New South Wales)", "CT"}; "Central tid (Sydaustralien/New South Wales)", "ACT"};
String BRT[] = new String[] {"Brasilien, normaltid", "BRT", String BRT[] = new String[] {"Brasilien, normaltid", "BRT",
"Brasilien, sommartid", "BRST", "Brasilien, sommartid", "BRST",
"Brasiliansk tid", "BRT"}; "Brasiliansk tid", "BRT"};
@ -111,9 +111,9 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
String CUBA[] = new String[] {"Kuba, normaltid", "CST", String CUBA[] = new String[] {"Kuba, normaltid", "CST",
"Kuba, sommartid", "CDT", "Kuba, sommartid", "CDT",
"Kubansk tid", "CT"}; "Kubansk tid", "CT"};
String DARWIN[] = new String[] {"Central standardtid (Nordterritoriet)", "CST", String DARWIN[] = new String[] {"Central standardtid (Nordterritoriet)", "ACST",
"Central sommartid (Nordterritoriet)", "CST", "Central sommartid (Nordterritoriet)", "ACDT",
"Central tid (Nordterritoriet)", "CT"}; "Central tid (Nordterritoriet)", "ACT"};
String DUBLIN[] = new String[] {"Greenwichtid", "GMT", String DUBLIN[] = new String[] {"Greenwichtid", "GMT",
"Irland, sommartid", "IST", "Irland, sommartid", "IST",
"Irl\u00E4ndsk tid", "IT"}; "Irl\u00E4ndsk tid", "IT"};
@ -132,9 +132,9 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
String EST[] = new String[] {"Eastern, normaltid", "EST", String EST[] = new String[] {"Eastern, normaltid", "EST",
"Eastern, sommartid", "EDT", "Eastern, sommartid", "EDT",
"\u00D6stlig tid", "ET"}; "\u00D6stlig tid", "ET"};
String EST_NSW[] = new String[] {"\u00D6stlig standardtid (New South Wales)", "EST", String EST_NSW[] = new String[] {"\u00D6stlig standardtid (New South Wales)", "AEST",
"\u00D6stlig sommartid (New South Wales)", "EST", "\u00D6stlig sommartid (New South Wales)", "AEDT",
"\u00D6stlig tid (New South Wales)", "ET"}; "\u00D6stlig tid (New South Wales)", "AET"};
String FET[] = new String[] {"Kaliningradtid", "FET", String FET[] = new String[] {"Kaliningradtid", "FET",
"\u00D6steuropeisk sommartid", "FEST", "\u00D6steuropeisk sommartid", "FEST",
"Kaliningradtid", "FET"}; "Kaliningradtid", "FET"};
@ -165,6 +165,9 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
String ICT[] = new String[] {"Indokinesisk tid", "ICT", String ICT[] = new String[] {"Indokinesisk tid", "ICT",
"Indokinesisk sommartid", "ICST", "Indokinesisk sommartid", "ICST",
"Indokinesisk tid", "ICT"}; "Indokinesisk tid", "ICT"};
String IRKT[] = new String[] {"Irkutsk, normaltid", "IRKT",
"Irkutsk, sommartid", "IRKST",
"Irkutsk-tid", "IRKT"};
String IRT[] = new String[] {"Iran, normaltid", "IRST", String IRT[] = new String[] {"Iran, normaltid", "IRST",
"Iran, sommartid", "IRDT", "Iran, sommartid", "IRDT",
"Iransk tid", "IRT"}; "Iransk tid", "IRT"};
@ -177,11 +180,14 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
String JST[] = new String[] {"Japan, normaltid", "JST", String JST[] = new String[] {"Japan, normaltid", "JST",
"Japan, sommartid", "JDT", "Japan, sommartid", "JDT",
"Japansk tid", "JT"}; "Japansk tid", "JT"};
String KRAT[] = new String[] {"Krasnojarsk, normaltid", "KRAT",
"Krasnojarsk, sommartid", "KRAST",
"Krasnojarsk-tid", "KRAT"};
String KST[] = new String[] {"Korea, normaltid", "KST", String KST[] = new String[] {"Korea, normaltid", "KST",
"Korea, sommartid", "KDT", "Korea, sommartid", "KDT",
"Koreansk tid", "KT"}; "Koreansk tid", "KT"};
String LORD_HOWE[] = new String[] {"Lord Howe, normaltid", "LHST", String LORD_HOWE[] = new String[] {"Lord Howe, normaltid", "LHST",
"Lord Howe, sommartid", "LHST", "Lord Howe, sommartid", "LHDT",
"Lord Howe-tid", "LHT"}; "Lord Howe-tid", "LHT"};
String MHT[] = new String[] {"Marshall\u00f6arna, normaltid", "MHT", String MHT[] = new String[] {"Marshall\u00f6arna, normaltid", "MHT",
"Marshall\u00f6arna, sommartid", "MHST", "Marshall\u00f6arna, sommartid", "MHST",
@ -231,20 +237,15 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
String SGT[] = new String[] {"Singapore, normaltid", "SGT", String SGT[] = new String[] {"Singapore, normaltid", "SGT",
"Singapore, sommartid", "SGST", "Singapore, sommartid", "SGST",
"Singapore-tid", "SGT"}; "Singapore-tid", "SGT"};
String SLST[] = new String[] {"Greenwichtid", "GMT", String TASMANIA[] = new String[] {"\u00D6stlig standardtid (Tasmania)", "AEST",
"Sierra Leone, sommartid", "SLST", "\u00D6stlig sommartid (Tasmanien)", "AEDT",
"Sierra Leone-tid", "SLT"}; "\u00D6stlig tid (Tasmania)", "AET"};
String TASMANIA[] = new String[] {"\u00D6stlig standardtid (Tasmania)", "EST",
"\u00D6stlig sommartid (Tasmanien)", "EST",
"\u00D6stlig tid (Tasmania)", "ET"};
String TMT[] = new String[] {"Turkmenistan, normaltid", "TMT", String TMT[] = new String[] {"Turkmenistan, normaltid", "TMT",
"Turkmenistan, sommartid", "TMST", "Turkmenistan, sommartid", "TMST",
"Turkmensk tid", "TMT"}; "Turkmensk tid", "TMT"};
String ULAT[]= new String[] {"Ulaanbaatar, normaltid", "ULAT", String ULAT[]= new String[] {"Ulaanbaatar, normaltid", "ULAT",
"Ulaanbaatar, sommartid", "ULAST", "Ulaanbaatar, sommartid", "ULAST",
"Ulaanbaatar-tid", "ULAT"}; "Ulaanbaatar-tid", "ULAT"};
String WART[] = new String[] {"V\u00e4stargentina, normaltid", "WART",
"V\u00e4stargentina, sommartid", "WARST"};
String WAT[] = new String[] {"V\u00e4stafrikansk tid", "WAT", String WAT[] = new String[] {"V\u00e4stafrikansk tid", "WAT",
"V\u00e4stafrikansk sommartid", "WAST", "V\u00e4stafrikansk sommartid", "WAST",
"V\u00E4stafrikansk tid", "WAT"}; "V\u00E4stafrikansk tid", "WAT"};
@ -254,27 +255,30 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
String WIT[] = new String[] {"V\u00e4stindonesisk tid", "WIB", String WIT[] = new String[] {"V\u00e4stindonesisk tid", "WIB",
"V\u00e4stindonesisk sommartid", "WIST", "V\u00e4stindonesisk sommartid", "WIST",
"V\u00E4stindonesisk tid", "WIB"}; "V\u00E4stindonesisk tid", "WIB"};
String WST_AUS[] = new String[] {"Western Standard Time (Australien)", "WST", String WST_AUS[] = new String[] {"Western Standard Time (Australien)", "AWST",
"V\u00E4stlig sommartid (Australien)", "WST", "V\u00E4stlig sommartid (Australien)", "AWDT",
"V\u00E4stlig tid (Australien)", "WT"}; "V\u00E4stlig tid (Australien)", "AWT"};
String SAMOA[] = new String[] {"Samoa, normaltid", "SST", String SAMOA[] = new String[] {"Samoa, normaltid", "SST",
"Samoa, sommartid", "SDT", "Samoa, sommartid", "SDT",
"Samoansk tid", "ST"}; "Samoansk tid", "ST"};
String WST_SAMOA[] = new String[] {"V\u00e4stsamoansk tid", "WST", String WST_SAMOA[] = new String[] {"V\u00e4stsamoansk tid", "WSST",
"V\u00e4stsamoansk sommartid", "WSDT", "V\u00e4stsamoansk sommartid", "WSDT",
"V\u00E4stsamoansk tid", "WST"}; "V\u00E4stsamoansk tid", "WST"};
String ChST[] = new String[] {"Chamorro, normaltid", "ChST", String ChST[] = new String[] {"Chamorro, normaltid", "ChST",
"Chamorro, sommartid", "ChDT", "Chamorro, sommartid", "ChDT",
"Chamorros tid", "ChT"}; "Chamorros tid", "ChT"};
String VICTORIA[] = new String[] {"\u00D6stlig standardtid (Victoria)", "EST", String VICTORIA[] = new String[] {"\u00D6stlig standardtid (Victoria)", "AEST",
"\u00D6stlig sommartid (Victoria)", "EST", "\u00D6stlig sommartid (Victoria)", "AEDT",
"\u00D6stlig tid (Victoria)", "ET"}; "\u00D6stlig tid (Victoria)", "AET"};
String UTC[] = new String[] {"Koordinerad universell tid", "UTC", String UTC[] = new String[] {"Koordinerad universell tid", "UTC",
"Koordinerad universell tid", "UTC", "Koordinerad universell tid", "UTC",
"UTC (koordinerad v\u00E4rldstid)", "UTC"}; "UTC (koordinerad v\u00E4rldstid)", "UTC"};
String UZT[] = new String[] {"Uzbekistan, normaltid", "UZT", String UZT[] = new String[] {"Uzbekistan, normaltid", "UZT",
"Uzbekistan, sommartid", "UZST", "Uzbekistan, sommartid", "UZST",
"Uzbekisk tid", "UZT"}; "Uzbekisk tid", "UZT"};
String XJT[] = new String[] {"Kina, normaltid", "XJT",
"Kina, sommartid", "XJDT",
"Kinesisk tid", "XJT"};
return new Object[][] { return new Object[][] {
{"America/Los_Angeles", PST}, {"America/Los_Angeles", PST},
@ -336,7 +340,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{"Africa/Djibouti", EAT}, {"Africa/Djibouti", EAT},
{"Africa/Douala", WAT}, {"Africa/Douala", WAT},
{"Africa/El_Aaiun", WET}, {"Africa/El_Aaiun", WET},
{"Africa/Freetown", SLST}, {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT}, {"Africa/Gaborone", CAT},
{"Africa/Harare", CAT}, {"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST}, {"Africa/Johannesburg", SAST},
@ -437,7 +441,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
"V\u00e4stra Gr\u00f6nland, sommartid", "WGST", "V\u00e4stra Gr\u00f6nland, sommartid", "WGST",
"V\u00E4stgr\u00F6nl\u00E4ndsk tid", "WGT"}}, "V\u00E4stgr\u00F6nl\u00E4ndsk tid", "WGT"}},
{"America/Goose_Bay", AST}, {"America/Goose_Bay", AST},
{"America/Grand_Turk", EST}, {"America/Grand_Turk", AST},
{"America/Grenada", AST}, {"America/Grenada", AST},
{"America/Guadeloupe", AST}, {"America/Guadeloupe", AST},
{"America/Guatemala", CST}, {"America/Guatemala", CST},
@ -484,9 +488,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{"America/Mendoza", AGT}, {"America/Mendoza", AGT},
{"America/Menominee", CST}, {"America/Menominee", CST},
{"America/Merida", CST}, {"America/Merida", CST},
{"America/Metlakatla", new String[] {"Metlakatla, normaltid", "MeST", {"America/Metlakatla", PST},
"Metlakatla, sommartid", "MeDT",
"Metlakatla-tid", "MeT"}},
{"America/Mexico_City", CST}, {"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Saint-Pierre-et-Miquelon, normaltid", "PMST", {"America/Miquelon", new String[] {"Saint-Pierre-et-Miquelon, normaltid", "PMST",
"Saint-Pierre-et-Miquelon, sommartid", "PMDT", "Saint-Pierre-et-Miquelon, sommartid", "PMDT",
@ -612,6 +614,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
"Choibalsan-tid", "CHOT"}}, "Choibalsan-tid", "CHOT"}},
{"Asia/Chongqing", CTT}, {"Asia/Chongqing", CTT},
{"Asia/Chungking", CTT}, {"Asia/Chungking", CTT},
{"Asia/Chita", IRKT},
{"Asia/Colombo", IST}, {"Asia/Colombo", IST},
{"Asia/Dacca", BDT}, {"Asia/Dacca", BDT},
{"Asia/Dhaka", BDT}, {"Asia/Dhaka", BDT},
@ -631,9 +634,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{"Asia/Hovd", new String[] {"Hovd, normaltid", "HOVT", {"Asia/Hovd", new String[] {"Hovd, normaltid", "HOVT",
"Hovd, sommartid", "HOVST", "Hovd, sommartid", "HOVST",
"Hovd-tid", "HOVT"}}, "Hovd-tid", "HOVT"}},
{"Asia/Irkutsk", new String[] {"Irkutsk, normaltid", "IRKT", {"Asia/Irkutsk", IRKT},
"Irkutsk, sommartid", "IRKST",
"Irkutsk-tid", "IRKT"}},
{"Asia/Istanbul", EET}, {"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT}, {"Asia/Jakarta", WIT},
{"Asia/Jayapura", new String[] {"\u00d6stindonesisk tid", "WIT", {"Asia/Jayapura", new String[] {"\u00d6stindonesisk tid", "WIT",
@ -646,16 +647,14 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
"Petropavlovsk-Kamtjatka, sommartid", "PETST", "Petropavlovsk-Kamtjatka, sommartid", "PETST",
"Petropavlovsk-Kamtjatskij-tid", "PETT"}}, "Petropavlovsk-Kamtjatskij-tid", "PETT"}},
{"Asia/Karachi", PKT}, {"Asia/Karachi", PKT},
{"Asia/Kashgar", CTT}, {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT}, {"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT}, {"Asia/Katmandu", NPT},
{"Asia/Khandyga", new String[] {"Khandyga, normaltid", "YAKT", {"Asia/Khandyga", new String[] {"Khandyga, normaltid", "YAKT",
"Khandyga, sommartid", "YAKST", "Khandyga, sommartid", "YAKST",
"Khandyga, normaltid", "YAKT"}}, "Khandyga, normaltid", "YAKT"}},
{"Asia/Kolkata", IST}, {"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"Krasnojarsk, normaltid", "KRAT", {"Asia/Krasnoyarsk", KRAT},
"Krasnojarsk, sommartid", "KRAST",
"Krasnojarsk-tid", "KRAT"}},
{"Asia/Kuala_Lumpur", MYT}, {"Asia/Kuala_Lumpur", MYT},
{"Asia/Kuching", MYT}, {"Asia/Kuching", MYT},
{"Asia/Kuwait", ARAST}, {"Asia/Kuwait", ARAST},
@ -670,7 +669,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
"Filippinsk tid", "PHT"}}, "Filippinsk tid", "PHT"}},
{"Asia/Muscat", GST}, {"Asia/Muscat", GST},
{"Asia/Nicosia", EET}, {"Asia/Nicosia", EET},
{"Asia/Novokuznetsk", NOVT}, {"Asia/Novokuznetsk", KRAT},
{"Asia/Novosibirsk", NOVT}, {"Asia/Novosibirsk", NOVT},
{"Asia/Oral", new String[] {"Oral, normaltid", "ORAT", {"Asia/Oral", new String[] {"Oral, normaltid", "ORAT",
"Oral, sommartid", "ORAST", "Oral, sommartid", "ORAST",
@ -696,6 +695,9 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{"Asia/Samarkand", UZT}, {"Asia/Samarkand", UZT},
{"Asia/Seoul", KST}, {"Asia/Seoul", KST},
{"Asia/Singapore", SGT}, {"Asia/Singapore", SGT},
{"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
"Srednekolymsk Daylight Time", "SREDT",
"Srednekolymsk Time", "SRET"}},
{"Asia/Taipei", CTT}, {"Asia/Taipei", CTT},
{"Asia/Tel_Aviv", ISRAEL}, {"Asia/Tel_Aviv", ISRAEL},
{"Asia/Tashkent", UZT}, {"Asia/Tashkent", UZT},
@ -708,7 +710,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{"Asia/Ujung_Pandang", CIT}, {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT}, {"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT}, {"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT}, {"Asia/Urumqi", XJT},
{"Asia/Ust-Nera", new String[] {"Ust-Nera, normaltid", "VLAT", {"Asia/Ust-Nera", new String[] {"Ust-Nera, normaltid", "VLAT",
"Ust-Nera, sommartid", "VLAST", "Ust-Nera, sommartid", "VLAST",
"Ust-Nera, normaltid", "VLAT"}}, "Ust-Nera, normaltid", "VLAT"}},
@ -750,9 +752,9 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{"Australia/Canberra", EST_NSW}, {"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW}, {"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN}, {"Australia/Darwin", DARWIN},
{"Australia/Eucla", new String[] {"Central v\u00E4stlig normaltid (Australien)", "CWST", {"Australia/Eucla", new String[] {"Central v\u00E4stlig normaltid (Australien)", "ACWST",
"Central v\u00E4stlig sommartid (Australien)", "CWST", "Central v\u00E4stlig sommartid (Australien)", "ACWDT",
"Central v\u00E4stlig tid (Australien)", "CWT"}}, "Central v\u00E4stlig tid (Australien)", "ACWT"}},
{"Australia/Hobart", TASMANIA}, {"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE}, {"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE}, {"Australia/Lindeman", BRISBANE},
@ -818,7 +820,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST}, {"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET}, {"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST}, {"Europe/Jersey", GMTBST},
{"Europe/Kaliningrad", FET}, {"Europe/Kaliningrad", EET},
{"Europe/Kiev", EET}, {"Europe/Kiev", EET},
{"Europe/Lisbon", WET}, {"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET}, {"Europe/Ljubljana", CET},
@ -853,9 +855,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{"Europe/Vatican", CET}, {"Europe/Vatican", CET},
{"Europe/Vienna", CET}, {"Europe/Vienna", CET},
{"Europe/Vilnius", EET}, {"Europe/Vilnius", EET},
{"Europe/Volgograd", new String[] {"Volgograd-tid", "VOLT", {"Europe/Volgograd", MSK},
"Volgograd, sommartid", "VOLST",
"Volgograd, normaltid", "VOLT"}},
{"Europe/Warsaw", CET}, {"Europe/Warsaw", CET},
{"Europe/Zagreb", CET}, {"Europe/Zagreb", CET},
{"Europe/Zaporozhye", EET}, {"Europe/Zaporozhye", EET},

104
jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
View File

@ -48,9 +48,9 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
String ACT[] = new String[] {"Acre \u65f6\u95f4", "ACT", String ACT[] = new String[] {"Acre \u65f6\u95f4", "ACT",
"Acre \u590f\u4ee4\u65f6", "ACST", "Acre \u590f\u4ee4\u65f6", "ACST",
"Acre \u65f6\u95f4", "ACT"}; "Acre \u65f6\u95f4", "ACT"};
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)", "ACST",
"\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A)", "CST", "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A)", "ACDT",
"\u4E2D\u90E8\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A)", "CT"}; "\u4E2D\u90E8\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A)", "ACT"};
String AGT[] = new String[] {"\u963f\u6839\u5ef7\u65f6\u95f4", "ART", String AGT[] = new String[] {"\u963f\u6839\u5ef7\u65f6\u95f4", "ART",
"\u963f\u6839\u5ef7\u590f\u4ee4\u65f6", "ARST", "\u963f\u6839\u5ef7\u590f\u4ee4\u65f6", "ARST",
"\u963F\u6839\u5EF7\u65F6\u95F4", "ART"}; "\u963F\u6839\u5EF7\u65F6\u95F4", "ART"};
@ -72,12 +72,12 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
String BDT[] = new String[] {"\u5b5f\u52a0\u62c9\u65f6\u95f4", "BDT", String BDT[] = new String[] {"\u5b5f\u52a0\u62c9\u65f6\u95f4", "BDT",
"\u5b5f\u52a0\u62c9\u590f\u4ee4\u65f6", "BDST", "\u5b5f\u52a0\u62c9\u590f\u4ee4\u65f6", "BDST",
"\u5B5F\u52A0\u62C9\u65F6\u95F4", "BDT"}; "\u5B5F\u52A0\u62C9\u65F6\u95F4", "BDT"};
String BRISBANE[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u6606\u58EB\u5170)", "EST", String BRISBANE[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u6606\u58EB\u5170)", "AEST",
"\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u6606\u58EB\u5170)", "EST", "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u6606\u58EB\u5170)", "AEDT",
"\u4E1C\u90E8\u65F6\u95F4 (\u6606\u58EB\u5170)", "ET"}; "\u4E1C\u90E8\u65F6\u95F4 (\u6606\u58EB\u5170)", "AET"};
String BROKEN_HILL[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "CST", String BROKEN_HILL[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "ACST",
"\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "CST", "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "ACDT",
"\u4E2D\u90E8\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "CT"}; "\u4E2D\u90E8\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "ACT"};
String BRT[] = new String[] {"\u5df4\u897f\u5229\u4e9a\u65f6\u95f4", "BRT", String BRT[] = new String[] {"\u5df4\u897f\u5229\u4e9a\u65f6\u95f4", "BRT",
"\u5df4\u897f\u5229\u4e9a\u590f\u4ee4\u65f6", "BRST", "\u5df4\u897f\u5229\u4e9a\u590f\u4ee4\u65f6", "BRST",
"\u5DF4\u897F\u5229\u4E9A\u65F6\u95F4", "BRT"}; "\u5DF4\u897F\u5229\u4E9A\u65F6\u95F4", "BRT"};
@ -111,9 +111,9 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
String CUBA[] = new String[] {"\u53e4\u5df4\u6807\u51c6\u65f6\u95f4", "CST", String CUBA[] = new String[] {"\u53e4\u5df4\u6807\u51c6\u65f6\u95f4", "CST",
"\u53e4\u5df4\u590f\u4ee4\u65f6", "CDT", "\u53e4\u5df4\u590f\u4ee4\u65f6", "CDT",
"\u53E4\u5DF4\u65F6\u95F4", "CT"}; "\u53E4\u5DF4\u65F6\u95F4", "CT"};
String DARWIN[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5317\u9886\u5730)", "CST", String DARWIN[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5317\u9886\u5730)", "ACST",
"\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5317\u9886\u5730)", "CST", "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5317\u9886\u5730)", "ACDT",
"\u4E2D\u90E8\u65F6\u95F4 (\u5317\u90E8\u5730\u533A)", "CT"}; "\u4E2D\u90E8\u65F6\u95F4 (\u5317\u90E8\u5730\u533A)", "ACT"};
String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT", String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT",
"\u7231\u5c14\u5170\u590f\u4ee4\u65f6", "IST", "\u7231\u5c14\u5170\u590f\u4ee4\u65f6", "IST",
"\u7231\u5C14\u5170\u65F6\u95F4", "IT"}; "\u7231\u5C14\u5170\u65F6\u95F4", "IT"};
@ -132,9 +132,9 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
String EST[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4", "EST", String EST[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4", "EST",
"\u4e1c\u90e8\u590f\u4ee4\u65f6", "EDT", "\u4e1c\u90e8\u590f\u4ee4\u65f6", "EDT",
"\u4E1C\u90E8\u65F6\u95F4", "ET"}; "\u4E1C\u90E8\u65F6\u95F4", "ET"};
String EST_NSW[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u65B0\u5357\u5A01\u5C14\u65AF)", "EST", String EST_NSW[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u65B0\u5357\u5A01\u5C14\u65AF)", "AEST",
"\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u65B0\u5357\u5A01\u5C14\u65AF)", "EST", "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u65B0\u5357\u5A01\u5C14\u65AF)", "AEDT",
"\u4E1C\u90E8\u65F6\u95F4 (\u65B0\u5357\u5A01\u5C14\u65AF)", "ET"}; "\u4E1C\u90E8\u65F6\u95F4 (\u65B0\u5357\u5A01\u5C14\u65AF)", "AET"};
String FET[] = new String[] {"\u8FDC\u4E1C\u6B27\u65F6\u95F4", "FET", String FET[] = new String[] {"\u8FDC\u4E1C\u6B27\u65F6\u95F4", "FET",
"\u8FDC\u4E1C\u6B27\u590F\u4EE4\u65F6", "FEST", "\u8FDC\u4E1C\u6B27\u590F\u4EE4\u65F6", "FEST",
"\u8FDC\u4E1C\u6B27\u65F6\u95F4", "FET"}; "\u8FDC\u4E1C\u6B27\u65F6\u95F4", "FET"};
@ -165,6 +165,9 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
String ICT[] = new String[] {"\u5370\u5ea6\u652f\u90a3\u65f6\u95f4", "ICT", String ICT[] = new String[] {"\u5370\u5ea6\u652f\u90a3\u65f6\u95f4", "ICT",
"\u5370\u5ea6\u652f\u90a3\u590f\u4ee4\u65f6", "ICST", "\u5370\u5ea6\u652f\u90a3\u590f\u4ee4\u65f6", "ICST",
"\u5370\u5EA6\u652F\u90A3\u65F6\u95F4", "ICT"}; "\u5370\u5EA6\u652F\u90A3\u65F6\u95F4", "ICT"};
String IRKT[] = new String[] {"\u4f0a\u5c14\u5e93\u6b21\u514b\u65f6\u95f4", "IRKT",
"\u4f0a\u5c14\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "IRKST",
"\u4F0A\u5C14\u5E93\u6B21\u514B\u65F6\u95F4", "IRKT"};
String IRT[] = new String[] {"\u4f0a\u6717\u6807\u51c6\u65f6\u95f4", "IRST", String IRT[] = new String[] {"\u4f0a\u6717\u6807\u51c6\u65f6\u95f4", "IRST",
"\u4f0a\u6717\u590f\u4ee4\u65f6", "IRDT", "\u4f0a\u6717\u590f\u4ee4\u65f6", "IRDT",
"\u4F0A\u6717\u65F6\u95F4", "IRT"}; "\u4F0A\u6717\u65F6\u95F4", "IRT"};
@ -177,11 +180,14 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
String JST[] = new String[] {"\u65e5\u672c\u6807\u51c6\u65f6\u95f4", "JST", String JST[] = new String[] {"\u65e5\u672c\u6807\u51c6\u65f6\u95f4", "JST",
"\u65e5\u672c\u590f\u4ee4\u65f6", "JDT", "\u65e5\u672c\u590f\u4ee4\u65f6", "JDT",
"\u65E5\u672C\u65F6\u95F4", "JT"}; "\u65E5\u672C\u65F6\u95F4", "JT"};
String KRAT[] = new String[] {"\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u65f6\u95f4", "KRAT",
"\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u590f\u4ee4\u65f6", "KRAST",
"\u514B\u62C9\u65AF\u8BFA\u4E9A\u5C14\u65AF\u514B\u65F6\u95F4", "KRAT"};
String KST[] = new String[] {"\u97e9\u56fd\u6807\u51c6\u65f6\u95f4", "KST", String KST[] = new String[] {"\u97e9\u56fd\u6807\u51c6\u65f6\u95f4", "KST",
"\u97e9\u56fd\u590f\u4ee4\u65f6", "KDT", "\u97e9\u56fd\u590f\u4ee4\u65f6", "KDT",
"\u97E9\u56FD\u65F6\u95F4", "KT"}; "\u97E9\u56FD\u65F6\u95F4", "KT"};
String LORD_HOWE[] = new String[] {"\u8c6a\u516c\u6807\u51c6\u65f6\u95f4", "LHST", String LORD_HOWE[] = new String[] {"\u8c6a\u516c\u6807\u51c6\u65f6\u95f4", "LHST",
"\u8c6a\u516c\u590f\u4ee4\u65f6", "LHST", "\u8c6a\u516c\u590f\u4ee4\u65f6", "LHDT",
"\u8C6A\u516C\u65F6\u95F4", "LHT"}; "\u8C6A\u516C\u65F6\u95F4", "LHT"};
String MHT[] = new String[] {"\u9a6c\u7ecd\u5c14\u7fa4\u5c9b\u65f6\u95f4", "MHT", String MHT[] = new String[] {"\u9a6c\u7ecd\u5c14\u7fa4\u5c9b\u65f6\u95f4", "MHT",
"\u9a6c\u7ecd\u5c14\u7fa4\u5c9b\u590f\u4ee4\u65f6", "MHST", "\u9a6c\u7ecd\u5c14\u7fa4\u5c9b\u590f\u4ee4\u65f6", "MHST",
@ -231,20 +237,15 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
String SGT[] = new String[] {"\u65b0\u52a0\u5761\u65f6\u95f4", "SGT", String SGT[] = new String[] {"\u65b0\u52a0\u5761\u65f6\u95f4", "SGT",
"\u65b0\u52a0\u5761\u590f\u4ee4\u65f6", "SGST", "\u65b0\u52a0\u5761\u590f\u4ee4\u65f6", "SGST",
"\u65B0\u52A0\u5761\u65F6\u95F4", "SGT"}; "\u65B0\u52A0\u5761\u65F6\u95F4", "SGT"};
String SLST[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT", String TASMANIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "AEST",
"\u585e\u62c9\u5229\u6602\u590f\u4ee4\u65f6", "SLST", "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "AEDT",
"\u585E\u62C9\u91CC\u6602\u65F6\u95F4", "SLT"}; "\u4E1C\u90E8\u65F6\u95F4 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "AET"};
String TASMANIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "EST",
"\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "EST",
"\u4E1C\u90E8\u65F6\u95F4 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "ET"};
String TMT[] = new String[] {"\u571f\u5e93\u66fc\u65f6\u95f4", "TMT", String TMT[] = new String[] {"\u571f\u5e93\u66fc\u65f6\u95f4", "TMT",
"\u571f\u5e93\u66fc\u590f\u4ee4\u65f6", "TMST", "\u571f\u5e93\u66fc\u590f\u4ee4\u65f6", "TMST",
"\u571F\u5E93\u66FC\u65F6\u95F4", "TMT"}; "\u571F\u5E93\u66FC\u65F6\u95F4", "TMT"};
String ULAT[]= new String[] {"\u5e93\u4f26\u65f6\u95f4", "ULAT", String ULAT[]= new String[] {"\u5e93\u4f26\u65f6\u95f4", "ULAT",
"\u5e93\u4f26\u590f\u4ee4\u65f6", "ULAST", "\u5e93\u4f26\u590f\u4ee4\u65f6", "ULAST",
"\u5E93\u4F26\u65F6\u95F4", "ULAT"}; "\u5E93\u4F26\u65F6\u95F4", "ULAT"};
String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u65f6\u95f4", "WART",
"\u897f\u963f\u6839\u5ef7\u590f\u4ee4\u65f6", "WARST"};
String WAT[] = new String[] {"\u897f\u975e\u65f6\u95f4", "WAT", String WAT[] = new String[] {"\u897f\u975e\u65f6\u95f4", "WAT",
"\u897f\u975e\u590f\u4ee4\u65f6", "WAST", "\u897f\u975e\u590f\u4ee4\u65f6", "WAST",
"\u897F\u975E\u65F6\u95F4", "WAT"}; "\u897F\u975E\u65F6\u95F4", "WAT"};
@ -254,27 +255,30 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
String WIT[] = new String[] {"\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIB", String WIT[] = new String[] {"\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIB",
"\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "WIST", "\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "WIST",
"\u897F\u5370\u5EA6\u5C3C\u897F\u4E9A\u65F6\u95F4", "WIB"}; "\u897F\u5370\u5EA6\u5C3C\u897F\u4E9A\u65F6\u95F4", "WIB"};
String WST_AUS[] = new String[] {"\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "WST", String WST_AUS[] = new String[] {"\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "AWST",
"\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "WST", "\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "AWDT",
"\u897F\u90E8\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "WT"}; "\u897F\u90E8\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "AWT"};
String SAMOA[] = new String[] {"\u8428\u6469\u4e9a\u7fa4\u5c9b\u6807\u51c6\u65f6\u95f4", "SST", String SAMOA[] = new String[] {"\u8428\u6469\u4e9a\u7fa4\u5c9b\u6807\u51c6\u65f6\u95f4", "SST",
"\u8428\u6469\u4e9a\u7fa4\u5c9b\u590f\u4ee4\u65f6", "SDT", "\u8428\u6469\u4e9a\u7fa4\u5c9b\u590f\u4ee4\u65f6", "SDT",
"\u8428\u6469\u4E9A\u65F6\u95F4", "ST"}; "\u8428\u6469\u4E9A\u65F6\u95F4", "ST"};
String WST_SAMOA[] = new String[] {"\u897f\u8428\u6469\u4e9a\u65f6\u95f4", "WST", String WST_SAMOA[] = new String[] {"\u897f\u8428\u6469\u4e9a\u65f6\u95f4", "WSST",
"\u897f\u8428\u6469\u4e9a\u590f\u4ee4\u65f6", "WSDT", "\u897f\u8428\u6469\u4e9a\u590f\u4ee4\u65f6", "WSDT",
"\u897F\u8428\u6469\u4E9A\u65F6\u95F4", "WST"}; "\u897F\u8428\u6469\u4E9A\u65F6\u95F4", "WST"};
String ChST[] = new String[] {"Chamorro \u6807\u51c6\u65f6\u95f4", "ChST", String ChST[] = new String[] {"Chamorro \u6807\u51c6\u65f6\u95f4", "ChST",
"Chamorro \u590f\u4ee4\u65f6", "ChDT", "Chamorro \u590f\u4ee4\u65f6", "ChDT",
"\u67E5\u6469\u6D1B\u65F6\u95F4", "ChT"}; "\u67E5\u6469\u6D1B\u65F6\u95F4", "ChT"};
String VICTORIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u7EF4\u591A\u5229\u4E9A)", "EST", String VICTORIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u7EF4\u591A\u5229\u4E9A)", "AEST",
"\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u7EF4\u591A\u5229\u4E9A)", "EST", "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u7EF4\u591A\u5229\u4E9A)", "AEDT",
"\u4E1C\u90E8\u65F6\u95F4 (\u7EF4\u591A\u5229\u4E9A)", "ET"}; "\u4E1C\u90E8\u65F6\u95F4 (\u7EF4\u591A\u5229\u4E9A)", "AET"};
String UTC[] = new String[] {"\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC", String UTC[] = new String[] {"\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC",
"\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC", "\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC",
"\u534F\u8C03\u4E16\u754C\u65F6\u95F4", "UTC"}; "\u534F\u8C03\u4E16\u754C\u65F6\u95F4", "UTC"};
String UZT[] = new String[] {"\u4e4c\u5179\u522b\u514b\u65af\u5766\u65f6\u95f4", "UZT", String UZT[] = new String[] {"\u4e4c\u5179\u522b\u514b\u65af\u5766\u65f6\u95f4", "UZT",
"\u4e4c\u5179\u522b\u514b\u65af\u5766\u590f\u4ee4\u65f6", "UZST", "\u4e4c\u5179\u522b\u514b\u65af\u5766\u590f\u4ee4\u65f6", "UZST",
"\u4E4C\u5179\u522B\u514B\u65AF\u5766\u65F6\u95F4", "UZT"}; "\u4E4C\u5179\u522B\u514B\u65AF\u5766\u65F6\u95F4", "UZT"};
String XJT[] = new String[] {"\u4e2d\u56fd\u6807\u51c6\u65f6\u95f4", "XJT",
"\u4e2d\u56fd\u590f\u4ee4\u65f6", "XJDT",
"\u4E2D\u56FD\u65F6\u95F4", "XJT"};
return new Object[][] { return new Object[][] {
{"America/Los_Angeles", PST}, {"America/Los_Angeles", PST},
@ -336,7 +340,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{"Africa/Djibouti", EAT}, {"Africa/Djibouti", EAT},
{"Africa/Douala", WAT}, {"Africa/Douala", WAT},
{"Africa/El_Aaiun", WET}, {"Africa/El_Aaiun", WET},
{"Africa/Freetown", SLST}, {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT}, {"Africa/Gaborone", CAT},
{"Africa/Harare", CAT}, {"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST}, {"Africa/Johannesburg", SAST},
@ -437,7 +441,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
"\u897f\u683c\u6797\u5170\u5c9b\u590f\u4ee4\u65f6", "WGST", "\u897f\u683c\u6797\u5170\u5c9b\u590f\u4ee4\u65f6", "WGST",
"\u897F\u683C\u6797\u5170\u5C9B\u65F6\u95F4", "WGT"}}, "\u897F\u683C\u6797\u5170\u5C9B\u65F6\u95F4", "WGT"}},
{"America/Goose_Bay", AST}, {"America/Goose_Bay", AST},
{"America/Grand_Turk", EST}, {"America/Grand_Turk", AST},
{"America/Grenada", AST}, {"America/Grenada", AST},
{"America/Guadeloupe", AST}, {"America/Guadeloupe", AST},
{"America/Guatemala", CST}, {"America/Guatemala", CST},
@ -484,9 +488,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{"America/Mendoza", AGT}, {"America/Mendoza", AGT},
{"America/Menominee", CST}, {"America/Menominee", CST},
{"America/Merida", CST}, {"America/Merida", CST},
{"America/Metlakatla", new String[] {"\u6885\u7279\u62C9\u5361\u7279\u62C9\u6807\u51C6\u65F6\u95F4", "MeST", {"America/Metlakatla", PST},
"\u6885\u7279\u62C9\u5361\u7279\u62C9\u590F\u4EE4\u65F6", "MeDT",
"\u6885\u7279\u62C9\u5361\u7279\u62C9\u65F6\u95F4", "MeT"}},
{"America/Mexico_City", CST}, {"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u6807\u51c6\u65f6\u95f4", "PMST", {"America/Miquelon", new String[] {"\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u6807\u51c6\u65f6\u95f4", "PMST",
"\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u590f\u4ee4\u65f6", "PMDT", "\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u590f\u4ee4\u65f6", "PMDT",
@ -607,6 +609,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
"\u6587\u83b1\u590f\u4ee4\u65f6", "BNST", "\u6587\u83b1\u590f\u4ee4\u65f6", "BNST",
"\u6587\u83B1\u65F6\u95F4", "BNT"}}, "\u6587\u83B1\u65F6\u95F4", "BNT"}},
{"Asia/Calcutta", IST}, {"Asia/Calcutta", IST},
{"Asia/Chita", IRKT},
{"Asia/Choibalsan", new String[] {"Choibalsan \u65f6\u95f4", "CHOT", {"Asia/Choibalsan", new String[] {"Choibalsan \u65f6\u95f4", "CHOT",
"Choibalsan \u590f\u4ee4\u65f6", "CHOST", "Choibalsan \u590f\u4ee4\u65f6", "CHOST",
"Choibalsan \u65F6\u95F4", "CHOT"}}, "Choibalsan \u65F6\u95F4", "CHOT"}},
@ -631,9 +634,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{"Asia/Hovd", new String[] {"\u79d1\u5e03\u591a\u65f6\u95f4", "HOVT", {"Asia/Hovd", new String[] {"\u79d1\u5e03\u591a\u65f6\u95f4", "HOVT",
"\u79d1\u5e03\u591a\u590f\u4ee4\u65f6", "HOVST", "\u79d1\u5e03\u591a\u590f\u4ee4\u65f6", "HOVST",
"\u79D1\u5E03\u591A\u65F6\u95F4", "HOVT"}}, "\u79D1\u5E03\u591A\u65F6\u95F4", "HOVT"}},
{"Asia/Irkutsk", new String[] {"\u4f0a\u5c14\u5e93\u6b21\u514b\u65f6\u95f4", "IRKT", {"Asia/Irkutsk", IRKT},
"\u4f0a\u5c14\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "IRKST",
"\u4F0A\u5C14\u5E93\u6B21\u514B\u65F6\u95F4", "IRKT"}},
{"Asia/Istanbul", EET}, {"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT}, {"Asia/Jakarta", WIT},
{"Asia/Jayapura", new String[] {"\u4e1c\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIT", {"Asia/Jayapura", new String[] {"\u4e1c\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIT",
@ -646,16 +647,14 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
"\u5f7c\u5f97\u7f57\u5df4\u752b\u6d1b\u592b\u65af\u514b\u590f\u4ee4\u65f6", "PETST", "\u5f7c\u5f97\u7f57\u5df4\u752b\u6d1b\u592b\u65af\u514b\u590f\u4ee4\u65f6", "PETST",
"\u5F7C\u5F97\u7F57\u5DF4\u752B\u6D1B\u592B\u65AF\u514B\u65F6\u95F4", "PETT"}}, "\u5F7C\u5F97\u7F57\u5DF4\u752B\u6D1B\u592B\u65AF\u514B\u65F6\u95F4", "PETT"}},
{"Asia/Karachi", PKT}, {"Asia/Karachi", PKT},
{"Asia/Kashgar", CTT}, {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT}, {"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT}, {"Asia/Katmandu", NPT},
{"Asia/Khandyga", new String[] {"\u6C49\u5FB7\u52A0\u65F6\u95F4", "YAKT", {"Asia/Khandyga", new String[] {"\u6C49\u5FB7\u52A0\u65F6\u95F4", "YAKT",
"\u6C49\u5FB7\u52A0\u590F\u4EE4\u65F6", "YAKST", "\u6C49\u5FB7\u52A0\u590F\u4EE4\u65F6", "YAKST",
"\u6C49\u5FB7\u52A0\u65F6\u95F4", "YAKT"}}, "\u6C49\u5FB7\u52A0\u65F6\u95F4", "YAKT"}},
{"Asia/Kolkata", IST}, {"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u65f6\u95f4", "KRAT", {"Asia/Krasnoyarsk", KRAT},
"\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u590f\u4ee4\u65f6", "KRAST",
"\u514B\u62C9\u65AF\u8BFA\u4E9A\u5C14\u65AF\u514B\u65F6\u95F4", "KRAT"}},
{"Asia/Kuala_Lumpur", MYT}, {"Asia/Kuala_Lumpur", MYT},
{"Asia/Kuching", MYT}, {"Asia/Kuching", MYT},
{"Asia/Kuwait", ARAST}, {"Asia/Kuwait", ARAST},
@ -670,7 +669,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
"\u83F2\u5F8B\u5BBE\u65F6\u95F4", "PHT"}}, "\u83F2\u5F8B\u5BBE\u65F6\u95F4", "PHT"}},
{"Asia/Muscat", GST}, {"Asia/Muscat", GST},
{"Asia/Nicosia", EET}, {"Asia/Nicosia", EET},
{"Asia/Novokuznetsk", NOVT}, {"Asia/Novokuznetsk", KRAT},
{"Asia/Novosibirsk", NOVT}, {"Asia/Novosibirsk", NOVT},
{"Asia/Oral", new String[] {"Oral \u65f6\u95f4", "ORAT", {"Asia/Oral", new String[] {"Oral \u65f6\u95f4", "ORAT",
"Oral \u590f\u4ee4\u65f6", "ORAST", "Oral \u590f\u4ee4\u65f6", "ORAST",
@ -696,6 +695,9 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{"Asia/Samarkand", UZT}, {"Asia/Samarkand", UZT},
{"Asia/Seoul", KST}, {"Asia/Seoul", KST},
{"Asia/Singapore", SGT}, {"Asia/Singapore", SGT},
{"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
"Srednekolymsk Daylight Time", "SREDT",
"Srednekolymsk Time", "SRET"}},
{"Asia/Taipei", CTT}, {"Asia/Taipei", CTT},
{"Asia/Tel_Aviv", ISRAEL}, {"Asia/Tel_Aviv", ISRAEL},
{"Asia/Tashkent", UZT}, {"Asia/Tashkent", UZT},
@ -708,7 +710,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{"Asia/Ujung_Pandang", CIT}, {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT}, {"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT}, {"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT}, {"Asia/Urumqi", XJT},
{"Asia/Ust-Nera", new String[] {"\u4E4C\u65AF\u5B63\u6D85\u62C9\u65F6\u95F4", "VLAT", {"Asia/Ust-Nera", new String[] {"\u4E4C\u65AF\u5B63\u6D85\u62C9\u65F6\u95F4", "VLAT",
"\u4E4C\u65AF\u5B63\u6D85\u62C9\u590F\u4EE4\u65F6", "VLAST", "\u4E4C\u65AF\u5B63\u6D85\u62C9\u590F\u4EE4\u65F6", "VLAST",
"\u4E4C\u65AF\u5B63\u6D85\u62C9\u65F6\u95F4", "VLAT"}}, "\u4E4C\u65AF\u5B63\u6D85\u62C9\u65F6\u95F4", "VLAT"}},
@ -750,9 +752,9 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{"Australia/Canberra", EST_NSW}, {"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW}, {"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN}, {"Australia/Darwin", DARWIN},
{"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "CWST", {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "ACWST",
"\u4E2D\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "CWST", "\u4E2D\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "ACWDT",
"\u4E2D\u897F\u90E8\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "CWT"}}, "\u4E2D\u897F\u90E8\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "ACWT"}},
{"Australia/Hobart", TASMANIA}, {"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE}, {"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE}, {"Australia/Lindeman", BRISBANE},
@ -818,7 +820,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST}, {"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET}, {"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST}, {"Europe/Jersey", GMTBST},
{"Europe/Kaliningrad", FET}, {"Europe/Kaliningrad", EET},
{"Europe/Kiev", EET}, {"Europe/Kiev", EET},
{"Europe/Lisbon", WET}, {"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET}, {"Europe/Ljubljana", CET},
@ -853,9 +855,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{"Europe/Vatican", CET}, {"Europe/Vatican", CET},
{"Europe/Vienna", CET}, {"Europe/Vienna", CET},
{"Europe/Vilnius", EET}, {"Europe/Vilnius", EET},
{"Europe/Volgograd", new String[] {"\u4f0f\u5c14\u52a0\u683c\u52d2\u65f6\u95f4", "VOLT", {"Europe/Volgograd", MSK},
"\u4f0f\u5c14\u52a0\u683c\u52d2\u590f\u4ee4\u65f6", "VOLST",
"\u4F0F\u5C14\u52A0\u683C\u52D2\u65F6\u95F4", "VOLT"}},
{"Europe/Warsaw", CET}, {"Europe/Warsaw", CET},
{"Europe/Zagreb", CET}, {"Europe/Zagreb", CET},
{"Europe/Zaporozhye", EET}, {"Europe/Zaporozhye", EET},

104
jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
View File

@ -48,9 +48,9 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
String ACT[] = new String[] {"Acre \u6642\u9593", "ACT", String ACT[] = new String[] {"Acre \u6642\u9593", "ACT",
"Acre \u590f\u4ee4\u6642\u9593", "ACST", "Acre \u590f\u4ee4\u6642\u9593", "ACST",
"Acre \u6642\u9593", "ACT"}; "Acre \u6642\u9593", "ACT"};
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)", "ACST",
"\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)", "ACDT",
"\u4E2D\u90E8\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u90E8)", "CT"}; "\u4E2D\u90E8\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u90E8)", "ACT"};
String AGT[] = new String[] {"\u963f\u6839\u5ef7\u6642\u9593", "ART", String AGT[] = new String[] {"\u963f\u6839\u5ef7\u6642\u9593", "ART",
"\u963f\u6839\u5ef7\u590f\u4ee4\u6642\u9593", "ARST", "\u963f\u6839\u5ef7\u590f\u4ee4\u6642\u9593", "ARST",
"\u963F\u6839\u5EF7\u6642\u9593", "ART"}; "\u963F\u6839\u5EF7\u6642\u9593", "ART"};
@ -72,12 +72,12 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
String BDT[] = new String[] {"\u5b5f\u52a0\u62c9\u6642\u9593", "BDT", String BDT[] = new String[] {"\u5b5f\u52a0\u62c9\u6642\u9593", "BDT",
"\u5b5f\u52a0\u62c9\u590f\u4ee4\u6642\u9593", "BDST", "\u5b5f\u52a0\u62c9\u590f\u4ee4\u6642\u9593", "BDST",
"\u5B5F\u52A0\u62C9\u6642\u9593", "BDT"}; "\u5B5F\u52A0\u62C9\u6642\u9593", "BDT"};
String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u6606\u58EB\u862D)", "EST", String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u6606\u58EB\u862D)", "AEST",
"\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u6606\u58EB\u862D)", "EST", "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u6606\u58EB\u862D)", "AEDT",
"\u6771\u90E8\u6642\u9593 (\u6606\u58EB\u862D)", "ET"}; "\u6771\u90E8\u6642\u9593 (\u6606\u58EB\u862D)", "AET"};
String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "CST", String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "ACST",
"\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "CST", "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "ACDT",
"\u4E2D\u90E8\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u90E8/\u65B0\u5357\u5A01\u723E\u65AF)", "CT"}; "\u4E2D\u90E8\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u90E8/\u65B0\u5357\u5A01\u723E\u65AF)", "ACT"};
String BRT[] = new String[] {"\u5df4\u897f\u5229\u4e9e\u6642\u9593", "BRT", String BRT[] = new String[] {"\u5df4\u897f\u5229\u4e9e\u6642\u9593", "BRT",
"\u5df4\u897f\u5229\u4e9e\u590f\u4ee4\u6642\u9593", "BRST", "\u5df4\u897f\u5229\u4e9e\u590f\u4ee4\u6642\u9593", "BRST",
"\u5DF4\u897F\u5229\u4E9E\u6642\u9593", "BRT"}; "\u5DF4\u897F\u5229\u4E9E\u6642\u9593", "BRT"};
@ -111,9 +111,9 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
String CUBA[] = new String[] {"\u53e4\u5df4\u6a19\u6e96\u6642\u9593", "CST", String CUBA[] = new String[] {"\u53e4\u5df4\u6a19\u6e96\u6642\u9593", "CST",
"\u53e4\u5df4\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT", "\u53e4\u5df4\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT",
"\u53E4\u5DF4\u6642\u9593", "CT"}; "\u53E4\u5DF4\u6642\u9593", "CT"};
String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "CST", String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "ACST",
"\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "CST", "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "ACDT",
"\u6FB3\u5927\u5229\u4E9E\u4E2D\u90E8\u6642\u9593 (\u5317\u65B9\u5340\u57DF)", "CT"}; "\u6FB3\u5927\u5229\u4E9E\u4E2D\u90E8\u6642\u9593 (\u5317\u65B9\u5340\u57DF)", "ACT"};
String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u5e73\u5747\u6642\u9593", "GMT", String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u5e73\u5747\u6642\u9593", "GMT",
"\u611b\u723e\u862d\u590f\u4ee4\u6642\u9593", "IST", "\u611b\u723e\u862d\u590f\u4ee4\u6642\u9593", "IST",
"\u611B\u723E\u862D\u6587\u6642\u9593", "IT"}; "\u611B\u723E\u862D\u6587\u6642\u9593", "IT"};
@ -132,9 +132,9 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
String EST[] = new String[] {"\u6771\u65b9\u6a19\u6e96\u6642\u9593", "EST", String EST[] = new String[] {"\u6771\u65b9\u6a19\u6e96\u6642\u9593", "EST",
"\u6771\u65b9\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "EDT", "\u6771\u65b9\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "EDT",
"\u7F8E\u570B\u6771\u90E8\u6642\u9593", "ET"}; "\u7F8E\u570B\u6771\u90E8\u6642\u9593", "ET"};
String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "EST", String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "AEST",
"\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "EST", "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "AEDT",
"\u6771\u90E8\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "ET"}; "\u6771\u90E8\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "AET"};
String FET[] = new String[] {"\u6771\u6B50\u5167\u9678\u6642\u9593", "FET", String FET[] = new String[] {"\u6771\u6B50\u5167\u9678\u6642\u9593", "FET",
"\u6771\u6B50\u5167\u9678\u590F\u4EE4\u6642\u9593", "FEST", "\u6771\u6B50\u5167\u9678\u590F\u4EE4\u6642\u9593", "FEST",
"\u6771\u6B50\u5167\u9678\u6642\u9593", "FET"}; "\u6771\u6B50\u5167\u9678\u6642\u9593", "FET"};
@ -165,6 +165,9 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
String ICT[] = new String[] {"\u5370\u5ea6\u652f\u90a3\u6642\u9593", "ICT", String ICT[] = new String[] {"\u5370\u5ea6\u652f\u90a3\u6642\u9593", "ICT",
"\u5370\u5ea6\u652f\u90a3\u590f\u4ee4\u6642\u9593", "ICST", "\u5370\u5ea6\u652f\u90a3\u590f\u4ee4\u6642\u9593", "ICST",
"\u5370\u5EA6\u652F\u90A3\u6642\u9593", "ICT"}; "\u5370\u5EA6\u652F\u90A3\u6642\u9593", "ICT"};
String IRKT[] = new String[] {"Irkutsk \u6642\u9593", "IRKT",
"Irkutsk \u590f\u4ee4\u6642\u9593", "IRKST",
"\u4F0A\u723E\u5EAB\u6B21\u514B\u6642\u9593", "IRKT"};
String IRT[] = new String[] {"\u4f0a\u6717\u6a19\u6e96\u6642\u9593", "IRST", String IRT[] = new String[] {"\u4f0a\u6717\u6a19\u6e96\u6642\u9593", "IRST",
"\u4f0a\u6717\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "IRDT", "\u4f0a\u6717\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "IRDT",
"\u4F0A\u6717\u6642\u9593", "IRT"}; "\u4F0A\u6717\u6642\u9593", "IRT"};
@ -177,11 +180,14 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
String JST[] = new String[] {"\u65e5\u672c\u6a19\u6e96\u6642\u9593", "JST", String JST[] = new String[] {"\u65e5\u672c\u6a19\u6e96\u6642\u9593", "JST",
"\u65e5\u672c\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "JDT", "\u65e5\u672c\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "JDT",
"\u65E5\u672C\u6642\u9593", "JT"}; "\u65E5\u672C\u6642\u9593", "JT"};
String KRAT[] = new String[] {"\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u6642\u9593", "KRAT",
"\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u590f\u4ee4\u6642\u9593", "KRAST",
"\u514B\u62C9\u65AF\u8AFE\u4E9E\u723E\u65AF\u514B\u6642\u9593", "KRAT"};
String KST[] = new String[] {"\u97d3\u570b\u6a19\u6e96\u6642\u9593", "KST", String KST[] = new String[] {"\u97d3\u570b\u6a19\u6e96\u6642\u9593", "KST",
"\u97d3\u570b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "KDT", "\u97d3\u570b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "KDT",
"\u97D3\u570B\u6642\u9593", "KT"}; "\u97D3\u570B\u6642\u9593", "KT"};
String LORD_HOWE[] = new String[] {"\u8c6a\u52f3\u7235\u5cf6\u6a19\u6e96\u6642\u9593", "LHST", String LORD_HOWE[] = new String[] {"\u8c6a\u52f3\u7235\u5cf6\u6a19\u6e96\u6642\u9593", "LHST",
"\u8c6a\u52f3\u7235\u5cf6\u590f\u4ee4\u6642\u9593", "LHST", "\u8c6a\u52f3\u7235\u5cf6\u590f\u4ee4\u6642\u9593", "LHDT",
"\u8C6A\u52F3\u7235\u5CF6\u6642\u9593", "LHT"}; "\u8C6A\u52F3\u7235\u5CF6\u6642\u9593", "LHT"};
String MHT[] = new String[] {"\u99ac\u7d39\u723e\u7fa4\u5cf6\u6642\u9593", "MHT", String MHT[] = new String[] {"\u99ac\u7d39\u723e\u7fa4\u5cf6\u6642\u9593", "MHT",
"\u99ac\u7d39\u723e\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "MHST", "\u99ac\u7d39\u723e\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "MHST",
@ -231,20 +237,15 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
String SGT[] = new String[] {"\u65b0\u52a0\u5761\u6642\u9593", "SGT", String SGT[] = new String[] {"\u65b0\u52a0\u5761\u6642\u9593", "SGT",
"\u65b0\u52a0\u5761\u590f\u4ee4\u6642\u9593", "SGST", "\u65b0\u52a0\u5761\u590f\u4ee4\u6642\u9593", "SGST",
"\u65B0\u52A0\u5761\u6642\u9593", "SGT"}; "\u65B0\u52A0\u5761\u6642\u9593", "SGT"};
String SLST[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u5e73\u5747\u6642\u9593", "GMT", String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "AEST",
"\u7345\u5b50\u5c71\u590f\u4ee4\u6642\u9593", "SLST", "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "AEDT",
"\u7345\u5B50\u5C71\u6642\u9593", "SLT"}; "\u6FB3\u5927\u5229\u4E9E\u6771\u90E8\u6642\u9593 (\u5854\u65AF\u99AC\u5C3C\u4E9E\u5CF6)", "AET"};
String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "EST",
"\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "EST",
"\u6FB3\u5927\u5229\u4E9E\u6771\u90E8\u6642\u9593 (\u5854\u65AF\u99AC\u5C3C\u4E9E\u5CF6)", "ET"};
String TMT[] = new String[] {"\u571f\u5eab\u66fc\u6642\u9593", "TMT", String TMT[] = new String[] {"\u571f\u5eab\u66fc\u6642\u9593", "TMT",
"\u571f\u5eab\u66fc\u590f\u4ee4\u6642\u9593", "TMST", "\u571f\u5eab\u66fc\u590f\u4ee4\u6642\u9593", "TMST",
"\u571F\u5EAB\u66FC\u6642\u9593", "TMT"}; "\u571F\u5EAB\u66FC\u6642\u9593", "TMT"};
String ULAT[]= new String[] {"\u5eab\u502b\u6642\u9593", "ULAT", String ULAT[]= new String[] {"\u5eab\u502b\u6642\u9593", "ULAT",
"\u5eab\u502b\u590f\u4ee4\u6642\u9593", "ULAST", "\u5eab\u502b\u590f\u4ee4\u6642\u9593", "ULAST",
"\u5EAB\u502B\u6642\u9593", "ULAT"}; "\u5EAB\u502B\u6642\u9593", "ULAT"};
String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u6642\u9593", "WART",
"\u897f\u963f\u6839\u5ef7\u590f\u4ee4\u6642\u9593", "WARST"};
String WAT[] = new String[] {"\u897f\u975e\u6642\u9593", "WAT", String WAT[] = new String[] {"\u897f\u975e\u6642\u9593", "WAT",
"\u897f\u975e\u590f\u4ee4\u6642\u9593", "WAST", "\u897f\u975e\u590f\u4ee4\u6642\u9593", "WAST",
"\u897F\u975E\u6642\u9593", "WAT"}; "\u897F\u975E\u6642\u9593", "WAT"};
@ -254,27 +255,30 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
String WIT[] = new String[] {"\u897f\u5370\u5c3c\u6642\u9593", "WIB", String WIT[] = new String[] {"\u897f\u5370\u5c3c\u6642\u9593", "WIB",
"\u897f\u5370\u5c3c\u590f\u4ee4\u6642\u9593", "WIST", "\u897f\u5370\u5c3c\u590f\u4ee4\u6642\u9593", "WIST",
"\u897F\u5370\u5C3C\u6642\u9593", "WIB"}; "\u897F\u5370\u5C3C\u6642\u9593", "WIB"};
String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "WST", String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "AWST",
"\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "WST", "\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "AWDT",
"\u897F\u90E8\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "WT"}; "\u897F\u90E8\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "AWT"};
String SAMOA[] = new String[] {"\u85a9\u6469\u4e9e\u6a19\u6e96\u6642\u9593", "SST", String SAMOA[] = new String[] {"\u85a9\u6469\u4e9e\u6a19\u6e96\u6642\u9593", "SST",
"\u85a9\u6469\u4e9e\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "SDT", "\u85a9\u6469\u4e9e\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "SDT",
"\u85A9\u6469\u4E9E\u6642\u9593", "ST"}; "\u85A9\u6469\u4E9E\u6642\u9593", "ST"};
String WST_SAMOA[] = new String[] {"\u897f\u85a9\u6469\u4e9e\u6642\u9593", "WST", String WST_SAMOA[] = new String[] {"\u897f\u85a9\u6469\u4e9e\u6642\u9593", "WSST",
"\u897f\u85a9\u6469\u4e9e\u590f\u4ee4\u6642\u9593", "WSDT", "\u897f\u85a9\u6469\u4e9e\u590f\u4ee4\u6642\u9593", "WSDT",
"\u897F\u85A9\u6469\u4E9E\u6642\u9593", "WST"}; "\u897F\u85A9\u6469\u4E9E\u6642\u9593", "WST"};
String ChST[] = new String[] {"\u67e5\u83ab\u6d1b\u6a19\u6e96\u6642\u9593", "ChST", String ChST[] = new String[] {"\u67e5\u83ab\u6d1b\u6a19\u6e96\u6642\u9593", "ChST",
"\u67e5\u83ab\u6d1b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ChDT", "\u67e5\u83ab\u6d1b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ChDT",
"\u67E5\u83AB\u7F85\u6642\u9593", "ChT"}; "\u67E5\u83AB\u7F85\u6642\u9593", "ChT"};
String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "EST", String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "AEST",
"\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "EST", "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "AEDT",
"\u6771\u90E8\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E)", "ET"}; "\u6771\u90E8\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E)", "AET"};
String UTC[] = new String[] {"\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC", String UTC[] = new String[] {"\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC",
"\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC", "\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC",
"\u5354\u8ABF\u4E16\u754C\u6642\u9593", "UTC"}; "\u5354\u8ABF\u4E16\u754C\u6642\u9593", "UTC"};
String UZT[] = new String[] {"\u70cf\u8332\u5225\u514b\u65af\u5766\u6642\u9593", "UZT", String UZT[] = new String[] {"\u70cf\u8332\u5225\u514b\u65af\u5766\u6642\u9593", "UZT",
"\u70cf\u8332\u5225\u514b\u65af\u5766\u590f\u4ee4\u6642\u9593", "UZST", "\u70cf\u8332\u5225\u514b\u65af\u5766\u590f\u4ee4\u6642\u9593", "UZST",
"\u70CF\u8332\u5225\u514B\u65AF\u5766\u6642\u9593", "UZT"}; "\u70CF\u8332\u5225\u514B\u65AF\u5766\u6642\u9593", "UZT"};
String XJT[] = new String[] {"\u4e2d\u570b\u6a19\u6e96\u6642\u9593", "XJT",
"\u4e2d\u570b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "XJDT",
"\u4E2D\u570B\u6642\u9593", "XJT"};
return new Object[][] { return new Object[][] {
{"America/Los_Angeles", PST}, {"America/Los_Angeles", PST},
@ -336,7 +340,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{"Africa/Djibouti", EAT}, {"Africa/Djibouti", EAT},
{"Africa/Douala", WAT}, {"Africa/Douala", WAT},
{"Africa/El_Aaiun", WET}, {"Africa/El_Aaiun", WET},
{"Africa/Freetown", SLST}, {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT}, {"Africa/Gaborone", CAT},
{"Africa/Harare", CAT}, {"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST}, {"Africa/Johannesburg", SAST},
@ -437,7 +441,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
"\u897f\u683c\u6797\u862d\u5cf6\u590f\u4ee4\u6642\u9593", "WGST", "\u897f\u683c\u6797\u862d\u5cf6\u590f\u4ee4\u6642\u9593", "WGST",
"\u897F\u683C\u9675\u862D\u6642\u9593", "WGT"}}, "\u897F\u683C\u9675\u862D\u6642\u9593", "WGT"}},
{"America/Goose_Bay", AST}, {"America/Goose_Bay", AST},
{"America/Grand_Turk", EST}, {"America/Grand_Turk", AST},
{"America/Grenada", AST}, {"America/Grenada", AST},
{"America/Guadeloupe", AST}, {"America/Guadeloupe", AST},
{"America/Guatemala", CST}, {"America/Guatemala", CST},
@ -484,9 +488,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{"America/Mendoza", AGT}, {"America/Mendoza", AGT},
{"America/Menominee", CST}, {"America/Menominee", CST},
{"America/Merida", CST}, {"America/Merida", CST},
{"America/Metlakatla", new String[] {"\u6885\u7279\u62C9\u5361\u7279\u62C9\u6A19\u6E96\u6642\u9593", "MeST", {"America/Metlakatla", PST},
"\u6885\u7279\u62C9\u5361\u7279\u62C9\u65E5\u5149\u7BC0\u7D04\u6642\u9593", "MeDT",
"\u6885\u7279\u62C9\u5361\u7279\u62C9\u6642\u9593", "MeT"}},
{"America/Mexico_City", CST}, {"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u6a19\u6e96\u6642\u9593", "PMST", {"America/Miquelon", new String[] {"\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u6a19\u6e96\u6642\u9593", "PMST",
"\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PMDT", "\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PMDT",
@ -607,6 +609,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
"\u6c76\u840a\u590f\u4ee4\u6642\u9593", "BNST", "\u6c76\u840a\u590f\u4ee4\u6642\u9593", "BNST",
"\u6C76\u840A\u6642\u9593", "BNT"}}, "\u6C76\u840A\u6642\u9593", "BNT"}},
{"Asia/Calcutta", IST}, {"Asia/Calcutta", IST},
{"Asia/Chita", IRKT},
{"Asia/Choibalsan", new String[] {"\u5de7\u5df4\u5c71 (Choibalsan) \u6642\u9593", "CHOT", {"Asia/Choibalsan", new String[] {"\u5de7\u5df4\u5c71 (Choibalsan) \u6642\u9593", "CHOT",
"\u5de7\u5df4\u5c71 (Choibalsan) \u590f\u4ee4\u6642\u9593", "CHOST", "\u5de7\u5df4\u5c71 (Choibalsan) \u590f\u4ee4\u6642\u9593", "CHOST",
"\u5DE7\u5DF4\u5C71 (Choibalsan) \u6642\u9593", "CHOT"}}, "\u5DE7\u5DF4\u5C71 (Choibalsan) \u6642\u9593", "CHOT"}},
@ -631,9 +634,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{"Asia/Hovd", new String[] {"\u4faf\u5fb7 (Hovd) \u6642\u9593", "HOVT", {"Asia/Hovd", new String[] {"\u4faf\u5fb7 (Hovd) \u6642\u9593", "HOVT",
"\u4faf\u5fb7 (Hovd) \u590f\u4ee4\u6642\u9593", "HOVST", "\u4faf\u5fb7 (Hovd) \u590f\u4ee4\u6642\u9593", "HOVST",
"\u4FAF\u5FB7 (Hovd) \u6642\u9593", "HOVT"}}, "\u4FAF\u5FB7 (Hovd) \u6642\u9593", "HOVT"}},
{"Asia/Irkutsk", new String[] {"Irkutsk \u6642\u9593", "IRKT", {"Asia/Irkutsk", IRKT},
"Irkutsk \u590f\u4ee4\u6642\u9593", "IRKST",
"\u4F0A\u723E\u5EAB\u6B21\u514B\u6642\u9593", "IRKT"}},
{"Asia/Istanbul", EET}, {"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT}, {"Asia/Jakarta", WIT},
{"Asia/Jayapura", new String[] {"\u6771\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "WIT", {"Asia/Jayapura", new String[] {"\u6771\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "WIT",
@ -646,16 +647,14 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
"Petropavlovsk-Kamchatski \u590f\u4ee4\u6642\u9593", "PETST", "Petropavlovsk-Kamchatski \u590f\u4ee4\u6642\u9593", "PETST",
"Petropavlovsk-Kamchatski \u6642\u9593", "PETT"}}, "Petropavlovsk-Kamchatski \u6642\u9593", "PETT"}},
{"Asia/Karachi", PKT}, {"Asia/Karachi", PKT},
{"Asia/Kashgar", CTT}, {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT}, {"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT}, {"Asia/Katmandu", NPT},
{"Asia/Khandyga", new String[] {"\u6F22\u5730\u52A0 (Khandyga) \u6642\u9593", "YAKT", {"Asia/Khandyga", new String[] {"\u6F22\u5730\u52A0 (Khandyga) \u6642\u9593", "YAKT",
"\u6F22\u5730\u52A0 (Khandyga) \u590F\u4EE4\u6642\u9593", "YAKST", "\u6F22\u5730\u52A0 (Khandyga) \u590F\u4EE4\u6642\u9593", "YAKST",
"\u6F22\u5730\u52A0 (Khandyga) \u6642\u9593", "YAKT"}}, "\u6F22\u5730\u52A0 (Khandyga) \u6642\u9593", "YAKT"}},
{"Asia/Kolkata", IST}, {"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u6642\u9593", "KRAT", {"Asia/Krasnoyarsk", KRAT},
"\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u590f\u4ee4\u6642\u9593", "KRAST",
"\u514B\u62C9\u65AF\u8AFE\u4E9E\u723E\u65AF\u514B\u6642\u9593", "KRAT"}},
{"Asia/Kuala_Lumpur", MYT}, {"Asia/Kuala_Lumpur", MYT},
{"Asia/Kuching", MYT}, {"Asia/Kuching", MYT},
{"Asia/Kuwait", ARAST}, {"Asia/Kuwait", ARAST},
@ -670,7 +669,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
"\u83F2\u5F8B\u8CD3\u6642\u9593", "PHT"}}, "\u83F2\u5F8B\u8CD3\u6642\u9593", "PHT"}},
{"Asia/Muscat", GST}, {"Asia/Muscat", GST},
{"Asia/Nicosia", EET}, {"Asia/Nicosia", EET},
{"Asia/Novokuznetsk", NOVT}, {"Asia/Novokuznetsk", KRAT},
{"Asia/Novosibirsk", NOVT}, {"Asia/Novosibirsk", NOVT},
{"Asia/Oral", new String[] {"\u6b50\u4f5b\u6642\u9593", "ORAT", {"Asia/Oral", new String[] {"\u6b50\u4f5b\u6642\u9593", "ORAT",
"\u6b50\u4f5b\u590f\u4ee4\u6642\u9593", "ORAST", "\u6b50\u4f5b\u590f\u4ee4\u6642\u9593", "ORAST",
@ -696,6 +695,9 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{"Asia/Samarkand", UZT}, {"Asia/Samarkand", UZT},
{"Asia/Seoul", KST}, {"Asia/Seoul", KST},
{"Asia/Singapore", SGT}, {"Asia/Singapore", SGT},
{"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
"Srednekolymsk Daylight Time", "SREDT",
"Srednekolymsk Time", "SRET"}},
{"Asia/Taipei", new String[] {"\u53f0\u7063\u6a19\u6e96\u6642\u9593", "TST", {"Asia/Taipei", new String[] {"\u53f0\u7063\u6a19\u6e96\u6642\u9593", "TST",
"\u53f0\u7063\u590f\u4ee4\u6642\u9593", "TDT", "\u53f0\u7063\u590f\u4ee4\u6642\u9593", "TDT",
"\u53f0\u7063\u6642\u9593", "TT"}}, "\u53f0\u7063\u6642\u9593", "TT"}},
@ -710,7 +712,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{"Asia/Ujung_Pandang", CIT}, {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT}, {"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT}, {"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT}, {"Asia/Urumqi", XJT},
{"Asia/Ust-Nera", new String[] {"\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u6642\u9593", "VLAT", {"Asia/Ust-Nera", new String[] {"\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u6642\u9593", "VLAT",
"\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u590F\u4EE4\u6642\u9593", "VLAST", "\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u590F\u4EE4\u6642\u9593", "VLAST",
"\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u6642\u9593", "VLAT"}}, "\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u6642\u9593", "VLAT"}},
@ -752,9 +754,9 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{"Australia/Canberra", EST_NSW}, {"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW}, {"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN}, {"Australia/Darwin", DARWIN},
{"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "CWST", {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "ACWST",
"\u4E2D\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "CWST", "\u4E2D\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "ACWDT",
"\u4E2D\u897F\u90E8\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "CWT"}}, "\u4E2D\u897F\u90E8\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "ACWT"}},
{"Australia/Hobart", TASMANIA}, {"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE}, {"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE}, {"Australia/Lindeman", BRISBANE},
@ -820,7 +822,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST}, {"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET}, {"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST}, {"Europe/Jersey", GMTBST},
{"Europe/Kaliningrad", FET}, {"Europe/Kaliningrad", EET},
{"Europe/Kiev", EET}, {"Europe/Kiev", EET},
{"Europe/Lisbon", WET}, {"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET}, {"Europe/Ljubljana", CET},
@ -855,9 +857,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{"Europe/Vatican", CET}, {"Europe/Vatican", CET},
{"Europe/Vienna", CET}, {"Europe/Vienna", CET},
{"Europe/Vilnius", EET}, {"Europe/Vilnius", EET},
{"Europe/Volgograd", new String[] {"\u4f0f\u723e\u52a0\u683c\u52d2\u6642\u9593", "VOLT", {"Europe/Volgograd", MSK},
"\u4f0f\u723e\u52a0\u683c\u52d2\u590f\u4ee4\u6642\u9593", "VOLST",
"\u4F0F\u723E\u52A0\u683C\u52D2\u6642\u9593", "VOLT"}},
{"Europe/Warsaw", CET}, {"Europe/Warsaw", CET},
{"Europe/Zagreb", CET}, {"Europe/Zagreb", CET},
{"Europe/Zaporozhye", EET}, {"Europe/Zaporozhye", EET},

2
jdk/test/java/time/test/java/time/format/TestZoneTextPrinterParser.java
View File

@ -138,7 +138,7 @@ public class TestZoneTextPrinterParser extends AbstractTestPrinterParser {
{"Asia/Taipei", "China Standard Time", preferred, Locale.ENGLISH, TextStyle.FULL}, {"Asia/Taipei", "China Standard Time", preferred, Locale.ENGLISH, TextStyle.FULL},
{"America/Chicago", "CST", none, Locale.ENGLISH, TextStyle.SHORT}, {"America/Chicago", "CST", none, Locale.ENGLISH, TextStyle.SHORT},
{"Asia/Taipei", "CST", preferred, Locale.ENGLISH, TextStyle.SHORT}, {"Asia/Taipei", "CST", preferred, Locale.ENGLISH, TextStyle.SHORT},
{"Australia/South", "CST", preferred_s, Locale.ENGLISH, TextStyle.SHORT}, {"Australia/South", "ACST", preferred_s, Locale.ENGLISH, TextStyle.SHORT},
{"America/Chicago", "CDT", none, Locale.ENGLISH, TextStyle.SHORT}, {"America/Chicago", "CDT", none, Locale.ENGLISH, TextStyle.SHORT},
{"Asia/Shanghai", "CDT", preferred_s, Locale.ENGLISH, TextStyle.SHORT}, {"Asia/Shanghai", "CDT", preferred_s, Locale.ENGLISH, TextStyle.SHORT},
}; };

2
jdk/test/sun/util/calendar/zi/tzdata/VERSION
View File

@ -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.
# #
tzdata2014c tzdata2014g

615
jdk/test/sun/util/calendar/zi/tzdata/africa
View File

File diff suppressed because it is too large Load Diff

126
jdk/test/sun/util/calendar/zi/tzdata/antarctica
View File

@ -21,19 +21,16 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
# From Paul Eggert (1999-11-15): # From Paul Eggert (1999-11-15):
# To keep things manageable, we list only locations occupied year-round; see # To keep things manageable, we list only locations occupied year-round; see
# <a href="http://www.comnap.aq/comnap/comnap.nsf/P/Stations/">
# COMNAP - Stations and Bases # COMNAP - Stations and Bases
# </a> # http://www.comnap.aq/comnap/comnap.nsf/P/Stations/
# and # and
# <a href="http://www.spri.cam.ac.uk/bob/periant.htm">
# Summary of the Peri-Antarctic Islands (1998-07-23) # Summary of the Peri-Antarctic Islands (1998-07-23)
# </a> # http://www.spri.cam.ac.uk/bob/periant.htm
# for information. # for information.
# Unless otherwise specified, we have no time zone information. # Unless otherwise specified, we have no time zone information.
# #
@ -78,19 +75,19 @@ Rule ChileAQ 2012 max - Sep Sun>=2 4:00u 1:00 S
# Argentina - year-round bases # Argentina - year-round bases
# Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05 # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
# Esperanza, San Martin Land, -6323-05659, since 1952-12-17 # Carlini, Potter Cove, King George Island, -6414-0602320, since 1982-01
# Jubany, Potter Peninsula, King George Island, -6414-0602320, since 1982-01 # Esperanza, Hope Bay, -6323-05659, since 1952-12-17
# Marambio, Seymour I, -6414-05637, since 1969-10-29 # Marambio, -6414-05637, since 1969-10-29
# Orcadas, Laurie I, -6016-04444, since 1904-02-22 # Orcadas, Laurie I, -6016-04444, since 1904-02-22
# San Martin, Debenham I, -6807-06708, since 1951-03-21 # San Martín, Barry I, -6808-06706, since 1951-03-21
# (except 1960-03 / 1976-03-21) # (except 1960-03 / 1976-03-21)
# Australia - territories # Australia - territories
# Heard Island, McDonald Islands (uninhabited) # Heard Island, McDonald Islands (uninhabited)
# previously sealers and scientific personnel wintered # previously sealers and scientific personnel wintered
# <a href="http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html">
# Margaret Turner reports # Margaret Turner reports
# </a> (1999-09-30) that they're UTC+5, with no DST; # http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html
# (1999-09-30) that they're UTC+5, with no DST;
# presumably this is when they have visitors. # presumably this is when they have visitors.
# #
# year-round bases # year-round bases
@ -107,14 +104,10 @@ Rule ChileAQ 2012 max - Sep Sun>=2 4:00u 1:00 S
# The changes occurred on 2009-10-18 at 02:00 (local times). # The changes occurred on 2009-10-18 at 02:00 (local times).
# #
# Government source: (Australian Antarctic Division) # Government source: (Australian Antarctic Division)
# <a href="http://www.aad.gov.au/default.asp?casid=37079">
# http://www.aad.gov.au/default.asp?casid=37079 # http://www.aad.gov.au/default.asp?casid=37079
# </a>
# #
# We have more background information here: # We have more background information here:
# <a href="http://www.timeanddate.com/news/time/antarctica-new-times.html">
# http://www.timeanddate.com/news/time/antarctica-new-times.html # http://www.timeanddate.com/news/time/antarctica-new-times.html
# </a>
# From Steffen Thorsen (2010-03-10): # From Steffen Thorsen (2010-03-10):
# We got these changes from the Australian Antarctic Division: ... # We got these changes from the Australian Antarctic Division: ...
@ -129,19 +122,16 @@ Rule ChileAQ 2012 max - Sep Sun>=2 4:00u 1:00 S
# - Mawson station stays on UTC+5. # - Mawson station stays on UTC+5.
# #
# Background: # Background:
# <a href="http://www.timeanddate.com/news/time/antartica-time-changes-2010.html">
# http://www.timeanddate.com/news/time/antartica-time-changes-2010.html # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
# </a>
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Antarctica/Casey 0 - zzz 1969 Zone Antarctica/Casey 0 - zzz 1969
8:00 - WST 2009 Oct 18 2:00 8:00 - AWST 2009 Oct 18 2:00
# Western (Aus) Standard Time # Australian Western Std Time
11:00 - CAST 2010 Mar 5 2:00 11:00 - CAST 2010 Mar 5 2:00 # Casey Time
# Casey Time 8:00 - AWST 2011 Oct 28 2:00
8:00 - WST 2011 Oct 28 2:00
11:00 - CAST 2012 Feb 21 17:00u 11:00 - CAST 2012 Feb 21 17:00u
8:00 - WST 8:00 - AWST
Zone Antarctica/Davis 0 - zzz 1957 Jan 13 Zone Antarctica/Davis 0 - zzz 1957 Jan 13
7:00 - DAVT 1964 Nov # Davis Time 7:00 - DAVT 1964 Nov # Davis Time
0 - zzz 1969 Feb 0 - zzz 1969 Feb
@ -151,28 +141,30 @@ Zone Antarctica/Davis 0 - zzz 1957 Jan 13
5:00 - DAVT 2012 Feb 21 20:00u 5:00 - DAVT 2012 Feb 21 20:00u
7:00 - DAVT 7:00 - DAVT
Zone Antarctica/Mawson 0 - zzz 1954 Feb 13 Zone Antarctica/Mawson 0 - zzz 1954 Feb 13
6:00 - MAWT 2009 Oct 18 2:00 6:00 - MAWT 2009 Oct 18 2:00 # Mawson Time
# Mawson Time
5:00 - MAWT 5:00 - MAWT
# References: # References:
# <a href="http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html">
# Casey Weather (1998-02-26) # Casey Weather (1998-02-26)
# </a> # http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html
# <a href="http://www.antdiv.gov.au/aad/exop/sfo/davis/video.html">
# Davis Station, Antarctica (1998-02-26) # Davis Station, Antarctica (1998-02-26)
# </a> # http://www.antdiv.gov.au/aad/exop/sfo/davis/video.html
# <a href="http://www.antdiv.gov.au/aad/exop/sfo/mawson/video.html">
# Mawson Station, Antarctica (1998-02-25) # Mawson Station, Antarctica (1998-02-25)
# </a> # http://www.antdiv.gov.au/aad/exop/sfo/mawson/video.html
# Belgium - year-round base
# Princess Elisabeth, Queen Maud Land, -713412+0231200, since 2007
# Brazil - year-round base # Brazil - year-round base
# Comandante Ferraz, King George Island, -6205+05824, since 1983/4 # Ferraz, King George Island, -6205+05824, since 1983/4
# Bulgaria - year-round base
# St. Kliment Ohridski, Livingston Island, -623829-0602153, since 1988
# Chile - year-round bases and towns # Chile - year-round bases and towns
# Escudero, South Shetland Is, -621157-0585735, since 1994 # Escudero, South Shetland Is, -621157-0585735, since 1994
# Presidente Eduadro Frei, King George Island, -6214-05848, since 1969-03-07 # Frei Montalva, King George Island, -6214-05848, since 1969-03-07
# General Bernardo O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02 # O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
# Capitan Arturo Prat, -6230-05941 # Prat, -6230-05941
# Villa Las Estrellas (a town), around the Frei base, since 1984-04-09 # Villa Las Estrellas (a town), around the Frei base, since 1984-04-09
# These locations have always used Santiago time; use TZ='America/Santiago'. # These locations have always used Santiago time; use TZ='America/Santiago'.
@ -180,31 +172,35 @@ Zone Antarctica/Mawson 0 - zzz 1954 Feb 13
# Great Wall, King George Island, -6213-05858, since 1985-02-20 # Great Wall, King George Island, -6213-05858, since 1985-02-20
# Zhongshan, Larsemann Hills, Prydz Bay, -6922+07623, since 1989-02-26 # Zhongshan, Larsemann Hills, Prydz Bay, -6922+07623, since 1989-02-26
# France - year-round bases # France - year-round bases (also see "France & Italy")
# #
# From Antoine Leca (1997-01-20): # From Antoine Leca (1997-01-20):
# Time data are from Nicole Pailleau at the IFRTP # Time data entries are from Nicole Pailleau at the IFRTP
# (French Institute for Polar Research and Technology). # (French Institute for Polar Research and Technology).
# She confirms that French Southern Territories and Terre Adelie bases # She confirms that French Southern Territories and Terre Adélie bases
# don't observe daylight saving time, even if Terre Adelie supplies came # don't observe daylight saving time, even if Terre Adélie supplies came
# from Tasmania. # from Tasmania.
# #
# French Southern Territories with year-round inhabitants # French Southern Territories with year-round inhabitants
# #
# Martin-de-Vivies Base, Amsterdam Island, -374105+0773155, since 1950 # Alfred Faure, Possession Island, Crozet Islands, -462551+0515152, since 1964;
# Alfred-Faure Base, Crozet Islands, -462551+0515152, since 1964 # sealing & whaling stations operated variously 1802/1911+;
# Port-aux-Francais, Kerguelen Islands, -492110+0701303, since 1951; # see Indian/Reunion.
#
# Martin-de-Viviès, Amsterdam Island, -374105+0773155, since 1950
# Port-aux-Français, Kerguelen Islands, -492110+0701303, since 1951;
# whaling & sealing station operated 1908/1914, 1920/1929, and 1951/1956 # whaling & sealing station operated 1908/1914, 1920/1929, and 1951/1956
# #
# St Paul Island - near Amsterdam, uninhabited # St Paul Island - near Amsterdam, uninhabited
# fishing stations operated variously 1819/1931 # fishing stations operated variously 1819/1931
# #
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Indian/Kerguelen 0 - zzz 1950 # Port-aux-Francais Zone Indian/Kerguelen 0 - zzz 1950 # Port-aux-Français
5:00 - TFT # ISO code TF Time 5:00 - TFT # ISO code TF Time
# #
# year-round base in the main continent # year-round base in the main continent
# Dumont-d'Urville, Ile des Petrels, -6640+14001, since 1956-11 # Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
# <http://en.wikipedia.org/wiki/Dumont_d'Urville_Station> (2005-12-05)
# #
# Another base at Port-Martin, 50km east, began operation in 1947. # Another base at Port-Martin, 50km east, began operation in 1947.
# It was destroyed by fire on 1952-01-14. # It was destroyed by fire on 1952-01-14.
@ -214,20 +210,22 @@ Zone Antarctica/DumontDUrville 0 - zzz 1947
10:00 - PMT 1952 Jan 14 # Port-Martin Time 10:00 - PMT 1952 Jan 14 # Port-Martin Time
0 - zzz 1956 Nov 0 - zzz 1956 Nov
10:00 - DDUT # Dumont-d'Urville Time 10:00 - DDUT # Dumont-d'Urville Time
# Reference:
# <a href="http://en.wikipedia.org/wiki/Dumont_d'Urville_Station"> # France & Italy - year-round base
# Dumont d'Urville Station (2005-12-05) # Concordia, -750600+1232000, since 2005
# </a>
# Germany - year-round base # Germany - year-round base
# Georg von Neumayer, -7039-00815 # Neumayer III, -704080-0081602, since 2009
# India - year-round base # India - year-round bases
# Dakshin Gangotri, -7005+01200 # Bharati, -692428+0761114, since 2012
# Maitri, -704558+0114356, since 1989
# Italy - year-round base (also see "France & Italy")
# Zuchelli, Terra Nova Bay, -744140+1640647, since 1986
# Japan - year-round bases # Japan - year-round bases
# Dome Fuji, -7719+03942 # Syowa (also known as Showa), -690022+0393524, since 1957
# Syowa, -690022+0393524
# #
# From Hideyuki Suzuki (1999-02-06): # From Hideyuki Suzuki (1999-02-06):
# In all Japanese stations, +0300 is used as the standard time. # In all Japanese stations, +0300 is used as the standard time.
@ -239,11 +237,11 @@ Zone Antarctica/DumontDUrville 0 - zzz 1947
Zone Antarctica/Syowa 0 - zzz 1957 Jan 29 Zone Antarctica/Syowa 0 - zzz 1957 Jan 29
3:00 - SYOT # Syowa Time 3:00 - SYOT # Syowa Time
# See: # See:
# <a href="http://www.nipr.ac.jp/english/ara01.html">
# NIPR Antarctic Research Activities (1999-08-17) # NIPR Antarctic Research Activities (1999-08-17)
# </a> # http://www.nipr.ac.jp/english/ara01.html
# S Korea - year-round base # S Korea - year-round base
# Jang Bogo, Terra Nova Bay, -743700+1641205 since 2014
# King Sejong, King George Island, -6213-05847, since 1988 # King Sejong, King George Island, -6213-05847, since 1988
# New Zealand - claims # New Zealand - claims
@ -292,6 +290,9 @@ Zone Antarctica/Troll 0 - zzz 2005 Feb 12
# Poland - year-round base # Poland - year-round base
# Arctowski, King George Island, -620945-0582745, since 1977 # Arctowski, King George Island, -620945-0582745, since 1977
# Romania - year-bound base
# Law-Racoviță, Larsemann Hills, -692319+0762251, since 1986
# Russia - year-round bases # Russia - year-round bases
# Bellingshausen, King George Island, -621159-0585337, since 1968-02-22 # Bellingshausen, King George Island, -621159-0585337, since 1968-02-22
# Mirny, Davis coast, -6633+09301, since 1956-02 # Mirny, Davis coast, -6633+09301, since 1956-02
@ -301,8 +302,8 @@ Zone Antarctica/Troll 0 - zzz 2005 Feb 12
# year-round from 1960/61 to 1992 # year-round from 1960/61 to 1992
# Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11 # Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11
# <a href="http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP"> # From Craig Mundell (1994-12-15):
# From Craig Mundell (1994-12-15)</a>: # http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP
# Vostok, which is one of the Russian stations, is set on the same # Vostok, which is one of the Russian stations, is set on the same
# time as Moscow, Russia. # time as Moscow, Russia.
# #
@ -317,7 +318,7 @@ Zone Antarctica/Troll 0 - zzz 2005 Feb 12
# #
# From Paul Eggert (2001-05-04): # From Paul Eggert (2001-05-04):
# This seems to be hopelessly confusing, so I asked Lee Hotz about it # This seems to be hopelessly confusing, so I asked Lee Hotz about it
# in person. He said that some Antartic locations set their local # in person. He said that some Antarctic locations set their local
# time so that noon is the warmest part of the day, and that this # time so that noon is the warmest part of the day, and that this
# changes during the year and does not necessarily correspond to mean # changes during the year and does not necessarily correspond to mean
# solar noon. So the Vostok time might have been whatever the clocks # solar noon. So the Vostok time might have been whatever the clocks
@ -329,9 +330,12 @@ Zone Antarctica/Vostok 0 - zzz 1957 Dec 16
# S Africa - year-round bases # S Africa - year-round bases
# Marion Island, -4653+03752 # Marion Island, -4653+03752
# Sanae, -7141-00250 # SANAE IV, Vesleskarvet, Queen Maud Land, -714022-0025026, since 1997
# UK # Ukraine - year-round base
# Vernadsky (formerly Faraday), Galindez Island, -651445-0641526, since 1954
# United Kingdom
# #
# British Antarctic Territories (BAT) claims # British Antarctic Territories (BAT) claims
# South Orkney Islands # South Orkney Islands
@ -387,7 +391,7 @@ Zone Antarctica/Palmer 0 - zzz 1965
# but that he found it more convenient to keep GMT+12 # but that he found it more convenient to keep GMT+12
# as supplies for the station were coming from McMurdo Sound, # as supplies for the station were coming from McMurdo Sound,
# which was on GMT+12 because New Zealand was on GMT+12 all year # which was on GMT+12 because New Zealand was on GMT+12 all year
# at that time (1957). (Source: Siple's book 90 degrees SOUTH.) # at that time (1957). (Source: Siple's book 90 Degrees South.)
# #
# From Susan Smith # From Susan Smith
# http://www.cybertours.com/whs/pole10.html # http://www.cybertours.com/whs/pole10.html

818
jdk/test/sun/util/calendar/zi/tzdata/asia
View File

File diff suppressed because it is too large Load Diff

836
jdk/test/sun/util/calendar/zi/tzdata/australasia
View File

File diff suppressed because it is too large Load Diff

9
jdk/test/sun/util/calendar/zi/tzdata/backward
View File

@ -21,15 +21,15 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
# This file provides links between current names for time zones # This file provides links between current names for time zones
# and their old names. Many names changed in late 1993. # and their old names. Many names changed in late 1993.
# Link TARGET LINK-NAME
Link Africa/Asmara Africa/Asmera Link Africa/Asmara Africa/Asmera
Link Africa/Bamako Africa/Timbuktu Link Africa/Abidjan Africa/Timbuktu
Link America/Argentina/Catamarca America/Argentina/ComodRivadavia Link America/Argentina/Catamarca America/Argentina/ComodRivadavia
Link America/Adak America/Atka Link America/Adak America/Atka
Link America/Argentina/Buenos_Aires America/Buenos_Aires Link America/Argentina/Buenos_Aires America/Buenos_Aires
@ -50,8 +50,11 @@ Link America/Port_of_Spain America/Virgin
Link Pacific/Auckland Antarctica/South_Pole Link Pacific/Auckland Antarctica/South_Pole
Link Asia/Ashgabat Asia/Ashkhabad Link Asia/Ashgabat Asia/Ashkhabad
Link Asia/Kolkata Asia/Calcutta Link Asia/Kolkata Asia/Calcutta
Link Asia/Chongqing Asia/Chungking Link Asia/Shanghai Asia/Chongqing
Link Asia/Shanghai Asia/Chungking
Link Asia/Dhaka Asia/Dacca Link Asia/Dhaka Asia/Dacca
Link Asia/Shanghai Asia/Harbin
Link Asia/Urumqi Asia/Kashgar
Link Asia/Kathmandu Asia/Katmandu Link Asia/Kathmandu Asia/Katmandu
Link Asia/Macau Asia/Macao Link Asia/Macau Asia/Macao
Link Asia/Ho_Chi_Minh Asia/Saigon Link Asia/Ho_Chi_Minh Asia/Saigon

3
jdk/test/sun/util/calendar/zi/tzdata/etcetera
View File

@ -21,7 +21,6 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
@ -37,7 +36,7 @@ Zone Etc/UTC 0 - UTC
Zone Etc/UCT 0 - UCT Zone Etc/UCT 0 - UCT
# The following link uses older naming conventions, # The following link uses older naming conventions,
# but it belongs here, not in the file `backward', # but it belongs here, not in the file 'backward',
# as functions like gmtime load the "GMT" file to handle leap seconds properly. # as functions like gmtime load the "GMT" file to handle leap seconds properly.
# We want this to work even on installations that omit the other older names. # We want this to work even on installations that omit the other older names.
Link Etc/GMT GMT Link Etc/GMT GMT

1050
jdk/test/sun/util/calendar/zi/tzdata/europe
View File

File diff suppressed because it is too large Load Diff

1
jdk/test/sun/util/calendar/zi/tzdata/factory
View File

@ -21,7 +21,6 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.

12
jdk/test/sun/util/calendar/zi/tzdata/iso3166.tab
View File

@ -26,21 +26,21 @@
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
# #
# From Paul Eggert (2013-05-27): # From Paul Eggert (2014-07-18):
# This file contains a table of two-letter country codes. Columns are
# separated by a single tab. Lines beginning with '#' are comments.
# Although all text currently uses ASCII encoding, this is planned to
# change to UTF-8 soon. The columns of the table are as follows:
# #
# This file contains a table with the following columns:
# 1. ISO 3166-1 alpha-2 country code, current as of # 1. ISO 3166-1 alpha-2 country code, current as of
# ISO 3166-1 Newsletter VI-15 (2013-05-10). See: Updates on ISO 3166 # ISO 3166-1 Newsletter VI-16 (2013-07-11). See: Updates on ISO 3166
# http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm # http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
# 2. The usual English name for the coded region, # 2. The usual English name for the coded region,
# chosen so that alphabetic sorting of subsets produces helpful lists. # chosen so that alphabetic sorting of subsets produces helpful lists.
# This is not the same as the English name in the ISO 3166 tables. # This is not the same as the English name in the ISO 3166 tables.
# #
# Columns are separated by a single tab.
# The table is sorted by country code. # The table is sorted by country code.
# #
# Lines beginning with `#' are comments.
#
# This table is intended as an aid for users, to help them select time # This table is intended as an aid for users, to help them select time
# zone data appropriate for their practical needs. It is not intended # zone data appropriate for their practical needs. It is not intended
# to take or endorse any position on legal or territorial claims. # to take or endorse any position on legal or territorial claims.

2
jdk/test/sun/util/calendar/zi/tzdata/leapseconds
View File

@ -31,7 +31,7 @@
# you should be able to pick up leap-seconds.list from a secondary NIST server. # you should be able to pick up leap-seconds.list from a secondary NIST server.
# For more about leap-seconds.list, please see # For more about leap-seconds.list, please see
# The NTP Timescale and Leap Seconds # The NTP Timescale and Leap Seconds
# <http://www.eecis.udel.edu/~mills/leap.html>. # http://www.eecis.udel.edu/~mills/leap.html
# The International Earth Rotation Service periodically uses leap seconds # The International Earth Rotation Service periodically uses leap seconds
# to keep UTC to within 0.9 s of UT1 # to keep UTC to within 0.9 s of UT1

471
jdk/test/sun/util/calendar/zi/tzdata/northamerica
View File

File diff suppressed because it is too large Load Diff

1
jdk/test/sun/util/calendar/zi/tzdata/pacificnew
View File

@ -21,7 +21,6 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.

446
jdk/test/sun/util/calendar/zi/tzdata/southamerica
View File

File diff suppressed because it is too large Load Diff

1
jdk/test/sun/util/calendar/zi/tzdata/systemv
View File

@ -21,7 +21,6 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.

69
jdk/test/sun/util/calendar/zi/tzdata/zone.tab
View File

@ -21,39 +21,27 @@
# 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.
# #
# TZ zone descriptions # tz zone descriptions (deprecated version)
# #
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
# #
# From Paul Eggert (2013-08-14): # From Paul Eggert (2014-07-31):
# This file is intended as a backward-compatibility aid for older programs.
# New programs should use zone1970.tab. This file is like zone1970.tab (see
# zone1970.tab's comments), but with the following additional restrictions:
# #
# This file contains a table where each row stands for an area that is # 1. This file contains only ASCII characters.
# the intersection of a region identified by a country code and of a # 2. The first data column contains exactly one country code.
# zone where civil clocks have agreed since 1970. The columns of the
# table are as follows:
# #
# 1. ISO 3166 2-character country code. See the file 'iso3166.tab'. # Because of (2), each row stands for an area that is the intersection
# 2. Latitude and longitude of the area's principal location # of a region identified by a country code and of a zone where civil
# in ISO 6709 sign-degrees-minutes-seconds format, # clocks have agreed since 1970; this is a narrower definition than
# either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS, # that of zone1970.tab.
# first latitude (+ is north), then longitude (+ is east).
# 3. Zone name used in value of TZ environment variable.
# Please see the 'Theory' file for how zone names are chosen.
# If multiple zones overlap a country, each has a row in the
# table, with column 1 being duplicated.
# 4. Comments; present if and only if the country has multiple rows.
#
# Columns are separated by a single tab.
# The table is sorted first by country, then an order within the country that
# (1) makes some geographical sense, and
# (2) puts the most populous areas first, where that does not contradict (1).
#
# Lines beginning with '#' are comments.
# #
# This table is intended as an aid for users, to help them select time # This table is intended as an aid for users, to help them select time
# zone data appropriate for their practical needs. It is not intended # zone data entries appropriate for their practical needs. It is not
# to take or endorse any position on legal or territorial claims. # intended to take or endorse any position on legal or territorial claims.
# #
#country- #country-
#code coordinates TZ comments #code coordinates TZ comments
@ -72,7 +60,7 @@ AQ -6736+06253 Antarctica/Mawson Mawson Station, Holme Bay
AQ -6835+07758 Antarctica/Davis Davis Station, Vestfold Hills AQ -6835+07758 Antarctica/Davis Davis Station, Vestfold Hills
AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula
AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok
AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Adelie Land
AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I
AQ -720041+0023206 Antarctica/Troll Troll Station, Queen Maud Land AQ -720041+0023206 Antarctica/Troll Troll Station, Queen Maud Land
AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF)
@ -151,7 +139,7 @@ CA +4901-08816 America/Nipigon Eastern Time - Ontario & Quebec - places that did
CA +4823-08915 America/Thunder_Bay Eastern Time - Thunder Bay, Ontario CA +4823-08915 America/Thunder_Bay Eastern Time - Thunder Bay, Ontario
CA +6344-06828 America/Iqaluit Eastern Time - east Nunavut - most locations CA +6344-06828 America/Iqaluit Eastern Time - east Nunavut - most locations
CA +6608-06544 America/Pangnirtung Eastern Time - Pangnirtung, Nunavut CA +6608-06544 America/Pangnirtung Eastern Time - Pangnirtung, Nunavut
CA +744144-0944945 America/Resolute Central Standard Time - Resolute, Nunavut CA +744144-0944945 America/Resolute Central Time - Resolute, Nunavut
CA +484531-0913718 America/Atikokan Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut CA +484531-0913718 America/Atikokan Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
CA +624900-0920459 America/Rankin_Inlet Central Time - central Nunavut CA +624900-0920459 America/Rankin_Inlet Central Time - central Nunavut
CA +4953-09709 America/Winnipeg Central Time - Manitoba & west Ontario CA +4953-09709 America/Winnipeg Central Time - Manitoba & west Ontario
@ -176,13 +164,10 @@ CH +4723+00832 Europe/Zurich
CI +0519-00402 Africa/Abidjan CI +0519-00402 Africa/Abidjan
CK -2114-15946 Pacific/Rarotonga CK -2114-15946 Pacific/Rarotonga
CL -3327-07040 America/Santiago most locations CL -3327-07040 America/Santiago most locations
CL -2709-10926 Pacific/Easter Easter Island & Sala y Gomez CL -2709-10926 Pacific/Easter Easter Island
CM +0403+00942 Africa/Douala CM +0403+00942 Africa/Douala
CN +3114+12128 Asia/Shanghai east China - Beijing, Guangdong, Shanghai, etc. CN +3114+12128 Asia/Shanghai Beijing Time
CN +4545+12641 Asia/Harbin Heilongjiang (except Mohe), Jilin CN +4348+08735 Asia/Urumqi Xinjiang Time
CN +2934+10635 Asia/Chongqing central China - Sichuan, Yunnan, Guangxi, Shaanxi, Guizhou, etc.
CN +4348+08735 Asia/Urumqi most of Tibet & Xinjiang
CN +3929+07559 Asia/Kashgar west Tibet & Xinjiang
CO +0436-07405 America/Bogota CO +0436-07405 America/Bogota
CR +0956-08405 America/Costa_Rica CR +0956-08405 America/Costa_Rica
CU +2308-08222 America/Havana CU +2308-08222 America/Havana
@ -364,24 +349,26 @@ RE -2052+05528 Indian/Reunion
RO +4426+02606 Europe/Bucharest RO +4426+02606 Europe/Bucharest
RS +4450+02030 Europe/Belgrade RS +4450+02030 Europe/Belgrade
RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad
RU +5545+03735 Europe/Moscow Moscow+00 - west Russia RU +554521+0373704 Europe/Moscow Moscow+00 - west Russia
RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea
RU +5312+05009 Europe/Samara Moscow+00 - Samara, Udmurtia
RU +4457+03406 Europe/Simferopol Moscow+00 - Crimea RU +4457+03406 Europe/Simferopol Moscow+00 - Crimea
RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea
RU +5312+05009 Europe/Samara Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals
RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia
RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk
RU +5345+08707 Asia/Novokuznetsk Moscow+03 - Novokuznetsk RU +5345+08707 Asia/Novokuznetsk Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
RU +5601+09250 Asia/Krasnoyarsk Moscow+04 - Yenisei River RU +5601+09250 Asia/Krasnoyarsk Moscow+04 - Yenisei River
RU +5216+10420 Asia/Irkutsk Moscow+05 - Lake Baikal RU +5216+10420 Asia/Irkutsk Moscow+05 - Lake Baikal
RU +5203+11328 Asia/Chita Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
RU +6200+12940 Asia/Yakutsk Moscow+06 - Lena River RU +6200+12940 Asia/Yakutsk Moscow+06 - Lena River
RU +623923+1353314 Asia/Khandyga Moscow+06 - Tomponsky, Ust-Maysky RU +623923+1353314 Asia/Khandyga Moscow+06 - Tomponsky, Ust-Maysky
RU +4310+13156 Asia/Vladivostok Moscow+07 - Amur River RU +4310+13156 Asia/Vladivostok Moscow+07 - Amur River
RU +4658+14242 Asia/Sakhalin Moscow+07 - Sakhalin Island RU +4658+14242 Asia/Sakhalin Moscow+07 - Sakhalin Island
RU +643337+1431336 Asia/Ust-Nera Moscow+07 - Oymyakonsky RU +643337+1431336 Asia/Ust-Nera Moscow+07 - Oymyakonsky
RU +5934+15048 Asia/Magadan Moscow+08 - Magadan RU +5934+15048 Asia/Magadan Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
RU +5301+15839 Asia/Kamchatka Moscow+08 - Kamchatka RU +6728+15343 Asia/Srednekolymsk Moscow+08 - E Sakha, N Kuril Is
RU +6445+17729 Asia/Anadyr Moscow+08 - Bering Sea RU +5301+15839 Asia/Kamchatka Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
RU +6445+17729 Asia/Anadyr Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
RW -0157+03004 Africa/Kigali RW -0157+03004 Africa/Kigali
SA +2438+04643 Asia/Riyadh SA +2438+04643 Asia/Riyadh
SB -0932+16012 Pacific/Guadalcanal SB -0932+16012 Pacific/Guadalcanal
@ -448,13 +435,13 @@ US +394421-1045903 America/Denver Mountain Time
US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon
US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona (except Navajo) US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona (except Navajo)
US +340308-1181434 America/Los_Angeles Pacific Time US +340308-1181434 America/Los_Angeles Pacific Time
US +550737-1313435 America/Metlakatla Pacific Standard Time - Annette Island, Alaska
US +611305-1495401 America/Anchorage Alaska Time US +611305-1495401 America/Anchorage Alaska Time
US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle
US +571035-1351807 America/Sitka Alaska Time - southeast Alaska panhandle US +571035-1351807 America/Sitka Alaska Time - southeast Alaska panhandle
US +593249-1394338 America/Yakutat Alaska Time - Alaska panhandle neck US +593249-1394338 America/Yakutat Alaska Time - Alaska panhandle neck
US +643004-1652423 America/Nome Alaska Time - west Alaska US +643004-1652423 America/Nome Alaska Time - west Alaska
US +515248-1763929 America/Adak Aleutian Islands US +515248-1763929 America/Adak Aleutian Islands
US +550737-1313435 America/Metlakatla Metlakatla Time - Annette Island
US +211825-1575130 Pacific/Honolulu Hawaii US +211825-1575130 Pacific/Honolulu Hawaii
UY -3453-05611 America/Montevideo UY -3453-05611 America/Montevideo
UZ +3940+06648 Asia/Samarkand west Uzbekistan UZ +3940+06648 Asia/Samarkand west Uzbekistan

4
jdk/test/sun/util/resources/TimeZone/Bug6317929.java
View File

@ -122,11 +122,11 @@ public class Bug6317929 {
TimeZone Currie = TimeZone.getTimeZone("Australia/Currie"); TimeZone Currie = TimeZone.getTimeZone("Australia/Currie");
tzLocale = locales2Test[0]; tzLocale = locales2Test[0];
if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals
("Eastern Standard Time (New South Wales)")) ("Australian Eastern Standard Time (New South Wales)"))
throw new RuntimeException("\n" + tzLocale + ": LONG, " + throw new RuntimeException("\n" + tzLocale + ": LONG, " +
"non-daylight saving name for " + "non-daylight saving name for " +
"Australia/Currie should be " + "Australia/Currie should be " +
"\"Eastern Standard Time " + "\"Australian Eastern Standard Time " +
"(New South Wales)\""); "(New South Wales)\"");
tzLocale = locales2Test[1]; tzLocale = locales2Test[1];
if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals