Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell11
提交
ae2540a4
D
dragonwell11
项目概览
openanolis
/
dragonwell11
通知
7
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell11
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ae2540a4
编写于
4月 04, 2014
作者:
A
aefimov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8038306: (tz) Support tzdata2014b
Reviewed-by: coffeys, sherman, okutsu
上级
b6f9a8b3
变更
25
隐藏空白更改
内联
并排
Showing
25 changed file
with
164 addition
and
51 deletion
+164
-51
jdk/make/data/tzdata/VERSION
jdk/make/data/tzdata/VERSION
+1
-1
jdk/make/data/tzdata/africa
jdk/make/data/tzdata/africa
+4
-1
jdk/make/data/tzdata/antarctica
jdk/make/data/tzdata/antarctica
+29
-12
jdk/make/data/tzdata/australasia
jdk/make/data/tzdata/australasia
+18
-3
jdk/make/data/tzdata/europe
jdk/make/data/tzdata/europe
+5
-1
jdk/make/data/tzdata/leapseconds
jdk/make/data/tzdata/leapseconds
+1
-1
jdk/make/data/tzdata/zone.tab
jdk/make/data/tzdata/zone.tab
+2
-1
jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
+4
-1
jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
...share/classes/sun/util/resources/de/TimeZoneNames_de.java
+4
-1
jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
...share/classes/sun/util/resources/es/TimeZoneNames_es.java
+4
-1
jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
...share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
+4
-1
jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
...share/classes/sun/util/resources/it/TimeZoneNames_it.java
+4
-1
jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
...share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
+4
-1
jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
...share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
+4
-1
jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
...re/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
+4
-1
jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
...share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
+4
-1
jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
...re/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
+4
-1
jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
...re/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
+4
-1
jdk/test/sun/util/calendar/zi/tzdata/VERSION
jdk/test/sun/util/calendar/zi/tzdata/VERSION
+1
-1
jdk/test/sun/util/calendar/zi/tzdata/africa
jdk/test/sun/util/calendar/zi/tzdata/africa
+4
-1
jdk/test/sun/util/calendar/zi/tzdata/antarctica
jdk/test/sun/util/calendar/zi/tzdata/antarctica
+29
-12
jdk/test/sun/util/calendar/zi/tzdata/australasia
jdk/test/sun/util/calendar/zi/tzdata/australasia
+18
-3
jdk/test/sun/util/calendar/zi/tzdata/europe
jdk/test/sun/util/calendar/zi/tzdata/europe
+5
-1
jdk/test/sun/util/calendar/zi/tzdata/leapseconds
jdk/test/sun/util/calendar/zi/tzdata/leapseconds
+1
-1
jdk/test/sun/util/calendar/zi/tzdata/zone.tab
jdk/test/sun/util/calendar/zi/tzdata/zone.tab
+2
-1
未找到文件。
jdk/make/data/tzdata/VERSION
浏览文件 @
ae2540a4
...
...
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
tzdata2014
a
tzdata2014
b
jdk/make/data/tzdata/africa
浏览文件 @
ae2540a4
...
...
@@ -891,7 +891,10 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou
# Another source (specifying the time for start and end in the decree):
# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html
# From Paul Eggert (2013-10-03):
# From Sebastien Willemijns (2014-03-18):
# http://www.afriquinfos.com/articles/2014/3/18/maroc-heure-dete-avancez-tous-horloges-247891.asp
# From Paul Eggert (2014-03-19):
# To estimate what the Moroccan government will do in future years,
# transition dates for 2014 through 2038 were determined by running
# the following program under GNU Emacs 24.3:
...
...
jdk/make/data/tzdata/antarctica
浏览文件 @
ae2540a4
...
...
@@ -253,24 +253,41 @@ Zone Antarctica/Syowa 0 - zzz 1957 Jan 29
# year-round base
# Scott Base, Ross Island, since 1957-01.
# See Pacific/Auckland.
#
# These rules for New Zealand are stolen from the 'australasia' file.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule NZAQ 1974 only - Nov 3 2:00s 1:00 D
Rule NZAQ 1975 1988 - Oct lastSun 2:00s 1:00 D
Rule NZAQ 1989 only - Oct 8 2:00s 1:00 D
Rule NZAQ 1990 2006 - Oct Sun>=1 2:00s 1:00 D
Rule NZAQ 1975 only - Feb 23 2:00s 0 S
Rule NZAQ 1976 1989 - Mar Sun>=1 2:00s 0 S
Rule NZAQ 1990 2007 - Mar Sun>=15 2:00s 0 S
Rule NZAQ 2007 max - Sep lastSun 2:00s 1:00 D
Rule NZAQ 2008 max - Apr Sun>=1 2:00s 0 S
# Norway - territories
# Bouvet (never inhabited)
#
# claims
# Peter I Island (never inhabited)
#
# year-round base
# Troll, Queen Maud Land, -720041+0023206, since 2005-02-12
#
# From Paul-Inge Flakstad (2014-03-10):
# I recently had a long dialog about this with the developer of timegenie.com.
# In the absence of specific dates, he decided to choose some likely ones:
# GMT +1 - From March 1 to the last Sunday in March
# GMT +2 - From the last Sunday in March until the last Sunday in October
# GMT +1 - From the last Sunday in October until November 7
# GMT +0 - From November 7 until March 1
# The dates for switching to and from UTC+0 will probably not be absolutely
# correct, but they should be quite close to the actual dates.
#
# From Paul Eggert (2014-03-21):
# The CET-switching Troll rules require zic from tzcode 2014b or later, so as
# suggested by Bengt-Inge Larsson comment them out for now, and approximate
# with only UTC and CEST. Uncomment them when 2014b is more prevalent.
#
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
#Rule Troll 2005 max - Mar 1 1:00u 1:00 CET
Rule Troll 2005 max - Mar lastSun 1:00u 2:00 CEST
#Rule Troll 2005 max - Oct lastSun 1:00u 1:00 CET
#Rule Troll 2004 max - Nov 7 1:00u 0:00 UTC
# Remove the following line when uncommenting the above '#Rule' lines.
Rule Troll 2004 max - Oct lastSun 1:00u 0:00 UTC
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Antarctica/Troll 0 - zzz 2005 Feb 12
0:00 Troll %s
# Poland - year-round base
# Arctowski, King George Island, -620945-0582745, since 1977
...
...
jdk/make/data/tzdata/australasia
浏览文件 @
ae2540a4
...
...
@@ -786,14 +786,29 @@ Zone Pacific/Funafuti 11:56:52 - LMT 1901
# Johnston
#
# From Paul Eggert (2013-09-03):
# From Paul Eggert (2014-03-11):
# Sometimes Johnston kept Hawaii time, and sometimes it was an hour behind.
# Details are uncertain. We have no data for Johnston after 1970, so
# treat it like Hawaii for now.
#
# In his memoirs of June 6th to October 4, 1945
# <http://www.315bw.org/Herb_Bach.htm> (2005), Herbert C. Bach writes,
# "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM
# Johnston time, 1:30 AM Kwajalein time." This was in June 1945, and
# confirms that Johnston kept the same time as Honolulu in summer 1945.
# We have no better information, so for now, assume this has been true
# indefinitely into the past.
#
# From Lyle McElhaney (2014-03-11):
# [W]hen JI was being used for that [atomic bomb] testing, the time being used
# was not Hawaiian time but rather the same time being used on the ships,
# which had a GMT offset of -11 hours. This apparently applied to at least the
# time from Operation Newsreel (Hardtack I/Teak shot, 1958-08-01) to the last
# Operation Fishbowl shot (Tightrope, 1962-11-04).... [See] Herman Hoerlin,
# "The United States High-Altitude Test Experience: A Review Emphasizing the
# Impact on the Environment", Los Alamos LA-6405, Oct 1976
# <http://www.fas.org/sgp/othergov/doe/lanl/docs1/00322994.pdf>.
# See the table on page 4 where he lists GMT and local times for the tests; a
# footnote for the JI tests reads that local time is "JI time = Hawaii Time
# Minus One Hour".
#
# See 'northamerica' for Pacific/Johnston.
...
...
jdk/make/data/tzdata/europe
浏览文件 @
ae2540a4
...
...
@@ -2986,7 +2986,11 @@ Zone Europe/Simferopol 2:16:24 - LMT 1880
# Assume it happened in March by not changing the clocks.
3:00 Russia MSK/MSD 1997
3:00 - MSK 1997 Mar lastSun 1:00u
2:00 EU EE%sT
# From Alexander Krivenyshev (2014-03-17):
# time change at 2:00 (2am) on March 30, 2014
# http://vz.ru/news/2014/3/17/677464.html
2:00 EU EE%sT 2014 Mar 30 2:00
4:00 - MSK
# Vatican City
# See Europe/Rome.
...
...
jdk/make/data/tzdata/leapseconds
浏览文件 @
ae2540a4
...
...
@@ -20,7 +20,7 @@
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# Allowance for leapseconds added to each timezone file.
# This file is in the public domain.
...
...
jdk/make/data/tzdata/zone.tab
浏览文件 @
ae2540a4
...
...
@@ -74,6 +74,7 @@ AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula
AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok
AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie
AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I
AQ -720041+0023206 Antarctica/Troll Troll Station, Queen Maud Land
AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF)
AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, MN, SE, SF)
AR -2447-06525 America/Argentina/Salta (SA, LP, NQ, RN)
...
...
@@ -366,6 +367,7 @@ RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad
RU +5545+03735 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 +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals
RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia
RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk
...
...
@@ -421,7 +423,6 @@ TZ -0648+03917 Africa/Dar_es_Salaam
UA +5026+03031 Europe/Kiev most locations
UA +4837+02218 Europe/Uzhgorod Ruthenia
UA +4750+03510 Europe/Zaporozhye Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
UA +4457+03406 Europe/Simferopol central Crimea
UG +0019+03225 Africa/Kampala
UM +1645-16931 Pacific/Johnston Johnston Atoll
UM +2813-17722 Pacific/Midway Midway Islands
...
...
jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
浏览文件 @
ae2540a4
...
...
@@ -570,6 +570,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{
"Antarctica/Syowa"
,
new
String
[]
{
"Syowa Time"
,
"SYOT"
,
"Syowa Summer Time"
,
"SYOST"
,
"Syowa Time"
,
"SYOT"
}},
{
"Antarctica/Troll"
,
new
String
[]
{
"Coordinated Universal Time"
,
"UTC"
,
"Central European Summer Time"
,
"CEST"
,
"Troll Time"
,
"ATT"
}},
{
"Antarctica/Vostok"
,
new
String
[]
{
"Vostok Time"
,
"VOST"
,
"Vostok Summer Time"
,
"VOSST"
,
"Vostok Time"
,
"VOST"
}},
...
...
@@ -839,7 +842,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
"Samara Time"
,
"SAMT"
}},
{
"Europe/San_Marino"
,
CET
},
{
"Europe/Sarajevo"
,
CET
},
{
"Europe/Simferopol"
,
EET
},
{
"Europe/Simferopol"
,
MSK
},
{
"Europe/Skopje"
,
CET
},
{
"Europe/Sofia"
,
EET
},
{
"Europe/Stockholm"
,
CET
},
...
...
jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
浏览文件 @
ae2540a4
...
...
@@ -570,6 +570,9 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{
"Antarctica/Syowa"
,
new
String
[]
{
"Syowa Zeit"
,
"SYOT"
,
"Syowa Sommerzeit"
,
"SYOST"
,
"Syowa Zeit"
,
"SYOT"
}},
{
"Antarctica/Troll"
,
new
String
[]
{
"Koordinierte Universalzeit"
,
"UTC"
,
"Mitteleurop\u00e4ische Sommerzeit"
,
"MESZ"
,
"Troll Time"
,
"ATT"
}},
{
"Antarctica/Vostok"
,
new
String
[]
{
"Vostok Zeit"
,
"VOST"
,
"Vostok Sommerzeit"
,
"VOSST"
,
"Vostok Zeit"
,
"VOST"
}},
...
...
@@ -838,7 +841,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
"Samarische Zeit"
,
"SAMT"
}},
{
"Europe/San_Marino"
,
CET
},
{
"Europe/Sarajevo"
,
CET
},
{
"Europe/Simferopol"
,
EET
},
{
"Europe/Simferopol"
,
MSK
},
{
"Europe/Skopje"
,
CET
},
{
"Europe/Sofia"
,
EET
},
{
"Europe/Stockholm"
,
CET
},
...
...
jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
浏览文件 @
ae2540a4
...
...
@@ -570,6 +570,9 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
{
"Antarctica/Syowa"
,
new
String
[]
{
"Hora de Syowa"
,
"SYOT"
,
"Hora de verano de Syowa"
,
"SYOST"
,
"Hora de Syowa"
,
"SYOT"
}},
{
"Antarctica/Troll"
,
new
String
[]
{
"Hora Universal Coordinada"
,
"UTC"
,
"Hora de verano de Europa Central"
,
"CEST"
,
"Troll Time"
,
"ATT"
}},
{
"Antarctica/Vostok"
,
new
String
[]
{
"Hora de Vostok"
,
"VOST"
,
"Hora de verano de Vostok"
,
"VOSST"
,
"Hora de Vostok"
,
"VOST"
}},
...
...
@@ -838,7 +841,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
"Hora de Samara"
,
"SAMT"
}},
{
"Europe/San_Marino"
,
CET
},
{
"Europe/Sarajevo"
,
CET
},
{
"Europe/Simferopol"
,
EET
},
{
"Europe/Simferopol"
,
MSK
},
{
"Europe/Skopje"
,
CET
},
{
"Europe/Sofia"
,
EET
},
{
"Europe/Stockholm"
,
CET
},
...
...
jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
浏览文件 @
ae2540a4
...
...
@@ -570,6 +570,9 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{
"Antarctica/Syowa"
,
new
String
[]
{
"Heure de Syowa"
,
"SYOT"
,
"Heure d'\u00e9t\u00e9 de Syowa"
,
"SYOST"
,
"Heure de Syowa"
,
"SYOT"
}},
{
"Antarctica/Troll"
,
new
String
[]
{
"Temps universel coordonn\u00e9"
,
"UTC"
,
"Heure d'\u00e9t\u00e9 d'Europe centrale"
,
"CEST"
,
"Troll Time"
,
"ATT"
}},
{
"Antarctica/Vostok"
,
new
String
[]
{
"Heure de Vostok"
,
"VOST"
,
"Heure d'\u00e9t\u00e9 de Vostok"
,
"VOSST"
,
"Heure de Vostok"
,
"VOST"
}},
...
...
@@ -838,7 +841,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
"Heure de Samara"
,
"SAMT"
}},
{
"Europe/San_Marino"
,
CET
},
{
"Europe/Sarajevo"
,
CET
},
{
"Europe/Simferopol"
,
EET
},
{
"Europe/Simferopol"
,
MSK
},
{
"Europe/Skopje"
,
CET
},
{
"Europe/Sofia"
,
EET
},
{
"Europe/Stockholm"
,
CET
},
...
...
jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
浏览文件 @
ae2540a4
...
...
@@ -570,6 +570,9 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{
"Antarctica/Syowa"
,
new
String
[]
{
"Ora di Syowa"
,
"SYOT"
,
"Ora estiva di Syowa"
,
"SYOST"
,
"Ora di Syowa"
,
"SYOT"
}},
{
"Antarctica/Troll"
,
new
String
[]
{
"Tempo universale coordinato"
,
"UTC"
,
"Ora estiva dell'Europa centrale"
,
"CEST"
,
"Troll Time"
,
"ATT"
}},
{
"Antarctica/Vostok"
,
new
String
[]
{
"Ora di Vostok"
,
"VOST"
,
"Ora estiva di Vostok"
,
"VOSST"
,
"Ora di Vostok"
,
"VOST"
}},
...
...
@@ -838,7 +841,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
"Ora di Samara"
,
"SAMT"
}},
{
"Europe/San_Marino"
,
CET
},
{
"Europe/Sarajevo"
,
CET
},
{
"Europe/Simferopol"
,
EET
},
{
"Europe/Simferopol"
,
MSK
},
{
"Europe/Skopje"
,
CET
},
{
"Europe/Sofia"
,
EET
},
{
"Europe/Stockholm"
,
CET
},
...
...
jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
浏览文件 @
ae2540a4
...
...
@@ -570,6 +570,9 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{
"Antarctica/Syowa"
,
new
String
[]
{
"\u662d\u548c\u57fa\u5730\u6642\u9593"
,
"SYOT"
,
"\u662d\u548c\u57fa\u5730\u590f\u6642\u9593"
,
"SYOST"
,
"\u662D\u548C\u57FA\u5730\u6642\u9593"
,
"SYOT"
}},
{
"Antarctica/Troll"
,
new
String
[]
{
"\u5354\u5b9a\u4e16\u754c\u6642"
,
"UTC"
,
"\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593"
,
"CEST"
,
"Troll Time"
,
"ATT"
}},
{
"Antarctica/Vostok"
,
new
String
[]
{
"\u30dc\u30b9\u30c8\u30fc\u30af\u57fa\u5730\u6642\u9593"
,
"VOST"
,
"\u30dc\u30b9\u30c8\u30fc\u30af\u57fa\u5730\u590f\u6642\u9593"
,
"VOSST"
,
"\u30DC\u30B9\u30C8\u30FC\u30AF\u6642\u9593"
,
"VOST"
}},
...
...
@@ -838,7 +841,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
"\u30B5\u30DE\u30E9\u6642\u9593"
,
"SAMT"
}},
{
"Europe/San_Marino"
,
CET
},
{
"Europe/Sarajevo"
,
CET
},
{
"Europe/Simferopol"
,
EET
},
{
"Europe/Simferopol"
,
MSK
},
{
"Europe/Skopje"
,
CET
},
{
"Europe/Sofia"
,
EET
},
{
"Europe/Stockholm"
,
CET
},
...
...
jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
浏览文件 @
ae2540a4
...
...
@@ -570,6 +570,9 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{
"Antarctica/Syowa"
,
new
String
[]
{
"Syowa \uc2dc\uac04"
,
"SYOT"
,
"Syowa \uc77c\uad11\uc808\uc57d\uc2dc\uac04"
,
"SYOST"
,
"\uC1FC\uC640 \uD45C\uC900\uC2DC"
,
"SYOT"
}},
{
"Antarctica/Troll"
,
new
String
[]
{
"\uc138\uacc4 \ud45c\uc900\uc2dc"
,
"UTC"
,
"\uc911\uc559 \uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04"
,
"CEST"
,
"Troll Time"
,
"ATT"
}},
{
"Antarctica/Vostok"
,
new
String
[]
{
"Vostok \uc2dc\uac04"
,
"VOST"
,
"Vostok \uc77c\uad11\uc808\uc57d\uc2dc\uac04"
,
"VOSST"
,
"\uBCF4\uC2A4\uD1A1 \uD45C\uC900\uC2DC"
,
"VOST"
}},
...
...
@@ -838,7 +841,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
"\uC0AC\uB9C8\uB77C \uD45C\uC900\uC2DC"
,
"SAMT"
}},
{
"Europe/San_Marino"
,
CET
},
{
"Europe/Sarajevo"
,
CET
},
{
"Europe/Simferopol"
,
EET
},
{
"Europe/Simferopol"
,
MSK
},
{
"Europe/Skopje"
,
CET
},
{
"Europe/Sofia"
,
EET
},
{
"Europe/Stockholm"
,
CET
},
...
...
jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
浏览文件 @
ae2540a4
...
...
@@ -570,6 +570,9 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{
"Antarctica/Syowa"
,
new
String
[]
{
"Fuso hor\u00e1rio de Syowa"
,
"SYOT"
,
"Fuso hor\u00e1rio de ver\u00e3o de Syowa"
,
"SYOST"
,
"Hor\u00E1rio de Syowa"
,
"SYOT"
}},
{
"Antarctica/Troll"
,
new
String
[]
{
"Tempo universal coordenado"
,
"UTC"
,
"Fuso hor\u00e1rio de ver\u00e3o da Europa Central"
,
"CEST"
,
"Troll Time"
,
"ATT"
}},
{
"Antarctica/Vostok"
,
new
String
[]
{
"Fuso hor\u00e1rio de Vostok"
,
"VOST"
,
"Fuso hor\u00e1rio de ver\u00e3o de Vostok"
,
"VOSST"
,
"Hor\u00E1rio de Vostok"
,
"VOST"
}},
...
...
@@ -838,7 +841,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
"Hor\u00E1rio de Samara"
,
"SAMT"
}},
{
"Europe/San_Marino"
,
CET
},
{
"Europe/Sarajevo"
,
CET
},
{
"Europe/Simferopol"
,
EET
},
{
"Europe/Simferopol"
,
MSK
},
{
"Europe/Skopje"
,
CET
},
{
"Europe/Sofia"
,
EET
},
{
"Europe/Stockholm"
,
CET
},
...
...
jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
浏览文件 @
ae2540a4
...
...
@@ -570,6 +570,9 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{
"Antarctica/Syowa"
,
new
String
[]
{
"Syowa, normaltid"
,
"SYOT"
,
"Syowa, sommartid"
,
"SYOST"
,
"Syowa-tid"
,
"SYOT"
}},
{
"Antarctica/Troll"
,
new
String
[]
{
"Koordinerad universell tid"
,
"UTC"
,
"Centraleuropeisk sommartid"
,
"CEST"
,
"Troll Time"
,
"ATT"
}},
{
"Antarctica/Vostok"
,
new
String
[]
{
"Vostok, normaltid"
,
"VOST"
,
"Vostok, sommartid"
,
"VOSST"
,
"Vostok-tid"
,
"VOST"
}},
...
...
@@ -838,7 +841,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
"Samara-tid"
,
"SAMT"
}},
{
"Europe/San_Marino"
,
CET
},
{
"Europe/Sarajevo"
,
CET
},
{
"Europe/Simferopol"
,
EET
},
{
"Europe/Simferopol"
,
MSK
},
{
"Europe/Skopje"
,
CET
},
{
"Europe/Sofia"
,
EET
},
{
"Europe/Stockholm"
,
CET
},
...
...
jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
浏览文件 @
ae2540a4
...
...
@@ -570,6 +570,9 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{
"Antarctica/Syowa"
,
new
String
[]
{
"Syowa \u65f6\u95f4"
,
"SYOT"
,
"Syowa \u590f\u4ee4\u65f6"
,
"SYOST"
,
"Syowa \u65F6\u95F4"
,
"SYOT"
}},
{
"Antarctica/Troll"
,
new
String
[]
{
"\u534f\u8c03\u4e16\u754c\u65f6\u95f4"
,
"UTC"
,
"\u4e2d\u6b27\u590f\u4ee4\u65f6"
,
"CEST"
,
"Troll Time"
,
"ATT"
}},
{
"Antarctica/Vostok"
,
new
String
[]
{
"\u83ab\u65af\u6258\u514b\u65f6\u95f4"
,
"VOST"
,
"\u83ab\u65af\u6258\u514b\u590f\u4ee4\u65f6"
,
"VOSST"
,
"\u83AB\u65AF\u6258\u514B\u65F6\u95F4"
,
"VOST"
}},
...
...
@@ -838,7 +841,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
"\u6C99\u9A6C\u62C9\u65F6\u95F4"
,
"SAMT"
}},
{
"Europe/San_Marino"
,
CET
},
{
"Europe/Sarajevo"
,
CET
},
{
"Europe/Simferopol"
,
EET
},
{
"Europe/Simferopol"
,
MSK
},
{
"Europe/Skopje"
,
CET
},
{
"Europe/Sofia"
,
EET
},
{
"Europe/Stockholm"
,
CET
},
...
...
jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
浏览文件 @
ae2540a4
...
...
@@ -570,6 +570,9 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{
"Antarctica/Syowa"
,
new
String
[]
{
"\u5915\u6b50\u74e6 (Syowa) \u6642\u9593"
,
"SYOT"
,
"\u5915\u6b50\u74e6 (Syowa) \u590f\u4ee4\u6642\u9593"
,
"SYOST"
,
"\u5915\u6B50\u74E6 (Syowa) \u6642\u9593"
,
"SYOT"
}},
{
"Antarctica/Troll"
,
new
String
[]
{
"\u5354\u8abf\u4e16\u754c\u6642\u9593"
,
"UTC"
,
"\u4e2d\u6b50\u590f\u4ee4\u6642\u9593"
,
"CEST"
,
"Troll Time"
,
"ATT"
}},
{
"Antarctica/Vostok"
,
new
String
[]
{
"\u4f5b\u65af\u6258 (Vostok) \u6642\u9593"
,
"VOST"
,
"\u4f5b\u65af\u6258 (Vostok) \u590f\u4ee4\u6642\u9593"
,
"VOSST"
,
"\u4F5B\u65AF\u6258 (Vostok) \u6642\u9593"
,
"VOST"
}},
...
...
@@ -840,7 +843,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
"\u6C99\u99AC\u62C9\u6642\u9593"
,
"SAMT"
}},
{
"Europe/San_Marino"
,
CET
},
{
"Europe/Sarajevo"
,
CET
},
{
"Europe/Simferopol"
,
EET
},
{
"Europe/Simferopol"
,
MSK
},
{
"Europe/Skopje"
,
CET
},
{
"Europe/Sofia"
,
EET
},
{
"Europe/Stockholm"
,
CET
},
...
...
jdk/test/sun/util/calendar/zi/tzdata/VERSION
浏览文件 @
ae2540a4
...
...
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
tzdata2014
a
tzdata2014
b
jdk/test/sun/util/calendar/zi/tzdata/africa
浏览文件 @
ae2540a4
...
...
@@ -891,7 +891,10 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou
# Another source (specifying the time for start and end in the decree):
# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html
# From Paul Eggert (2013-10-03):
# From Sebastien Willemijns (2014-03-18):
# http://www.afriquinfos.com/articles/2014/3/18/maroc-heure-dete-avancez-tous-horloges-247891.asp
# From Paul Eggert (2014-03-19):
# To estimate what the Moroccan government will do in future years,
# transition dates for 2014 through 2038 were determined by running
# the following program under GNU Emacs 24.3:
...
...
jdk/test/sun/util/calendar/zi/tzdata/antarctica
浏览文件 @
ae2540a4
...
...
@@ -253,24 +253,41 @@ Zone Antarctica/Syowa 0 - zzz 1957 Jan 29
# year-round base
# Scott Base, Ross Island, since 1957-01.
# See Pacific/Auckland.
#
# These rules for New Zealand are stolen from the 'australasia' file.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule NZAQ 1974 only - Nov 3 2:00s 1:00 D
Rule NZAQ 1975 1988 - Oct lastSun 2:00s 1:00 D
Rule NZAQ 1989 only - Oct 8 2:00s 1:00 D
Rule NZAQ 1990 2006 - Oct Sun>=1 2:00s 1:00 D
Rule NZAQ 1975 only - Feb 23 2:00s 0 S
Rule NZAQ 1976 1989 - Mar Sun>=1 2:00s 0 S
Rule NZAQ 1990 2007 - Mar Sun>=15 2:00s 0 S
Rule NZAQ 2007 max - Sep lastSun 2:00s 1:00 D
Rule NZAQ 2008 max - Apr Sun>=1 2:00s 0 S
# Norway - territories
# Bouvet (never inhabited)
#
# claims
# Peter I Island (never inhabited)
#
# year-round base
# Troll, Queen Maud Land, -720041+0023206, since 2005-02-12
#
# From Paul-Inge Flakstad (2014-03-10):
# I recently had a long dialog about this with the developer of timegenie.com.
# In the absence of specific dates, he decided to choose some likely ones:
# GMT +1 - From March 1 to the last Sunday in March
# GMT +2 - From the last Sunday in March until the last Sunday in October
# GMT +1 - From the last Sunday in October until November 7
# GMT +0 - From November 7 until March 1
# The dates for switching to and from UTC+0 will probably not be absolutely
# correct, but they should be quite close to the actual dates.
#
# From Paul Eggert (2014-03-21):
# The CET-switching Troll rules require zic from tzcode 2014b or later, so as
# suggested by Bengt-Inge Larsson comment them out for now, and approximate
# with only UTC and CEST. Uncomment them when 2014b is more prevalent.
#
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
#Rule Troll 2005 max - Mar 1 1:00u 1:00 CET
Rule Troll 2005 max - Mar lastSun 1:00u 2:00 CEST
#Rule Troll 2005 max - Oct lastSun 1:00u 1:00 CET
#Rule Troll 2004 max - Nov 7 1:00u 0:00 UTC
# Remove the following line when uncommenting the above '#Rule' lines.
Rule Troll 2004 max - Oct lastSun 1:00u 0:00 UTC
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Antarctica/Troll 0 - zzz 2005 Feb 12
0:00 Troll %s
# Poland - year-round base
# Arctowski, King George Island, -620945-0582745, since 1977
...
...
jdk/test/sun/util/calendar/zi/tzdata/australasia
浏览文件 @
ae2540a4
...
...
@@ -786,14 +786,29 @@ Zone Pacific/Funafuti 11:56:52 - LMT 1901
# Johnston
#
# From Paul Eggert (2013-09-03):
# From Paul Eggert (2014-03-11):
# Sometimes Johnston kept Hawaii time, and sometimes it was an hour behind.
# Details are uncertain. We have no data for Johnston after 1970, so
# treat it like Hawaii for now.
#
# In his memoirs of June 6th to October 4, 1945
# <http://www.315bw.org/Herb_Bach.htm> (2005), Herbert C. Bach writes,
# "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM
# Johnston time, 1:30 AM Kwajalein time." This was in June 1945, and
# confirms that Johnston kept the same time as Honolulu in summer 1945.
# We have no better information, so for now, assume this has been true
# indefinitely into the past.
#
# From Lyle McElhaney (2014-03-11):
# [W]hen JI was being used for that [atomic bomb] testing, the time being used
# was not Hawaiian time but rather the same time being used on the ships,
# which had a GMT offset of -11 hours. This apparently applied to at least the
# time from Operation Newsreel (Hardtack I/Teak shot, 1958-08-01) to the last
# Operation Fishbowl shot (Tightrope, 1962-11-04).... [See] Herman Hoerlin,
# "The United States High-Altitude Test Experience: A Review Emphasizing the
# Impact on the Environment", Los Alamos LA-6405, Oct 1976
# <http://www.fas.org/sgp/othergov/doe/lanl/docs1/00322994.pdf>.
# See the table on page 4 where he lists GMT and local times for the tests; a
# footnote for the JI tests reads that local time is "JI time = Hawaii Time
# Minus One Hour".
#
# See 'northamerica' for Pacific/Johnston.
...
...
jdk/test/sun/util/calendar/zi/tzdata/europe
浏览文件 @
ae2540a4
...
...
@@ -2986,7 +2986,11 @@ Zone Europe/Simferopol 2:16:24 - LMT 1880
# Assume it happened in March by not changing the clocks.
3:00 Russia MSK/MSD 1997
3:00 - MSK 1997 Mar lastSun 1:00u
2:00 EU EE%sT
# From Alexander Krivenyshev (2014-03-17):
# time change at 2:00 (2am) on March 30, 2014
# http://vz.ru/news/2014/3/17/677464.html
2:00 EU EE%sT 2014 Mar 30 2:00
4:00 - MSK
# Vatican City
# See Europe/Rome.
...
...
jdk/test/sun/util/calendar/zi/tzdata/leapseconds
浏览文件 @
ae2540a4
...
...
@@ -20,7 +20,7 @@
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# Allowance for leapseconds added to each timezone file.
# This file is in the public domain.
...
...
jdk/test/sun/util/calendar/zi/tzdata/zone.tab
浏览文件 @
ae2540a4
...
...
@@ -74,6 +74,7 @@ AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula
AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok
AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie
AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I
AQ -720041+0023206 Antarctica/Troll Troll Station, Queen Maud Land
AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF)
AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, MN, SE, SF)
AR -2447-06525 America/Argentina/Salta (SA, LP, NQ, RN)
...
...
@@ -366,6 +367,7 @@ RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad
RU +5545+03735 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 +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals
RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia
RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk
...
...
@@ -421,7 +423,6 @@ TZ -0648+03917 Africa/Dar_es_Salaam
UA +5026+03031 Europe/Kiev most locations
UA +4837+02218 Europe/Uzhgorod Ruthenia
UA +4750+03510 Europe/Zaporozhye Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
UA +4457+03406 Europe/Simferopol central Crimea
UG +0019+03225 Africa/Kampala
UM +1645-16931 Pacific/Johnston Johnston Atoll
UM +2813-17722 Pacific/Midway Midway Islands
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录