Support translating metazone names to standard zone names.

2008-07-07  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* java/text/DateFormatSymbols.java:
	Use metazones to convert metazone names to standard
	Continent/City form.  Also add hack to include GMT
	as a short name.
	* resource/java/text/metazones.properties:
	New properties file for mapping metazones to standard
	zone names.

1 files changed, 323 insertions, 0 deletions

diff --git a/resource/java/text/metazones.properties b/resource/java/text/metazones.properties
new file mode 100644
index 000000000..2535eaa6b
--- /dev/null
+++ b/resource/java/text/metazones.properties
@@ -0,0 +1,323 @@
+# This document is automatically generated by gnu.supplementgen
+
+Acre.DEFAULT=America/Rio_Branco
+Afghanistan.DEFAULT=Asia/Kabul
+Africa_Central.BI=Africa/Bujumbura
+Africa_Central.BW=Africa/Gaborone
+Africa_Central.CD=Africa/Lubumbashi
+Africa_Central.DEFAULT=Africa/Maputo
+Africa_Central.MW=Africa/Blantyre
+Africa_Central.RW=Africa/Kigali
+Africa_Central.ZM=Africa/Lusaka
+Africa_Central.ZW=Africa/Harare
+Africa_Eastern.DEFAULT=Africa/Nairobi
+Africa_Eastern.DJ=Africa/Djibouti
+Africa_Eastern.ER=Africa/Asmera
+Africa_Eastern.ET=Africa/Addis_Ababa
+Africa_Eastern.KM=Indian/Comoro
+Africa_Eastern.MG=Indian/Antananarivo
+Africa_Eastern.SO=Africa/Mogadishu
+Africa_Eastern.TZ=Africa/Dar_es_Salaam
+Africa_Eastern.UG=Africa/Kampala
+Africa_Eastern.YT=Indian/Mayotte
+Africa_FarWestern.DEFAULT=Africa/El_Aaiun
+Africa_FarWestern.GW=Africa/Bissau
+Africa_Southern.DEFAULT=Africa/Johannesburg
+Africa_Southern.LS=Africa/Maseru
+Africa_Southern.SZ=Africa/Mbabane
+Africa_Western.AO=Africa/Luanda
+Africa_Western.BJ=Africa/Porto-Novo
+Africa_Western.CD=Africa/Kinshasa
+Africa_Western.CF=Africa/Bangui
+Africa_Western.CG=Africa/Brazzaville
+Africa_Western.CM=Africa/Douala
+Africa_Western.DEFAULT=Africa/Lagos
+Africa_Western.GA=Africa/Libreville
+Africa_Western.GQ=Africa/Malabo
+Africa_Western.NE=Africa/Niamey
+Africa_Western.TD=Africa/Ndjamena
+Aktyubinsk.DEFAULT=Asia/Aqtobe
+Alaska.DEFAULT=America/Juneau
+Alaska_Hawaii.DEFAULT=America/Anchorage
+Almaty.DEFAULT=Asia/Almaty
+Amazon.DEFAULT=America/Manaus
+America_Central.BZ=America/Belize
+America_Central.CA=America/Winnipeg
+America_Central.CR=America/Costa_Rica
+America_Central.DEFAULT=America/Chicago
+America_Central.GT=America/Guatemala
+America_Central.HN=America/Tegucigalpa
+America_Central.MX=America/Mexico_City
+America_Central.SV=America/El_Salvador
+America_Eastern.BS=America/Nassau
+America_Eastern.CA=America/Toronto
+America_Eastern.DEFAULT=America/New_York
+America_Eastern.HT=America/Port-au-Prince
+America_Eastern.JM=America/Jamaica
+America_Eastern.KY=America/Cayman
+America_Eastern.PA=America/Panama
+America_Eastern.TC=America/Grand_Turk
+America_Mountain.CA=America/Edmonton
+America_Mountain.DEFAULT=America/Denver
+America_Mountain.MX=America/Hermosillo
+America_Pacific.CA=America/Vancouver
+America_Pacific.DEFAULT=America/Los_Angeles
+America_Pacific.MX=America/Tijuana
+Anadyr.DEFAULT=Asia/Anadyr
+Aqtau.DEFAULT=Asia/Aqtau
+Aqtobe.DEFAULT=Asia/Aqtobe
+Arabian.BH=Asia/Bahrain
+Arabian.DEFAULT=Asia/Riyadh
+Arabian.IQ=Asia/Baghdad
+Arabian.KW=Asia/Kuwait
+Arabian.QA=Asia/Qatar
+Arabian.YE=Asia/Aden
+Argentina.DEFAULT=America/Buenos_Aires
+Argentina_Western.DEFAULT=America/Mendoza
+Armenia.DEFAULT=Asia/Yerevan
+Ashkhabad.DEFAULT=Asia/Ashgabat
+Atlantic.AG=America/Antigua
+Atlantic.AI=America/Anguilla
+Atlantic.AN=America/Curacao
+Atlantic.AW=America/Aruba
+Atlantic.BB=America/Barbados
+Atlantic.BM=America/Bermuda
+Atlantic.DEFAULT=America/Halifax
+Atlantic.DM=America/Dominica
+Atlantic.GD=America/Grenada
+Atlantic.GL=America/Thule
+Atlantic.GP=America/Guadaloupe
+Atlantic.KN=America/St_Kitts
+Atlantic.LC=America/St_Lucia
+Atlantic.MQ=America/Martinique
+Atlantic.MS=America/Montserrat
+Atlantic.PR=America/Puerto_Rico
+Atlantic.TT=America/Port_of_Spain
+Atlantic.VC=America/St_Vincent
+Atlantic.VG=America/Tortola
+Atlantic.VI=America/St_Thomas
+Australia_Central.DEFAULT=Australia/Adelaide
+Australia_CentralWestern.DEFAULT=Australia/Eucla
+Australia_Eastern.DEFAULT=Australia/Sydney
+Australia_Western.DEFAULT=Australia/Perth
+Azerbaijan.DEFAULT=Asia/Baku
+Azores.DEFAULT=Atlantic/Azores
+Baku.DEFAULT=Asia/Baku
+Bangladesh.DEFAULT=Asia/Dhaka
+Bering.DEFAULT=America/Adak
+Bhutan.DEFAULT=Asia/Thimphu
+Bolivia.DEFAULT=America/La_Paz
+Borneo.DEFAULT=Asia/Kuching
+Brasilia.DEFAULT=America/Sao_Paulo
+British.DEFAULT=Europe/London
+Brunei.DEFAULT=Asia/Brunei
+Cape_Verde.DEFAULT=Atlantic/Cape_Verde
+Chamorro.DEFAULT=Pacific/Saipan
+Chamorro.GU=Pacific/Guam
+Changbai.DEFAULT=Asia/Harbin
+Chatham.DEFAULT=Pacific/Chatham
+Chile.AQ=Antarctica/Palmer
+Chile.DEFAULT=America/Santiago
+China.DEFAULT=Asia/Shanghai
+China.MO=Asia/Macau
+China.TW=Asia/Taipei
+Choibalsan.DEFAULT=Asia/Choibalsan
+Christmas.DEFAULT=Indian/Christmas
+Cocos.DEFAULT=Indian/Cocos
+Colombia.DEFAULT=America/Bogota
+Cook.DEFAULT=Pacific/Rarotonga
+Cuba.DEFAULT=America/Havana
+Dacca.DEFAULT=Asia/Dhaka
+Davis.DEFAULT=Antarctica/Davis
+Dominican.DEFAULT=America/Santo_Domingo
+DumontDUrville.DEFAULT=Antarctica/DumontDUrville
+Dushanbe.DEFAULT=Asia/Dushanbe
+Dutch_Guiana.DEFAULT=America/Paramaribo
+East_Timor.DEFAULT=Asia/Dili
+Easter.DEFAULT=Pacific/Easter
+Ecuador.DEFAULT=America/Guayaquil
+Europe_Central.AD=Europe/Andorra
+Europe_Central.AL=Europe/Tirane
+Europe_Central.AT=Europe/Vienna
+Europe_Central.BA=Europe/Sarajevo
+Europe_Central.BE=Europe/Brussels
+Europe_Central.CH=Europe/Zurich
+Europe_Central.CZ=Europe/Prague
+Europe_Central.DE=Europe/Berlin
+Europe_Central.DEFAULT=Europe/Paris
+Europe_Central.DK=Europe/Copenhagen
+Europe_Central.ES=Europe/Madrid
+Europe_Central.GI=Europe/Gibraltar
+Europe_Central.HR=Europe/Zagreb
+Europe_Central.HU=Europe/Budapest
+Europe_Central.IT=Europe/Rome
+Europe_Central.LI=Europe/Vaduz
+Europe_Central.LU=Europe/Luxembourg
+Europe_Central.MC=Europe/Monaco
+Europe_Central.ME=Europe/Podgorica
+Europe_Central.MK=Europe/Skopje
+Europe_Central.MT=Europe/Malta
+Europe_Central.NL=Europe/Amsterdam
+Europe_Central.NO=Europe/Oslo
+Europe_Central.PL=Europe/Warsaw
+Europe_Central.RS=Europe/Belgrade
+Europe_Central.SE=Europe/Stockholm
+Europe_Central.SI=Europe/Ljubljana
+Europe_Central.SK=Europe/Bratislava
+Europe_Central.TN=Africa/Tunis
+Europe_Eastern.BG=Europe/Sofia
+Europe_Eastern.CY=Asia/Nicosia
+Europe_Eastern.DEFAULT=Europe/Bucharest
+Europe_Eastern.EG=Africa/Cairo
+Europe_Eastern.FI=Europe/Helsinki
+Europe_Eastern.GR=Europe/Athens
+Europe_Eastern.JO=Asia/Amman
+Europe_Eastern.LB=Asia/Beirut
+Europe_Eastern.SY=Asia/Damascus
+Europe_Western.DEFAULT=Atlantic/Canary
+Europe_Western.FO=Atlantic/Faeroe
+Falkland.DEFAULT=Atlantic/Stanley
+Fiji.DEFAULT=Pacific/Fiji
+French_Guiana.DEFAULT=America/Cayenne
+French_Southern.DEFAULT=Indian/Kerguelen
+Frunze.DEFAULT=Asia/Bishkek
+GMT.BF=Africa/Ouagadougou
+GMT.CI=Africa/Abidjan
+GMT.DEFAULT=Atlantic/Reykjavik
+GMT.GB=Europe/London
+GMT.GH=Africa/Accra
+GMT.GM=Africa/Banjul
+GMT.GN=Africa/Conakry
+GMT.GW=Africa/Bissau
+GMT.IE=Europe/Dublin
+GMT.LR=Africa/Monrovia
+GMT.ML=Africa/Bamako
+GMT.MR=Africa/Nouakchott
+GMT.SH=Atlantic/St_Helena
+GMT.SL=Africa/Freetown
+GMT.SN=Africa/Dakar
+GMT.ST=Africa/Sao_Tome
+GMT.TG=Africa/Lome
+Galapagos.DEFAULT=Pacific/Galapagos
+Gambier.DEFAULT=Pacific/Gambier
+Georgia.DEFAULT=Asia/Tbilisi
+Gilbert_Islands.DEFAULT=Pacific/Tarawa
+Goose_Bay.DEFAULT=America/Goose_Bay
+Greenland_Central.DEFAULT=America/Scoresbysund
+Greenland_Eastern.DEFAULT=America/Scoresbysund
+Greenland_Western.DEFAULT=America/Godthab
+Guam.DEFAULT=Pacific/Guam
+Gulf.DEFAULT=Asia/Dubai
+Gulf.OM=Asia/Muscat
+Guyana.DEFAULT=America/Guyana
+Hawaii_Aleutian.DEFAULT=Pacific/Honolulu
+Hong_Kong.DEFAULT=Asia/Hong_Kong
+Hovd.DEFAULT=Asia/Hovd
+India.DEFAULT=Asia/Calcutta
+India.LK=Asia/Colombo
+Indian_Ocean.DEFAULT=Indian/Chagos
+Indochina.DEFAULT=Asia/Saigon
+Indochina.KH=Asia/Phnom_Penh
+Indochina.LA=Asia/Vientiane
+Indochina.TH=Asia/Bangkok
+Indonesia_Central.DEFAULT=Asia/Makassar
+Indonesia_Eastern.DEFAULT=Asia/Jayapura
+Indonesia_Western.DEFAULT=Asia/Jakarta
+Iran.DEFAULT=Asia/Tehran
+Irish.DEFAULT=Europe/Dublin
+Irkutsk.DEFAULT=Asia/Irkutsk
+Israel.DEFAULT=Asia/Jerusalem
+Japan.DEFAULT=Asia/Tokyo
+Kamchatka.DEFAULT=Asia/Kamchatka
+Karachi.DEFAULT=Asia/Karachi
+Kashgar.DEFAULT=Asia/Kashgar
+Kazakhstan_Eastern.DEFAULT=Asia/Almaty
+Kazakhstan_Western.DEFAULT=Asia/Aqtobe
+Kizilorda.DEFAULT=Asia/Qyzylorda
+Korea.DEFAULT=Asia/Seoul
+Korea.KP=Asia/Pyongyang
+Kosrae.DEFAULT=Pacific/Kosrae
+Krasnoyarsk.DEFAULT=Asia/Krasnoyarsk
+Kuybyshev.DEFAULT=Europe/Samara
+Kwajalein.DEFAULT=Pacific/Kwajalein
+Kyrgystan.DEFAULT=Asia/Bishkek
+Lanka.DEFAULT=Asia/Colombo
+Liberia.DEFAULT=Africa/Monrovia
+Line_Islands.DEFAULT=Pacific/Kiritimati
+Long_Shu.DEFAULT=Asia/Chongqing
+Lord_Howe.DEFAULT=Australia/Lord_Howe
+Macau.DEFAULT=Asia/Macau
+Magadan.DEFAULT=Asia/Magadan
+Malaya.DEFAULT=Asia/Kuala_Lumpur
+Malaysia.DEFAULT=Asia/Kuching
+Maldives.DEFAULT=Indian/Maldives
+Marquesas.DEFAULT=Pacific/Marquesas
+Marshall_Islands.DEFAULT=Pacific/Majuro
+Mauritius.DEFAULT=Indian/Mauritius
+Mawson.DEFAULT=Antarctica/Mawson
+Mongolia.DEFAULT=Asia/Ulaanbaatar
+Moscow.DEFAULT=Europe/Moscow
+Myanmar.DEFAULT=Asia/Rangoon
+Nauru.DEFAULT=Pacific/Nauru
+Nepal.DEFAULT=Asia/Katmandu
+New_Caledonia.DEFAULT=Pacific/Noumea
+New_Zealand.AQ=Antarctica/McMurdo
+New_Zealand.DEFAULT=Pacific/Auckland
+Newfoundland.DEFAULT=America/St_Johns
+Niue.DEFAULT=Pacific/Niue
+Norfolk.DEFAULT=Pacific/Norfolk
+Noronha.DEFAULT=America/Noronha
+North_Mariana.DEFAULT=Pacific/Saipan
+Novosibirsk.DEFAULT=Asia/Novosibirsk
+Omsk.DEFAULT=Asia/Omsk
+Oral.DEFAULT=Asia/Oral
+Pakistan.DEFAULT=Asia/Karachi
+Palau.DEFAULT=Pacific/Palau
+Papua_New_Guinea.DEFAULT=Pacific/Port_Moresby
+Paraguay.DEFAULT=America/Asuncion
+Peru.DEFAULT=America/Lima
+Philippines.DEFAULT=Asia/Manila
+Phoenix_Islands.DEFAULT=Pacific/Enderbury
+Pierre_Miquelon.DEFAULT=America/Miquelon
+Pitcairn.DEFAULT=Pacific/Pitcairn
+Ponape.DEFAULT=Pacific/Ponape
+Qyzylorda.DEFAULT=Asia/Qyzylorda
+Reunion.DEFAULT=Indian/Reunion
+Rothera.DEFAULT=Antarctica/Rothera
+Sakhalin.DEFAULT=Asia/Sakhalin
+Samara.DEFAULT=Europe/Samara
+Samarkand.DEFAULT=Asia/Samarkand
+Samoa.DEFAULT=Pacific/Apia
+Seychelles.DEFAULT=Indian/Mahe
+Shevchenko.DEFAULT=Asia/Aqtau
+Singapore.DEFAULT=Asia/Singapore
+Solomon.DEFAULT=Pacific/Guadalcanal
+South_Georgia.DEFAULT=Atlantic/South_Georgia
+Suriname.DEFAULT=America/Paramaribo
+Sverdlovsk.DEFAULT=Asia/Yekaterinburg
+Syowa.DEFAULT=Antarctica/Syowa
+Tahiti.DEFAULT=Pacific/Tahiti
+Tajikistan.DEFAULT=Asia/Dushanbe
+Tashkent.DEFAULT=Asia/Tashkent
+Tbilisi.DEFAULT=Asia/Tbilisi
+Tokelau.DEFAULT=Pacific/Fakaofo
+Tonga.DEFAULT=Pacific/Tongatapu
+Truk.DEFAULT=Pacific/Truk
+Turkey.DEFAULT=Europe/Istanbul
+Turkmenistan.DEFAULT=Asia/Ashgabat
+Tuvalu.DEFAULT=Pacific/Funafuti
+Uralsk.DEFAULT=Asia/Oral
+Uruguay.DEFAULT=America/Montevideo
+Urumqi.DEFAULT=Asia/Urumqi
+Uzbekistan.DEFAULT=Asia/Tashkent
+Vanuatu.DEFAULT=Pacific/Efate
+Venezuela.DEFAULT=America/Caracas
+Vladivostok.DEFAULT=Asia/Vladivostok
+Volgograd.DEFAULT=Europe/Volgograd
+Vostok.DEFAULT=Antarctica/Vostok
+Wake.DEFAULT=Pacific/Wake
+Wallis.DEFAULT=Pacific/Wallis
+Yakutsk.DEFAULT=Asia/Yakutsk
+Yekaterinburg.DEFAULT=Asia/Yekaterinburg
+Yerevan.DEFAULT=Asia/Yerevan
+Yukon.DEFAULT=America/Yakutat