summaryrefslogtreecommitdiffstats
path: root/intl/icu/source/data/misc/windowsZones.txt
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-06-23 15:20:34 +0000
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-06-23 15:20:34 +0000
commita42bed2e9a78715889240ff900e2391bef923285 (patch)
tree202c502b7e964384fb7f0639b756353374b0c045 /intl/icu/source/data/misc/windowsZones.txt
parent9a2224a97c7d258fc1f0e5fad30706987880ce22 (diff)
parent276f6583e00edf2a217a3092471ca2aa3aab5a09 (diff)
downloadUXP-a42bed2e9a78715889240ff900e2391bef923285.tar
UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.gz
UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.lz
UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.xz
UXP-a42bed2e9a78715889240ff900e2391bef923285.zip
Merge branch 'master' into remove-unboxed
# Conflicts: # js/src/jit/BaselineIC.cpp # js/src/jsarray.cpp
Diffstat (limited to 'intl/icu/source/data/misc/windowsZones.txt')
-rw-r--r--intl/icu/source/data/misc/windowsZones.txt49
1 files changed, 33 insertions, 16 deletions
diff --git a/intl/icu/source/data/misc/windowsZones.txt b/intl/icu/source/data/misc/windowsZones.txt
index 4606b168f..585dccc74 100644
--- a/intl/icu/source/data/misc/windowsZones.txt
+++ b/intl/icu/source/data/misc/windowsZones.txt
@@ -1,4 +1,4 @@
-// © 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
windowsZones:table(nofallback){
mapTimezones{
@@ -17,8 +17,8 @@ windowsZones:table(nofallback){
"Alaskan Standard Time"{
001{"America/Anchorage"}
US{
- "America/Anchorage America/Juneau America/Metlakatla America/Nome Ame"
- "rica/Sitka America/Yakutat"
+ "America/Anchorage America/Juneau America/Nome America/Sitka America/"
+ "Yakutat"
}
}
"Aleutian Standard Time"{
@@ -58,7 +58,7 @@ windowsZones:table(nofallback){
}
"Astrakhan Standard Time"{
001{"Europe/Astrakhan"}
- RU{"Europe/Astrakhan Europe/Saratov Europe/Ulyanovsk"}
+ RU{"Europe/Astrakhan Europe/Ulyanovsk"}
}
"Atlantic Standard Time"{
001{"America/Halifax"}
@@ -130,7 +130,7 @@ windowsZones:table(nofallback){
CN{"Asia/Urumqi"}
IO{"Indian/Chagos"}
KG{"Asia/Bishkek"}
- KZ{"Asia/Almaty Asia/Qyzylorda"}
+ KZ{"Asia/Almaty Asia/Qostanay"}
ZZ{"Etc/GMT-6"}
}
"Central Brazilian Standard Time"{
@@ -156,7 +156,6 @@ windowsZones:table(nofallback){
}
"Central Pacific Standard Time"{
001{"Pacific/Guadalcanal"}
- AQ{"Antarctica/Casey"}
AU{"Antarctica/Macquarie"}
FM{"Pacific/Ponape Pacific/Kosrae"}
NC{"Pacific/Noumea"}
@@ -212,7 +211,6 @@ windowsZones:table(nofallback){
KE{"Africa/Nairobi"}
KM{"Indian/Comoro"}
MG{"Indian/Antananarivo"}
- SD{"Africa/Khartoum"}
SO{"Africa/Mogadishu"}
SS{"Africa/Juba"}
TZ{"Africa/Dar_es_Salaam"}
@@ -289,7 +287,7 @@ windowsZones:table(nofallback){
}
"GTB Standard Time"{
001{"Europe/Bucharest"}
- CY{"Asia/Nicosia"}
+ CY{"Asia/Famagusta Asia/Nicosia"}
GR{"Europe/Athens"}
RO{"Europe/Bucharest"}
}
@@ -316,7 +314,6 @@ windowsZones:table(nofallback){
SH{"Atlantic/St_Helena"}
SL{"Africa/Freetown"}
SN{"Africa/Dakar"}
- ST{"Africa/Sao_Tome"}
TG{"Africa/Lome"}
}
"Haiti Standard Time"{
@@ -372,6 +369,11 @@ windowsZones:table(nofallback){
001{"Asia/Magadan"}
RU{"Asia/Magadan"}
}
+ "Magallanes Standard Time"{
+ 001{"America/Punta_Arenas"}
+ AQ{"Antarctica/Palmer"}
+ CL{"America/Punta_Arenas"}
+ }
"Marquesas Standard Time"{
001{"Pacific/Marquesas"}
PF{"Pacific/Marquesas"}
@@ -457,7 +459,6 @@ windowsZones:table(nofallback){
}
"Pacific SA Standard Time"{
001{"America/Santiago"}
- AQ{"Antarctica/Palmer"}
CL{"America/Santiago"}
}
"Pacific Standard Time (Mexico)"{
@@ -467,7 +468,7 @@ windowsZones:table(nofallback){
"Pacific Standard Time"{
001{"America/Los_Angeles"}
CA{"America/Vancouver America/Dawson America/Whitehorse"}
- US{"America/Los_Angeles"}
+ US{"America/Los_Angeles America/Metlakatla"}
ZZ{"PST8PDT"}
}
"Pakistan Standard Time"{
@@ -579,6 +580,14 @@ windowsZones:table(nofallback){
001{"Pacific/Apia"}
WS{"Pacific/Apia"}
}
+ "Sao Tome Standard Time"{
+ 001{"Africa/Sao_Tome"}
+ ST{"Africa/Sao_Tome"}
+ }
+ "Saratov Standard Time"{
+ 001{"Europe/Saratov"}
+ RU{"Europe/Saratov"}
+ }
"Singapore Standard Time"{
001{"Asia/Singapore"}
BN{"Asia/Brunei"}
@@ -607,6 +616,10 @@ windowsZones:table(nofallback){
001{"Asia/Colombo"}
LK{"Asia/Colombo"}
}
+ "Sudan Standard Time"{
+ 001{"Africa/Khartoum"}
+ SD{"Africa/Khartoum"}
+ }
"Syria Standard Time"{
001{"Asia/Damascus"}
SY{"Asia/Damascus"}
@@ -637,10 +650,7 @@ windowsZones:table(nofallback){
}
"Tonga Standard Time"{
001{"Pacific/Tongatapu"}
- KI{"Pacific/Enderbury"}
- TK{"Pacific/Fakaofo"}
TO{"Pacific/Tongatapu"}
- ZZ{"Etc/GMT-13"}
}
"Transbaikal Standard Time"{
001{"Asia/Chita"}
@@ -668,7 +678,7 @@ windowsZones:table(nofallback){
"UTC"{
001{"Etc/GMT"}
GL{"America/Danmarkshavn"}
- ZZ{"Etc/GMT"}
+ ZZ{"Etc/GMT Etc/UTC"}
}
"UTC+12"{
001{"Etc/GMT-12"}
@@ -680,6 +690,12 @@ windowsZones:table(nofallback){
WF{"Pacific/Wallis"}
ZZ{"Etc/GMT-12"}
}
+ "UTC+13"{
+ 001{"Etc/GMT-13"}
+ KI{"Pacific/Enderbury"}
+ TK{"Pacific/Fakaofo"}
+ ZZ{"Etc/GMT-13"}
+ }
"UTC-02"{
001{"Etc/GMT+2"}
BR{"America/Noronha"}
@@ -717,6 +733,7 @@ windowsZones:table(nofallback){
}
"W. Australia Standard Time"{
001{"Australia/Perth"}
+ AQ{"Antarctica/Casey"}
AU{"Australia/Perth"}
}
"W. Central Africa Standard Time"{
@@ -762,7 +779,7 @@ windowsZones:table(nofallback){
"West Asia Standard Time"{
001{"Asia/Tashkent"}
AQ{"Antarctica/Mawson"}
- KZ{"Asia/Oral Asia/Aqtau Asia/Aqtobe Asia/Atyrau"}
+ KZ{"Asia/Oral Asia/Aqtau Asia/Aqtobe Asia/Atyrau Asia/Qyzylorda"}
MV{"Indian/Maldives"}
TF{"Indian/Kerguelen"}
TJ{"Asia/Dushanbe"}