Cygwin: utils: refresh tzmap

- update path to Unicode windowsZones.xml file
- drop Windows XP considerations
- regenerate tzmap.h

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2020-08-07 12:09:02 +02:00 committed by Ken Brown
parent 9bc79893be
commit 835865603d
2 changed files with 91 additions and 58 deletions

View File

@ -8,7 +8,7 @@
# Create the table file as required by tzset.c.
#
ZONES_FILE="http://unicode.org/repos/cldr/trunk/common/supplemental/windowsZones.xml"
ZONES_FILE="https://raw.githubusercontent.com/unicode-org/cldr/master/common/supplemental/windowsZones.xml"
echo "/*"
echo " This file gets auto-generated by the script tzmap-from-unicode.org via"
@ -24,13 +24,7 @@ echo " This table maps Windows timezone keynames and countries per ISO 3166-1
echo " POSIX-compatible timezone IDs."
echo ""
echo " The mapping from unicode.org is just a bit incomplete. It doesn't contain"
echo " a few timezones available on Windows XP, namely:"
echo ""
echo " Armenian Standard Time"
echo " Mexico Standard Time"
echo " Mexico Standard Time 2"
echo ""
echo " as well as the still (Windows 8.1) available"
echo " a few timezones available on Windows 8.1:"
echo ""
echo " E. Europe Standard Time"
echo " Mid-Atlantic Standard Time"
@ -46,10 +40,9 @@ echo " Kaliningrad Standard Time/BY"
echo " SA Pacific Standard Time/HT "
echo " South Africa Standard Time/LY"
echo ""
echo " It also doesn't contain some of the deprecated country codes used in older"
echo " It also doesn't contain deprecated country codes used in older"
echo " OSes, namely:"
echo ""
echo " SP (Serbian, proposed) used in XP"
echo " CS (Serbian and Montenegro, dissolved, now RS and ME) used in Vista"
echo " "
echo " While these are apparently old, they are required here to get a complete"
@ -66,9 +59,7 @@ wget -O - "${ZONES_FILE}" | \
sed -n -e 's#territory="001"#territory=""#
s#Asia/Calcutta#Asia/Kolkata#
s#.*mapZone other=\("[^"]*"\) territory=\("[^"]*"\) type=\("[^"]*"\).*# { L\1, L\2, L\3 },#p'
echo ' { L"Armenian Standard Time", L"AM", L"Asia/Yerevan" },'
echo ' { L"Central Europe Standard Time", L"CS", L"Europe/Belgrade" },'
echo ' { L"Central Europe Standard Time", L"SP", L"Europe/Belgrade" },'
echo ' { L"E. Europe Standard Time", L"", L"Asia/Nicosia" },'
echo ' { L"E. Europe Standard Time", L"CY", L"Asia/Nicosia" },'
echo ' { L"Eastern Standard Time", L"TC", L"America/Grand_Turk" },'
@ -77,8 +68,6 @@ wget -O - "${ZONES_FILE}" | \
echo ' { L"Kaliningrad Standard Time", L"BY", L"Europe/Minsk" },'
echo ' { L"Kamchatka Standard Time", L"", L"Asia/Kamchatka" },'
echo ' { L"Hawaiian Standard Time", L"TK", L"Pacific/Fakaofo" },'
echo ' { L"Mexico Standard Time", L"", L"America/Mexico_City" },'
echo ' { L"Mexico Standard Time 2", L"", L"America/Mazatlan" },'
echo ' { L"Mid-Atlantic Standard Time", L"", L"Atlantic/South_Georgia" },'
echo ' { L"SA Pacific Standard Time", L"HT", L"America/Port-au-Prince" },'
echo ' { L"South Africa Standard Time", L"LY", L"Africa/Tripoli" },'

View File

