Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

通知 3
Star 2
Fork 0
D
dragonwell8_jdk

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 c269b8bb 编写于 作者: A asaha
浏览文件
操作

Merge

上级 969352bd 30013299
隐藏空白更改
内联 并排
Showing with 267 addition and 244 deletion
.hgtags
浏览文件 @ c269b8bb
......@@ -552,6 +552,7 @@ de91f05824c5398cb2d2f666ff404aaa165498de jdk8u75-b04
32f64c19b5fba8beeae5236ca6e480bd8e99698a jdk8u75-b06
d6b69f2ba2a9fe49ff5aa5c03c923e6caf4ef459 jdk8u75-b07
ecf980386508e3c74319172e2da9ffedacbb42e2 jdk8u75-b08
e6f4eb91a1fa895c2f4520e4cca0ae6f2ca14fbb jdk8u75-b09
39baa472e20c13c0eb1243eb5dce589e82f78143 jdk8u76-b00
6ea3aea950d19d803475b3f4d704a2942e71b302 jdk8u76-b01
4de4cffb5988cd68959ce4bbd14c6d4547078c91 jdk8u76-b02
......@@ -561,3 +562,4 @@ b3128c272f8d1684303975795687fd2e9cb87ddf jdk8u76-b05
06c922a192a822b6a76516d114bfb6979fab03bf jdk8u76-b06
0022766a3b8e40ab4df6a9b3732facd24ad3beb0 jdk8u76-b07
74aa3fb974fcb80a0981c1e91eae9b25174135c6 jdk8u76-b08
cbafa4c725f9d80fd369dd7979dd97682ae284e6 jdk8u76-b09
make/data/tzdata/VERSION
浏览文件 @ c269b8bb
......@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
tzdata2015g
tzdata2016a
make/data/tzdata/asia
浏览文件 @ c269b8bb
......@@ -897,6 +897,15 @@ Zone Asia/Dili 8:22:20 - LMT 1912 Jan 1
9:00 - TLT
# India
# From Ian P. Beacock, in "A brief history of (modern) time", The Atlantic
# http://www.theatlantic.com/technology/archive/2015/12/the-creation-of-modern-time/421419/
# (2015-12-22):
# In January 1906, several thousand cotton-mill workers rioted on the
# outskirts of Bombay.... They were protesting the proposed abolition of
# local time in favor of Indian Standard Time.... Journalists called this
# dispute the "Battle of the Clocks." It lasted nearly half a century.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Kolkata 5:53:28 - LMT 1880 # Kolkata
5:53:20 - HMT 1941 Oct # Howrah Mean Time?
......@@ -1107,8 +1116,15 @@ Rule Iran 2032 2033 - Mar 21 0:00 1:00 D
Rule Iran 2032 2033 - Sep 21 0:00 0 S
Rule Iran 2034 2035 - Mar 22 0:00 1:00 D
Rule Iran 2034 2035 - Sep 22 0:00 0 S
Rule Iran 2036 2037 - Mar 21 0:00 1:00 D
Rule Iran 2036 2037 - Sep 21 0:00 0 S
#
# The following rules are approximations starting in the year 2038.
# These are the best post-2037 approximations available, given the
# restrictions of a single rule using a Gregorian-based data format.
# At some point this table will need to be extended, though quite
# possibly Iran will change the rules first.
Rule Iran 2036 max - Mar 21 0:00 1:00 D
Rule Iran 2036 max - Sep 21 0:00 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Tehran 3:25:44 - LMT 1916
3:25:44 - TMT 1946 # Tehran Mean Time
......@@ -2134,8 +2150,8 @@ Zone Asia/Kathmandu 5:41:16 - LMT 1920
# http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374&Itemid=2
# 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 2002 only - Apr Sun>=2 0:00 1:00 S
Rule Pakistan 2002 only - Oct Sun>=2 0:00 0 -
Rule Pakistan 2008 only - Jun 1 0:00 1:00 S
Rule Pakistan 2008 2009 - Nov 1 0:00 0 -
Rule Pakistan 2009 only - Apr 15 0:00 1:00 S
......
make/data/tzdata/backward
浏览文件 @ c269b8bb
......@@ -46,6 +46,7 @@ Link America/Argentina/Mendoza America/Mendoza
Link America/Toronto America/Montreal
Link America/Rio_Branco America/Porto_Acre
Link America/Argentina/Cordoba America/Rosario
Link America/Tijuana America/Santa_Isabel
Link America/Denver America/Shiprock
Link America/Port_of_Spain America/Virgin
Link Pacific/Auckland Antarctica/South_Pole
......
make/data/tzdata/europe
浏览文件 @ c269b8bb
......@@ -2616,13 +2616,20 @@ Zone Asia/Irkutsk 6:57:05 - LMT 1880
# Note: Effective 2008-03-01, (75) Chita Oblast and (80) Agin-Buryat
# Autonomous Okrug merged to form (92, RU-ZAB) Zabaykalsky Krai.
# From Alexander Krivenyshev (2016-01-02):
# [The] time zone in the Trans-Baikal Territory (Zabaykalsky Krai) -
# Asia/Chita [is changing] from UTC+8 to UTC+9. Effective date will
# be March 27, 2016 at 2:00am....
# http://publication.pravo.gov.ru/Document/View/000120151230010
Zone Asia/Chita 7:33:52 - LMT 1919 Dec 15
8:00 - YAKT 1930 Jun 21 # Yakutsk Time
9:00 Russia YAK%sT 1991 Mar 31 2:00s
8:00 Russia YAK%sT 1992 Jan 19 2:00s
9:00 Russia YAK%sT 2011 Mar 27 2:00s
10:00 - YAKT 2014 Oct 26 2:00s
8:00 - IRKT
8:00 - IRKT 2016 Mar 27 2:00
9:00 - YAKT
# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
......@@ -3177,6 +3184,12 @@ Zone Europe/Zurich 0:34:08 - LMT 1853 Jul 16 # See above comment.
# It's officially announced now by the Ministry of Energy.
# Turkey delays winter time to 8th of November 04:00
# http://www.aa.com.tr/tr/turkiye/yaz-saati-uygulamasi-8-kasimda-sona-erecek/362217
#
# From BBC News (2015-10-25):
# Confused Turks are asking "what's the time?" after automatic clocks defied a
# government decision ... "For the next two weeks #Turkey is on EEST... Erdogan
# Engineered Standard Time," said Twitter user @aysekarahasan.
# http://www.bbc.com/news/world-europe-34631326
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Turkey 1916 only - May 1 0:00 1:00 S
......
make/data/tzdata/northamerica
浏览文件 @ c269b8bb
......@@ -348,6 +348,16 @@ Zone America/New_York -4:56:02 - LMT 1883 Nov 18 12:03:58
# Statue 175 closer in synch with the US Congress' intent....
# http://www.legis.state.wi.us/2007/data/acts/07Act3.pdf
# From an email administrator of the City of Fort Pierre, SD (2015-12-21):
# Fort Pierre is technically located in the Mountain time zone as is
# the rest of Stanley County. Most of Stanley County and Fort Pierre
# uses the Central time zone due to doing most of their business in
# Pierre so it simplifies schedules. I have lived in Stanley County
# all my life and it has been that way since I can remember. (43 years!)
#
# From Paul Eggert (2015-12-25):
# Assume this practice predates 1970, so Fort Pierre can use America/Chicago.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
Rule Chicago 1920 only - Jun 13 2:00 1:00 D
Rule Chicago 1920 1921 - Oct lastSun 2:00 0 S
......@@ -504,6 +514,12 @@ Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 12:07:02
# For lack of better information, assume that Metlakatla's
# abandonment of use of daylight saving resulted from the 1983 vote.
# From Steffen Thorsen (2015-11-09):
# It seems Metlakatla did go off PST on Sunday, November 1, changing
# their time to AKST and are going to follow Alaska's DST, switching
# between AKST and AKDT from now on....
# http://www.krbd.org/2015/10/30/annette-island-times-they-are-a-changing/
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Juneau 15:02:19 - LMT 1867 Oct 18
-8:57:41 - LMT 1900 Aug 20 12:00
......@@ -529,7 +545,8 @@ Zone America/Metlakatla 15:13:42 - LMT 1867 Oct 18
-8:00 US P%sT 1946
-8:00 - PST 1969
-8:00 US P%sT 1983 Oct 30 2:00
-8:00 - PST
-8:00 - PST 2015 Nov 1 2:00
-9:00 US AK%sT
Zone America/Yakutat 14:41:05 - LMT 1867 Oct 18
-9:18:55 - LMT 1900 Aug 20 12:00
-9:00 - YST 1942
......@@ -2610,25 +2627,6 @@ Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 0:11:56
-8:00 US P%sT 2002 Feb 20
-8:00 Mexico P%sT 2010
-8:00 US P%sT
# Baja California (away from US border)
Zone America/Santa_Isabel -7:39:28 - LMT 1922 Jan 1 0:20:32
-7:00 - MST 1924
-8:00 - PST 1927 Jun 10 23:00
-7:00 - MST 1930 Nov 15
-8:00 - PST 1931 Apr 1
-8:00 1:00 PDT 1931 Sep 30
-8:00 - PST 1942 Apr 24
-8:00 1:00 PWT 1945 Aug 14 23:00u
-8:00 1:00 PPT 1945 Nov 12 # Peace
-8:00 - PST 1948 Apr 5
-8:00 1:00 PDT 1949 Jan 14
-8:00 - PST 1954
-8:00 CA P%sT 1961
-8:00 - PST 1976
-8:00 US P%sT 1996
-8:00 Mexico P%sT 2001
-8:00 US P%sT 2002 Feb 20
-8:00 Mexico P%sT
# From Paul Eggert (2006-03-22):
# Formerly there was an America/Ensenada zone, which differed from
# America/Tijuana only in that it did not observe DST from 1976
......@@ -2641,6 +2639,13 @@ Zone America/Santa_Isabel -7:39:28 - LMT 1922 Jan 1 0:20:32
# other than America/Tijuana for Baja, but it's not clear yet what its
# name or contents should be.
#
# From Paul Eggert (2015-10-08):
# Formerly there was an America/Santa_Isabel zone, but this appears to
# have come from a misreading of
# http://dof.gob.mx/nota_detalle.php?codigo=5127480&fecha=06/01/2010
# It has been moved to the 'backward' file.
#
#
# Revillagigedo Is
# no information
......@@ -2715,17 +2720,7 @@ Zone Atlantic/Bermuda -4:19:18 - LMT 1930 Jan 1 2:00 # Hamilton
-4:00 US A%sT
# Cayman Is
# From Paul Eggert (2015-05-15):
# The Cayman government has decided to introduce DST in 2016, the idea being
# to keep in sync with New York. The legislation hasn't passed but the change
# seems quite likely. See: Meade B. Cayman 27.
# http://www.cayman27.com.ky/2015/05/15/clock-ticks-toward-daylight-saving-time-in-cayman
Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown
-5:07:11 - KMT 1912 Feb # Kingston Mean Time
-5:00 - EST 2016
-5:00 US E%sT
# See America/Panama.
# Costa Rica
......@@ -3248,6 +3243,7 @@ Zone America/Managua -5:45:08 - LMT 1890
Zone America/Panama -5:18:08 - LMT 1890
-5:19:36 - CMT 1908 Apr 22 # Colón Mean Time
-5:00 - EST
Link America/Panama America/Cayman
# Puerto Rico
# There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
......
make/data/tzdata/zone.tab
浏览文件 @ c269b8bb
......@@ -306,8 +306,7 @@ MX +2313-10625 America/Mazatlan Mountain Time - S Baja, Nayarit, Sinaloa
MX +2838-10605 America/Chihuahua Mexican Mountain Time - Chihuahua away from US border
MX +2934-10425 America/Ojinaga US Mountain Time - Chihuahua near US border
MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora
MX +3232-11701 America/Tijuana US Pacific Time - Baja California near US border
MX +3018-11452 America/Santa_Isabel Mexican Pacific Time - Baja California away from US border
MX +3232-11701 America/Tijuana US Pacific Time - Baja California state
MX +2048-10515 America/Bahia_Banderas Mexican Central Time - Bahia de Banderas
MY +0310+10142 Asia/Kuala_Lumpur peninsular Malaysia
MY +0133+11020 Asia/Kuching Sabah & Sarawak
......@@ -437,10 +436,10 @@ US +394421-1045903 America/Denver Mountain Time
US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon
US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona (except Navajo)
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 +581807-1342511 America/Juneau Alaska Time - Alaska panhandle
US +571035-1351807 America/Sitka Alaska Time - southeast Alaska panhandle
US +550737-1313435 America/Metlakatla Alaska Time - Annette Island
US +593249-1394338 America/Yakutat Alaska Time - Alaska panhandle neck
US +643004-1652423 America/Nome Alaska Time - west Alaska
US +515248-1763929 America/Adak Aleutian Islands
......
src/share/classes/sun/util/resources/TimeZoneNames.java
浏览文件 @ c269b8bb
......@@ -275,6 +275,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
String XJT[] = new String[] {"Xinjiang Standard Time", "XJT",
"Xinjiang Daylight Time", "XJDT",
"Xinjiang Time", "XJT"};
String YAKT[] = new String[] {"Yakutsk Time", "YAKT",
"Yakutsk Summer Time", "YAKST",
"Yakutsk Time", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
......@@ -485,7 +488,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
{"America/Metlakatla", PST},
{"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Pierre & Miquelon Standard Time", "PMST",
"Pierre & Miquelon Daylight Time", "PMDT",
......@@ -606,7 +609,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
"Brunei Summer Time", "BNST",
"Brunei Time", "BNT"}},
{"Asia/Calcutta", IST},
{"Asia/Chita", IRKT},
{"Asia/Chita", YAKT},
{"Asia/Choibalsan", new String[] {"Choibalsan Time", "CHOT",
"Choibalsan Summer Time", "CHOST",
"Choibalsan Time", "CHOT"}},
......@@ -647,10 +650,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
{"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT",
"Khandyga Summer Time", "YAKST",
"Khandyga Time", "YAKT"}},
{"Asia/Khandyga", YAKT},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
......@@ -716,9 +716,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Asia/Vladivostok", new String[] {"Vladivostok Time", "VLAT",
"Vladivostok Summer Time", "VLAST",
"Vladivostok Time", "VLAT"}},
{"Asia/Yakutsk", new String[] {"Yakutsk Time", "YAKT",
"Yakutsk Summer Time", "YAKST",
"Yakutsk Time", "YAKT"}},
{"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"Yekaterinburg Time", "YEKT",
"Yekaterinburg Summer Time", "YEKST",
"Yekaterinburg Time", "YEKT"}},
......
src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
浏览文件 @ c269b8bb
......@@ -276,6 +276,9 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
String XJT[] = new String[] {"Chinesische Normalzeit", "XJT",
"Chinesische Sommerzeit", "XJDT",
"Zeitzone f\u00FCr China", "XJT"};
String YAKT[] = new String[] {"Jakutsk Zeit", "YAKT",
"Jakutsk Sommerzeit", "YAKST",
"Jakutsk Zeit", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
......@@ -486,7 +489,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
{"America/Metlakatla", PST},
{"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Pierre & Miquelon Normalzeit", "PMST",
"Pierre & Miquelon Sommerzeit", "PMDT",
......@@ -607,7 +610,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
"Brunei Sommerzeit", "BNST",
"Brunei Zeit", "BNT"}},
{"Asia/Calcutta", IST},
{"Asia/Chita", IRKT},
{"Asia/Chita", YAKT},
{"Asia/Choibalsan", new String[] {"Choibalsan Zeit", "CHOT",
"Choibalsan Sommerzeit", "CHOST",
"Choibalsan Zeit", "CHOT"}},
......@@ -648,9 +651,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
{"Asia/Khandyga", new String[] {"Chandyga Zeit", "YAKT",
"Chandyga Sommerzeit", "YAKST",
"Chandyga Zeit", "YAKT"}},
{"Asia/Khandyga", YAKT},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
......@@ -716,9 +717,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{"Asia/Vladivostok", new String[] {"Wladiwostok Zeit", "VLAT",
"Wladiwostok Sommerzeit", "VLAST",
"Wladiwostok Zeit", "VLAT"}},
{"Asia/Yakutsk", new String[] {"Jakutsk Zeit", "YAKT",
"Jakutsk Sommerzeit", "YAKST",
"Jakutsk Zeit", "YAKT"}},
{"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"Jekaterinburger Zeit", "YEKT",
"Jekaterinburger Sommerzeit", "YEKST",
"Jekaterinburger Zeit", "YEKT"}},
......
src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
浏览文件 @ c269b8bb
......@@ -276,6 +276,9 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
String XJT[] = new String[] {"Hora est\u00e1ndar de China", "XJT",
"Hora de verano de China", "XJDT",
"Hora de China", "XJT"};
String YAKT[] = new String[] {"Hora de Yakutsk", "YAKT",
"Hora de verano de Yakutsk", "YAKST",
"Hora de Yakutsk", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
......@@ -486,7 +489,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
{"America/Metlakatla", PST},
{"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Hora est\u00e1ndar de Pierre & Miquelon", "PMST",
"Hora de verano de Pierre & Miquelon", "PMDT",
......@@ -607,7 +610,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
"Hora de verano de Brunei", "BNST",
"Hora de Brunei", "BNT"}},
{"Asia/Calcutta", IST},
{"Asia/Chita", IRKT},
{"Asia/Chita", YAKT},
{"Asia/Choibalsan", new String[] {"Hora de Choibalsan", "CHOT",
"Hora de verano de Choibalsan", "CHOST",
"Hora de Choibalsan", "CHOT"}},
......@@ -648,9 +651,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
{"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
{"Asia/Khandyga", new String[] {"Hora de Khandyga", "YAKT",
"Hora de verano de Khandyga", "YAKST",
"Hora de Khandyga", "YAKT"}},
{"Asia/Khandyga", YAKT},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
......@@ -716,9 +717,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
{"Asia/Vladivostok", new String[] {"Hora de Vladivostok", "VLAT",
"Hora de verano de Vladivostok", "VLAST",
"Hora de Vladivostok", "VLAT"}},
{"Asia/Yakutsk", new String[] {"Hora de Yakutsk", "YAKT",
"Hora de verano de Yakutsk", "YAKST",
"Hora de Yakutsk", "YAKT"}},
{"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"Hora de Ekaterinburgo", "YEKT",
"Hora de verano de Ekaterinburgo", "YEKST",
"Hora de Ekaterinburgo", "YEKT"}},
......
src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
浏览文件 @ c269b8bb
......@@ -276,6 +276,9 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
String XJT[] = new String[] {"Heure normale de Chine", "XJT",
"Heure avanc\u00e9e de Chine", "XJDT",
"Chine", "XJT"};
String YAKT[] = new String[] {"Heure du Iakoutsk", "YAKT",
"Heure d'\u00e9t\u00e9 du Iakoutsk", "YAKST",
"Heure du Iakoutsk", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
......@@ -486,7 +489,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
{"America/Metlakatla", PST},
{"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Heure normale de Saint-Pierre et Miquelon", "PMST",
"Heure avanc\u00e9e de Saint-Pierre et Miquelon", "PMDT",
......@@ -607,7 +610,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
"Heure d'\u00e9t\u00e9 du Brunei", "BNST",
"Heure du Brunei", "BNT"}},
{"Asia/Calcutta", IST},
{"Asia/Chita", IRKT},
{"Asia/Chita", YAKT},
{"Asia/Choibalsan", new String[] {"Heure de Choibalsan", "CHOT",
"Heure d'\u00e9t\u00e9 de Choibalsan", "CHOST",
"Heure de Choibalsan", "CHOT"}},
......@@ -648,9 +651,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
{"Asia/Khandyga", new String[] {"Heure de Khandyga", "YAKT",
"Heure d'\u00E9t\u00E9 de Khandyga", "YAKST",
"Heure de Khandyga", "YAKT"}},
{"Asia/Khandyga", YAKT},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
......@@ -716,9 +717,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{"Asia/Vladivostok", new String[] {"Heure de Vladivostok", "VLAT",
"Heure d'\u00e9t\u00e9 de Vladivostok", "VLAST",
"Heure de Vladivostok", "VLAT"}},
{"Asia/Yakutsk", new String[] {"Heure du Iakoutsk", "YAKT",
"Heure d'\u00e9t\u00e9 du Iakoutsk", "YAKST",
"Heure du Iakoutsk", "YAKT"}},
{"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"Heure de Yekaterinburg", "YEKT",
"Heure d'\u00e9t\u00e9 de Yekaterinburg", "YEKST",
"Heure de Yekaterinburg", "YEKT"}},
......
src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
浏览文件 @ c269b8bb
......@@ -276,6 +276,9 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
String XJT[] = new String[] {"Ora solare della Cina", "XJT",
"Ora legale della Cina", "XJDT",
"Ora Cina", "XJT"};
String YAKT[] = new String[] {"Ora di Jakutsk", "YAKT",
"Ora estiva di Jakutsk", "YAKST",
"Ora di Yakutsk", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
......@@ -486,7 +489,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
{"America/Metlakatla", PST},
{"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Ora solare di Saint-Pierre e Miquelon", "PMST",
"Ora legale di Saint-Pierre e Miquelon", "PMDT",
......@@ -607,7 +610,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
"Ora estiva del Brunei", "BNST",
"Ora del Brunei", "BNT"}},
{"Asia/Calcutta", IST},
{"Asia/Chita", IRKT},
{"Asia/Chita", YAKT},
{"Asia/Choibalsan", new String[] {"Ora di Choibalsan", "CHOT",
"Ora estiva di Choibalsan", "CHOST",
"Ora di Choibalsan", "CHOT"}},
......@@ -649,9 +652,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
{"Asia/Kolkata", IST},
{"Asia/Khandyga", new String[] {"Ora di Khandyga", "YAKT",
"Ora estiva di Khandyga", "YAKST",
"Ora di Khandyga", "YAKT"}},
{"Asia/Khandyga", YAKT},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
{"Asia/Kuching", MYT},
......@@ -716,9 +717,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{"Asia/Vladivostok", new String[] {"Ora di Vladivostok", "VLAT",
"Ora estiva di Vladivostok", "VLAST",
"Ora di Vladivostok", "VLAT"}},
{"Asia/Yakutsk", new String[] {"Ora di Jakutsk", "YAKT",
"Ora estiva di Jakutsk", "YAKST",
"Ora di Yakutsk", "YAKT"}},
{"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"Ora di Ekaterinburg", "YEKT",
"Ora estiva di Ekaterinburg", "YEKST",
"Ora di Ekaterinburg", "YEKT"}},
......
src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
浏览文件 @ c269b8bb
......@@ -276,6 +276,9 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
String XJT[] = new String[] {"\u4e2d\u56fd\u6a19\u6e96\u6642", "XJT",
"\u4e2d\u56fd\u590f\u6642\u9593", "XJDT",
"\u4E2D\u56FD\u6642\u9593", "XJT"};
String YAKT[] = new String[] {"\u30e4\u30af\u30fc\u30c4\u30af\u6642\u9593", "YAKT",
"\u30e4\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "YAKST",
"\u30E4\u30AF\u30FC\u30C4\u30AF\u6642\u9593", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
......@@ -486,7 +489,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
{"America/Metlakatla", PST},
{"America/Metlakatla", AKST},
{"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",
"\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u590f\u6642\u9593", "PMDT",
......@@ -607,7 +610,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
"\u30d6\u30eb\u30cd\u30a4\u590f\u6642\u9593", "BNST",
"\u30D6\u30EB\u30CD\u30A4\u6642\u9593", "BNT"}},
{"Asia/Calcutta", IST},
{"Asia/Chita", IRKT},
{"Asia/Chita", YAKT},
{"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\u6642\u9593", "CHOT"}},
......@@ -648,9 +651,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
{"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\u6642\u9593", "YAKT"}},
{"Asia/Khandyga", YAKT},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
......@@ -716,9 +717,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{"Asia/Vladivostok", new String[] {"\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u6642\u9593", "VLAT",
"\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u590f\u6642\u9593", "VLAST",
"\u30A6\u30E9\u30B8\u30AA\u30B9\u30C8\u30AF\u6642\u9593", "VLAT"}},
{"Asia/Yakutsk", new String[] {"\u30e4\u30af\u30fc\u30c4\u30af\u6642\u9593", "YAKT",
"\u30e4\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "YAKST",
"\u30E4\u30AF\u30FC\u30C4\u30AF\u6642\u9593", "YAKT"}},
{"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"\u30a8\u30ab\u30c6\u30ea\u30f3\u30d6\u30eb\u30b0\u6642\u9593", "YEKT",
"\u30a8\u30ab\u30c6\u30ea\u30f3\u30d6\u30eb\u30b0\u590f\u6642\u9593", "YEKST",
"\u30A8\u30AB\u30C6\u30EA\u30F3\u30D6\u30EB\u30AF\u6642\u9593", "YEKT"}},
......
src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
浏览文件 @ c269b8bb
......@@ -276,6 +276,9 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
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"};
String YAKT[] = new String[] {"\uc57c\uce20\ud06c \uc2dc\uac04", "YAKT",
"\uc57c\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "YAKST",
"\uC57C\uCFE0\uCE20\uD06C \uD45C\uC900\uC2DC", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
......@@ -486,7 +489,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
{"America/Metlakatla", PST},
{"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"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",
......@@ -607,7 +610,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
"\ube0c\ub8e8\ub098\uc774 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BNST",
"\uBE0C\uB8E8\uB098\uC774 \uD45C\uC900\uC2DC", "BNT"}},
{"Asia/Calcutta", IST},
{"Asia/Chita", IRKT},
{"Asia/Chita", YAKT},
{"Asia/Choibalsan", new String[] {"Choibalsan \uc2dc\uac04", "CHOT",
"Choibalsan \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CHOST",
"\uCD08\uC774\uBC1C\uC0B0 \uD45C\uC900\uC2DC", "CHOT"}},
......@@ -648,9 +651,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
{"Asia/Khandyga", new String[] {"\uD55C\uB514\uAC00 \uD45C\uC900\uC2DC", "YAKT",
"\uD55C\uB514\uAC00 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "YAKST",
"\uD55C\uB514\uAC00 \uD45C\uC900\uC2DC", "YAKT"}},
{"Asia/Khandyga", YAKT},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
......@@ -716,9 +717,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{"Asia/Vladivostok", new String[] {"\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc2dc\uac04", "VLAT",
"\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VLAST",
"\uBE14\uB77C\uB514\uBCF4\uC2A4\uD1A1 \uD45C\uC900\uC2DC", "VLAT"}},
{"Asia/Yakutsk", new String[] {"\uc57c\uce20\ud06c \uc2dc\uac04", "YAKT",
"\uc57c\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "YAKST",
"\uC57C\uCFE0\uCE20\uD06C \uD45C\uC900\uC2DC", "YAKT"}},
{"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"\uc608\uce74\ud14c\ub9b0\ubc84\uadf8 \uc2dc\uac04", "YEKT",
"\uc608\uce74\ud14c\ub9b0\ubc84\uadf8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "YEKST",
"\uC608\uCE74\uD14C\uB9B0\uBD80\uB974\uD06C \uD45C\uC900\uC2DC", "YEKT"}},
......
src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
浏览文件 @ c269b8bb
......@@ -276,6 +276,9 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
String XJT[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da China", "XJT",
"Hor\u00e1rio de luz natural da China", "XJDT",
"Hor\u00E1rio da China", "XJT"};
String YAKT[] = new String[] {"Fuso hor\u00e1rio de Yakutsk", "YAKT",
"Fuso hor\u00e1rio de ver\u00e3o de Yakutsk", "YAKST",
"Hor\u00E1rio de Yakutsk", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
......@@ -486,7 +489,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
{"America/Metlakatla", PST},
{"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"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",
......@@ -607,7 +610,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
"Fuso hor\u00e1rio de ver\u00e3o de Brunei", "BNST",
"Hor\u00E1rio de Brunei", "BNT"}},
{"Asia/Calcutta", IST},
{"Asia/Chita", IRKT},
{"Asia/Chita", YAKT},
{"Asia/Choibalsan", new String[] {"Fuso hor\u00e1rio de Choibalsan", "CHOT",
"Fuso hor\u00e1rio de ver\u00e3o de Choibalsan", "CHOST",
"Hor\u00E1rio de Choibalsan", "CHOT"}},
......@@ -648,9 +651,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
{"Asia/Khandyga", new String[] {"Hor\u00E1rio de Khandyga", "YAKT",
"Hor\u00E1rio de Ver\u00E3o de Khandyga", "YAKST",
"Hor\u00E1rio de Khandyga", "YAKT"}},
{"Asia/Khandyga", YAKT},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
......@@ -716,9 +717,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{"Asia/Vladivostok", new String[] {"Fuso hor\u00e1rio de Vladivostok", "VLAT",
"Fuso hor\u00e1rio de ver\u00e3o de Vladivostok", "VLAST",
"Hor\u00E1rio de Vladivostok", "VLAT"}},
{"Asia/Yakutsk", new String[] {"Fuso hor\u00e1rio de Yakutsk", "YAKT",
"Fuso hor\u00e1rio de ver\u00e3o de Yakutsk", "YAKST",
"Hor\u00E1rio de Yakutsk", "YAKT"}},
{"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"Fuso hor\u00e1rio de Yekaterinburgo", "YEKT",
"Fuso hor\u00e1rio de ver\u00e3o de Yekaterinburgo", "YEKST",
"Hor\u00E1rio de Yekaterinburg", "YEKT"}},
......
src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
浏览文件 @ c269b8bb
......@@ -276,6 +276,9 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
String XJT[] = new String[] {"Kina, normaltid", "XJT",
"Kina, sommartid", "XJDT",
"Kinesisk tid", "XJT"};
String YAKT[] = new String[] {"Jakutsk, normaltid", "YAKT",
"Jakutsk, sommartid", "YAKST",
"Jakutsk-tid", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
......@@ -486,7 +489,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
{"America/Metlakatla", PST},
{"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Saint-Pierre-et-Miquelon, normaltid", "PMST",
"Saint-Pierre-et-Miquelon, sommartid", "PMDT",
......@@ -612,7 +615,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
"Choibalsan-tid", "CHOT"}},
{"Asia/Chongqing", CTT},
{"Asia/Chungking", CTT},
{"Asia/Chita", IRKT},
{"Asia/Chita", YAKT},
{"Asia/Colombo", IST},
{"Asia/Dacca", BDT},
{"Asia/Dhaka", BDT},
......@@ -648,9 +651,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
{"Asia/Khandyga", new String[] {"Khandyga, normaltid", "YAKT",
"Khandyga, sommartid", "YAKST",
"Khandyga, normaltid", "YAKT"}},
{"Asia/Khandyga", YAKT},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
......@@ -716,9 +717,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{"Asia/Vladivostok", new String[] {"Vladivostok, normaltid", "VLAT",
"Vladivostok, sommartid", "VLAST",
"Vladivostok-tid", "VLAT"}},
{"Asia/Yakutsk", new String[] {"Jakutsk, normaltid", "YAKT",
"Jakutsk, sommartid", "YAKST",
"Jakutsk-tid", "YAKT"}},
{"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"Jekaterinburg, normaltid", "YEKT",
"Jekaterinburg, sommartid", "YEKST",
"Jekaterinburg-tid", "YEKT"}},
......
src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
浏览文件 @ c269b8bb
......@@ -276,6 +276,9 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
String XJT[] = new String[] {"\u4e2d\u56fd\u6807\u51c6\u65f6\u95f4", "XJT",
"\u4e2d\u56fd\u590f\u4ee4\u65f6", "XJDT",
"\u4E2D\u56FD\u65F6\u95F4", "XJT"};
String YAKT[] = new String[] {"\u4e9a\u5e93\u6b21\u514b\u65f6\u95f4", "YAKT",
"\u4e9a\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "YAKST",
"\u4E9A\u5E93\u6B21\u514B\u65F6\u95F4", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
......@@ -486,7 +489,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
{"America/Metlakatla", PST},
{"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"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",
......@@ -607,7 +610,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
"\u6587\u83b1\u590f\u4ee4\u65f6", "BNST",
"\u6587\u83B1\u65F6\u95F4", "BNT"}},
{"Asia/Calcutta", IST},
{"Asia/Chita", IRKT},
{"Asia/Chita", YAKT},
{"Asia/Choibalsan", new String[] {"Choibalsan \u65f6\u95f4", "CHOT",
"Choibalsan \u590f\u4ee4\u65f6", "CHOST",
"Choibalsan \u65F6\u95F4", "CHOT"}},
......@@ -648,9 +651,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
{"Asia/Khandyga", new String[] {"\u6C49\u5FB7\u52A0\u65F6\u95F4", "YAKT",
"\u6C49\u5FB7\u52A0\u590F\u4EE4\u65F6", "YAKST",
"\u6C49\u5FB7\u52A0\u65F6\u95F4", "YAKT"}},
{"Asia/Khandyga", YAKT},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
......@@ -716,9 +717,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{"Asia/Vladivostok", new String[] {"\u6d77\u53c2\u5d34\u65f6\u95f4", "VLAT",
"\u6d77\u53c2\u5d34\u590f\u4ee4\u65f6", "VLAST",
"\u6D77\u53C2\u5D34\u65F6\u95F4", "VLAT"}},
{"Asia/Yakutsk", new String[] {"\u4e9a\u5e93\u6b21\u514b\u65f6\u95f4", "YAKT",
"\u4e9a\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "YAKST",
"\u4E9A\u5E93\u6B21\u514B\u65F6\u95F4", "YAKT"}},
{"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"Yekaterinburg \u65f6\u95f4", "YEKT",
"Yekaterinburg \u590f\u4ee4\u65f6", "YEKST",
"Yekaterinburg \u65F6\u95F4", "YEKT"}},
......
src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
浏览文件 @ c269b8bb
......@@ -276,6 +276,9 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
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"};
String YAKT[] = new String[] {"\u4e9e\u5eab\u6b21\u514b\u6642\u9593", "YAKT",
"\u4e9e\u5eab\u6b21\u514b\u590f\u4ee4\u6642\u9593", "YAKST",
"\u4E9E\u5EAB\u6B21\u514B\u6642\u9593", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
......@@ -486,7 +489,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
{"America/Metlakatla", PST},
{"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"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",
......@@ -607,7 +610,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
"\u6c76\u840a\u590f\u4ee4\u6642\u9593", "BNST",
"\u6C76\u840A\u6642\u9593", "BNT"}},
{"Asia/Calcutta", IST},
{"Asia/Chita", IRKT},
{"Asia/Chita", YAKT},
{"Asia/Choibalsan", new String[] {"\u5de7\u5df4\u5c71 (Choibalsan) \u6642\u9593", "CHOT",
"\u5de7\u5df4\u5c71 (Choibalsan) \u590f\u4ee4\u6642\u9593", "CHOST",
"\u5DE7\u5DF4\u5C71 (Choibalsan) \u6642\u9593", "CHOT"}},
......@@ -648,9 +651,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
{"Asia/Khandyga", new String[] {"\u6F22\u5730\u52A0 (Khandyga) \u6642\u9593", "YAKT",
"\u6F22\u5730\u52A0 (Khandyga) \u590F\u4EE4\u6642\u9593", "YAKST",
"\u6F22\u5730\u52A0 (Khandyga) \u6642\u9593", "YAKT"}},
{"Asia/Khandyga", YAKT},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
......@@ -718,9 +719,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{"Asia/Vladivostok", new String[] {"\u6d77\u53c3\u5d34\u6642\u9593", "VLAT",
"\u6d77\u53c3\u5d34\u590f\u4ee4\u6642\u9593", "VLAST",
"\u6D77\u53C3\u5D34\u6642\u9593", "VLAT"}},
{"Asia/Yakutsk", new String[] {"\u4e9e\u5eab\u6b21\u514b\u6642\u9593", "YAKT",
"\u4e9e\u5eab\u6b21\u514b\u590f\u4ee4\u6642\u9593", "YAKST",
"\u4E9E\u5EAB\u6B21\u514B\u6642\u9593", "YAKT"}},
{"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"Yekaterinburg \u6642\u9593", "YEKT",
"Yekaterinburg \u590f\u4ee4\u6642\u9593", "YEKST",
"\u8449\u5361\u6377\u7433\u5821\u6642\u9593", "YEKT"}},
......
test/com/sun/jdi/ShellScaffold.sh
浏览文件 @ c269b8bb
......@@ -43,11 +43,11 @@
# in your java file
# classname=<classnam> Omit this to use the default class name, 'shtest'.
# compileOptions=<string> compile options for at least the first compile,
# compileOptions=<string> compile options for at least the first compile,
# eg, compileOptions=-g
# compileOptions2=<string> Options for the 2nd, ..., compile. compileOptions1
# is used if this is not set. To use no compile
# options for the 2nd ... compiles, do
# options for the 2nd ... compiles, do
# compileOptions2=none
#
# mode=-Xcomp or mode=-Xint to run in these modes. These should not
......@@ -88,12 +88,12 @@
#
# The only other tag supported is @1 breakpoint. The setbkpts function
# sets bkpts at all lines that contain this string.
#
#
# Currently, all these tags are start with @1. It is envisioned that this script
# could be ehanced to allow multiple cycles of redefines by allowing
# @2, @3, ... tags. IE, processing the @i tags in the ith version of
# the file will produce the i+1th version of the file.
#
#
# There are problem with jtreg leaving behind orphan java and jdb processes
# when this script is run. Sometimes, on some platforms, it just doesn't
# get them all killed properly.
......@@ -110,7 +110,7 @@
#
# mks 6.2a on win 98 presents two problems:
# $! returns the PID as a negative number whereas ps returns
# it in the form 0xFFF.... This means our trick of
# it in the form 0xFFF.... This means our trick of
# of using $! to get the PIDs of the jdb and debuggee processes
# doesn't work. This will cause some error cases to fail
# with a jtreg timeout instead of failing more gracefully.
......@@ -167,7 +167,7 @@ killOrphans()
# then use ps to find the cygwin pid to be killed.
# The form of a ps output line is
# ^ ddddd dddd dddd dddd.*
# where the 4th digits are the win pid and the first
# where the 4th digits are the win pid and the first
# are the cygwin pid.
if [ -r "$jdk/bin/$jstack" ] ; then
winPid=`$jdk/bin/jps -v | $grep -i $str | sed -e 's@ .*@@'`
......@@ -181,7 +181,7 @@ killOrphans()
awk '{print $1}' | tr '\n\r' ' '`
fi
else
# Well, too bad - we can't find what to kill.
# Well, too bad - we can't find what to kill.
toBeKilled=
fi
fi
......@@ -190,35 +190,31 @@ killOrphans()
echo "$1: kill -9 $toBeKilled" >& 2
kill -9 $toBeKilled
fi
}
}
findPid()
{
# Return 0 if $1 is the pid of a running process.
if [ -z "$isWin98" ] ; then
if [ "$osname" = SunOS ] ; then
# Solaris and OpenSolaris use pgrep and not ps in psCmd
findPidCmd="$psCmd"
elif [ "$osname" = AIX ] ; then
findPidCmd="$psCmd"
else
case "$osname" in
SunOS | AIX)
$psCmd | $grep '^ *'"$1 " > $devnull 2>&1
res=$?
;;
Windows* | CYGWIN*)
# Don't use ps on cygwin since it sometimes misses
# some processes (!).
tasklist /NH | $grep " $1 " > $devnull 2>&1
res=$?
;;
*)
# Never use plain 'ps', which requires a "controlling terminal"
# and will fail with a "ps: no controlling terminal" error.
# Running under 'rsh' will cause this ps error.
# cygwin ps puts an I in column 1 for some reason.
findPidCmd="$psCmd -e"
fi
$findPidCmd | $grep '^I* *'"$1 " > $devnull 2>&1
return $?
fi
# mks 6.2a on win98 has $! getting a negative
# number and in ps, it shows up as 0x...
# Thus, we can't search in ps output for
# PIDs gotten via $!
# We don't know if it is running or not - assume it is.
# We don't really care about win98 anymore.
return 0
$psCmd -e | $grep '^ *'"$1 " > $devnull 2>&1
res=$?
;;
esac
return $res
}
setup()
......@@ -245,20 +241,13 @@ setup()
echo "--Error: TESTJAVA must be defined as the pathname of a jdk to test."
exit 1
fi
ulimitCmd=
osname=`uname -s`
isWin98=
isCygwin=
case "$osname" in
Windows* | CYGWIN*)
Windows* | CYGWIN*)
devnull=NUL
if [ "$osname" = Windows_98 -o "$osname" = Windows_ME ]; then
isWin98=1
debuggeeKeyword='we_cant_kill_debuggees_on_win98'
jdbKeyword='jdb\.exe'
fi
case "$osname" in
CYGWIN*)
isCygwin=1
......@@ -373,12 +362,12 @@ EOF
####################################################3
####################################################3
####################################################3
# sol: this gets all processes killed but
# sol: this gets all processes killed but
# no jstack
# linux same as above
# win mks: No dice; processes still running
trap "cleanup" 0 1 2 3 4 6 9 10 15
jdbOptions="$jdbOptions -J-D${jdbKeyword}"
}
......@@ -397,7 +386,7 @@ docompile()
cp $classname.java.1 $classname.java
echo "--Compiling first version of `pwd`/$classname.java with options: $compileOptions"
# Result is in $pkgSlash$classname.class
if [ -z "$javacCmd" ] ; then
javacCmd=$jdk/bin/javac
fi
......@@ -435,7 +424,7 @@ docompile()
if [ $? = 0 ] ; then
break
fi
echo
echo
echo "--Compiling second version of `pwd`/$classname.java with $compileOptions"
$javacCmd $compileOptions -d . $classname.java
if [ $? != 0 ] ; then
......@@ -464,7 +453,7 @@ docompile()
if [ $? = 0 ] ; then
break
fi
echo
echo
echo "--Compiling third version of `pwd`/$classname.java with $compileOptions"
$javacCmd $compileOptions -d . $classname.java
if [ $? != 0 ] ; then
......@@ -490,7 +479,7 @@ docompile()
if [ $? = 0 ] ; then
break
fi
echo
echo
echo "--Compiling fourth version of `pwd`/$classname.java with $compileOptions"
$javacCmd $compileOptions -d . $classname.java
if [ $? != 0 ] ; then
......@@ -523,7 +512,7 @@ docompile()
# If it ever becomes necessary to send a jdb command before
# a main[10] form of prompt appears, then this
# code will have to be modified.
cmd()
cmd()
{
if [ $1 = quit -o -r "$failFile" ] ; then
# if jdb got a cont cmd that caused the debuggee
......@@ -540,21 +529,21 @@ cmd()
# in the pipeline.
exit 1
fi
# $jdbOutFile always exists here and is non empty
# because after starting jdb, we waited
# because after starting jdb, we waited
# for the prompt.
fileSize=`wc -c $jdbOutFile | awk '{ print $1 }'`
echo "--Sending cmd: " $* >&2
# jjh: We have a few intermittent failures here.
# It is as if every so often, jdb doesn't
# get the first cmd that is sent to it here.
# get the first cmd that is sent to it here.
# (actually, I have seen it get the first cmd ok,
# but then not get some subsequent cmd).
# It seems like jdb really doesn't get the cmd; jdb's response
# does not appear in the jxdboutput file. It contains:
# main[1]
# main[1]
# The application has been disconnected
# Is it possible
......@@ -569,7 +558,7 @@ cmd()
# msg output below after the timeout.
# And, we know jdb is started because the main[1] output is in the .jtr
# file. And, we wouldn't have gotten here if mydojdbcmds hadn't
# seen the ].
# seen the ].
echo $*
# Now we have to wait for the next jdb prompt. We wait for a pattern
......@@ -605,7 +594,7 @@ cmd()
# i.e., the > prompt comes out AFTER the prompt we we need to wait for.
#
# So, how do we know when the next prompt has appeared??
# 1. Search for
# 1. Search for
# main[89] $
# This will handle cases 1, 2, 3
# 2. This leaves cases 4 and 5.
......@@ -715,7 +704,7 @@ waitForJdbMsg()
allowExit="$3"
myCount=0
timeLimit=40 # wait a max of this many secs for a response from a jdb command
while [ 1 = 1 ] ; do
while [ 1 = 1 ] ; do
if [ -r $jdbOutFile ] ; then
# Something here causes jdb to complain about Unrecognized cmd on x86.
tail -$nlines $jdbOutFile | $grep -s "$1" > $devnull 2>&1
......@@ -723,27 +712,27 @@ waitForJdbMsg()
# Found desired string
break
fi
fi
tail -2 $jdbOutFile | $grep -s "The application exited" > $devnull 2>&1
if [ $? = 0 ] ; then
fi
tail -2 $jdbOutFile | $grep -s "The application exited" > $devnull 2>&1
if [ $? = 0 ] ; then
# Found 'The application exited'
if [ ! -z "$allowExit" ] ; then
break
fi
# Otherwise, it is an error if we don't find $1
if [ -r $jdbOutFile ] ; then
tail -$nlines $jdbOutFile | $grep -s "$1" > $devnull 2>&1
if [ -r $jdbOutFile ] ; then
tail -$nlines $jdbOutFile | $grep -s "$1" > $devnull 2>&1
if [ $? = 0 ] ; then
break
fi
fi
dofail "Waited for jdb msg $1, but it never appeared"
fi
break
fi
fi
dofail "Waited for jdb msg $1, but it never appeared"
fi
sleep ${sleep_seconds}
findPid $topPid
if [ $? != 0 ] ; then
# Top process is dead. We better die too
echo "--Top process ($topPid) is dead. We better die too" >&2
dojstack
exit 1
fi
......@@ -788,7 +777,7 @@ dofail()
}
redefineClass()
redefineClass()
{
if [ -z "$1" ] ; then
vers=2
......@@ -796,7 +785,7 @@ redefineClass()
vers=`echo $1 | sed -e 's/@//'`
vers=`expr $vers + 1`
fi
cmd redefine $pkgDot$classname $tmpFileDir/vers$vers/$classname.class
cp $tmpFileDir/$classname.java.$vers \
......@@ -853,7 +842,7 @@ startDebuggee()
if [ -r $TESTCLASSES/../@debuggeeVMOptions ] ; then
args=`cat $TESTCLASSES/../@debuggeeVMOptions`
fi
if [ ! -z "$args" ] ; then
echo "--Starting debuggee with args from @debuggeeVMOptions: $args"
else
......@@ -931,12 +920,6 @@ waitForFinish()
if [ $? != 0 ] ; then
break
fi
if [ ! -z "$isWin98" ] ; then
$psCmd | $grep -i 'JDB\.EXE' >$devnull 2>&1
if [ $? != 0 ] ; then
break;
fi
fi
$grep -s 'Input stream closed' $jdbOutFile > $devnull 2>&1
if [ $? = 0 ] ; then
#something went wrong
......@@ -970,7 +953,7 @@ grepForString()
theCmd="tail -$3"
fi
case "$2" in
case "$2" in
*\>*)
# Target string contains a '>' so we better not ignore it
$theCmd $1 | $grep -s "$2" > $devnull 2>&1
......@@ -1016,7 +999,7 @@ matchRegexp()
theCmd="tail -$3"
fi
case "$2" in
case "$2" in
*\>*)
# Target string contains a '>' so we better not ignore it
res=`$theCmd $1 | sed -e "$2"`
......@@ -1136,7 +1119,7 @@ runit()
runitAfterSetup()
{
docompile
startJdb
startJdb
startDebuggee
waitForFinish
......
test/sun/util/calendar/zi/tzdata/VERSION
浏览文件 @ c269b8bb
......@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
tzdata2015g
tzdata2016a
test/sun/util/calendar/zi/tzdata/asia
浏览文件 @ c269b8bb
......@@ -897,6 +897,15 @@ Zone Asia/Dili 8:22:20 - LMT 1912 Jan 1
9:00 - TLT
# India
# From Ian P. Beacock, in "A brief history of (modern) time", The Atlantic
# http://www.theatlantic.com/technology/archive/2015/12/the-creation-of-modern-time/421419/
# (2015-12-22):
# In January 1906, several thousand cotton-mill workers rioted on the
# outskirts of Bombay.... They were protesting the proposed abolition of
# local time in favor of Indian Standard Time.... Journalists called this
# dispute the "Battle of the Clocks." It lasted nearly half a century.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Kolkata 5:53:28 - LMT 1880 # Kolkata
5:53:20 - HMT 1941 Oct # Howrah Mean Time?
......@@ -1107,8 +1116,15 @@ Rule Iran 2032 2033 - Mar 21 0:00 1:00 D
Rule Iran 2032 2033 - Sep 21 0:00 0 S
Rule Iran 2034 2035 - Mar 22 0:00 1:00 D
Rule Iran 2034 2035 - Sep 22 0:00 0 S
Rule Iran 2036 2037 - Mar 21 0:00 1:00 D
Rule Iran 2036 2037 - Sep 21 0:00 0 S
#
# The following rules are approximations starting in the year 2038.
# These are the best post-2037 approximations available, given the
# restrictions of a single rule using a Gregorian-based data format.
# At some point this table will need to be extended, though quite
# possibly Iran will change the rules first.
Rule Iran 2036 max - Mar 21 0:00 1:00 D
Rule Iran 2036 max - Sep 21 0:00 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Tehran 3:25:44 - LMT 1916
3:25:44 - TMT 1946 # Tehran Mean Time
......@@ -2134,8 +2150,8 @@ Zone Asia/Kathmandu 5:41:16 - LMT 1920
# http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374&Itemid=2
# 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 2002 only - Apr Sun>=2 0:00 1:00 S
Rule Pakistan 2002 only - Oct Sun>=2 0:00 0 -
Rule Pakistan 2008 only - Jun 1 0:00 1:00 S
Rule Pakistan 2008 2009 - Nov 1 0:00 0 -
Rule Pakistan 2009 only - Apr 15 0:00 1:00 S
......
test/sun/util/calendar/zi/tzdata/backward
浏览文件 @ c269b8bb
......@@ -46,6 +46,7 @@ Link America/Argentina/Mendoza America/Mendoza
Link America/Toronto America/Montreal
Link America/Rio_Branco America/Porto_Acre
Link America/Argentina/Cordoba America/Rosario
Link America/Tijuana America/Santa_Isabel
Link America/Denver America/Shiprock
Link America/Port_of_Spain America/Virgin
Link Pacific/Auckland Antarctica/South_Pole
......
test/sun/util/calendar/zi/tzdata/europe
浏览文件 @ c269b8bb
......@@ -2616,13 +2616,20 @@ Zone Asia/Irkutsk 6:57:05 - LMT 1880
# Note: Effective 2008-03-01, (75) Chita Oblast and (80) Agin-Buryat
# Autonomous Okrug merged to form (92, RU-ZAB) Zabaykalsky Krai.
# From Alexander Krivenyshev (2016-01-02):
# [The] time zone in the Trans-Baikal Territory (Zabaykalsky Krai) -
# Asia/Chita [is changing] from UTC+8 to UTC+9. Effective date will
# be March 27, 2016 at 2:00am....
# http://publication.pravo.gov.ru/Document/View/000120151230010
Zone Asia/Chita 7:33:52 - LMT 1919 Dec 15
8:00 - YAKT 1930 Jun 21 # Yakutsk Time
9:00 Russia YAK%sT 1991 Mar 31 2:00s
8:00 Russia YAK%sT 1992 Jan 19 2:00s
9:00 Russia YAK%sT 2011 Mar 27 2:00s
10:00 - YAKT 2014 Oct 26 2:00s
8:00 - IRKT
8:00 - IRKT 2016 Mar 27 2:00
9:00 - YAKT
# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
......@@ -3177,6 +3184,12 @@ Zone Europe/Zurich 0:34:08 - LMT 1853 Jul 16 # See above comment.
# It's officially announced now by the Ministry of Energy.
# Turkey delays winter time to 8th of November 04:00
# http://www.aa.com.tr/tr/turkiye/yaz-saati-uygulamasi-8-kasimda-sona-erecek/362217
#
# From BBC News (2015-10-25):
# Confused Turks are asking "what's the time?" after automatic clocks defied a
# government decision ... "For the next two weeks #Turkey is on EEST... Erdogan
# Engineered Standard Time," said Twitter user @aysekarahasan.
# http://www.bbc.com/news/world-europe-34631326
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Turkey 1916 only - May 1 0:00 1:00 S
......
test/sun/util/calendar/zi/tzdata/northamerica
浏览文件 @ c269b8bb
......@@ -348,6 +348,16 @@ Zone America/New_York -4:56:02 - LMT 1883 Nov 18 12:03:58
# Statue 175 closer in synch with the US Congress' intent....
# http://www.legis.state.wi.us/2007/data/acts/07Act3.pdf
# From an email administrator of the City of Fort Pierre, SD (2015-12-21):
# Fort Pierre is technically located in the Mountain time zone as is
# the rest of Stanley County. Most of Stanley County and Fort Pierre
# uses the Central time zone due to doing most of their business in
# Pierre so it simplifies schedules. I have lived in Stanley County
# all my life and it has been that way since I can remember. (43 years!)
#
# From Paul Eggert (2015-12-25):
# Assume this practice predates 1970, so Fort Pierre can use America/Chicago.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
Rule Chicago 1920 only - Jun 13 2:00 1:00 D
Rule Chicago 1920 1921 - Oct lastSun 2:00 0 S
......@@ -504,6 +514,12 @@ Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 12:07:02
# For lack of better information, assume that Metlakatla's
# abandonment of use of daylight saving resulted from the 1983 vote.
# From Steffen Thorsen (2015-11-09):
# It seems Metlakatla did go off PST on Sunday, November 1, changing
# their time to AKST and are going to follow Alaska's DST, switching
# between AKST and AKDT from now on....
# http://www.krbd.org/2015/10/30/annette-island-times-they-are-a-changing/
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Juneau 15:02:19 - LMT 1867 Oct 18
-8:57:41 - LMT 1900 Aug 20 12:00
......@@ -529,7 +545,8 @@ Zone America/Metlakatla 15:13:42 - LMT 1867 Oct 18
-8:00 US P%sT 1946
-8:00 - PST 1969
-8:00 US P%sT 1983 Oct 30 2:00
-8:00 - PST
-8:00 - PST 2015 Nov 1 2:00
-9:00 US AK%sT
Zone America/Yakutat 14:41:05 - LMT 1867 Oct 18
-9:18:55 - LMT 1900 Aug 20 12:00
-9:00 - YST 1942
......@@ -2610,25 +2627,6 @@ Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 0:11:56
-8:00 US P%sT 2002 Feb 20
-8:00 Mexico P%sT 2010
-8:00 US P%sT
# Baja California (away from US border)
Zone America/Santa_Isabel -7:39:28 - LMT 1922 Jan 1 0:20:32
-7:00 - MST 1924
-8:00 - PST 1927 Jun 10 23:00
-7:00 - MST 1930 Nov 15
-8:00 - PST 1931 Apr 1
-8:00 1:00 PDT 1931 Sep 30
-8:00 - PST 1942 Apr 24
-8:00 1:00 PWT 1945 Aug 14 23:00u
-8:00 1:00 PPT 1945 Nov 12 # Peace
-8:00 - PST 1948 Apr 5
-8:00 1:00 PDT 1949 Jan 14
-8:00 - PST 1954
-8:00 CA P%sT 1961
-8:00 - PST 1976
-8:00 US P%sT 1996
-8:00 Mexico P%sT 2001
-8:00 US P%sT 2002 Feb 20
-8:00 Mexico P%sT
# From Paul Eggert (2006-03-22):
# Formerly there was an America/Ensenada zone, which differed from
# America/Tijuana only in that it did not observe DST from 1976
......@@ -2641,6 +2639,13 @@ Zone America/Santa_Isabel -7:39:28 - LMT 1922 Jan 1 0:20:32
# other than America/Tijuana for Baja, but it's not clear yet what its
# name or contents should be.
#
# From Paul Eggert (2015-10-08):
# Formerly there was an America/Santa_Isabel zone, but this appears to
# have come from a misreading of
# http://dof.gob.mx/nota_detalle.php?codigo=5127480&fecha=06/01/2010
# It has been moved to the 'backward' file.
#
#
# Revillagigedo Is
# no information
......@@ -2715,17 +2720,7 @@ Zone Atlantic/Bermuda -4:19:18 - LMT 1930 Jan 1 2:00 # Hamilton
-4:00 US A%sT
# Cayman Is
# From Paul Eggert (2015-05-15):
# The Cayman government has decided to introduce DST in 2016, the idea being
# to keep in sync with New York. The legislation hasn't passed but the change
# seems quite likely. See: Meade B. Cayman 27.
# http://www.cayman27.com.ky/2015/05/15/clock-ticks-toward-daylight-saving-time-in-cayman
Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown
-5:07:11 - KMT 1912 Feb # Kingston Mean Time
-5:00 - EST 2016
-5:00 US E%sT
# See America/Panama.
# Costa Rica
......@@ -3248,6 +3243,7 @@ Zone America/Managua -5:45:08 - LMT 1890
Zone America/Panama -5:18:08 - LMT 1890
-5:19:36 - CMT 1908 Apr 22 # Colón Mean Time
-5:00 - EST
Link America/Panama America/Cayman
# Puerto Rico
# There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
......
test/sun/util/calendar/zi/tzdata/zone.tab
浏览文件 @ c269b8bb
......@@ -306,8 +306,7 @@ MX +2313-10625 America/Mazatlan Mountain Time - S Baja, Nayarit, Sinaloa
MX +2838-10605 America/Chihuahua Mexican Mountain Time - Chihuahua away from US border
MX +2934-10425 America/Ojinaga US Mountain Time - Chihuahua near US border
MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora
MX +3232-11701 America/Tijuana US Pacific Time - Baja California near US border
MX +3018-11452 America/Santa_Isabel Mexican Pacific Time - Baja California away from US border
MX +3232-11701 America/Tijuana US Pacific Time - Baja California state
MX +2048-10515 America/Bahia_Banderas Mexican Central Time - Bahia de Banderas
MY +0310+10142 Asia/Kuala_Lumpur peninsular Malaysia
MY +0133+11020 Asia/Kuching Sabah & Sarawak
......@@ -437,10 +436,10 @@ US +394421-1045903 America/Denver Mountain Time
US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon
US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona (except Navajo)
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 +581807-1342511 America/Juneau Alaska Time - Alaska panhandle
US +571035-1351807 America/Sitka Alaska Time - southeast Alaska panhandle
US +550737-1313435 America/Metlakatla Alaska Time - Annette Island
US +593249-1394338 America/Yakutat Alaska Time - Alaska panhandle neck
US +643004-1652423 America/Nome Alaska Time - west Alaska
US +515248-1763929 America/Adak Aleutian Islands
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或