From f8c67856cc304afe51cb26b1e0ac8309e294dfe3 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Wed, 11 Jun 2008 06:03:21 +0000 Subject: [PATCH] ICU-6340 Updated Windows tzid/Olson mapping in wintz.c - equivalent to CLDR 1.6. X-SVN-Rev: 24149 --- icu4c/source/common/wintz.c | 426 ++++++++++++++++++++++++++++-------- 1 file changed, 335 insertions(+), 91 deletions(-) diff --git a/icu4c/source/common/wintz.c b/icu4c/source/common/wintz.c index faa8f87564..ccb3056479 100644 --- a/icu4c/source/common/wintz.c +++ b/icu4c/source/common/wintz.c @@ -198,128 +198,372 @@ static const WindowsICUMap NEW_ZONE_MAP[] = { * ICU zone id from the first one is the preferred match. */ static const WindowsICUMap ZONE_MAP[] = { - {"Pacific/Kwajalein", "Dateline"}, /* S (GMT-12:00) International Date Line West */ - {"Etc/GMT+12", "Dateline"}, /* S (GMT-12:00) International Date Line West */ + /* S (GMT-12:00) International Date Line West */ + {"Etc/GMT+12", "Dateline"}, - {"Pacific/Apia", "Samoa"}, /* S (GMT-11:00) Midway Island, Samoa */ + /* S (GMT-11:00) Midway Island, Samoa */ + {"Pacific/Apia", "Samoa"}, + {"Pacific/Midway", "Samoa"}, - {"Pacific/Honolulu", "Hawaiian"}, /* S (GMT-10:00) Hawaii */ + /* S (GMT-10:00) Hawaii */ + {"Pacific/Honolulu", "Hawaiian"}, - {"America/Anchorage", "Alaskan"}, /* D (GMT-09:00) Alaska */ + /* D (GMT-09:00) Alaska */ + {"America/Anchorage", "Alaskan"}, + {"America/Juneau", "Alaskan"}, + {"America/Yakutat", "Alaskan"}, + {"America/Nome", "Alaskan"}, - {"America/Los_Angeles", "Pacific"}, /* D (GMT-08:00) Pacific Time (US & Canada) */ - {"America/Tijuana", "Pacific Standard Time (Mexico)"}, /* S (GMT-08:00) Tijuana, Baja California */ + /* D (GMT-08:00) Pacific Time (US & Canada) */ + {"America/Los_Angeles", "Pacific"}, + {"America/Dawson", "Pacific"}, + {"America/Vancouver", "Pacific"}, + {"America/Whitehorse", "Pacific"}, - {"America/Phoenix", "US Mountain"}, /* S (GMT-07:00) Arizona */ - {"America/Denver", "Mountain"}, /* D (GMT-07:00) Mountain Time (US & Canada) */ - {"America/Chihuahua", "Mountain Standard Time (Mexico)"}, /* D (GMT-07:00) Chihuahua, La Paz, Mazatlan */ + /* D (GMT-08:00) Tijuana, Baja California */ + {"America/Tijuana", "Pacific Standard Time (Mexico)"}, - {"America/Managua", "Central America"}, /* S (GMT-06:00) Central America */ /* America/Guatemala? */ - {"America/Regina", "Canada Central"}, /* S (GMT-06:00) Saskatchewan */ - {"America/Mexico_City", "Central Standard Time (Mexico)"}, /* D (GMT-06:00) Guadalajara, Mexico City, Monterrey */ - {"America/Chicago", "Central"}, /* D (GMT-06:00) Central Time (US & Canada) */ + /* D (GMT-07:00) Mountain Time (US & Canada) */ + {"America/Denver", "Mountain"}, + {"America/Boise", "Mountain"}, + {"America/Cambridge_Bay", "Mountain"}, + {"America/Edmonton", "Mountain"}, + {"America/Inuvik", "Mountain"}, + {"America/Shiprock", "Mountain"}, + {"America/Yellowknife", "Mountain"}, - {"America/Indianapolis", "US Eastern"}, /* S (GMT-05:00) Indiana (East) */ - {"America/Bogota", "SA Pacific"}, /* S (GMT-05:00) Bogota, Lima, Quito */ - {"America/New_York", "Eastern"}, /* D (GMT-05:00) Eastern Time (US & Canada) */ + /* S (GMT-07:00) Arizona */ + {"America/Phoenix", "US Mountain"}, - {"America/Caracas", "SA Western"}, /* S (GMT-04:00) Caracas, La Paz */ - {"America/Santiago", "Pacific SA"}, /* D (GMT-04:00) Santiago */ - {"America/Halifax", "Atlantic"}, /* D (GMT-04:00) Atlantic Time (Canada) */ - {"America/Manaus", "Central Brazilian"}, /* D (GMT-04:00 Manaus */ + /* D (GMT-07:00) Chihuahua, La Paz, Mazatlan */ + {"America/Chihuahua", "Mountain Standard Time (Mexico)"}, + {"America/Mazatlan", "Mountain Standard Time (Mexico)"}, - {"America/St_Johns", "Newfoundland"}, /* D (GMT-03:30) Newfoundland */ + /* D (GMT-06:00) Central Time (US & Canada) */ + {"America/Chicago", "Central"}, + {"America/Indiana/Knox", "Central"}, + {"America/Indiana/Tell_City", "Central"}, + {"America/Menominee", "Central"}, + {"America/North_Dakota/Center", "Central"}, + {"America/North_Dakota/New_Salem", "Central"}, + {"America/Rainy_River", "Central"}, + {"America/Rankin_Inlet", "Central"}, + {"America/Winnipeg", "Central"}, - {"America/Buenos_Aires", "SA Eastern"}, /* S (GMT-03:00) Buenos Aires, Georgetown */ - {"America/Godthab", "Greenland"}, /* D (GMT-03:00) Greenland */ - {"America/Sao_Paulo", "E. South America"}, /* D (GMT-03:00) Brasilia */ - {"America/Montevideo", "Montevideo"}, /* S (GMT-03:00) Montevideo */ + /* D (GMT-06:00) Guadalajara, Mexico City, Monterrey */ + {"America/Mexico_City", "Central Standard Time (Mexico)"}, + {"America/Monterrey", "Central Standard Time (Mexico)"}, - {"America/Noronha", "Mid-Atlantic"}, /* D (GMT-02:00) Mid-Atlantic */ + /* S (GMT-06:00) Central America */ + {"America/Guatemala", "Central America"}, + {"America/Belize", "Central America"}, + {"America/Costa_Rica", "Central America"}, + {"America/El_Salvador", "Central America"}, + {"America/Managua", "Central America"}, + {"America/Tegucigalpa", "Central America"}, + {"Pacific/Galapagos", "Central America"}, - {"Atlantic/Cape_Verde", "Cape Verde"}, /* S (GMT-01:00) Cape Verde Is. */ - {"Atlantic/Azores", "Azores"}, /* D (GMT-01:00) Azores */ + /* S (GMT-06:00) Saskatchewan */ + {"America/Regina", "Canada Central"}, + {"America/Swift_Current", "Canada Central"}, - {"Africa/Casablanca", "Greenwich"}, /* S (GMT) Casablanca, Monrovia */ - {"Europe/London", "GMT"}, /* D (GMT) Greenwich Mean Time : Dublin, Edinburgh, Lisbon, London */ + /* D (GMT-05:00) Eastern Time (US & Canada) */ + {"America/New_York", "Eastern"}, + {"America/Detroit", "Eastern"}, + {"America/Grand_Turk", "Eastern"}, + {"America/Indiana/Marengo", "Eastern"}, + {"America/Indiana/Petersburg", "Eastern"}, + {"America/Indiana/Vevay", "Eastern"}, + {"America/Indiana/Vincennes", "Eastern"}, + {"America/Indiana/Winamac", "Eastern"}, + {"America/Indianapolis", "Eastern"}, + {"America/Iqaluit", "Eastern"}, + {"America/Kentucky/Monticello", "Eastern"}, + {"America/Louisville", "Eastern"}, + {"America/Montreal", "Eastern"}, + {"America/Nassau", "Eastern"}, + {"America/Nipigon", "Eastern"}, + {"America/Pangnirtung", "Eastern"}, + {"America/Thunder_Bay", "Eastern"}, + {"America/Toronto", "Eastern"}, - {"Africa/Lagos", "W. Central Africa"}, /* S (GMT+01:00) West Central Africa */ - {"Europe/Berlin", "W. Europe"}, /* D (GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna */ - {"Europe/Paris", "Romance"}, /* D (GMT+01:00) Brussels, Copenhagen, Madrid, Paris */ - {"Eurpoe/Warsaw", "Central European"}, /* D (GMT+01:00) Sarajevo, Skopje, Warsaw, Zagreb */ - {"Europe/Sarajevo", "Central European"}, /* D (GMT+01:00) Sarajevo, Skopje, Warsaw, Zagreb */ - {"Europe/Prague", "Central Europe"}, /* D (GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague */ - {"Europe/Belgrade", "Central Europe"}, /* D (GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague */ + /* S (GMT-05:00) Bogota, Lima, Quito, Rio Branco */ + {"America/Bogota", "SA Pacific"}, + {"America/Lima", "SA Pacific"}, + {"America/Guayaquil", "SA Pacific"}, + {"America/Rio_Branco", "SA Pacific"}, - {"Africa/Johannesburg", "South Africa"}, /* S (GMT+02:00) Harare, Pretoria */ - {"Asia/Jerusalem", "Israel"}, /* S (GMT+02:00) Jerusalem */ - {"Europe/Istanbul", "GTB"}, /* D (GMT+02:00) Athens, Istanbul, Minsk */ - {"Europe/Helsinki", "FLE"}, /* D (GMT+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius */ - {"Africa/Cairo", "Egypt"}, /* D (GMT+02:00) Cairo */ - {"Europe/Minsk", "E. Europe"}, /* D (GMT+02:00) Bucharest */ - {"Europe/Bucharest", "E. Europe"}, /* D (GMT+02:00) Bucharest */ - {"Africa/Windhoek", "Namibia"}, /* S (GMT+02:00) Windhoek */ - {"Asia/Amman", "Jordan"}, /* S (GMT+02:00) Aman */ - {"Asia/Beirut", "Middle East"}, /* S (GMT+02:00) Beirut */ + /* S (GMT-05:00) Indiana (East) */ + {"Etc/GMT+5", "US Eastern"}, - {"Africa/Nairobi", "E. Africa"}, /* S (GMT+03:00) Nairobi */ - {"Asia/Riyadh", "Arab"}, /* S (GMT+03:00) Kuwait, Riyadh */ - {"Europe/Moscow", "Russian"}, /* D (GMT+03:00) Moscow, St. Petersburg, Volgograd */ - {"Asia/Baghdad", "Arabic"}, /* D (GMT+03:00) Baghdad */ + /* S (GMT-04:30) Caracas */ + {"America/Caracas", "Venezuela"}, - {"Asia/Tehran", "Iran"}, /* D (GMT+03:30) Tehran */ + /* D (GMT-04:00) Atlantic Time (Canada) */ + {"America/Halifax", "Atlantic"}, + {"America/Glace_Bay", "Atlantic"}, + {"America/Moncton", "Atlantic"}, - {"Asia/Muscat", "Arabian"}, /* S (GMT+04:00) Abu Dhabi, Muscat */ - {"Asia/Tbilisi", "Georgian"}, /* D (GMT+04:00) Tbilisi */ - {"Asia/Baku", "Azerbaijan"}, /* S (GMT+04:00) Baku */ - {"Asia/Yerevan", "Caucasus"}, /* S (GMT+04:00) Yerevan */ - {"Asia/Kabul", "Afghanistan"}, /* S (GMT+04:30) Kabul */ + /* D (GMT-04:00) Santiago */ + {"America/Santiago", "Pacific SA"}, - {"Asia/Karachi", "West Asia"}, /* S (GMT+05:00) Islamabad, Karachi, Tashkent */ - {"Asia/Yekaterinburg", "Ekaterinburg"}, /* D (GMT+05:00) Ekaterinburg */ + /* D (GMT-04:00) Manaus */ /* MS bug - DST is not used */ + {"America/Manaus", "Central Brazilian"}, - {"Asia/Calcutta", "India"}, /* S (GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi */ + /* S (GMT-04:00) La Paz */ + {"America/La_Paz", "SA Western"}, - {"Asia/Katmandu", "Nepal"}, /* S (GMT+05:45) Kathmandu */ + /* D (GMT-03:30) Newfoundland */ + {"America/St_Johns", "Newfoundland"}, - {"Asia/Colombo", "Sri Lanka"}, /* S (GMT+06:00) Sri Jayawardenepura */ - {"Asia/Dhaka", "Central Asia"}, /* S (GMT+06:00) Astana, Dhaka */ - {"Asia/Novosibirsk", "N. Central Asia"}, /* D (GMT+06:00) Almaty, Novosibirsk */ + /* D (GMT-03:00) Brasilia */ + {"America/Sao_Paulo", "E. South America"}, - {"Asia/Rangoon", "Myanmar"}, /* S (GMT+06:30) Rangoon */ + /* D (GMT-03:00) Buenos Aires */ + {"America/Buenos_Aires", "Argentina"}, - {"Asia/Bangkok", "SE Asia"}, /* S (GMT+07:00) Bangkok, Hanoi, Jakarta */ - {"Asia/Krasnoyarsk", "North Asia"}, /* D (GMT+07:00) Krasnoyarsk */ + /* D (GMT-03:00) Greenland */ + {"America/Godthab", "Greenland"}, - {"Australia/Perth", "W. Australia"}, /* S (GMT+08:00) Perth */ - {"Asia/Taipei", "Taipei"}, /* S (GMT+08:00) Taipei */ - {"Asia/Singapore", "Singapore"}, /* S (GMT+08:00) Kuala Lumpur, Singapore */ - {"Asia/Shanghai", "China"}, /* S (GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi */ - {"Asia/Hong_Kong", "China"}, /* S (GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi */ - {"Asia/Ulaanbaatar", "North Asia East"}, /* D (GMT+08:00) Irkutsk, Ulaan Bataar */ - {"Asia/Irkutsk", "North Asia East"}, /* D (GMT+08:00) Irkutsk, Ulaan Bataar */ + /* D (GMT-03:00) Montevideo */ + {"America/Montevideo", "Montevideo"}, - {"Asia/Tokyo", "Tokyo"}, /* S (GMT+09:00) Osaka, Sapporo, Tokyo */ - {"Asia/Seoul", "Korea"}, /* S (GMT+09:00) Seoul */ - {"Asia/Yakutsk", "Yakutsk"}, /* D (GMT+09:00) Yakutsk */ + /* S (GMT-03:00) Georgetown */ /* MS bug - Georgetown uses GMT-04:00 */ + {"Etc/GMT+3", "SA Eastern"}, - {"Australia/Darwin", "AUS Central"}, /* S (GMT+09:30) Darwin */ - {"Australia/Adelaide", "Cen. Australia"}, /* D (GMT+09:30) Adelaide */ + /* D (GMT-02:00) Mid-Atlantic */ /* MS bug - There is no such zone using GMT-02:00 with DST */ + {"America/South_Georgia", "Mid-Atlantic"}, + {"America/Noronha", "Mid-Atlantic"}, - {"Pacific/Guam", "West Pacific"}, /* S (GMT+10:00) Guam, Port Moresby */ - {"Australia/Brisbane", "E. Australia"}, /* S (GMT+10:00) Brisbane */ - {"Asia/Vladivostok", "Vladivostok"}, /* D (GMT+10:00) Vladivostok */ - {"Australia/Hobart", "Tasmania"}, /* D (GMT+10:00) Hobart */ - {"Australia/Sydney", "AUS Eastern"}, /* D (GMT+10:00) Canberra, Melbourne, Sydney */ + /* D (GMT-01:00) Azores */ + {"Atlantic/Azores", "Azores"}, - {"Asia/Guadalcanal", "Central Pacific"}, /* S (GMT+11:00) Magadan, Solomon Is., New Caledonia */ - {"Asia/Magadan", "Central Pacific"}, /* S (GMT+11:00) Magadan, Solomon Is., New Caledonia */ + /* S (GMT-01:00) Cape Verde Is. */ + {"Atlantic/Cape_Verde", "Cape Verde"}, - {"Pacific/Fiji", "Fiji"}, /* S (GMT+12:00) Fiji, Kamchatka, Marshall Is. */ - {"Pacific/Auckland", "New Zealand"}, /* D (GMT+12:00) Auckland, Wellington */ + /* D (GMT) Greenwich Mean Time : Dublin, Edinburgh, Lisbon, London */ + {"Europe/London", "GMT"}, + {"Europe/Dublin", "GMT"}, + {"Europe/Lisbon", "GMT"}, - {"Pacific/Tongatapu", "Tonga"}, /* S (GMT+13:00) Nuku'alofa */ - NULL, NULL + /* S (GMT) Casablanca, Monrovia, Reykjavik */ + {"Africa/Casablanca", "Greenwich"}, + {"Africa/Monrovia", "Greenwich"}, + {"Atlantic/Reykjavik", "Greenwich"}, + + /* D (GMT+01:00) Brussels, Copenhagen, Madrid, Paris */ + {"Europe/Paris", "Romance"}, + {"Europe/Brussels", "Romance"}, + {"Europe/Copenhagen", "Romance"}, + {"Europe/Madrid", "Romance"}, + + /* D (GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna */ + {"Europe/Berlin", "W. Europe"}, + {"Europe/Amsterdam", "W. Europe"}, + {"Europe/Zurich", "W. Europe"}, + {"Europe/Rome", "W. Europe"}, + {"Europe/Stockholm", "W. Europe"}, + {"Europe/Vienna", "W. Europe"}, + + /* D (GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague */ + {"Europe/Budapest", "Central Europe"}, + {"Europe/Belgrade", "Central Europe"}, + {"Europe/Bratislava", "Central Europe"}, + {"Europe/Ljubljana", "Central Europe"}, + {"Europe/Prague", "Central Europe"}, + + /* D (GMT+01:00) Sarajevo, Skopje, Warsaw, Zagreb */ + {"Eurpoe/Warsaw", "Central European"}, + {"Eurpoe/Sarajevo", "Central European"}, + {"Eurpoe/Skopje", "Central European"}, + {"Eurpoe/Zagreb", "Central European"}, + + /* S (GMT+01:00) West Central Africa */ + {"Africa/Lagos", "W. Central Africa"}, + {"Africa/Luanda", "W. Central Africa"}, + {"Africa/Porto-Novo", "W. Central Africa"}, + {"Africa/Douala", "W. Central Africa"}, + {"Africa/Bangui", "W. Central Africa"}, + {"Africa/Ndjamena", "W. Central Africa"}, + {"Africa/Kinshasa", "W. Central Africa"}, + {"Africa/Brazzaville", "W. Central Africa"}, + {"Africa/Malabo", "W. Central Africa"}, + {"Africa/Libreville", "W. Central Africa"}, + {"Africa/Niamey", "W. Central Africa"}, + + /* D (GMT+02:00) Athens, Bucharest, Istanbul */ + {"Europe/Istanbul", "GTB"}, + {"Europe/Athens", "GTB"}, + {"Europe/Bucharest", "GTB"}, + + /* D (GMT+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius */ + {"Europe/Kiev", "FLE"}, + {"Europe/Helsinki", "FLE"}, + {"Europe/Riga", "FLE"}, + {"Europe/Sofia", "FLE"}, + {"Europe/Tallinn", "FLE"}, + {"Europe/Vilnius", "FLE"}, + + /* D (GMT+02:00) Jerusalem */ + {"Asia/Jerusalem", "Israel"}, + + /* D (GMT+02:00) Minsk */ + {"Europe/Minsk", "E. Europe"}, + + /* D (GMT+02:00) Cairo */ + {"Africa/Cairo", "Egypt"}, + + /* D (GMT+02:00) Amman */ + {"Asia/Amman", "Jordan"}, + + /* D (GMT+02:00) Beirut */ + {"Asia/Beirut", "Middle East"}, + + /* D (GMT+02:00) Windhoek */ + {"Africa/Windhoek", "Namibia"}, + + /* S (GMT+02:00) Harare, Pretoria */ + {"Africa/Johannesburg", "South Africa"}, + {"Africa/Harare", "South Africa"}, + + /* D (GMT+03:00) Moscow, St. Petersburg, Volgograd */ + {"Europe/Moscow", "Russian"}, + {"Europe/Volgograd", "Russian"}, + + /* D (GMT+03:00) Baghdad */ + {"Asia/Baghdad", "Arabic"}, + + /* S (GMT+03:00) Kuwait, Riyadh */ + {"Asia/Riyadh", "Arab"}, + {"Asia/Kuwait", "Arab"}, + + /* S (GMT+03:00) Nairobi */ + {"Africa/Nairobi", "E. Africa"}, + + /* S (GMT+03:00) Tbilisi */ /* MS bug - Tbilisi uses GMT+04:00 */ + {"Etc/GMT-3", "Georgian"}, + + /* D (GMT+03:30) Tehran */ + {"Asia/Tehran", "Iran"}, + + /* D (GMT+04:00) Yerevan */ + {"Asia/Yerevan", "Armenian"}, + + /* D (GMT+04:00) Baku */ + {"Asia/Baku", "Azerbaijan"}, + + /* S (GMT+04:00) Abu Dhabi, Muscat */ + {"Asia/Dubai", "Arabian"}, + {"Asia/Muscat", "Arabian"}, + + /* S (GMT+04:00) Caucasus Standard Time */ + {"Asia/Tbilisi", "Caucasus"}, + + /* S (GMT+04:30) Kabul */ + {"Asia/Kabul", "Afghanistan"}, + + /* D (GMT+05:00) Ekaterinburg */ + {"Asia/Yekaterinburg", "Ekaterinburg"}, + + /* S (GMT+05:00) Islamabad, Karachi, Tashkent */ + {"Asia/Karachi", "West Asia"}, + {"Asia/Tashkent", "West Asia"}, + + /* S (GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi */ + {"Asia/Calcutta", "India"}, + + /* S (GMT+05:30) Sri Jayawardenepura */ + {"Asia/Colombo", "Sri Lanka"}, + + /* S (GMT+05:45) Kathmandu */ + {"Asia/Katmandu", "Nepal"}, + + /* D (GMT+06:00) Almaty, Novosibirsk */ /* No DST in Almaty */ + {"Asia/Novosibirsk", "N. Central Asia"}, + + /* S (GMT+06:00) Astana, Dhaka */ + {"Asia/Dhaka", "Central Asia"}, + {"Asia/Almaty", "Central Asia"}, + {"Asia/Qyzylorda", "Central Asia"}, + + /* S (GMT+06:30) Yangon (Rangoon) */ + {"Asia/Rangoon", "Myanmar"}, + + /* D (GMT+07:00) Krasnoyarsk */ + {"Asia/Krasnoyarsk", "North Asia"}, + + /* S (GMT+07:00) Bangkok, Hanoi, Jakarta */ + {"Asia/Bangkok", "SE Asia"}, + {"Asia/Saigon", "SE Asia"}, + {"Asia/Jakarta", "SE Asia"}, + + /* D (GMT+08:00) Irkutsk, Ulaan Bataar */ /* Ulaan Bataar does not use DST */ + {"Asia/Irkutsk", "North Asia East"}, + + /* D (GMT+08:00) Perth */ + {"Australia/Perth", "W. Australia"}, + + /* S (GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi */ + {"Asia/Shanghai", "China"}, + {"Asia/Chongqing", "China"}, + {"Asia/Hong_Kong", "China"}, + {"Asia/Urumqi", "China"}, + + /* S (GMT+08:00) Taipei */ + {"Asia/Taipei", "Taipei"}, + + /* S (GMT+08:00) Kuala Lumpur, Singapore */ + {"Asia/Singapore", "Singapore"}, + {"Asia/Kuala_Lumpur", "Singapore"}, + + /* D (GMT+09:00) Yakutsk */ + {"Asia/Yakutsk", "Yakutsk"}, + + /* S (GMT+09:00) Osaka, Sapporo, Tokyo */ + {"Asia/Tokyo", "Tokyo"}, + + /* S (GMT+09:00) Seoul */ + {"Asia/Seoul", "Korea"}, + + /* D (GMT+09:30) Adelaide */ + {"Australia/Adelaide", "Cen. Australia"}, + + /* S (GMT+09:30) Darwin */ + {"Australia/Darwin", "AUS Central"}, + + /* D (GMT+10:00) Canberra, Melbourne, Sydney */ + {"Australia/Sydney", "AUS Eastern"}, + {"Australia/Melbourne", "AUS Eastern"}, + + /* D (GMT+10:00) Hobart */ + {"Australia/Hobart", "Tasmania"}, + + /* D (GMT+10:00) Vladivostok */ + {"Asia/Vladivostok", "Vladivostok"}, + + /* S (GMT+10:00) Brisbane */ + {"Australia/Brisbane", "E. Australia"}, + + /* S (GMT+10:00) Guam, Port Moresby */ + {"Pacific/Port_Moresby", "West Pacific"}, + {"Pacific/Guam", "West Pacific"}, + + /* S (GMT+11:00) Magadan, Solomon Is., New Caledonia */ /* Magadan uses DST */ + {"Pacific/Guadalcanal", "Central Pacific"}, + {"Pacific/Noumea", "Central Pacific"}, + + /* D (GMT+12:00) Auckland, Wellington */ + {"Pacific/Auckland", "New Zealand"}, + + /* S (GMT+12:00) Fiji, Kamchatka, Marshall Is. */ + {"Pacific/Fiji", "Fiji"}, + {"Pacific/Majuro", "Fiji"}, + {"Pacific/Kwajalein", "Fiji"}, + + /* S (GMT+13:00) Nuku'alofa */ + {"Pacific/Tongatapu", "Tonga"}, + + NULL, NULL }; /**