From 6d23bbf4a2992d63111131bf26a01b299ed05cb7 Mon Sep 17 00:00:00 2001 From: peytoia Date: Tue, 12 May 2009 15:21:55 +0900 Subject: [PATCH] 6834474: (tz) Support tzdata2009g Reviewed-by: okutsu --- jdk/make/sun/javazic/tzdata/VERSION | 2 +- jdk/make/sun/javazic/tzdata/africa | 120 +++++++++++++++++- jdk/make/sun/javazic/tzdata/asia | 119 ++++++++++++++++- jdk/make/sun/javazic/tzdata/leapseconds | 34 ++--- jdk/make/sun/javazic/tzdata/northamerica | 22 +++- jdk/make/sun/javazic/tzdata/southamerica | 47 ++++++- .../sun/util/resources/TimeZoneNames.java | 4 +- .../sun/util/resources/TimeZoneNames_de.java | 4 +- .../sun/util/resources/TimeZoneNames_es.java | 4 +- .../sun/util/resources/TimeZoneNames_fr.java | 4 +- .../sun/util/resources/TimeZoneNames_it.java | 4 +- .../sun/util/resources/TimeZoneNames_ja.java | 4 +- .../sun/util/resources/TimeZoneNames_ko.java | 4 +- .../sun/util/resources/TimeZoneNames_sv.java | 4 +- .../util/resources/TimeZoneNames_zh_CN.java | 4 +- .../util/resources/TimeZoneNames_zh_TW.java | 4 +- 16 files changed, 342 insertions(+), 42 deletions(-) diff --git a/jdk/make/sun/javazic/tzdata/VERSION b/jdk/make/sun/javazic/tzdata/VERSION index 2c19203a2c..373805077f 100644 --- a/jdk/make/sun/javazic/tzdata/VERSION +++ b/jdk/make/sun/javazic/tzdata/VERSION @@ -21,4 +21,4 @@ # CA 95054 USA or visit www.sun.com if you need additional information or # have any questions. # -tzdata2009a +tzdata2009g diff --git a/jdk/make/sun/javazic/tzdata/africa b/jdk/make/sun/javazic/tzdata/africa index 52289f1205..072bc251c1 100644 --- a/jdk/make/sun/javazic/tzdata/africa +++ b/jdk/make/sun/javazic/tzdata/africa @@ -258,7 +258,46 @@ Rule Egypt 2007 only - Sep Thu>=1 23:00s 0 - # unless discontinued, next DST may end Thursday 28 August 2008. # From Paul Eggert (2007-08-17): # For lack of better info, assume the new rule is last Thursday in August. -Rule Egypt 2008 max - Aug lastThu 23:00s 0 - + +# From Petr Machata (2009-04-06): +# The following appeared in Red Hat bugzilla[1] (edited): +# +# > $ zdump -v /usr/share/zoneinfo/Africa/Cairo | grep 2009 +# > /usr/share/zoneinfo/Africa/Cairo Thu Apr 23 21:59:59 2009 UTC =3D Thu = +# Apr 23 +# > 23:59:59 2009 EET isdst=3D0 gmtoff=3D7200 +# > /usr/share/zoneinfo/Africa/Cairo Thu Apr 23 22:00:00 2009 UTC =3D Fri = +# Apr 24 +# > 01:00:00 2009 EEST isdst=3D1 gmtoff=3D10800 +# > /usr/share/zoneinfo/Africa/Cairo Thu Aug 27 20:59:59 2009 UTC =3D Thu = +# Aug 27 +# > 23:59:59 2009 EEST isdst=3D1 gmtoff=3D10800 +# > /usr/share/zoneinfo/Africa/Cairo Thu Aug 27 21:00:00 2009 UTC =3D Thu = +# Aug 27 +# > 23:00:00 2009 EET isdst=3D0 gmtoff=3D7200 +# +# > end date should be Thu Sep 24 2009 (Last Thursday in September at 23:59= +# :59) +# > http://support.microsoft.com/kb/958729/ +# +# timeanddate[2] and another site I've found[3] also support that. +# +# [1] +# https://bugzilla.redhat.com/show_bug.cgi?id=3D492263 +# +# [2] +# http://www.timeanddate.com/worldclock/clockchange.html?n=3D53 +# +# [3] +# http://wwp.greenwichmeantime.com/time-zone/africa/egypt/ +# + +# From Arthur David Olson (2009-04-20): +# In 2009 (and for the next several years), Ramadan ends before the fourth +# Thursday in September; Egypt is expected to revert to the last Thursday +# in September. +Rule Egypt 2008 only - Aug lastThu 23:00s 0 - +Rule Egypt 2009 max - Sep lastThu 23:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Cairo 2:05:00 - LMT 1900 Oct @@ -586,6 +625,40 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou # # http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html # + +# From Steffen Thorsen (2009-03-17): +# Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 according +# to many sources, such as +# +# http://news.marweb.com/morocco/entertainment/morocco-daylight-saving.html +# +# +# http://www.medi1sat.ma/fr/depeche.aspx?idp=2312 +# +# (French) +# +# Our summary: +# +# http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html +# + +# From Alexander Krivenyshev (2009-03-17): +# Here is a link to official document from Royaume du Maroc Premier Ministre, +# Ministere de la Modernisation des Secteurs Publics +# +# Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 june 1967) +# concerning the amendment of the legal time, the Ministry of Modernization of +# Public Sectors announced that the official time in the Kingdom will be +# advanced 60 minutes from Sunday 31 May 2009 at midnight. +# +# +# http://www.mmsp.gov.ma/francais/Actualites_fr/PDF_Actualites_Fr/HeureEte_FR.pdf +# +# +# +# http://www.worldtimezone.com/dst_news/dst_news_morocco03.html +# + # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Morocco 1939 only - Sep 12 0:00 1:00 S @@ -605,6 +678,8 @@ Rule Morocco 1978 only - Jun 1 0:00 1:00 S Rule Morocco 1978 only - Aug 4 0:00 0 - Rule Morocco 2008 only - Jun 1 0:00 1:00 S Rule Morocco 2008 only - Sep 1 0:00 0 - +Rule Morocco 2009 only - Jun 1 0:00 1:00 S +Rule Morocco 2009 only - Aug 21 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 0:00 Morocco WE%sT 1984 Mar 16 @@ -809,6 +884,43 @@ Zone Africa/Lome 0:04:52 - LMT 1893 # Ending : the last Sunday of October at 03:00 ... # http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=1188&Itemid=50 +# From Steffen Thorsen (2009-03-16): +# According to several news sources, Tunisia will not observe DST this year. +# (Arabic) +# +# http://www.elbashayer.com/?page=viewn&nid=42546 +# +# +# http://www.babnet.net/kiwidetail-15295.asp +# +# +# We have also confirmed this with the US embassy in Tunisia. +# We have a wrap-up about this on the following page: +# +# http://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html +# + +# From Alexander Krivenyshev (2009-03-17): +# Here is a link to Tunis Afrique Presse News Agency +# +# Standard time to be kept the whole year long (tap.info.tn): +# +# (in English) +# +# http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=26813&Itemid=157 +# +# +# (in Arabic) +# +# http://www.tap.info.tn/ar/index.php?option=com_content&task=view&id=61240&Itemid=1 +# + +# From Arthur David Olson (2009--3-18): +# The Tunis Afrique Presse News Agency notice contains this: "This measure is due to the fact +# that the fasting month of ramadan coincides with the period concerned by summer time. +# Therefore, the standard time will be kept unchanged the whole year long." +# So foregoing DST seems to be an exception (albeit one that may be repeated in the future). + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Tunisia 1939 only - Apr 15 23:00s 1:00 S Rule Tunisia 1939 only - Nov 18 23:00s 0 - @@ -833,8 +945,10 @@ Rule Tunisia 1989 only - Mar 26 0:00s 1:00 S Rule Tunisia 1990 only - May 1 0:00s 1:00 S Rule Tunisia 2005 only - May 1 0:00s 1:00 S Rule Tunisia 2005 only - Sep 30 1:00s 0 - -Rule Tunisia 2006 max - Mar lastSun 2:00s 1:00 S -Rule Tunisia 2006 max - Oct lastSun 2:00s 0 - +Rule Tunisia 2006 2008 - Mar lastSun 2:00s 1:00 S +Rule Tunisia 2006 2008 - Oct lastSun 2:00s 0 - +Rule Tunisia 2010 max - Mar lastSun 2:00s 1:00 S +Rule Tunisia 2010 max - Oct lastSun 2:00s 0 - # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's # more precise 0:09:21. # Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11. diff --git a/jdk/make/sun/javazic/tzdata/asia b/jdk/make/sun/javazic/tzdata/asia index b245bbf065..64e6b0504a 100644 --- a/jdk/make/sun/javazic/tzdata/asia +++ b/jdk/make/sun/javazic/tzdata/asia @@ -1071,6 +1071,40 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 31 15:00u # http://www.petranews.gov.jo/nepras/2006/Sep/05/4000.htm # "Jordan will switch to winter time on Friday, October 27". # + +# From Phil Pizzey (2009-04-02): +# ...I think I may have spotted an error in the timezone data for +# Jordan. +# The current (2009d) asia file shows Jordan going to daylight +# saving +# time on the last Thursday in March. +# +# Rule Jordan 2000 max - Mar lastThu 0:00s 1:00 S +# +# However timeanddate.com, which I usually find reliable, shows Jordan +# going to daylight saving time on the last Friday in March since 2002. +# Please see +# +# http://www.timeanddate.com/worldclock/timezone.html?n=11 +# + +# From Steffen Thorsen (2009-04-02): +# This single one might be good enough, (2009-03-24, Arabic): +# +# http://petra.gov.jo/Artical.aspx?Lng=2&Section=8&Artical=95279 +# +# +# Google's translation: +# +# > The Council of Ministers decided in 2002 to adopt the principle of timely +# > submission of the summer at 60 minutes as of midnight on the last Thursday +# > of the month of March of each year. +# +# So - this means the midnight between Thursday and Friday since 2002. + +# From Arthur David Olson (2009-04-06): +# We still have Jordan switching to DST on Thursdays in 2000 and 2001. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Jordan 1973 only - Jun 6 0:00 1:00 S Rule Jordan 1973 1975 - Oct 1 0:00 0 - @@ -1093,8 +1127,9 @@ Rule Jordan 1993 1998 - Apr Fri>=1 0:00 1:00 S Rule Jordan 1994 only - Sep Fri>=15 0:00 0 - Rule Jordan 1995 1998 - Sep Fri>=15 0:00s 0 - Rule Jordan 1999 only - Jul 1 0:00s 1:00 S -Rule Jordan 1999 2002 - Sep lastThu 0:00s 0 - -Rule Jordan 2000 max - Mar lastThu 0:00s 1:00 S +Rule Jordan 1999 2002 - Sep lastFri 0:00s 0 - +Rule Jordan 2000 2001 - Mar lastThu 0:00s 1:00 S +Rule Jordan 2002 max - Mar lastFri 0:00s 1:00 S Rule Jordan 2003 only - Oct 24 0:00s 0 - Rule Jordan 2004 only - Oct 15 0:00s 0 - Rule Jordan 2005 only - Sep lastFri 0:00s 0 - @@ -1576,11 +1611,46 @@ Zone Asia/Muscat 3:54:20 - LMT 1920 # http://dailymailnews.com/200808/28/news/dmbrn03.html # +# From Alexander Krivenyshev (2009-04-08): +# Based on previous media reports that "... proposed plan to +# advance clocks by one hour from May 1 will cause disturbance +# to the working schedules rather than bringing discipline in +# official working." +# +# http://www.thenews.com.pk/daily_detail.asp?id=171280 +# +# +# recent news that instead of May 2009 - Pakistan plan to +# introduce DST from April 15, 2009 +# +# FYI: Associated Press Of Pakistan +# April 08, 2009 +# Cabinet okays proposal to advance clocks by one hour from April 15 +# +# http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=73043&Itemid=1 +# +# +# or +# +# +# http://www.worldtimezone.com/dst_news/dst_news_pakistan05.html +# +# +# .... +# The Federal Cabinet on Wednesday approved the proposal to +# advance clocks in the country by one hour from April 15 to +# conserve energy" + +# From Arthur David Olson (2009-04-10): +# Assume for now that Pakistan will end DST in 2009 as it did in 2008. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Pakistan 2002 only - Apr Sun>=2 0:01 1:00 S Rule Pakistan 2002 only - Oct Sun>=2 0:01 0 - Rule Pakistan 2008 only - Jun 1 0:00 1:00 S Rule Pakistan 2008 only - Nov 1 0:00 0 - +Rule Pakistan 2009 only - Apr 15 0:00 1:00 S +Rule Pakistan 2009 only - Nov 1 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Karachi 4:28:12 - LMT 1907 5:30 - IST 1942 Sep @@ -1717,6 +1787,22 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # http://www.worldtimezone.com/dst_news/dst_news_gazastrip01.html # +# From Alexander Krivenyshev (2009-03-26): +# According to the Palestine News Network (arabic.pnn.ps), Palestinian +# government decided to start Daylight Time on Thursday night March +# 26 and continue until the night of 27 September 2009. +# +# (in Arabic) +# +# http://arabic.pnn.ps/index.php?option=com_content&task=view&id=50850 +# +# +# or +# (English translation) +# +# http://www.worldtimezone.com/dst_news/dst_news_westbank01.html +# + # The rules for Egypt are stolen from the `africa' file. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule EgyptAsia 1957 only - May 10 0:00 1:00 S @@ -1730,10 +1816,12 @@ Rule Palestine 1999 2005 - Apr Fri>=15 0:00 1:00 S Rule Palestine 1999 2003 - Oct Fri>=15 0:00 0 - Rule Palestine 2004 only - Oct 1 1:00 0 - Rule Palestine 2005 only - Oct 4 2:00 0 - -Rule Palestine 2006 max - Apr 1 0:00 1:00 S +Rule Palestine 2006 2008 - Apr 1 0:00 1:00 S Rule Palestine 2006 only - Sep 22 0:00 0 - Rule Palestine 2007 only - Sep Thu>=8 2:00 0 - -Rule Palestine 2008 max - Aug lastThu 2:00 0 - +Rule Palestine 2008 only - Aug lastFri 2:00 0 - +Rule Palestine 2009 max - Mar lastFri 0:00 1:00 S +Rule Palestine 2009 max - Sep lastMon 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -1991,8 +2079,29 @@ Rule Syria 2007 only - Nov Fri>=1 0:00 0 - # http://sana.sy/ara/2/2008/10/07/195459.htm # -Rule Syria 2008 max - Apr Fri>=1 0:00 1:00 S +# From Steffen Thorsen (2009-03-19): +# Syria will start DST on 2009-03-27 00:00 this year according to many sources, +# two examples: +# +# +# http://www.sana.sy/eng/21/2009/03/17/217563.htm +# +# (English, Syrian Arab News # Agency) +# +# http://thawra.alwehda.gov.sy/_View_news2.asp?FileName=94459258720090318012209 +# +# (Arabic, gov-site) +# +# We have not found any sources saying anything about when DST ends this year. +# +# Our summary +# +# http://www.timeanddate.com/news/time/syria-dst-starts-march-27-2009.html +# + +Rule Syria 2008 only - Apr Fri>=1 0:00 1:00 S Rule Syria 2008 max - Nov 1 0:00 0 - +Rule Syria 2009 max - Mar lastFri 0:00 1:00 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Damascus 2:25:12 - LMT 1920 # Dimashq diff --git a/jdk/make/sun/javazic/tzdata/leapseconds b/jdk/make/sun/javazic/tzdata/leapseconds index 4526cddf5b..ab4f97377f 100644 --- a/jdk/make/sun/javazic/tzdata/leapseconds +++ b/jdk/make/sun/javazic/tzdata/leapseconds @@ -75,40 +75,32 @@ Leap 2008 Dec 31 23:59:60 + S # SERVICE DE LA ROTATION TERRESTRE # OBSERVATOIRE DE PARIS # 61, Av. de l'Observatoire 75014 PARIS (France) -# Tel. : 33 (0) 1 40 51 22 26 +# Tel. : 33 (0) 1 40 51 22 29 # FAX : 33 (0) 1 40 51 22 91 -# e-mail : services.iers@obspm.fr -# http://hpiers.obspm.fr/eop-pc +# Internet : services.iers@obspm.fr # -# Paris, 4 July 2008 +# Paris, 15 January 2009 # -# Bulletin C 36 +# Bulletin C 37 # # To authorities responsible # for the measurement and # distribution of time # -# UTC TIME STEP -# on the 1st of January 2009 +# INFORMATION ON UTC - TAI # -# A positive leap second will be introduced at the end of December 2008. -# The sequence of dates of the UTC second markers will be: +# NO positive leap second will be introduced at the end of June 2009. +# The difference between Coordinated Universal Time UTC and the +# International Atomic Time TAI is : # -# 2008 December 31, 23h 59m 59s -# 2008 December 31, 23h 59m 60s -# 2009 January 1, 0h 0m 0s -# -# The difference between UTC and the International Atomic Time TAI is: -# -# from 2006 January 1, 0h UTC, to 2009 January 1 0h UTC : UTC-TAI = - 33s -# from 2009 January 1, 0h UTC, until further notice : UTC-TAI = - 34s +# from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s # # Leap seconds can be introduced in UTC at the end of the months of December -# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every -# six months, either to announce a time step in UTC or to confirm that there +# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every +# six months, either to announce a time step in UTC, or to confirm that there # will be no time step at the next possible date. # # Daniel GAMBIS -# Head -# Earth Orientation Center of IERS +# Head +# Earth Orientation Center of the IERS # Observatoire de Paris, France diff --git a/jdk/make/sun/javazic/tzdata/northamerica b/jdk/make/sun/javazic/tzdata/northamerica index 1638f1fecb..a4dd95217b 100644 --- a/jdk/make/sun/javazic/tzdata/northamerica +++ b/jdk/make/sun/javazic/tzdata/northamerica @@ -2280,6 +2280,25 @@ Zone America/Costa_Rica -5:36:20 - LMT 1890 # San Jose # From Arthur David Olson (2008-03-12): # Assume Sun>=15 (third Sunday) going forward. +# From Alexander Krivenyshev (2009-03-04) +# According to the Radio Reloj - Cuba will start Daylight Saving Time on +# midnight between Saturday, March 07, 2009 and Sunday, March 08, 2009- +# not on midnight March 14 / March 15 as previously thought. +# +# +# http://www.worldtimezone.com/dst_news/dst_news_cuba05.html +# (in Spanish) +# + +# From Arthur David Olson (2009-03-09) +# I listened over the Internet to +# +# http://media.enet.cu/readioreloj +# +# this morning; when it was 10:05 a. m. here in Bethesda, Maryland the +# the time was announced as "diez cinco"--the same time as here, indicating +# that has indeed switched to DST. Assume second Sunday from 2009 forward. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Cuba 1928 only - Jun 10 0:00 1:00 D Rule Cuba 1928 only - Oct 10 0:00 0 S @@ -2312,7 +2331,8 @@ Rule Cuba 1998 2003 - Oct lastSun 0:00s 0 S Rule Cuba 2000 2004 - Apr Sun>=1 0:00s 1:00 D Rule Cuba 2006 max - Oct lastSun 0:00s 0 S Rule Cuba 2007 only - Mar Sun>=8 0:00s 1:00 D -Rule Cuba 2008 max - Mar Sun>=15 0:00s 1:00 D +Rule Cuba 2008 only - Mar Sun>=15 0:00s 1:00 D +Rule Cuba 2009 max - Mar Sun>=8 0:00s 1:00 D # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Havana -5:29:28 - LMT 1890 diff --git a/jdk/make/sun/javazic/tzdata/southamerica b/jdk/make/sun/javazic/tzdata/southamerica index 6c82a557a7..7da29e0925 100644 --- a/jdk/make/sun/javazic/tzdata/southamerica +++ b/jdk/make/sun/javazic/tzdata/southamerica @@ -373,6 +373,50 @@ Rule Arg 2008 max - Oct Sun>=15 0:00 1:00 S # keep America/Cordoba a single region rather than splitting it into the # other 5 subregions. +# From Mariano Absatz (2009-03-13): +# Yesterday (with our usual 2-day notice) the Province of San Luis +# decided that next Sunday instead of "staying" @utc-03:00 they will go +# to utc-04:00 until the second Saturday in October... +# +# The press release is at +# +# http://www.sanluis.gov.ar/SL/Paginas/NoticiaDetalle.asp?TemaId=1&InfoPrensaId=3102 +# +# (I couldn't find the decree, but +# +# www.sanluis.gov.ar +# +# is the official page for the Province Government). +# +# There's also a note in only one of the major national papers (La Nación) at +# +# http://www.lanacion.com.ar/nota.asp?nota_id=1107912 +# +# +# The press release says: +# (...) anunció que el próximo domingo a las 00:00 los puntanos deberán +# atrasar una hora sus relojes. +# +# A partir de entonces, San Luis establecerá el huso horario propio de +# la Provincia. De esta manera, durante el periodo del calendario anual +# 2009, el cambio horario quedará comprendido entre las 00:00 del tercer +# domingo de marzo y las 24:00 del segundo sábado de octubre. +# Quick&dirty translation +# (...) announced that next Sunday, at 00:00, Puntanos (the San Luis +# inhabitants) will have to turn back one hour their clocks +# +# Since then, San Luis will establish its own Province timezone. Thus, +# during 2009, this timezone change will run from 00:00 the third Sunday +# in March until 24:00 of the second Saturday in October. + +# From Arthur David Olson (2009-03-16): +# The unofficial claim at +# +# http://www.timeanddate.com/news/time/san-luis-new-time-zone.html +# +# is that "The province will most likely follow the next daylight saving schedule, +# which is planned for the second Sunday in October." + # # Zone NAME GMTOFF RULES FORMAT [UNTIL] # @@ -520,7 +564,8 @@ Zone America/Argentina/San_Luis -4:25:24 - LMT 1894 Oct 31 -3:00 - ART 2004 May 31 -4:00 - WART 2004 Jul 25 -3:00 Arg AR%sT 2008 Jan 21 - -3:00 - ART + -3:00 - ART 2009 Mar 15 + -4:00 Arg WAR%sT # # Santa Cruz (SC) Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31 diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java index 7b820ecd7c..7f2c570cce 100644 --- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java +++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java @@ -171,6 +171,8 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { "Truk Summer Time", "TRUST"}; String ULAT[]= new String[] {"Ulaanbaatar Time", "ULAT", "Ulaanbaatar Summer Time", "ULAST"}; + String WART[] = new String[] {"Western Argentine Time", "WART", + "Western Argentine Summer Time", "WARST"}; String WAT[] = new String[] {"Western African Time", "WAT", "Western African Summer Time", "WAST"}; String WET[] = new String[] {"Western European Time", "WET", @@ -296,7 +298,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { {"America/Argentina/Rio_Gallegos", AGT}, {"America/Argentina/Salta", AGT}, {"America/Argentina/San_Juan", AGT}, - {"America/Argentina/San_Luis", AGT}, + {"America/Argentina/San_Luis", WART}, {"America/Argentina/Tucuman", AGT}, {"America/Argentina/Ushuaia", AGT}, {"America/Aruba", AST}, diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java index f8bd8ba84f..7ff10f89df 100644 --- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java +++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java @@ -171,6 +171,8 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle { "Truk Sommerzeit", "TRUST"}; String ULAT[]= new String[] {"Ulaanbaatar Zeit", "ULAT", "Ulaanbaatar Sommerzeit", "ULAST"}; + String WART[] = new String[] {"Argentinische Zeit", "WART", + "Argentinische Sommerzeit", "WARST"}; String WAT[] = new String[] {"Westafrikanische Zeit", "WAT", "Westafrikanische Sommerzeit", "WAST"}; String WET[] = new String[] {"Westeurop\u00e4ische Zeit", "WET", @@ -296,7 +298,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle { {"America/Argentina/Rio_Gallegos", AGT}, {"America/Argentina/Salta", AGT}, {"America/Argentina/San_Juan", AGT}, - {"America/Argentina/San_Luis", AGT}, + {"America/Argentina/San_Luis", WART}, {"America/Argentina/Tucuman", AGT}, {"America/Argentina/Ushuaia", AGT}, {"America/Aruba", AST}, diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java index 54651d6922..9e1ffa8397 100644 --- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java +++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java @@ -171,6 +171,8 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle { "Hora de verano de Truk", "TRUST"}; String ULAT[]= new String[] {"Hora de Ulan Bator", "ULAT", "Hora de verano de Ulan Bator", "ULAST"}; + String WART[] = new String[] {"Hora de Argentina", "WART", + "Hora de verano de Argentina", "WARST"}; String WAT[] = new String[] {"Hora de \u00c1frica Occidental", "WAT", "Hora de verano de \u00c1frica Occidental", "WAST"}; String WET[] = new String[] {"Hora de Europa Occidental", "WET", @@ -296,7 +298,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle { {"America/Argentina/Rio_Gallegos", AGT}, {"America/Argentina/Salta", AGT}, {"America/Argentina/San_Juan", AGT}, - {"America/Argentina/San_Luis", AGT}, + {"America/Argentina/San_Luis", WART}, {"America/Argentina/Tucuman", AGT}, {"America/Argentina/Ushuaia", AGT}, {"America/Aruba", AST}, diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java index 0a91a78305..941bc4e972 100644 --- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java +++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java @@ -171,6 +171,8 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle { "Heure d'\u00e9t\u00e9 de Truk", "TRUST"}; String ULAT[]= new String[] {"Heure de l'Ulaanbaatar", "ULAT", "Heure d'\u00e9t\u00e9 de l'Ulaanbaatar", "ULAST"} ; + String WART[] = new String[] {"Heure D'Argentine", "WART", + "Heure d'\u00e9t\u00e9 D'Argentine", "WARST"} ; String WAT[] = new String[] {"Heure d'Afrique de l'Ouest", "WAT", "Heure d'\u00e9t\u00e9 d'Afrique de l'Ouest", "WAST"} ; String WET[] = new String[] {"Heure d'Europe de l'Ouest", "WET", @@ -296,7 +298,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle { {"America/Argentina/Rio_Gallegos", AGT}, {"America/Argentina/Salta", AGT}, {"America/Argentina/San_Juan", AGT}, - {"America/Argentina/San_Luis", AGT}, + {"America/Argentina/San_Luis", WART}, {"America/Argentina/Tucuman", AGT}, {"America/Argentina/Ushuaia", AGT}, {"America/Aruba", AST}, diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java index 197dd5e872..499f0fe2d9 100644 --- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java +++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java @@ -171,6 +171,8 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle { "Ora estiva di Truk", "TRUST"}; String ULAT[]= new String[] {"Ora di Ulaanbaatar", "ULAT", "Ora estiva di Ulaanbaatar", "ULAST"}; + String WART[] = new String[] {"Ora dell'Argentina", "WART", + "Ora estiva dell'Argentina", "WARST"}; String WAT[] = new String[] {"Ora dell'Africa occidentale", "WAT", "Ora estiva dell'Africa occidentale", "WAST"}; String WET[] = new String[] {"Ora dell'Europa occidentale", "WET", @@ -296,7 +298,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle { {"America/Argentina/Rio_Gallegos", AGT}, {"America/Argentina/Salta", AGT}, {"America/Argentina/San_Juan", AGT}, - {"America/Argentina/San_Luis", AGT}, + {"America/Argentina/San_Luis", WART}, {"America/Argentina/Tucuman", AGT}, {"America/Argentina/Ushuaia", AGT}, {"America/Aruba", AST}, diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java index 3cf518acf4..583a0a4e1c 100644 --- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java +++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java @@ -171,6 +171,8 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle { "\u30c8\u30e9\u30c3\u30af\u590f\u6642\u9593", "TRUST"}; 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"}; + String WART[] = new String[] {"\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "WART", + "\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u590f\u6642\u9593", "WARST"}; String WAT[] = new String[] {"\u897f\u30a2\u30d5\u30ea\u30ab\u6642\u9593", "WAT", "\u897f\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "WAST"}; String WET[] = new String[] {"\u897f\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "WET", @@ -296,7 +298,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle { {"America/Argentina/Rio_Gallegos", AGT}, {"America/Argentina/Salta", AGT}, {"America/Argentina/San_Juan", AGT}, - {"America/Argentina/San_Luis", AGT}, + {"America/Argentina/San_Luis", WART}, {"America/Argentina/Tucuman", AGT}, {"America/Argentina/Ushuaia", AGT}, {"America/Aruba", AST}, diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java index d03e150449..3e179dad3a 100644 --- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java +++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java @@ -171,6 +171,8 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle { "\ud2b8\ub8e8\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TRUST"}; String ULAT[]= new String[] {"\uc6b8\ub780\ubc14\ud0c0\ub974 \uc2dc\uac04", "ULAT", "\uc6b8\ub780\ubc14\ud0c0\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ULAST"}; + String WART[] = new String[] {"\uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "WART", + "\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", "\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WAST"}; String WET[] = new String[] {"\uc11c\uc720\ub7fd \uc2dc\uac04", "WET", @@ -296,7 +298,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle { {"America/Argentina/Rio_Gallegos", AGT}, {"America/Argentina/Salta", AGT}, {"America/Argentina/San_Juan", AGT}, - {"America/Argentina/San_Luis", AGT}, + {"America/Argentina/San_Luis", WART}, {"America/Argentina/Tucuman", AGT}, {"America/Argentina/Ushuaia", AGT}, {"America/Aruba", AST}, diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java index 2ede6f8080..ab13cd9216 100644 --- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java +++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java @@ -171,6 +171,8 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle { "Truk, sommartid", "TRUST"}; String ULAT[]= new String[] {"Ulaanbaatar, normaltid", "ULAT", "Ulaanbaatar, sommartid", "ULAST"}; + String WART[] = new String[] {"Argentina, normaltid", "WART", + "Argentina, sommartid", "WARST"}; String WAT[] = new String[] {"V\u00e4stafrikansk tid", "WAT", "V\u00e4stafrikansk sommartid", "WAST"}; String WET[] = new String[] {"V\u00e4steuropeisk tid", "WET", @@ -296,7 +298,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle { {"America/Argentina/Rio_Gallegos", AGT}, {"America/Argentina/Salta", AGT}, {"America/Argentina/San_Juan", AGT}, - {"America/Argentina/San_Luis", AGT}, + {"America/Argentina/San_Luis", WART}, {"America/Argentina/Tucuman", AGT}, {"America/Argentina/Ushuaia", AGT}, {"America/Aruba", AST}, diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java index 121492ce4a..e0dc1ec7ea 100644 --- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java +++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java @@ -171,6 +171,8 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle { "\u7279\u9c81\u514b\u590f\u4ee4\u65f6", "TRUST"}; String ULAT[]= new String[] {"\u5e93\u4f26\u65f6\u95f4", "ULAT", "\u5e93\u4f26\u590f\u4ee4\u65f6", "ULAST"}; + String WART[] = new String[] {"\u963f\u6839\u5ef7\u65f6\u95f4", "WART", + "\u963f\u6839\u5ef7\u590f\u4ee4\u65f6", "WARST"}; String WAT[] = new String[] {"\u897f\u975e\u65f6\u95f4", "WAT", "\u897f\u975e\u590f\u4ee4\u65f6", "WAST"}; String WET[] = new String[] {"\u897f\u6b27\u65f6\u95f4", "WET", @@ -296,7 +298,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle { {"America/Argentina/Rio_Gallegos", AGT}, {"America/Argentina/Salta", AGT}, {"America/Argentina/San_Juan", AGT}, - {"America/Argentina/San_Luis", AGT}, + {"America/Argentina/San_Luis", WART}, {"America/Argentina/Tucuman", AGT}, {"America/Argentina/Ushuaia", AGT}, {"America/Aruba", AST}, diff --git a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java index afd6109765..73dd22cad1 100644 --- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java +++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java @@ -171,6 +171,8 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle { "\u7279\u9b6f\u514b\u590f\u4ee4\u6642\u9593", "TRUST"}; String ULAT[]= new String[] {"\u5eab\u502b\u6642\u9593", "ULAT", "\u5eab\u502b\u590f\u4ee4\u6642\u9593", "ULAST"}; + String WART[] = new String[] {"\u963f\u6839\u5ef7\u6642\u9593", "WART", + "\u963f\u6839\u5ef7\u590f\u4ee4\u6642\u9593", "WARST"}; String WAT[] = new String[] {"\u897f\u975e\u6642\u9593", "WAT", "\u897f\u975e\u590f\u4ee4\u6642\u9593", "WAST"}; String WET[] = new String[] {"\u897f\u6b50\u6642\u9593", "WET", @@ -296,7 +298,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle { {"America/Argentina/Rio_Gallegos", AGT}, {"America/Argentina/Salta", AGT}, {"America/Argentina/San_Juan", AGT}, - {"America/Argentina/San_Luis", AGT}, + {"America/Argentina/San_Luis", WART}, {"America/Argentina/Tucuman", AGT}, {"America/Argentina/Ushuaia", AGT}, {"America/Aruba", AST}, -- GitLab