@ -3,7 +3,7 @@
a Makefile rule. To regenerate the file, just call 'make tzmap'. It
fetches the file
http://unicode.org/repos/cldr/trunk/common/supplemental/windowsZones.xml
https://raw.githubusercontent.com/unicode-org/cldr/master/common/supplemental/windowsZones.xml
using wget and converts it into the tzmap table required by tzget.c.
Regenerating might be necessary on a regular basis...
@ -12,13 +12,7 @@
POSIX-compatible timezone IDs.
The mapping from unicode.org is just a bit incomplete. It doesn't contain
a few timezones available on Windows XP, namely:
Armenian Standard Time
Mexico Standard Time
Mexico Standard Time 2
as well as the still (Windows 8.1) available
a few timezones available on Windows 8.1:
E. Europe Standard Time
Mid-Atlantic Standard Time
@ -34,10 +28,9 @@
SA Pacific Standard Time/HT
South Africa Standard Time/LY
It also doesn't contain some of the deprecated country codes used in older
It also doesn't contain deprecated country codes used in older
OSes, namely:
SP (Serbian, proposed) used in XP
CS (Serbian and Montenegro, dissolved, now RS and ME) used in Vista
While these are apparently old, they are required here to get a complete
@ -56,7 +49,11 @@ struct
{ L"Afghanistan Standard Time", L"", L"Asia/Kabul" },
{ L"Afghanistan Standard Time", L"AF", L"Asia/Kabul" },
{ L"Alaskan Standard Time", L"", L"America/Anchorage" },
{ L"Alaskan Standard Time", L"US", L"America/Anchorage America/Juneau America/Nome America/Sitka America/Yakutat" },
{ L"Alaskan Standard Time", L"US", L"America/Anchorage America/Juneau America/Metlakatla America/Nome America/Sitka America/Yakutat" },
{ L"Aleutian Standard Time", L"", L"America/Adak" },
{ L"Aleutian Standard Time", L"US", L"America/Adak" },
{ L"Altai Standard Time", L"", L"Asia/Barnaul" },
{ L"Altai Standard Time", L"RU", L"Asia/Barnaul" },
{ L"Arab Standard Time", L"", L"Asia/Riyadh" },
{ L"Arab Standard Time", L"BH", L"Asia/Bahrain" },
{ L"Arab Standard Time", L"KW", L"Asia/Kuwait" },
@ -71,11 +68,14 @@ struct
{ L"Arabic Standard Time", L"IQ", L"Asia/Baghdad" },
{ L"Argentina Standard Time", L"", L"America/Buenos_Aires" },
{ L"Argentina Standard Time", L"AR", L"America/Buenos_Aires America/Argentina/La_Rioja America/Argentina/Rio_Gallegos America/Argentina/Salta America/Argentina/San_Juan America/Argentina/San_Luis America/Argentina/Tucuman America/Argentina/Ushuaia America/Catamarca America/Cordoba America/Jujuy America/Mendoza" },
{ L"Armenian Standard Time", L"AM", L"Asia/Yerevan" },
{ L"Astrakhan Standard Time", L"", L"Europe/Astrakhan" },
{ L"Astrakhan Standard Time", L"RU", L"Europe/Astrakhan Europe/Ulyanovsk" },
{ L"Atlantic Standard Time", L"", L"America/Halifax" },
{ L"Atlantic Standard Time", L"BM", L"Atlantic/Bermuda" },
{ L"Atlantic Standard Time", L"CA", L"America/Halifax America/Glace_Bay America/Goose_Bay America/Moncton" },
{ L"Atlantic Standard Time", L"GL", L"America/Thule" },
{ L"Aus Central W. Standard Time", L"", L"Australia/Eucla" },
{ L"Aus Central W. Standard Time", L"AU", L"Australia/Eucla" },
{ L"Azerbaijan Standard Time", L"", L"Asia/Baku" },
{ L"Azerbaijan Standard Time", L"AZ", L"Asia/Baku" },
{ L"Azores Standard Time", L"", L"Atlantic/Azores" },
@ -88,6 +88,8 @@ struct
{ L"Bangladesh Standard Time", L"BT", L"Asia/Thimphu" },
{ L"Belarus Standard Time", L"", L"Europe/Minsk" },
{ L"Belarus Standard Time", L"BY", L"Europe/Minsk" },
{ L"Bougainville Standard Time", L"", L"Pacific/Bougainville" },
{ L"Bougainville Standard Time", L"PG", L"Pacific/Bougainville" },
{ L"Canada Central Standard Time", L"", L"America/Regina" },
{ L"Canada Central Standard Time", L"CA", L"America/Regina America/Swift_Current" },
{ L"Cape Verde Standard Time", L"", L"Atlantic/Cape_Verde" },
@ -111,7 +113,7 @@ struct
{ L"Central Asia Standard Time", L"CN", L"Asia/Urumqi" },
{ L"Central Asia Standard Time", L"IO", L"Indian/Chagos" },
{ L"Central Asia Standard Time", L"KG", L"Asia/Bishkek" },
{ L"Central Asia Standard Time", L"KZ", L"Asia/Almaty Asia/Qyzylorda" },
{ L"Central Asia Standard Time", L"KZ", L"Asia/Almaty Asia/Qostanay" },
{ L"Central Asia Standard Time", L"ZZ", L"Etc/GMT-6" },
{ L"Central Brazilian Standard Time", L"", L"America/Cuiaba" },
{ L"Central Brazilian Standard Time", L"BR", L"America/Cuiaba America/Campo_Grande" },
@ -124,7 +126,6 @@ struct
{ L"Central Europe Standard Time", L"RS", L"Europe/Belgrade" },
{ L"Central Europe Standard Time", L"SI", L"Europe/Ljubljana" },
{ L"Central Europe Standard Time", L"SK", L"Europe/Bratislava" },
{ L"Central Europe Standard Time", L"SP", L"Europe/Belgrade" },
{ L"Central European Standard Time", L"", L"Europe/Warsaw" },
{ L"Central European Standard Time", L"BA", L"Europe/Sarajevo" },
{ L"Central European Standard Time", L"HR", L"Europe/Zagreb" },
@ -134,7 +135,6 @@ struct
{ L"Central Pacific Standard Time", L"AU", L"Antarctica/Macquarie" },
{ L"Central Pacific Standard Time", L"FM", L"Pacific/Ponape Pacific/Kosrae" },
{ L"Central Pacific Standard Time", L"NC", L"Pacific/Noumea" },
{ L"Central Pacific Standard Time", L"PG", L"Pacific/Bougainville" },
{ L"Central Pacific Standard Time", L"SB", L"Pacific/Guadalcanal" },
{ L"Central Pacific Standard Time", L"VU", L"Pacific/Efate" },
{ L"Central Pacific Standard Time", L"ZZ", L"Etc/GMT-11" },
@ -145,10 +145,14 @@ struct
{ L"Central Standard Time", L"ZZ", L"CST6CDT" },
{ L"Central Standard Time (Mexico)", L"", L"America/Mexico_City" },
{ L"Central Standard Time (Mexico)", L"MX", L"America/Mexico_City America/Bahia_Banderas America/Merida America/Monterrey" },
{ L"Chatham Islands Standard Time", L"", L"Pacific/Chatham" },
{ L"Chatham Islands Standard Time", L"NZ", L"Pacific/Chatham" },
{ L"China Standard Time", L"", L"Asia/Shanghai" },
{ L"China Standard Time", L"CN", L"Asia/Shanghai" },
{ L"China Standard Time", L"HK", L"Asia/Hong_Kong" },
{ L"China Standard Time", L"MO", L"Asia/Macau" },
{ L"Cuba Standard Time", L"", L"America/Havana" },
{ L"Cuba Standard Time", L"CU", L"America/Havana" },
{ L"Dateline Standard Time", L"", L"Etc/GMT+12" },
{ L"Dateline Standard Time", L"ZZ", L"Etc/GMT+12" },
{ L"E. Africa Standard Time", L"", L"Africa/Nairobi" },
@ -159,7 +163,6 @@ struct
{ L"E. Africa Standard Time", L"KE", L"Africa/Nairobi" },
{ L"E. Africa Standard Time", L"KM", L"Indian/Comoro" },
{ L"E. Africa Standard Time", L"MG", L"Indian/Antananarivo" },
{ L"E. Africa Standard Time", L"SD", L"Africa/Khartoum" },
{ L"E. Africa Standard Time", L"SO", L"Africa/Mogadishu" },
{ L"E. Africa Standard Time", L"SS", L"Africa/Juba" },
{ L"E. Africa Standard Time", L"TZ", L"Africa/Dar_es_Salaam" },
@ -169,14 +172,16 @@ struct
{ L"E. Australia Standard Time", L"", L"Australia/Brisbane" },
{ L"E. Australia Standard Time", L"AU", L"Australia/Brisbane Australia/Lindeman" },
{ L"E. Europe Standard Time", L"", L"Asia/Nicosia" },
{ L"E. Europe Standard Time", L"", L"Europe/Chisinau" },
{ L"E. Europe Standard Time", L"CY", L"Asia/Nicosia" },
{ L"E. Europe Standard Time", L"MD", L"Europe/Chisinau" },
{ L"E. South America Standard Time", L"", L"America/Sao_Paulo" },
{ L"E. South America Standard Time", L"BR", L"America/Sao_Paulo" },
{ L"Easter Island Standard Time", L"", L"Pacific/Easter" },
{ L"Easter Island Standard Time", L"CL", L"Pacific/Easter" },
{ L"Eastern Standard Time", L"", L"America/New_York" },
{ L"Eastern Standard Time", L"BS", L"America/Nassau" },
{ L"Eastern Standard Time", L"CA", L"America/Toronto America/Iqaluit America/Montreal America/Nipigon America/Pangnirtung America/Thunder_Bay" },
{ L"Eastern Standard Time", L"CU", L"America/Havana" },
{ L"Eastern Standard Time", L"HT", L"America/Port-au-Prince" },
{ L"Eastern Standard Time", L"TC", L"America/Grand_Turk" },
{ L"Eastern Standard Time", L"US", L"America/New_York America/Detroit America/Indiana/Petersburg America/Indiana/Vincennes America/Indiana/Winamac America/Kentucky/Monticello America/Louisville" },
{ L"Eastern Standard Time", L"ZZ", L"EST5EDT" },
@ -207,9 +212,8 @@ struct
{ L"GMT Standard Time", L"JE", L"Europe/Jersey" },
{ L"GMT Standard Time", L"PT", L"Europe/Lisbon Atlantic/Madeira" },
{ L"GTB Standard Time", L"", L"Europe/Bucharest" },
{ L"GTB Standard Time", L"CY", L"Asia/Nicosia" },
{ L"GTB Standard Time", L"CY", L"Asia/Nicosia Asia/Famagusta" },
{ L"GTB Standard Time", L"GR", L"Europe/Athens" },
{ L"GTB Standard Time", L"MD", L"Europe/Chisinau" },
{ L"GTB Standard Time", L"RO", L"Europe/Bucharest" },
{ L"Georgian Standard Time", L"", L"Asia/Tbilisi" },
{ L"Georgian Standard Time", L"GE", L"Asia/Tbilisi" },
@ -230,8 +234,9 @@ struct
{ L"Greenwich Standard Time", L"SH", L"Atlantic/St_Helena" },
{ L"Greenwich Standard Time", L"SL", L"Africa/Freetown" },
{ L"Greenwich Standard Time", L"SN", L"Africa/Dakar" },
{ L"Greenwich Standard Time", L"ST", L"Africa/Sao_Tome" },
{ L"Greenwich Standard Time", L"TG", L"Africa/Lome" },
{ L"Haiti Standard Time", L"", L"America/Port-au-Prince" },
{ L"Haiti Standard Time", L"HT", L"America/Port-au-Prince" },
{ L"Hawaiian Standard Time", L"", L"Pacific/Honolulu" },
{ L"Hawaiian Standard Time", L"CK", L"Pacific/Rarotonga" },
{ L"Hawaiian Standard Time", L"PF", L"Pacific/Tahiti" },
@ -252,21 +257,24 @@ struct
{ L"Kaliningrad Standard Time", L"RU", L"Europe/Kaliningrad" },
{ L"Kamchatka Standard Time", L"", L"Asia/Kamchatka" },
{ L"Korea Standard Time", L"", L"Asia/Seoul" },
{ L"Korea Standard Time", L"KP", L"Asia/Pyongyang" },
{ L"Korea Standard Time", L"KR", L"Asia/Seoul" },
{ L"Libya Standard Time", L"", L"Africa/Tripoli" },
{ L"Libya Standard Time", L"LY", L"Africa/Tripoli" },
{ L"Line Islands Standard Time", L"", L"Pacific/Kiritimati" },
{ L"Line Islands Standard Time", L"KI", L"Pacific/Kiritimati" },
{ L"Line Islands Standard Time", L"ZZ", L"Etc/GMT-14" },
{ L"Lord Howe Standard Time", L"", L"Australia/Lord_Howe" },
{ L"Lord Howe Standard Time", L"AU", L"Australia/Lord_Howe" },
{ L"Magadan Standard Time", L"", L"Asia/Magadan" },
{ L"Magadan Standard Time", L"RU", L"Asia/Magadan" },
{ L"Magallanes Standard Time", L"", L"America/Punta_Arenas" },
{ L"Magallanes Standard Time", L"CL", L"America/Punta_Arenas" },
{ L"Marquesas Standard Time", L"", L"Pacific/Marquesas" },
{ L"Marquesas Standard Time", L"PF", L"Pacific/Marquesas" },
{ L"Mauritius Standard Time", L"", L"Indian/Mauritius" },
{ L"Mauritius Standard Time", L"MU", L"Indian/Mauritius" },
{ L"Mauritius Standard Time", L"RE", L"Indian/Reunion" },
{ L"Mauritius Standard Time", L"SC", L"Indian/Mahe" },
{ L"Mexico Standard Time 2", L"", L"America/Mazatlan" },
{ L"Mexico Standard Time", L"", L"America/Mexico_City" },
{ L"Mid-Atlantic Standard Time", L"", L"Atlantic/South_Georgia" },
{ L"Middle East Standard Time", L"", L"Asia/Beirut" },
{ L"Middle East Standard Time", L"LB", L"Asia/Beirut" },
@ -286,7 +294,7 @@ struct
{ L"Myanmar Standard Time", L"CC", L"Indian/Cocos" },
{ L"Myanmar Standard Time", L"MM", L"Asia/Rangoon" },
{ L"N. Central Asia Standard Time", L"", L"Asia/Novosibirsk" },
{ L"N. Central Asia Standard Time", L"RU", L"Asia/Novosibirsk Asia/Omsk" },
{ L"N. Central Asia Standard Time", L"RU", L"Asia/Novosibirsk" },
{ L"Namibia Standard Time", L"", L"Africa/Windhoek" },
{ L"Namibia Standard Time", L"NA", L"Africa/Windhoek" },
{ L"Nepal Standard Time", L"", L"Asia/Katmandu" },
@ -296,24 +304,30 @@ struct
{ L"New Zealand Standard Time", L"NZ", L"Pacific/Auckland" },
{ L"Newfoundland Standard Time", L"", L"America/St_Johns" },
{ L"Newfoundland Standard Time", L"CA", L"America/St_Johns" },
{ L"Norfolk Standard Time", L"", L"Pacific/Norfolk" },
{ L"Norfolk Standard Time", L"NF", L"Pacific/Norfolk" },
{ L"North Asia East Standard Time", L"", L"Asia/Irkutsk" },
{ L"North Asia East Standard Time", L"RU", L"Asia/Irkutsk Asia/Chita" },
{ L"North Asia East Standard Time", L"RU", L"Asia/Irkutsk" },
{ L"North Asia Standard Time", L"", L"Asia/Krasnoyarsk" },
{ L"North Asia Standard Time", L"RU", L"Asia/Krasnoyarsk Asia/Novokuznetsk" },
{ L"North Korea Standard Time", L"", L"Asia/Pyongyang" },
{ L"North Korea Standard Time", L"KP", L"Asia/Pyongyang" },
{ L"Omsk Standard Time", L"", L"Asia/Omsk" },
{ L"Omsk Standard Time", L"RU", L"Asia/Omsk" },
{ L"Pacific SA Standard Time", L"", L"America/Santiago" },
{ L"Pacific SA Standard Time", L"AQ", L"Antarctica/Palmer" },
{ L"Pacific SA Standard Time", L"CL", L"America/Santiago" },
{ L"Pacific Standard Time", L"", L"America/Los_Angeles" },
{ L"Pacific Standard Time", L"CA", L"America/Vancouver America/Dawson America/Whitehorse" },
{ L"Pacific Standard Time", L"MX", L"America/Tijuana" },
{ L"Pacific Standard Time", L"CA", L"America/Vancouver" },
{ L"Pacific Standard Time", L"US", L"America/Los_Angeles" },
{ L"Pacific Standard Time", L"ZZ", L"PST8PDT" },
{ L"Pacific Standard Time (Mexico)", L"", L"America/Santa_Isabel" },
{ L"Pacific Standard Time (Mexico)", L"MX", L"America/Santa_Isabel" },
{ L"Pacific Standard Time (Mexico)", L"", L"America/Tijuana" },
{ L"Pacific Standard Time (Mexico)", L"MX", L"America/Tijuana America/Santa_Isabel" },
{ L"Pakistan Standard Time", L"", L"Asia/Karachi" },
{ L"Pakistan Standard Time", L"PK", L"Asia/Karachi" },
{ L"Paraguay Standard Time", L"", L"America/Asuncion" },
{ L"Paraguay Standard Time", L"PY", L"America/Asuncion" },
{ L"Qyzylorda Standard Time", L"", L"Asia/Qyzylorda" },
{ L"Qyzylorda Standard Time", L"KZ", L"Asia/Qyzylorda" },
{ L"Romance Standard Time", L"", L"Europe/Paris" },
{ L"Romance Standard Time", L"BE", L"Europe/Brussels" },
{ L"Romance Standard Time", L"DK", L"Europe/Copenhagen" },
@ -326,10 +340,11 @@ struct
{ L"Russia Time Zone 3", L"", L"Europe/Samara" },
{ L"Russia Time Zone 3", L"RU", L"Europe/Samara" },
{ L"Russian Standard Time", L"", L"Europe/Moscow" },
{ L"Russian Standard Time", L"RU", L"Europe/Moscow Europe/Simferopol Europe/Volgograd" },
{ L"Russian Standard Time", L"RU", L"Europe/Moscow Europe/Kirov" },
{ L"Russian Standard Time", L"UA", L"Europe/Simferopol" },
{ L"SA Eastern Standard Time", L"", L"America/Cayenne" },
{ L"SA Eastern Standard Time", L"AQ", L"Antarctica/Rothera" },
{ L"SA Eastern Standard Time", L"BR", L"America/Fortaleza America/Araguaina America/Belem America/Maceio America/Recife America/Santarem" },
{ L"SA Eastern Standard Time", L"AQ", L"Antarctica/Rothera Antarctica/Palmer" },
{ L"SA Eastern Standard Time", L"BR", L"America/Fortaleza America/Belem America/Maceio America/Recife America/Santarem" },
{ L"SA Eastern Standard Time", L"FK", L"Atlantic/Stanley" },
{ L"SA Eastern Standard Time", L"GF", L"America/Cayenne" },
{ L"SA Eastern Standard Time", L"SR", L"America/Paramaribo" },
@ -368,7 +383,6 @@ struct
{ L"SA Western Standard Time", L"MS", L"America/Montserrat" },
{ L"SA Western Standard Time", L"PR", L"America/Puerto_Rico" },
{ L"SA Western Standard Time", L"SX", L"America/Lower_Princes" },
{ L"SA Western Standard Time", L"TC", L"America/Grand_Turk" },
{ L"SA Western Standard Time", L"TT", L"America/Port_of_Spain" },
{ L"SA Western Standard Time", L"VC", L"America/St_Vincent" },
{ L"SA Western Standard Time", L"VG", L"America/Tortola" },
@ -380,13 +394,21 @@ struct
{ L"SE Asia Standard Time", L"ID", L"Asia/Jakarta Asia/Pontianak" },
{ L"SE Asia Standard Time", L"KH", L"Asia/Phnom_Penh" },
{ L"SE Asia Standard Time", L"LA", L"Asia/Vientiane" },
{ L"SE Asia Standard Time", L"MN", L"Asia/Hovd" },
{ L"SE Asia Standard Time", L"TH", L"Asia/Bangkok" },
{ L"SE Asia Standard Time", L"VN", L"Asia/Saigon" },
{ L"SE Asia Standard Time", L"ZZ", L"Etc/GMT-7" },
{ L"Saint Pierre Standard Time", L"", L"America/Miquelon" },
{ L"Saint Pierre Standard Time", L"PM", L"America/Miquelon" },
{ L"Sakhalin Standard Time", L"", L"Asia/Sakhalin" },
{ L"Sakhalin Standard Time", L"RU", L"Asia/Sakhalin" },
{ L"Samoa Standard Time", L"", L"Pacific/Apia" },
{ L"Samoa Standard Time", L"WS", L"Pacific/Apia" },
{ L"Sao Tome Standard Time", L"", L"Africa/Sao_Tome" },
{ L"Sao Tome Standard Time", L"ST", L"Africa/Sao_Tome" },
{ L"Saratov Standard Time", L"", L"Europe/Saratov" },
{ L"Saratov Standard Time", L"RU", L"Europe/Saratov" },
{ L"Singapore Standard Time", L"", L"Asia/Singapore" },
{ L"Singapore Standard Time", L"AQ", L"Antarctica/Casey" },
{ L"Singapore Standard Time", L"BN", L"Asia/Brunei" },
{ L"Singapore Standard Time", L"ID", L"Asia/Makassar" },
{ L"Singapore Standard Time", L"MY", L"Asia/Kuala_Lumpur Asia/Kuching" },
@ -409,39 +431,52 @@ struct
{ L"South Africa Standard Time", L"ZZ", L"Etc/GMT-2" },
{ L"Sri Lanka Standard Time", L"", L"Asia/Colombo" },
{ L"Sri Lanka Standard Time", L"LK", L"Asia/Colombo" },
{ L"Sudan Standard Time", L"", L"Africa/Khartoum" },
{ L"Sudan Standard Time", L"SD", L"Africa/Khartoum" },
{ L"Syria Standard Time", L"", L"Asia/Damascus" },
{ L"Syria Standard Time", L"SY", L"Asia/Damascus" },
{ L"Taipei Standard Time", L"", L"Asia/Taipei" },
{ L"Taipei Standard Time", L"TW", L"Asia/Taipei" },
{ L"Tasmania Standard Time", L"", L"Australia/Hobart" },
{ L"Tasmania Standard Time", L"AU", L"Australia/Hobart Australia/Currie" },
{ L"Tocantins Standard Time", L"", L"America/Araguaina" },
{ L"Tocantins Standard Time", L"BR", L"America/Araguaina" },
{ L"Tokyo Standard Time", L"", L"Asia/Tokyo" },
{ L"Tokyo Standard Time", L"ID", L"Asia/Jayapura" },
{ L"Tokyo Standard Time", L"JP", L"Asia/Tokyo" },
{ L"Tokyo Standard Time", L"PW", L"Pacific/Palau" },
{ L"Tokyo Standard Time", L"TL", L"Asia/Dili" },
{ L"Tokyo Standard Time", L"ZZ", L"Etc/GMT-9" },
{ L"Tomsk Standard Time", L"", L"Asia/Tomsk" },
{ L"Tomsk Standard Time", L"RU", L"Asia/Tomsk" },
{ L"Tonga Standard Time", L"", L"Pacific/Tongatapu" },
{ L"Tonga Standard Time", L"KI", L"Pacific/Enderbury" },
{ L"Tonga Standard Time", L"TK", L"Pacific/Fakaofo" },
{ L"Tonga Standard Time", L"TO", L"Pacific/Tongatapu" },
{ L"Tonga Standard Time", L"ZZ", L"Etc/GMT-13" },
{ L"Transbaikal Standard Time", L"", L"Asia/Chita" },
{ L"Transbaikal Standard Time", L"RU", L"Asia/Chita" },
{ L"Turkey Standard Time", L"", L"Europe/Istanbul" },
{ L"Turkey Standard Time", L"TR", L"Europe/Istanbul" },
{ L"Turks And Caicos Standard Time", L"", L"America/Grand_Turk" },
{ L"Turks And Caicos Standard Time", L"TC", L"America/Grand_Turk" },
{ L"US Eastern Standard Time", L"", L"America/Indianapolis" },
{ L"US Eastern Standard Time", L"US", L"America/Indianapolis America/Indiana/Marengo America/Indiana/Vevay" },
{ L"US Mountain Standard Time", L"", L"America/Phoenix" },
{ L"US Mountain Standard Time", L"CA", L"America/Dawson_Creek America/Creston" },
{ L"US Mountain Standard Time", L"CA", L"America/Whitehorse America/Creston America/Dawson America/Dawson_Creek America/Fort_Nelson" },
{ L"US Mountain Standard Time", L"MX", L"America/Hermosillo" },
{ L"US Mountain Standard Time", L"US", L"America/Phoenix" },
{ L"US Mountain Standard Time", L"ZZ", L"Etc/GMT+7" },
{ L"UTC", L"", L"Etc/GMT" },
{ L"UTC", L"GL", L"America/Danmarkshavn" },
{ L"UTC", L"ZZ", L"Etc/GMT" },
{ L"UTC", L"ZZ", L"Etc/GMT Etc/UTC" },
{ L"UTC-02", L"", L"Etc/GMT+2" },
{ L"UTC-02", L"BR", L"America/Noronha" },
{ L"UTC-02", L"GS", L"Atlantic/South_Georgia" },
{ L"UTC-02", L"ZZ", L"Etc/GMT+2" },
{ L"UTC-08", L"", L"Etc/GMT+8" },
{ L"UTC-08", L"PN", L"Pacific/Pitcairn" },
{ L"UTC-08", L"ZZ", L"Etc/GMT+8" },
{ L"UTC-09", L"", L"Etc/GMT+9" },
{ L"UTC-09", L"PF", L"Pacific/Gambier" },
{ L"UTC-09", L"ZZ", L"Etc/GMT+9" },
{ L"UTC-11", L"", L"Etc/GMT+11" },
{ L"UTC-11", L"AS", L"Pacific/Pago_Pago" },
{ L"UTC-11", L"NU", L"Pacific/Niue" },
@ -455,14 +490,19 @@ struct
{ L"UTC+12", L"UM", L"Pacific/Wake" },
{ L"UTC+12", L"WF", L"Pacific/Wallis" },
{ L"UTC+12", L"ZZ", L"Etc/GMT-12" },
{ L"UTC+13", L"", L"Etc/GMT-13" },
{ L"UTC+13", L"KI", L"Pacific/Enderbury" },
{ L"UTC+13", L"TK", L"Pacific/Fakaofo" },
{ L"UTC+13", L"ZZ", L"Etc/GMT-13" },
{ L"Ulaanbaatar Standard Time", L"", L"Asia/Ulaanbaatar" },
{ L"Ulaanbaatar Standard Time", L"MN", L"Asia/Ulaanbaatar Asia/Choibalsan" },
{ L"Venezuela Standard Time", L"", L"America/Caracas" },
{ L"Venezuela Standard Time", L"VE", L"America/Caracas" },
{ L"Vladivostok Standard Time", L"", L"Asia/Vladivostok" },
{ L"Vladivostok Standard Time", L"RU", L"Asia/Vladivostok Asia/Sakhalin Asia/Ust-Nera" },
{ L"Vladivostok Standard Time", L"RU", L"Asia/Vladivostok Asia/Ust-Nera" },
{ L"Volgograd Standard Time", L"", L"Europe/Volgograd" },
{ L"Volgograd Standard Time", L"RU", L"Europe/Volgograd" },
{ L"W. Australia Standard Time", L"", L"Australia/Perth" },
{ L"W. Australia Standard Time", L"AQ", L"Antarctica/Casey" },
{ L"W. Australia Standard Time", L"AU", L"Australia/Perth" },
{ L"W. Central Africa Standard Time", L"", L"Africa/Lagos" },
{ L"W. Central Africa Standard Time", L"AO", L"Africa/Luanda" },
@ -496,15 +536,19 @@ struct
{ L"W. Europe Standard Time", L"SJ", L"Arctic/Longyearbyen" },
{ L"W. Europe Standard Time", L"SM", L"Europe/San_Marino" },
{ L"W. Europe Standard Time", L"VA", L"Europe/Vatican" },
{ L"W. Mongolia Standard Time", L"", L"Asia/Hovd" },
{ L"W. Mongolia Standard Time", L"MN", L"Asia/Hovd" },
{ L"West Asia Standard Time", L"", L"Asia/Tashkent" },
{ L"West Asia Standard Time", L"AQ", L"Antarctica/Mawson" },
{ L"West Asia Standard Time", L"KZ", L"Asia/Oral Asia/Aqtau Asia/Aqtobe" },
{ L"West Asia Standard Time", L"KZ", L"Asia/Oral Asia/Aqtau Asia/Aqtobe Asia/Atyrau" },
{ L"West Asia Standard Time", L"MV", L"Indian/Maldives" },
{ L"West Asia Standard Time", L"TF", L"Indian/Kerguelen" },
{ L"West Asia Standard Time", L"TJ", L"Asia/Dushanbe" },
{ L"West Asia Standard Time", L"TM", L"Asia/Ashgabat" },
{ L"West Asia Standard Time", L"UZ", L"Asia/Tashkent Asia/Samarkand" },
{ L"West Asia Standard Time", L"ZZ", L"Etc/GMT-5" },
{ L"West Bank Standard Time", L"", L"Asia/Hebron" },
{ L"West Bank Standard Time", L"PS", L"Asia/Hebron Asia/Gaza" },
{ L"West Pacific Standard Time", L"", L"Pacific/Port_Moresby" },
{ L"West Pacific Standard Time", L"AQ", L"Antarctica/DumontDUrville" },
{ L"West Pacific Standard Time", L"FM", L"Pacific/Truk" },