libgweather r272 - in trunk: . data
- From: danw svn gnome org
- To: svn-commits-list gnome org
- Subject: libgweather r272 - in trunk: . data
- Date: Sun, 29 Jun 2008 21:47:39 +0000 (UTC)
Author: danw
Date: Sun Jun 29 21:47:38 2008
New Revision: 272
URL: http://svn.gnome.org/viewvc/libgweather?rev=272&view=rev
Log:
* data/Locations.xml.in: Reorganize countries exactly according to
ISO 3166; Move various territories/dependencies with their own ISO
codes out into their own <country> nodes, and preemptively add
nodes for the countries that we don't yet have weather stations
for. Sync up a few names/accents with ISO 3166 and/or common
English usage, and put a comment before each country giving the
official name (plus notes in the cases that are confusing or
non-obvious). #535518
* data/locations.dtd: Allow empty countries; the code already just
ignores them.
Modified:
trunk/ChangeLog
trunk/data/Locations.xml.in
trunk/data/locations.dtd
Modified: trunk/data/Locations.xml.in
==============================================================================
--- trunk/data/Locations.xml.in (original)
+++ trunk/data/Locations.xml.in Sun Jun 29 21:47:38 2008
@@ -8,6 +8,7 @@
<region>
<_name>Middle East</_name>
<country>
+ <!-- AE - United Arab Emirates -->
<_name>United Arab Emirates</_name>
<iso-code>AE</iso-code>
<tz-hint>Asia/Dubai</tz-hint>
@@ -49,6 +50,7 @@
</location>
</country>
<country>
+ <!-- QA - Qatar -->
<_name>Qatar</_name>
<iso-code>QA</iso-code>
<tz-hint>Asia/Qatar</tz-hint>
@@ -66,6 +68,7 @@
</location>
</country>
<country>
+ <!-- OM - Oman -->
<_name>Oman</_name>
<iso-code>OM</iso-code>
<tz-hint>Asia/Muscat</tz-hint>
@@ -83,6 +86,7 @@
</location>
</country>
<country>
+ <!-- YE - Yemen -->
<_name>Yemen</_name>
<iso-code>YE</iso-code>
<tz-hint>Asia/Aden</tz-hint>
@@ -142,6 +146,7 @@
</location>
</country>
<country>
+ <!-- SA - Saudi Arabia -->
<_name>Saudi Arabia</_name>
<iso-code>SA</iso-code>
<tz-hint>Asia/Riyadh</tz-hint>
@@ -321,6 +326,7 @@
</location>
</country>
<country>
+ <!-- BH - Bahrain -->
<_name>Bahrain</_name>
<iso-code>BH</iso-code>
<tz-hint>Asia/Bahrain</tz-hint>
@@ -331,6 +337,7 @@
</location>
</country>
<country>
+ <!-- LB - Lebanon -->
<_name>Lebanon</_name>
<iso-code>LB</iso-code>
<tz-hint>Asia/Beirut</tz-hint>
@@ -342,6 +349,7 @@
</location>
</country>
<country>
+ <!-- IL - Israel -->
<_name>Israel</_name>
<iso-code>IL</iso-code>
<tz-hint>Asia/Jerusalem</tz-hint>
@@ -377,8 +385,8 @@
</location>
</country>
<country>
- <!-- FIXME: rename this to Iran -->
- <_name>Iran, Islamic Republic of</_name>
+ <!-- IR - Islamic Republic of Iran -->
+ <_name>Iran</_name>
<iso-code>IR</iso-code>
<tz-hint>Asia/Tehran</tz-hint>
<location>
@@ -521,6 +529,13 @@
</location>
</country>
<country>
+ <!-- IQ - Iraq -->
+ <_name>Iraq</_name>
+ <iso-code>IQ</iso-code>
+ <tz-hint>Asia/Baghdad</tz-hint>
+ </country>
+ <country>
+ <!-- JO - Jordan -->
<_name>Jordan</_name>
<iso-code>JO</iso-code>
<tz-hint>Asia/Amman</tz-hint>
@@ -544,6 +559,7 @@
</location>
</country>
<country>
+ <!-- KW - Kuwait -->
<_name>Kuwait</_name>
<iso-code>KW</iso-code>
<tz-hint>Asia/Kuwait</tz-hint>
@@ -554,6 +570,13 @@
</location>
</country>
<country>
+ <!-- PS - Occupied Palestinian Territory -->
+ <_name>Palestinian Territory</_name>
+ <iso-code>PS</iso-code>
+ <tz-hint>Asia/Gaza</tz-hint>
+ </country>
+ <country>
+ <!-- SY - Syrian Arab Republic -->
<_name>Syria</_name>
<iso-code>SY</iso-code>
<tz-hint>Asia/Damascus</tz-hint>
@@ -592,6 +615,7 @@
<region>
<_name>North America</_name>
<country>
+ <!-- MX - Mexico -->
<_name>Mexico</_name>
<iso-code>MX</iso-code>
<state>
@@ -1156,6 +1180,7 @@
</state>
</country>
<country>
+ <!-- US - United States, aka United States of America -->
<_name>United States</_name>
<iso-code>US</iso-code>
<state>
@@ -15182,6 +15207,7 @@
</state>
</country>
<country>
+ <!-- CA - Canada -->
<_name>Canada</_name>
<iso-code>CA</iso-code>
<!-- FIXME: Many cities on the eastern and western edges of their
@@ -16994,6 +17020,10 @@
</state>
</country>
<country>
+ <!-- PM - Saint Pierre and Miquelon, a French territory in North
+ America (off the coast of Newfoundland). The French name is
+ "Saint-Pierre-et-Miquelon".
+ -->
<_name>Saint Pierre and Miquelon</_name>
<iso-code>PM</iso-code>
<tz-hint>America/Miquelon</tz-hint>
@@ -17008,6 +17038,22 @@
<region>
<_name>Europe</_name>
<country>
+ <!-- AX - Ãland Islands, an autonomous province of Finland -->
+ <_name>Ãland Islands</_name>
+ <iso-code>AX</iso-code>
+ <tz-hint>Europe/Mariehamn</tz-hint>
+ <location>
+ <!-- Translators: This is in the Ãland Islands of Finland.
+ local name (sv_FI): Mariehamn
+ local name (fi_FI): Maarianhamina
+ -->
+ <_name>Mariehamn</_name>
+ <code>EFMA</code>
+ <coordinates>60-07N 019-54E</coordinates>
+ </location>
+ </country>
+ <country>
+ <!-- AL - Albania -->
<_name>Albania</_name>
<iso-code>AL</iso-code>
<tz-hint>Europe/Tirane</tz-hint>
@@ -17019,6 +17065,13 @@
</location>
</country>
<country>
+ <!-- AD - Andorra -->
+ <_name>Andorra</_name>
+ <iso-code>AD</iso-code>
+ <tz-hint>Europe/Andorra</tz-hint>
+ </country>
+ <country>
+ <!-- AT - Austria -->
<_name>Austria</_name>
<iso-code>AT</iso-code>
<tz-hint>Europe/Vienna</tz-hint>
@@ -17124,6 +17177,7 @@
</location>
</country>
<country>
+ <!-- BY - Belarus -->
<_name>Belarus</_name>
<iso-code>BY</iso-code>
<tz-hint>Europe/Minsk</tz-hint>
@@ -17165,9 +17219,8 @@
</location>
</country>
<country>
- <!-- TRANSLATOR: local name (nl): BelgiÃ.
- local name (fr): Belgique.
- local name (de): Belgien.
+ <!-- BE - Belgium. The local names for the country are "BelgiÃ"
+ (Dutch), Belgique (French), and Belgien (German).
-->
<_name>Belgium</_name>
<iso-code>BE</iso-code>
@@ -17329,40 +17382,42 @@
</state>
</country>
<country>
- <_name>Bosnia-Herzegovina</_name>
+ <!-- BA - Bosnia and Herzegovina -->
+ <_name>Bosnia and Herzegovina</_name>
<iso-code>BA</iso-code>
<tz-hint>Europe/Sarajevo</tz-hint>
<location>
- <!-- Translators: This is in Bosnia-Herzegovina. -->
+ <!-- Translators: This is in Bosnia and Herzegovina. -->
<_name>Banja Luka</_name>
<code>LQBK</code>
<coordinates>44-47N 017-13E</coordinates>
</location>
<location>
- <!-- Translators: This is in Bosnia-Herzegovina. -->
+ <!-- Translators: This is in Bosnia and Herzegovina. -->
<_name>Mostar</_name>
<code>LQMO</code>
<coordinates>43-21N 017-48E</coordinates>
</location>
<location>
- <!-- Translators: This is in Bosnia-Herzegovina. -->
+ <!-- Translators: This is in Bosnia and Herzegovina. -->
<_name>Sarajevo</_name>
<code>LQSA</code>
</location>
<location>
- <!-- Translators: This is in Bosnia-Herzegovina. -->
+ <!-- Translators: This is in Bosnia and Herzegovina. -->
<_name>Sarajevo/Butmir</_name>
<code>LQSA</code>
<coordinates>43-49N 018-20E</coordinates>
</location>
<location>
- <!-- Translators: This is in Bosnia-Herzegovina. -->
+ <!-- Translators: This is in Bosnia and Herzegovina. -->
<_name>Tuzla</_name>
<code>LQTZ</code>
<coordinates>44-33N 018-42E</coordinates>
</location>
</country>
<country>
+ <!-- BG - Bulgaria -->
<_name>Bulgaria</_name>
<iso-code>BG</iso-code>
<tz-hint>Europe/Sofia</tz-hint>
@@ -17398,6 +17453,7 @@
</location>
</country>
<country>
+ <!-- CZ - Czech Republic -->
<_name>Czech Republic</_name>
<iso-code>CZ</iso-code>
<tz-hint>Europe/Prague</tz-hint>
@@ -17456,6 +17512,7 @@
</location>
</country>
<country>
+ <!-- HR - Croatia -->
<_name>Croatia</_name>
<iso-code>HR</iso-code>
<tz-hint>Europe/Zagreb</tz-hint>
@@ -17523,10 +17580,7 @@
</location>
</country>
<country>
- <!-- Translators: The native name is "Danmark" - many contries have
- their own transcription though, because the country is a very old
- kingdom.
- -->
+ <!-- DK - Denmark. The Danish name is "Danmark" -->
<_name>Denmark</_name>
<iso-code>DK</iso-code>
<tz-hint>Europe/Copenhagen</tz-hint>
@@ -17636,6 +17690,7 @@
</location>
</country>
<country>
+ <!-- EE - Estonia -->
<_name>Estonia</_name>
<iso-code>EE</iso-code>
<tz-hint>Europe/Tallinn</tz-hint>
@@ -17685,6 +17740,9 @@
</city>
</country>
<country>
+ <!-- FO - Faroe Islands, an autonomous province of Denmark in the
+ north Atlantic.
+ -->
<_name>Faroe Islands</_name>
<iso-code>FO</iso-code>
<tz-hint>Atlantic/Faroe</tz-hint>
@@ -17698,6 +17756,9 @@
</location>
</country>
<country>
+ <!-- GI - Gibraltar, a British overseas territory on the southern
+ tip of Spain.
+ -->
<_name>Gibraltar</_name>
<iso-code>GI</iso-code>
<tz-hint>Europe/Gibraltar</tz-hint>
@@ -17709,6 +17770,7 @@
</location>
</country>
<country>
+ <!-- IS - Iceland -->
<_name>Iceland</_name>
<iso-code>IS</iso-code>
<tz-hint>Atlantic/Reykjavik</tz-hint>
@@ -17738,6 +17800,7 @@
</location>
</country>
<country>
+ <!-- LV - Latvia -->
<_name>Latvia</_name>
<iso-code>LV</iso-code>
<tz-hint>Europe/Riga</tz-hint>
@@ -17757,6 +17820,13 @@
</location>
</country>
<country>
+ <!-- LI - Liechtenstien -->
+ <_name>Liechtenstein</_name>
+ <iso-code>LI</iso-code>
+ <tz-hint>Europe/Vaduz</tz-hint>
+ </country>
+ <country>
+ <!-- LT - Lithuania -->
<_name>Lithuania</_name>
<iso-code>LT</iso-code>
<tz-hint>Europe/Vilnius</tz-hint>
@@ -17791,6 +17861,7 @@
</location>
</country>
<country>
+ <!-- LU - Luxembourg -->
<_name>Luxembourg</_name>
<iso-code>LU</iso-code>
<tz-hint>Europe/Luxembourg</tz-hint>
@@ -17806,6 +17877,7 @@
</location>
</country>
<country>
+ <!-- MK - The Former Yugoslav Republic of Macedonia -->
<_name>Macedonia</_name>
<iso-code>MK</iso-code>
<tz-hint>Europe/Skopje</tz-hint>
@@ -17827,6 +17899,7 @@
</location>
</country>
<country>
+ <!-- MT - Malta -->
<_name>Malta</_name>
<iso-code>MT</iso-code>
<tz-hint>Europe/Malta</tz-hint>
@@ -17838,6 +17911,7 @@
</location>
</country>
<country>
+ <!-- MD - Moldova -->
<_name>Moldova</_name>
<iso-code>MD</iso-code>
<tz-hint>Europe/Chisinau</tz-hint>
@@ -17849,6 +17923,13 @@
</location>
</country>
<country>
+ <!-- MC - Monaco -->
+ <_name>Monaco</_name>
+ <iso-code>MC</iso-code>
+ <tz-hint>Europe/Monaco</tz-hint>
+ </country>
+ <country>
+ <!-- ME - Montenegro -->
<_name>Montenegro</_name>
<iso-code>ME</iso-code>
<tz-hint>Europe/Podgorica</tz-hint>
@@ -17870,6 +17951,7 @@
</location>
</country>
<country>
+ <!-- NO - Norway -->
<_name>Norway</_name>
<iso-code>NO</iso-code>
<tz-hint>Europe/Oslo</tz-hint>
@@ -18185,12 +18267,6 @@
</location>
<location>
<!-- Translators: This is in Norway. -->
- <_name>Svalbard</_name>
- <code>ENSB</code>
- <coordinates>78-15N 015-28E</coordinates>
- </location>
- <location>
- <!-- Translators: This is in Norway. -->
<_name>Svartnes</_name>
<code>ENSS</code>
<coordinates>70-21N 031-03E</coordinates>
@@ -18227,6 +18303,7 @@
</location>
</country>
<country>
+ <!-- PL - Poland -->
<_name>Poland</_name>
<iso-code>PL</iso-code>
<tz-hint>Europe/Warsaw</tz-hint>
@@ -18298,6 +18375,7 @@
</location>
</country>
<country>
+ <!-- PT - Portugal -->
<_name>Portugal</_name>
<iso-code>PT</iso-code>
<tz-hint>Europe/Lisbon</tz-hint>
@@ -18385,6 +18463,7 @@
</location>
</country>
<country>
+ <!-- RO - Romania -->
<_name>Romania</_name>
<iso-code>RO</iso-code>
<tz-hint>Europe/Bucharest</tz-hint>
@@ -18448,6 +18527,7 @@
</location>
</country>
<country>
+ <!-- RU - Russian Federation -->
<_name>Russia</_name>
<iso-code>RU</iso-code>
<location>
@@ -18969,6 +19049,7 @@
</location>
</country>
<country>
+ <!-- RS - Serbia -->
<_name>Serbia</_name>
<iso-code>RS</iso-code>
<tz-hint>Europe/Belgrade</tz-hint>
@@ -19000,6 +19081,7 @@
</location>
</country>
<country>
+ <!-- SK - Slovakia -->
<_name>Slovakia</_name>
<iso-code>SK</iso-code>
<tz-hint>Europe/Bratislava</tz-hint>
@@ -19079,6 +19161,7 @@
</city>
</country>
<country>
+ <!-- SI - Slovenia -->
<_name>Slovenia</_name>
<iso-code>SI</iso-code>
<tz-hint>Europe/Ljubljana</tz-hint>
@@ -19122,6 +19205,7 @@
</city>
</country>
<country>
+ <!-- SE - Sweden -->
<_name>Sweden</_name>
<iso-code>SE</iso-code>
<tz-hint>Europe/Stockholm</tz-hint>
@@ -19381,6 +19465,7 @@
</location>
</country>
<country>
+ <!-- CH - Switzerland -->
<_name>Switzerland</_name>
<iso-code>CH</iso-code>
<tz-hint>Europe/Zurich</tz-hint>
@@ -19472,6 +19557,22 @@
</city>
</country>
<country>
+ <!-- SJ - Svalbard and Jan Mayen. Svalbard is an island in the
+ Arctic Ocean which is a part of Norway with unusual status
+ internationally.
+ -->
+ <_name>Svalbard and Jan Mayen</_name>
+ <iso-code>SJ</iso-code>
+ <tz-hint>Arctic/Longyearbyen</tz-hint>
+ <location>
+ <!-- Translators: This is in Norway. -->
+ <_name>Svalbard</_name>
+ <code>ENSB</code>
+ <coordinates>78-15N 015-28E</coordinates>
+ </location>
+ </country>
+ <country>
+ <!-- CY - Cyprus -->
<_name>Cyprus</_name>
<iso-code>CY</iso-code>
<tz-hint>Asia/Nicosia</tz-hint>
@@ -19501,6 +19602,7 @@
</location>
</country>
<country>
+ <!-- FI - Finland -->
<_name>Finland</_name>
<iso-code>FI</iso-code>
<tz-hint>Europe/Helsinki</tz-hint>
@@ -19621,15 +19723,6 @@
</location>
<location>
<!-- Translators: This is in Finland.
- local name (sv_FI): Mariehamn
- local name (fi_FI): Maarianhamina
- -->
- <_name>Mariehamn</_name>
- <code>EFMA</code>
- <coordinates>60-07N 019-54E</coordinates>
- </location>
- <location>
- <!-- Translators: This is in Finland.
local name (fi_FI): Mikkeli
local name (sv_FI): Sankt Michel
-->
@@ -19723,6 +19816,7 @@
</location>
</country>
<country>
+ <!-- FR - France -->
<_name>France</_name>
<iso-code>FR</iso-code>
<tz-hint>Europe/Paris</tz-hint>
@@ -19990,18 +20084,6 @@
</location>
</city>
<city>
- <!-- Translators: This is in France.
- "Wallis" is an island in the Pacific Ocean.
- -->
- <_name>Ãle Wallis</_name>
- <location>
- <!-- Translators: This is in Ãle Wallis in France. -->
- <_name>Hihifo</_name>
- <code>NLWW</code>
- <coordinates>13-14S 176-10W</coordinates>
- </location>
- </city>
- <city>
<!-- Translators: This is in France. -->
<_name>HyÃres</_name>
<location>
@@ -20403,6 +20485,7 @@
</city>
</country>
<country>
+ <!-- DE - Germany -->
<_name>Germany</_name>
<iso-code>DE</iso-code>
<tz-hint>Europe/Berlin</tz-hint>
@@ -21146,6 +21229,7 @@
</state>
</country>
<country>
+ <!-- GR - Greece -->
<_name>Greece</_name>
<iso-code>GR</iso-code>
<tz-hint>Europe/Athens</tz-hint>
@@ -21329,6 +21413,19 @@
</location>
</country>
<country>
+ <!-- GG - The Bailiwick of Guernsey, a British Crown dependency -->
+ <_name>Guernsey</_name>
+ <iso-code>GG</iso-code>
+ <tz-hint>Europe/Guernsey</tz-hint>
+ <location>
+ <_name>Guernsey</_name>
+ <code>EGJB</code>
+ <zone>:centralsouthern</zone>
+ <coordinates>49-26N 002-36W</coordinates>
+ </location>
+ </country>
+ <country>
+ <!-- HU - Hungary -->
<_name>Hungary</_name>
<iso-code>HU</iso-code>
<tz-hint>Europe/Budapest</tz-hint>
@@ -21367,6 +21464,7 @@
</location>
</country>
<country>
+ <!-- IE - Ireland -->
<_name>Ireland</_name>
<iso-code>IE</iso-code>
<tz-hint>Europe/Dublin</tz-hint>
@@ -21392,6 +21490,19 @@
</location>
</country>
<country>
+ <!-- IM - Isle of Man, a British Crown dependency -->
+ <_name>Isle of Man</_name>
+ <iso-code>IM</iso-code>
+ <tz-hint>Europe/Isle_of_Man</tz-hint>
+ <location>
+ <_name>Isle of Man</_name>
+ <code>EGNS</code>
+ <zone>:northwest</zone>
+ <coordinates>54-05N 004-38W</coordinates>
+ </location>
+ </country>
+ <country>
+ <!-- IT - Italy -->
<_name>Italy</_name>
<iso-code>IT</iso-code>
<tz-hint>Europe/Rome</tz-hint>
@@ -21894,6 +22005,19 @@
</location>
</country>
<country>
+ <!-- JE - The Bailiwick of Jersey, a British Crown dependency -->
+ <_name>Jersey</_name>
+ <iso-code>JE</iso-code>
+ <tz-hint>Europe/Jersey</tz-hint>
+ <location>
+ <_name>Jersey</_name>
+ <code>EGJJ</code>
+ <zone>:centralsouthern</zone>
+ <coordinates>49-13N 002-12W</coordinates>
+ </location>
+ </country>
+ <country>
+ <!-- NL - Netherlands -->
<_name>Netherlands</_name>
<iso-code>NL</iso-code>
<tz-hint>Europe/Amsterdam</tz-hint>
@@ -21974,6 +22098,13 @@
</location>
</country>
<country>
+ <!-- SM - San Marino -->
+ <_name>San Marino</_name>
+ <iso-code>SM</iso-code>
+ <tz-hint>Europe/San_Marino</tz-hint>
+ </country>
+ <country>
+ <!-- ES - Spain -->
<_name>Spain</_name>
<iso-code>ES</iso-code>
<tz-hint>Europe/Madrid</tz-hint>
@@ -22229,6 +22360,7 @@
</location>
</country>
<country>
+ <!-- TR - Turkey -->
<_name>Turkey</_name>
<iso-code>TR</iso-code>
<tz-hint>Europe/Istanbul</tz-hint>
@@ -22422,6 +22554,7 @@
</location>
</country>
<country>
+ <!-- UA - Ukraine -->
<_name>Ukraine</_name>
<iso-code>UA</iso-code>
<tz-hint>Europe/Kiev</tz-hint>
@@ -22521,6 +22654,7 @@
</location>
</country>
<country>
+ <!-- GB - United Kingdom -->
<_name>United Kingdom</_name>
<iso-code>GB</iso-code>
<tz-hint>Europe/London</tz-hint>
@@ -22807,14 +22941,6 @@
<coordinates>53-10N 002-59W</coordinates>
</location>
<location>
- <_name>Isle of Man</_name>
- <iso-code>IM</iso-code>
- <tz-hint>Europe/Isle_of_Man</tz-hint>
- <code>EGNS</code>
- <zone>:northwest</zone>
- <coordinates>54-05N 004-38W</coordinates>
- </location>
- <location>
<_name>Leeds/Bradford</_name>
<code>EGNM</code>
<zone>:RYPMS</zone>
@@ -22873,22 +22999,6 @@
<coordinates>50-44N 003-25W</coordinates>
</location>
<location>
- <_name>Guernsey</_name>
- <iso-code>GG</iso-code>
- <tz-hint>Europe/Guernsey</tz-hint>
- <code>EGJB</code>
- <zone>:centralsouthern</zone>
- <coordinates>49-26N 002-36W</coordinates>
- </location>
- <location>
- <_name>Jersey</_name>
- <iso-code>JE</iso-code>
- <tz-hint>Europe/Jersey</tz-hint>
- <code>EGJJ</code>
- <zone>:centralsouthern</zone>
- <coordinates>49-13N 002-12W</coordinates>
- </location>
- <location>
<_name>Lyneham</_name>
<code>EGDL</code>
<zone>:midlands</zone>
@@ -23055,10 +23165,17 @@
</location>
</state>
</country>
+ <country>
+ <!-- VA - Holy See (Vatican City State) -->
+ <_name>Vatican City</_name>
+ <iso-code>VA</iso-code>
+ <tz-hint>Europe/Vatican</tz-hint>
+ </country>
</region>
<region>
<_name>Africa</_name>
<country>
+ <!-- DZ - Algeria -->
<_name>Algeria</_name>
<iso-code>DZ</iso-code>
<tz-hint>Africa/Algiers</tz-hint>
@@ -23242,6 +23359,7 @@
</location>
</country>
<country>
+ <!-- AO - Angola -->
<_name>Angola</_name>
<iso-code>AO</iso-code>
<tz-hint>Africa/Luanda</tz-hint>
@@ -23262,6 +23380,7 @@
</location>
</country>
<country>
+ <!-- BJ - Benin -->
<_name>Benin</_name>
<iso-code>BJ</iso-code>
<tz-hint>Africa/Porto-Novo</tz-hint>
@@ -23272,6 +23391,7 @@
</location>
</country>
<country>
+ <!-- BW - Botswana -->
<_name>Botswana</_name>
<iso-code>BW</iso-code>
<tz-hint>Africa/Gaborone</tz-hint>
@@ -23337,6 +23457,7 @@
</location>
</country>
<country>
+ <!-- BF - Burkina Faso -->
<_name>Burkina Faso</_name>
<iso-code>BF</iso-code>
<tz-hint>Africa/Ouagadougou</tz-hint>
@@ -23352,6 +23473,7 @@
</location>
</country>
<country>
+ <!-- BI - Burundi -->
<_name>Burundi</_name>
<iso-code>BI</iso-code>
<tz-hint>Africa/Bujumbura</tz-hint>
@@ -23362,6 +23484,7 @@
</location>
</country>
<country>
+ <!-- CM - Cameroon -->
<_name>Cameroon</_name>
<iso-code>CM</iso-code>
<tz-hint>Africa/Douala</tz-hint>
@@ -23387,6 +23510,7 @@
</location>
</country>
<country>
+ <!-- CV - Cape Verde -->
<_name>Cape Verde</_name>
<iso-code>CV</iso-code>
<tz-hint>Atlantic/Cape_Verde</tz-hint>
@@ -23397,6 +23521,7 @@
</location>
</country>
<country>
+ <!-- CF - Central African Republic -->
<_name>Central African Republic</_name>
<iso-code>CF</iso-code>
<tz-hint>Africa/Bangui</tz-hint>
@@ -23417,6 +23542,7 @@
</location>
</country>
<country>
+ <!-- TD - Chad -->
<_name>Chad</_name>
<iso-code>TD</iso-code>
<tz-hint>Africa/Ndjamena</tz-hint>
@@ -23442,21 +23568,18 @@
</location>
</country>
<country>
+ <!-- KM - Comoros -->
<_name>Comoros</_name>
<iso-code>KM</iso-code>
<tz-hint>Indian/Comoro</tz-hint>
<location>
- <_name>Dzaoudzi / Pamanzi Mayotte</_name>
- <code>FMCZ</code>
- <coordinates>12-48S 045-17E</coordinates>
- </location>
- <location>
<_name>Hahaya</_name>
<code>FMCH</code>
<coordinates>11-32S 043-16E</coordinates>
</location>
</country>
<country>
+ <!-- CD - Democratic Republic of the Congo -->
<_name>Congo, Democratic Republic of the</_name>
<iso-code>CD</iso-code>
<location>
@@ -23479,6 +23602,11 @@
</location>
</country>
<country>
+ <!-- CG - Republic of the Congo. The official ISO 3166 short
+ English name is simply "Congo"; we use the long name to
+ better distinguish it from CD (The Democratic Republic of the
+ Congo).
+ -->
<_name>Congo, Republic of the</_name>
<iso-code>CG</iso-code>
<tz-hint>Africa/Brazzaville</tz-hint>
@@ -23494,7 +23622,8 @@
</location>
</country>
<country>
- <_name>Cote d'Ivoire</_name>
+ <!-- CI - CÃte d'Ivoire -->
+ <_name>CÃte d'Ivoire</_name>
<iso-code>CI</iso-code>
<tz-hint>Africa/Abidjan</tz-hint>
<location>
@@ -23504,6 +23633,7 @@
</location>
</country>
<country>
+ <!-- DJ - Djibouti -->
<_name>Djibouti</_name>
<iso-code>DJ</iso-code>
<tz-hint>Africa/Djibouti</tz-hint>
@@ -23514,6 +23644,7 @@
</location>
</country>
<country>
+ <!-- EG - Egypt -->
<_name>Egypt</_name>
<iso-code>EG</iso-code>
<tz-hint>Africa/Cairo</tz-hint>
@@ -23579,6 +23710,7 @@
</location>
</country>
<country>
+ <!-- GQ - Equatorial Guinea -->
<_name>Equatorial Guinea</_name>
<iso-code>GQ</iso-code>
<tz-hint>Africa/Malabo</tz-hint>
@@ -23589,6 +23721,7 @@
</location>
</country>
<country>
+ <!-- ER - Eritrea -->
<_name>Eritrea</_name>
<iso-code>ER</iso-code>
<tz-hint>Africa/Asmara</tz-hint>
@@ -23599,6 +23732,7 @@
</location>
</country>
<country>
+ <!-- ET - Ethiopia -->
<_name>Ethiopia</_name>
<iso-code>ET</iso-code>
<tz-hint>Africa/Addis_Ababa</tz-hint>
@@ -23609,6 +23743,17 @@
</location>
</country>
<country>
+ <!-- TF - French Southern Territories, a territory of France
+ consisting of several mostly-uninhabited islands in the
+ Indian Ocean. The French name is "Terres australes
+ franÃaises".
+ -->
+ <_name>French Southern Territories</_name>
+ <iso-code>TF</iso-code>
+ <tz-hint>Indian/Kerguelen</tz-hint>
+ </country>
+ <country>
+ <!-- GA - Gabon -->
<_name>Gabon</_name>
<iso-code>GA</iso-code>
<tz-hint>Africa/Libreville</tz-hint>
@@ -23679,7 +23824,8 @@
</location>
</country>
<country>
- <_name>Gambia, The</_name>
+ <!-- GM - Gambia -->
+ <_name>Gambia</_name>
<iso-code>GM</iso-code>
<tz-hint>Africa/Banjul</tz-hint>
<location>
@@ -23689,6 +23835,7 @@
</location>
</country>
<country>
+ <!-- GH - Ghana -->
<_name>Ghana</_name>
<iso-code>GH</iso-code>
<tz-hint>Africa/Accra</tz-hint>
@@ -23704,6 +23851,7 @@
</location>
</country>
<country>
+ <!-- GN - Guinea -->
<_name>Guinea</_name>
<iso-code>GN</iso-code>
<tz-hint>Africa/Conakry</tz-hint>
@@ -23714,6 +23862,13 @@
</location>
</country>
<country>
+ <!-- GW - Guinea-Bissau -->
+ <_name>Guinea-Bissau</_name>
+ <iso-code>GW</iso-code>
+ <tz-hint>Africa/Bissau</tz-hint>
+ </country>
+ <country>
+ <!-- KE - Kenya -->
<_name>Kenya</_name>
<iso-code>KE</iso-code>
<tz-hint>Africa/Nairobi</tz-hint>
@@ -23847,6 +24002,13 @@
</location>
</country>
<country>
+ <!-- LS - Lesotho -->
+ <_name>Lesotho</_name>
+ <iso-code>LS</iso-code>
+ <tz-hint>Africa/Maseru</tz-hint>
+ </country>
+ <country>
+ <!-- LR - Liberia -->
<_name>Liberia</_name>
<iso-code>LR</iso-code>
<tz-hint>Africa/Monrovia</tz-hint>
@@ -23857,6 +24019,7 @@
</location>
</country>
<country>
+ <!-- LY - Libyan Arab Jamahiriya -->
<_name>Libya</_name>
<iso-code>LY</iso-code>
<tz-hint>Africa/Tripoli</tz-hint>
@@ -23872,6 +24035,7 @@
</location>
</country>
<country>
+ <!-- MG - Madagascar -->
<_name>Madagascar</_name>
<iso-code>MG</iso-code>
<tz-hint>Indian/Antananarivo</tz-hint>
@@ -23917,6 +24081,13 @@
</location>
</country>
<country>
+ <!-- MW - Malawi -->
+ <_name>Malawi</_name>
+ <iso-code>MW</iso-code>
+ <tz-hint>Africa/Blantyre</tz-hint>
+ </country>
+ <country>
+ <!-- ML - Mali -->
<_name>Mali</_name>
<iso-code>ML</iso-code>
<tz-hint>Africa/Bamako</tz-hint>
@@ -23927,6 +24098,7 @@
</location>
</country>
<country>
+ <!-- MR - Mauritania -->
<_name>Mauritania</_name>
<iso-code>MR</iso-code>
<tz-hint>Africa/Nouakchott</tz-hint>
@@ -23942,6 +24114,7 @@
</location>
</country>
<country>
+ <!-- MU - Mauritius -->
<_name>Mauritius</_name>
<iso-code>MU</iso-code>
<tz-hint>Indian/Mauritius</tz-hint>
@@ -23957,6 +24130,18 @@
</location>
</country>
<country>
+ <!-- YT - Mayotte -->
+ <_name>Mayotte</_name>
+ <iso-code>YT</iso-code>
+ <tz-hint>Indian/Mayotte</tz-hint>
+ <location>
+ <_name>Dzaoudzi / Pamanzi Mayotte</_name>
+ <code>FMCZ</code>
+ <coordinates>12-48S 045-17E</coordinates>
+ </location>
+ </country>
+ <country>
+ <!-- MA - Morocco -->
<_name>Morocco</_name>
<iso-code>MA</iso-code>
<tz-hint>Africa/Casablanca</tz-hint>
@@ -24035,6 +24220,7 @@
</location>
</country>
<country>
+ <!-- MZ - Mozambique -->
<_name>Mozambique</_name>
<iso-code>MZ</iso-code>
<tz-hint>Africa/Maputo</tz-hint>
@@ -24093,6 +24279,7 @@
</location>
</country>
<country>
+ <!-- NA - Namibia -->
<_name>Namibia</_name>
<iso-code>NA</iso-code>
<tz-hint>Africa/Windhoek</tz-hint>
@@ -24113,6 +24300,7 @@
</location>
</country>
<country>
+ <!-- NE - Niger -->
<_name>Niger</_name>
<iso-code>NE</iso-code>
<tz-hint>Africa/Niamey</tz-hint>
@@ -24133,6 +24321,7 @@
</location>
</country>
<country>
+ <!-- NG - Nigeria -->
<_name>Nigeria</_name>
<iso-code>NG</iso-code>
<tz-hint>Africa/Lagos</tz-hint>
@@ -24188,8 +24377,10 @@
</location>
</country>
<country>
- <!-- local name (fr_RE): RÃunion -->
- <_name>Reunion</_name>
+ <!-- RE - RÃunion, an overseas department of France in the Indian
+ Ocean.
+ -->
+ <_name>RÃunion</_name>
<iso-code>RE</iso-code>
<tz-hint>Indian/Reunion</tz-hint>
<location>
@@ -24204,6 +24395,7 @@
</location>
</country>
<country>
+ <!-- RW - Rwanda -->
<_name>Rwanda</_name>
<iso-code>RW</iso-code>
<tz-hint>Africa/Kigali</tz-hint>
@@ -24214,6 +24406,16 @@
</location>
</country>
<country>
+ <!-- ST - Sao Tome and Principe. The local (Portuguese) name is
+ "SÃo Tomà and PrÃncipe". The official ISO 3166 short English
+ name does not have the accents.
+ -->
+ <_name>Sao Tome and Principe</_name>
+ <iso-code>ST</iso-code>
+ <tz-hint>Africa/Sao_Tome</tz-hint>
+ </country>
+ <country>
+ <!-- SN - Senegal -->
<_name>Senegal</_name>
<iso-code>SN</iso-code>
<tz-hint>Africa/Dakar</tz-hint>
@@ -24244,6 +24446,7 @@
</location>
</country>
<country>
+ <!-- SC - Seychelles -->
<_name>Seychelles</_name>
<iso-code>SC</iso-code>
<tz-hint>Indian/Mahe</tz-hint>
@@ -24254,6 +24457,7 @@
</location>
</country>
<country>
+ <!-- SO - Somalia -->
<_name>Somalia</_name>
<iso-code>SO</iso-code>
<tz-hint>Africa/Mogadishu</tz-hint>
@@ -24279,6 +24483,7 @@
</location>
</country>
<country>
+ <!-- ZA - South Africa -->
<_name>South Africa</_name>
<iso-code>ZA</iso-code>
<tz-hint>Africa/Johannesburg</tz-hint>
@@ -24392,6 +24597,7 @@
</location>
</country>
<country>
+ <!-- SL - Sierra Leone -->
<_name>Sierra Leone</_name>
<iso-code>SL</iso-code>
<tz-hint>Africa/Freetown</tz-hint>
@@ -24402,6 +24608,7 @@
</location>
</country>
<country>
+ <!-- SD - Sudan -->
<_name>Sudan</_name>
<iso-code>SD</iso-code>
<tz-hint>Africa/Khartoum</tz-hint>
@@ -24412,6 +24619,7 @@
</location>
</country>
<country>
+ <!-- SZ - Swaziland -->
<_name>Swaziland</_name>
<iso-code>SZ</iso-code>
<tz-hint>Africa/Mbabane</tz-hint>
@@ -24422,6 +24630,7 @@
</location>
</country>
<country>
+ <!-- TZ - United Republic of Tanzania -->
<_name>Tanzania</_name>
<iso-code>TZ</iso-code>
<tz-hint>Africa/Dar_es_Salaam</tz-hint>
@@ -24527,6 +24736,7 @@
</location>
</country>
<country>
+ <!-- TG - Togo -->
<_name>Togo</_name>
<iso-code>TG</iso-code>
<tz-hint>Africa/Lome</tz-hint>
@@ -24542,6 +24752,7 @@
</location>
</country>
<country>
+ <!-- TN - Tunisia -->
<_name>Tunisia</_name>
<iso-code>TN</iso-code>
<tz-hint>Africa/Tunis</tz-hint>
@@ -24627,6 +24838,7 @@
</location>
</country>
<country>
+ <!-- UG - Uganda -->
<_name>Uganda</_name>
<iso-code>UG</iso-code>
<tz-hint>Africa/Kampala</tz-hint>
@@ -24687,6 +24899,13 @@
</location>
</country>
<country>
+ <!-- EH - Western Sahara, a disputed territory in western Africa -->
+ <_name>Western Sahara</_name>
+ <iso-code>EH</iso-code>
+ <tz-hint>Africa/El_Aaiun</tz-hint>
+ </country>
+ <country>
+ <!-- ZM - Zambia -->
<_name>Zambia</_name>
<iso-code>ZM</iso-code>
<tz-hint>Africa/Lusaka</tz-hint>
@@ -24712,6 +24931,7 @@
</location>
</country>
<country>
+ <!-- ZW - Zimbabwe -->
<_name>Zimbabwe</_name>
<iso-code>ZW</iso-code>
<tz-hint>Africa/Harare</tz-hint>
@@ -24760,6 +24980,10 @@
<region>
<_name>Australasia & Oceania</_name>
<country>
+ <!-- AS - American Samoa, a territory of the United States in the
+ South Pacific, not to be confused with the separate nation of
+ "Samoa".
+ -->
<_name>American Samoa</_name>
<iso-code>AS</iso-code>
<tz-hint>Pacific/Pago_Pago</tz-hint>
@@ -24770,6 +24994,7 @@
</location>
</country>
<country>
+ <!-- AU - Australia -->
<_name>Australia</_name>
<iso-code>AU</iso-code>
<!-- FIXME: the tz-hint for each state is correct, but some
@@ -24956,35 +25181,12 @@
<coordinates>41-32S 147-12E</coordinates>
</location>
</state><!-- /Tasmania -->
- <state>
- <_name>Australian External Territories</_name>
- <location>
- <_name>Norfolk Island</_name>
- <iso-code>NF</iso-code>
- <tz-hint>Pacific/Norfolk</tz-hint>
- <code>YSNF</code>
- <zone>@IDN10008</zone>
- <coordinates>29-02S 167-56E</coordinates>
- </location>
- <location>
- <_name>Christmas Island</_name>
- <iso-code>CX</iso-code>
- <tz-hint>Indian/Christmas</tz-hint>
- <code>YPXM</code>
- </location>
- <location>
- <!-- FIXME: remove Keeling? -->
- <_name>Cocos (Keeling) Island</_name>
- <iso-code>CC</iso-code>
- <tz-hint>Indian/Cocos</tz-hint>
- <code>YPCC</code>
- <zone>@IDW10600</zone>
- <coordinates>12-30S 96-50E</coordinates>
- </location>
- </state>
</country>
<country>
- <_name>British Indian Ocean Territory</_name>
+ <!-- IO - British Indian Ocean Territory, which is exactly what it
+ sounds like.
+ -->
+ <_name>British Indian Ocean Territory</_name>
<iso-code>IO</iso-code>
<tz-hint>Indian/Chagos</tz-hint>
<location>
@@ -24994,6 +25196,36 @@
</location>
</country>
<country>
+ <!-- CX - Christmas Island, a territory of Australia in the Indian
+ Ocean, not to be confused with various other islands of the
+ same name.
+ -->
+ <_name>Christmas Island</_name>
+ <iso-code>CX</iso-code>
+ <tz-hint>Indian/Christmas</tz-hint>
+ <location>
+ <_name>Christmas Island</_name>
+ <code>YPXM</code>
+ <coordinates>10-26S 105-41E</coordinates>
+ </location>
+ </country>
+ <country>
+ <!-- CC - Cocos (Keeling) Islands, a territory of Australia in the
+ Indian Ocean. The "(Keeling)" is to distinguish them from
+ other "Cocos Island"s, and is part of the official name.
+ -->
+ <_name>Cocos (Keeling) Islands</_name>
+ <iso-code>CC</iso-code>
+ <tz-hint>Indian/Cocos</tz-hint>
+ <location>
+ <_name>Cocos Island</_name>
+ <code>YPCC</code>
+ <zone>@IDW10600</zone>
+ <coordinates>12-30S 96-50E</coordinates>
+ </location>
+ </country>
+ <country>
+ <!-- CK - Cook Islands -->
<_name>Cook Islands</_name>
<iso-code>CK</iso-code>
<tz-hint>Pacific/Rarotonga</tz-hint>
@@ -25004,6 +25236,7 @@
</location>
</country>
<country>
+ <!-- FJ - Fiji -->
<_name>Fiji</_name>
<iso-code>FJ</iso-code>
<tz-hint>Pacific/Fiji</tz-hint>
@@ -25019,6 +25252,7 @@
</location>
</country>
<country>
+ <!-- PF - French Polynesia, a French territory in the South Pacific -->
<_name>French Polynesia</_name>
<iso-code>PF</iso-code>
<tz-hint>Pacific/Tahiti</tz-hint>
@@ -25029,6 +25263,9 @@
</location>
</country>
<country>
+ <!-- GU - Guam, a territory of the United States in the South
+ Pacific.
+ -->
<_name>Guam</_name>
<iso-code>GU</iso-code>
<tz-hint>Pacific/Guam</tz-hint>
@@ -25054,6 +25291,7 @@
</location>
</country>
<country>
+ <!-- ID - Indonesia -->
<_name>Indonesia</_name>
<iso-code>ID</iso-code>
<tz-hint>Asia/Jakarta</tz-hint>
@@ -25081,6 +25319,7 @@
</location>
</country>
<country>
+ <!-- KI - Kiribati -->
<_name>Kiribati</_name>
<iso-code>KI</iso-code>
<tz-hint>Pacific/Tarawa</tz-hint>
@@ -25096,6 +25335,7 @@
</location>
</country>
<country>
+ <!-- MH - Marshall Islands -->
<_name>Marshall Islands</_name>
<iso-code>MH</iso-code>
<tz-hint>Pacific/Majuro</tz-hint>
@@ -25117,7 +25357,7 @@
</location>
</country>
<country>
- <!-- FIXME: rename this to Micronesia? -->
+ <!-- FM - Federated States of Micronesia -->
<_name>Micronesia, Federated States of</_name>
<iso-code>FM</iso-code>
<location>
@@ -25152,6 +25392,15 @@
</location>
</country>
<country>
+ <!-- NR - Nauru -->
+ <_name>Nauru</_name>
+ <iso-code>NR</iso-code>
+ <tz-hint>Pacific/Nauru</tz-hint>
+ </country>
+ <country>
+ <!-- NC - New Caledonia, a French territory in the South Pacific.
+ The French name is "Nouvelle-CalÃdonie".
+ -->
<_name>New Caledonia</_name>
<iso-code>NC</iso-code>
<tz-hint>Pacific/Noumea</tz-hint>
@@ -25163,6 +25412,7 @@
</location>
</country>
<country>
+ <!-- NZ - New Zealand -->
<_name>New Zealand</_name>
<iso-code>NZ</iso-code>
<tz-hint>Pacific/Auckland</tz-hint>
@@ -25278,16 +25528,32 @@
</location>
</country>
<country>
+ <!-- NU - Niue -->
<_name>Niue</_name>
<iso-code>NU</iso-code>
<tz-hint>Pacific/Niue</tz-hint>
<location>
- <name>Alofi / Niue</name>
+ <_name>Alofi / Niue</_name>
<code>NIUE</code>
<coordinates>19-04S 169-55W</coordinates>
</location>
</country>
<country>
+ <!-- NF - Norfolk Island, a territory of Australia -->
+ <_name>Norfolk Island</_name>
+ <iso-code>NF</iso-code>
+ <tz-hint>Pacific/Norfolk</tz-hint>
+ <location>
+ <_name>Norfolk Island</_name>
+ <code>YSNF</code>
+ <zone>@IDN10008</zone>
+ <coordinates>29-02S 167-56E</coordinates>
+ </location>
+ </country>
+ <country>
+ <!-- MP - Northern Mariana Islands, a semi-independent territory
+ of the United States in the western Pacific Ocean.
+ -->
<_name>Northern Mariana Islands</_name>
<iso-code>MP</iso-code>
<tz-hint>Pacific/Saipan</tz-hint>
@@ -25298,6 +25564,7 @@
</location>
</country>
<country>
+ <!-- PW - Palau -->
<_name>Palau</_name>
<iso-code>PW</iso-code>
<tz-hint>Pacific/Palau</tz-hint>
@@ -25313,6 +25580,7 @@
</location>
</country>
<country>
+ <!-- PG - Papua New Guinea -->
<_name>Papua New Guinea</_name>
<iso-code>PG</iso-code>
<tz-hint>Pacific/Port_Moresby</tz-hint>
@@ -25328,6 +25596,15 @@
</location>
</country>
<country>
+ <!-- PN - Pitcairn, a British territory in the South Pacific -->
+ <_name>Pitcairn</_name>
+ <iso-code>PN</iso-code>
+ <tz-hint>Pacific/Pitcairn</tz-hint>
+ </country>
+ <country>
+ <!-- WS - Samoa, an independent nation not to be confused with
+ "American Samoa"
+ -->
<_name>Samoa</_name>
<iso-code>WS</iso-code>
<tz-hint>Pacific/Apia</tz-hint>
@@ -25338,6 +25615,7 @@
</location>
</country>
<country>
+ <!-- SB - Solomon Islands -->
<_name>Solomon Islands</_name>
<iso-code>SB</iso-code>
<tz-hint>Pacific/Guadalcanal</tz-hint>
@@ -25348,6 +25626,19 @@
</location>
</country>
<country>
+ <!-- TL - Timor-Leste (formerly known as "East Timor") -->
+ <_name>Timor-Leste</_name>
+ <iso-code>TL</iso-code>
+ <tz-hint>Asia/Dili</tz-hint>
+ </country>
+ <country>
+ <!-- TK - Tokelau, a territory of New Zealand -->
+ <_name>Tokelau</_name>
+ <iso-code>TK</iso-code>
+ <tz-hint>Pacific/Fakaofo</tz-hint>
+ </country>
+ <country>
+ <!-- TO - Tonga -->
<_name>Tonga</_name>
<iso-code>TO</iso-code>
<tz-hint>Pacific/Tongatapu</tz-hint>
@@ -25363,6 +25654,7 @@
</location>
</country>
<country>
+ <!-- TV - Tuvalu -->
<_name>Tuvalu</_name>
<iso-code>TV</iso-code>
<tz-hint>Pacific/Funafuti</tz-hint>
@@ -25373,22 +25665,29 @@
</location>
</country>
<country>
+ <!-- UM - United States Minor Outlying Islands, a group of
+ mostly-uninhabited United States territories in the South
+ Pacific.
+ -->
<_name>United States Minor Outlying Islands</_name>
<iso-code>UM</iso-code>
<location>
<!-- Translators: This is in the United States Minor Outlying Islands. -->
<_name>Sand Island</_name>
+ <tz-hint>Pacific/Midway</tz-hint>
<code>PMDY</code>
<coordinates>28-13N 177-22W</coordinates>
</location>
<location>
<!-- Translators: This is in the United States Minor Outlying Islands. -->
<_name>Wake Island</_name>
+ <tz-hint>Pacific/Wake</tz-hint>
<code>PWAK</code>
<coordinates>19-17N 166-39E</coordinates>
</location>
</country>
<country>
+ <!-- VU - Vanuatu -->
<_name>Vanuatu</_name>
<iso-code>VU</iso-code>
<tz-hint>Pacific/Efate</tz-hint>
@@ -25413,10 +25712,27 @@
<coordinates>13-51S 167-33E</coordinates>
</location>
</country>
+ <country>
+ <!-- WF - Wallis and Futuna, a French territory in the South Pacific -->
+ <_name>Wallis and Futuna</_name>
+ <iso-code>WF</iso-code>
+ <tz-hint>Pacific/Wallis</tz-hint>
+ <city>
+ <!-- Translators: This is in Wallis and Futuna -->
+ <_name>Ãle Wallis</_name>
+ <location>
+ <!-- Translators: This is in Ãle Wallis in Wallis and Futuna. -->
+ <_name>Hihifo</_name>
+ <code>NLWW</code>
+ <coordinates>13-14S 176-10W</coordinates>
+ </location>
+ </city>
+ </country>
</region>
<region>
<_name>Asia</_name>
<country>
+ <!-- AM - Armenia -->
<_name>Armenia</_name>
<iso-code>AM</iso-code>
<tz-hint>Asia/Yerevan</tz-hint>
@@ -25427,6 +25743,7 @@
</location>
</country>
<country>
+ <!-- AF - Afghanistan -->
<_name>Afghanistan</_name>
<iso-code>AF</iso-code>
<tz-hint>Asia/Kabul</tz-hint>
@@ -25442,6 +25759,7 @@
</location>
</country>
<country>
+ <!-- PH - Philippines -->
<_name>Philippines</_name>
<iso-code>PH</iso-code>
<tz-hint>Asia/Manila</tz-hint>
@@ -25482,6 +25800,10 @@
</location>
</country>
<country>
+ <!-- VN - Viet Nam (The official ISO 3166 short English name
+ includes a space, though it is also frequently written
+ without one.)
+ -->
<_name>Viet Nam</_name>
<iso-code>VN</iso-code>
<tz-hint>Asia/Ho_Chi_Minh</tz-hint>
@@ -25502,6 +25824,7 @@
</location>
</country>
<country>
+ <!-- KR - The Republic of Korea, aka South Korea -->
<_name>South Korea</_name>
<iso-code>KR</iso-code>
<tz-hint>Asia/Seoul</tz-hint>
@@ -25582,6 +25905,7 @@
</location>
</country>
<country>
+ <!-- KP - The Democratic People's Republic of Korea, aka North Korea -->
<_name>North Korea</_name>
<iso-code>KP</iso-code>
<tz-hint>Asia/Pyongyang</tz-hint>
@@ -25599,6 +25923,7 @@
</location>
</country>
<country>
+ <!-- HK - Hong Kong, aka "Hong Kong Special Administrative Region of China" -->
<_name>Hong Kong</_name>
<iso-code>HK</iso-code>
<tz-hint>Asia/Hong_Kong</tz-hint>
@@ -25616,6 +25941,7 @@
</location>
</country>
<country>
+ <!-- PK - Pakistan -->
<_name>Pakistan</_name>
<iso-code>PK</iso-code>
<tz-hint>Asia/Karachi</tz-hint>
@@ -25651,6 +25977,7 @@
</location>
</country>
<country>
+ <!-- GE - Georgia (the country, not the US state) -->
<_name>Georgia</_name>
<iso-code>GE</iso-code>
<tz-hint>Asia/Tbilisi</tz-hint>
@@ -25661,6 +25988,7 @@
</location>
</country>
<country>
+ <!-- IN - India -->
<_name>India</_name>
<iso-code>IN</iso-code>
<tz-hint>Asia/Kolkata</tz-hint>
@@ -25741,6 +26069,7 @@
</location>
</country>
<country>
+ <!-- NP - Nepal -->
<_name>Nepal</_name>
<iso-code>NP</iso-code>
<tz-hint>Asia/Katmandu</tz-hint>
@@ -25751,7 +26080,10 @@
</location>
</country>
<country>
- <_name>People's Republic of China</_name>
+ <!-- CN - China. (The official ISO 3166 short English name does
+ not include "The People's Republic of".)
+ -->
+ <_name>China</_name>
<iso-code>CN</iso-code>
<tz-hint>Asia/Shanghai</tz-hint>
<city>
@@ -26137,6 +26469,7 @@
</location>
</country>
<country>
+ <!-- JP - Japan -->
<_name>Japan</_name>
<iso-code>JP</iso-code>
<tz-hint>Asia/Tokyo</tz-hint>
@@ -26672,6 +27005,7 @@
</location>
</country>
<country>
+ <!-- KZ - Kazakhstan -->
<_name>Kazakhstan</_name>
<iso-code>KZ</iso-code>
<tz-hint>Asia/Almaty</tz-hint>
@@ -26729,6 +27063,7 @@
</location>
</country>
<country>
+ <!-- MY - Malaysia -->
<_name>Malaysia</_name>
<iso-code>MY</iso-code>
<tz-hint>Asia/Kuala_Lumpur</tz-hint>
@@ -26832,6 +27167,7 @@
</location>
</country>
<country>
+ <!-- MN - Mongolia -->
<_name>Mongolia</_name>
<iso-code>MN</iso-code>
<tz-hint>Asia/Ulaanbaatar</tz-hint>
@@ -26842,7 +27178,10 @@
</location>
</country>
<country>
- <!-- FIXME: rename this to Burma? -->
+ <!-- MM - Myanmar (also known as Burma, but "Myanmar" is currently
+ the official ISO 3166 short English name, and gets more
+ Google hits in English)
+ -->
<_name>Myanmar</_name>
<iso-code>MM</iso-code>
<tz-hint>Asia/Rangoon</tz-hint>
@@ -26853,6 +27192,7 @@
</location>
</country>
<country>
+ <!-- SG - Singapore -->
<_name>Singapore</_name>
<iso-code>SG</iso-code>
<tz-hint>Asia/Singapore</tz-hint>
@@ -26868,6 +27208,7 @@
</location>
</country>
<country>
+ <!-- LK - Sri Lanka -->
<_name>Sri Lanka</_name>
<iso-code>LK</iso-code>
<tz-hint>Asia/Colombo</tz-hint>
@@ -26878,6 +27219,7 @@
</location>
</country>
<country>
+ <!-- TJ - Tajikistan -->
<_name>Tajikistan</_name>
<iso-code>TJ</iso-code>
<tz-hint>Asia/Dushanbe</tz-hint>
@@ -26888,6 +27230,7 @@
</location>
</country>
<country>
+ <!-- TH - Thailand -->
<_name>Thailand</_name>
<iso-code>TH</iso-code>
<tz-hint>Asia/Bangkok</tz-hint>
@@ -27028,6 +27371,9 @@
</location>
</country>
<country>
+ <!-- TW - Taiwan, Province of China. (That's the official ISO 3166
+ short English name.)
+ -->
<_name>Taiwan</_name>
<iso-code>TW</iso-code>
<tz-hint>Asia/Taipei</tz-hint>
@@ -27048,6 +27394,7 @@
</location>
</country>
<country>
+ <!-- TM - Turkmenistan -->
<_name>Turkmenistan</_name>
<iso-code>TM</iso-code>
<tz-hint>Asia/Ashgabat</tz-hint>
@@ -27058,6 +27405,7 @@
</location>
</country>
<country>
+ <!-- MV - Maldives -->
<_name>Maldives</_name>
<iso-code>MV</iso-code>
<tz-hint>Indian/Maldives</tz-hint>
@@ -27068,6 +27416,7 @@
</location>
</country>
<country>
+ <!-- AZ - Azerbaijan -->
<_name>Azerbaijan</_name>
<iso-code>AZ</iso-code>
<tz-hint>Asia/Baku</tz-hint>
@@ -27083,6 +27432,7 @@
</location>
</country>
<country>
+ <!-- BD - Bangladesh -->
<_name>Bangladesh</_name>
<iso-code>BD</iso-code>
<tz-hint>Asia/Dhaka</tz-hint>
@@ -27098,6 +27448,13 @@
</location>
</country>
<country>
+ <!-- BT - Bhutan -->
+ <_name>Bhutan</_name>
+ <iso-code>BT</iso-code>
+ <tz-hint>Asia/Thimphu</tz-hint>
+ </country>
+ <country>
+ <!-- BN - Brunei Darussalam -->
<_name>Brunei</_name>
<iso-code>BN</iso-code>
<tz-hint>Asia/Brunei</tz-hint>
@@ -27108,6 +27465,7 @@
</location>
</country>
<country>
+ <!-- KG - Kyrgyzstan -->
<_name>Kyrgyzstan</_name>
<iso-code>KG</iso-code>
<tz-hint>Asia/Bishkek</tz-hint>
@@ -27118,6 +27476,7 @@
</location>
</country>
<country>
+ <!-- LA - Lao People's Democratic Republic -->
<_name>Laos</_name>
<iso-code>LA</iso-code>
<tz-hint>Asia/Vientiane</tz-hint>
@@ -27128,6 +27487,11 @@
</location>
</country>
<country>
+ <!-- MO - Macao, aka "Macao Special Administrative Region of
+ China". (The spellings "Macao" and "Macau" are both widely
+ used. The "u" spelling is currently slightly more popular in
+ English.)
+ -->
<_name>Macau</_name>
<iso-code>MO</iso-code>
<tz-hint>Asia/Macau</tz-hint>
@@ -27138,6 +27502,7 @@
</location>
</country>
<country>
+ <!-- UZ - Uzbekistan -->
<_name>Uzbekistan</_name>
<iso-code>UZ</iso-code>
<tz-hint>Asia/Tashkent</tz-hint>
@@ -27168,6 +27533,7 @@
</location>
</country>
<country>
+ <!-- KH - Cambodia -->
<_name>Cambodia</_name>
<iso-code>KH</iso-code>
<tz-hint>Asia/Phnom_Penh</tz-hint>
@@ -27186,6 +27552,9 @@
<region>
<_name>Central and South America</_name>
<country>
+ <!-- AW - Aruba, a Caribbean island that is one of the three
+ constituent countries of the Kingdom of the Netherlands.
+ -->
<_name>Aruba</_name>
<iso-code>AW</iso-code>
<tz-hint>America/Aruba</tz-hint>
@@ -27196,6 +27565,7 @@
</location>
</country>
<country>
+ <!-- BS - Bahamas -->
<_name>Bahamas</_name>
<iso-code>BS</iso-code>
<tz-hint>America/Nassau</tz-hint>
@@ -27216,6 +27586,7 @@
</location>
</country>
<country>
+ <!-- BZ - Belize -->
<_name>Belize</_name>
<iso-code>BZ</iso-code>
<tz-hint>America/Belize</tz-hint>
@@ -27226,6 +27597,7 @@
</location>
</country>
<country>
+ <!-- VG - British Virgin Islands, a British territory in the Caribbean -->
<_name>British Virgin Islands</_name>
<iso-code>VG</iso-code>
<tz-hint>America/Tortola</tz-hint>
@@ -27236,6 +27608,7 @@
</location>
</country>
<country>
+ <!-- KY - Cayman Islands, a British territory in the Caribbean -->
<_name>Cayman Islands</_name>
<iso-code>KY</iso-code>
<tz-hint>America/Cayman</tz-hint>
@@ -27251,6 +27624,7 @@
</location>
</country>
<country>
+ <!-- CU - Cuba -->
<_name>Cuba</_name>
<iso-code>CU</iso-code>
<tz-hint>America/Havana</tz-hint>
@@ -27337,6 +27711,7 @@
</location>
</country>
<country>
+ <!-- CR - Costa Rica -->
<_name>Costa Rica</_name>
<iso-code>CR</iso-code>
<tz-hint>America/Costa_Rica</tz-hint>
@@ -27362,6 +27737,7 @@
</location>
</country>
<country>
+ <!-- DO - Dominican Republic -->
<_name>Dominican Republic</_name>
<iso-code>DO</iso-code>
<tz-hint>America/Santo_Domingo</tz-hint>
@@ -27397,6 +27773,7 @@
</location>
</country>
<country>
+ <!-- SV - El Salvador -->
<_name>El Salvador</_name>
<iso-code>SV</iso-code>
<tz-hint>America/El_Salvador</tz-hint>
@@ -27427,6 +27804,7 @@
</location>
</country>
<country>
+ <!-- GD - Grenada -->
<_name>Grenada</_name>
<iso-code>GD</iso-code>
<tz-hint>America/Grenada</tz-hint>
@@ -27437,6 +27815,9 @@
</location>
</country>
<country>
+ <!-- GP - Guadeloupe, an overseas department of France in the
+ Caribbean.
+ -->
<_name>Guadeloupe</_name>
<iso-code>GP</iso-code>
<tz-hint>America/Guadeloupe</tz-hint>
@@ -27447,6 +27828,7 @@
</location>
</country>
<country>
+ <!-- GT - Guatemala -->
<_name>Guatemala</_name>
<iso-code>GT</iso-code>
<tz-hint>America/Guatemala</tz-hint>
@@ -27477,6 +27859,7 @@
</location>
</country>
<country>
+ <!-- GY - Guyana -->
<_name>Guyana</_name>
<iso-code>GY</iso-code>
<tz-hint>America/Guyana</tz-hint>
@@ -27487,6 +27870,7 @@
</location>
</country>
<country>
+ <!-- HT - Haiti -->
<_name>Haiti</_name>
<iso-code>HT</iso-code>
<tz-hint>America/Port-au-Prince</tz-hint>
@@ -27502,6 +27886,7 @@
</location>
</country>
<country>
+ <!-- HN - Honduras -->
<_name>Honduras</_name>
<iso-code>HN</iso-code>
<tz-hint>America/Tegucigalpa</tz-hint>
@@ -27581,6 +27966,7 @@
</location>
</country>
<country>
+ <!-- JM - Jamaica -->
<_name>Jamaica</_name>
<iso-code>JM</iso-code>
<tz-hint>America/Jamaica</tz-hint>
@@ -27601,6 +27987,9 @@
</location>
</country>
<country>
+ <!-- MQ - Martinique, an overseas department of France in the
+ Caribbean.
+ -->
<_name>Martinique</_name>
<iso-code>MQ</iso-code>
<tz-hint>America/Martinique</tz-hint>
@@ -27611,6 +28000,16 @@
</location>
</country>
<country>
+ <!-- MS - Montserrat, a British territory in the Caribbean. -->
+ <_name>Montserrat</_name>
+ <iso-code>MS</iso-code>
+ <tz-hint>America/Montserrat</tz-hint>
+ </country>
+ <country>
+ <!-- AN - Netherlands Antilles, a group of Caribbean islands; one
+ of the three constituent countries of the Kingdom of the
+ Netherlands.
+ -->
<_name>Netherlands Antilles</_name>
<iso-code>AN</iso-code>
<tz-hint>America/Curacao</tz-hint>
@@ -27636,6 +28035,7 @@
</location>
</country>
<country>
+ <!-- NI - Nicaragua -->
<_name>Nicaragua</_name>
<iso-code>NI</iso-code>
<tz-hint>America/Managua</tz-hint>
@@ -27676,7 +28076,10 @@
</location>
</country>
<country>
- <_name>PanamÃ</_name>
+ <!-- PA - Panama. The local (Spanish) name is "PanamÃ". In common
+ English usage (and in ISO 3166) it does not have the accent.
+ -->
+ <_name>Panama</_name>
<iso-code>PA</iso-code>
<tz-hint>America/Panama</tz-hint>
<location>
@@ -27715,6 +28118,7 @@
</location>
</country>
<country>
+ <!-- LC - Saint Lucia -->
<_name>Saint Lucia</_name>
<iso-code>LC</iso-code>
<tz-hint>America/St_Lucia</tz-hint>
@@ -27730,6 +28134,16 @@
</location>
</country>
<country>
+ <!-- MF - Saint Martin, the French half of the island of Saint
+ Martin / Sint Maarten. (The Dutch half is considered part of
+ the Netherlands Antilles.)
+ -->
+ <_name>Saint Martin</_name>
+ <iso-code>MF</iso-code>
+ <tz-hint>America/Marigot</tz-hint>
+ </country>
+ <country>
+ <!-- VC - Saint Vincent and the Grenadines -->
<_name>Saint Vincent and the Grenadines</_name>
<iso-code>VC</iso-code>
<tz-hint>America/St_Vincent</tz-hint>
@@ -27740,6 +28154,7 @@
</location>
</country>
<country>
+ <!-- TT - Trinidad and Tobago -->
<_name>Trinidad and Tobago</_name>
<iso-code>TT</iso-code>
<tz-hint>America/Port_of_Spain</tz-hint>
@@ -27755,6 +28170,7 @@
</location>
</country>
<country>
+ <!-- TC - Turks and Caicos Islands, a British territory in the Caribbean -->
<_name>Turks and Caicos Islands</_name>
<iso-code>TC</iso-code>
<tz-hint>America/Grand_Turk</tz-hint>
@@ -27765,6 +28181,7 @@
</location>
</country>
<country>
+ <!-- BO - Bolivia -->
<_name>Bolivia</_name>
<iso-code>BO</iso-code>
<tz-hint>America/La_Paz</tz-hint>
@@ -27920,6 +28337,7 @@
</location>
</country>
<country>
+ <!-- CL - Chile -->
<_name>Chile</_name>
<iso-code>CL</iso-code>
<tz-hint>America/Santiago</tz-hint>
@@ -27995,6 +28413,7 @@
</location>
</country>
<country>
+ <!-- CO - Colombia -->
<_name>Colombia</_name>
<iso-code>CO</iso-code>
<tz-hint>America/Bogota</tz-hint>
@@ -28135,6 +28554,7 @@
</location>
</country>
<country>
+ <!-- EC - Ecuador -->
<_name>Ecuador</_name>
<iso-code>EC</iso-code>
<tz-hint>America/Guayaquil</tz-hint>
@@ -28160,6 +28580,12 @@
</location>
</country>
<country>
+ <!-- FK - Falkland Islands (Malvinas), a British territory in the
+ South Atlantic also claimed by Argentina. (The British name
+ is "Falkland Islands". The Argentine name is "Islas
+ Malvinas". The parenthesized form is the compromise used by
+ ISO and the UN.)
+ -->
<_name>Falkland Islands (Malvinas)</_name>
<iso-code>FK</iso-code>
<tz-hint>Atlantic/Stanley</tz-hint>
@@ -28170,6 +28596,9 @@
</location>
</country>
<country>
+ <!-- GF - French Guiana, an overseas department of France on the
+ northern coast of South America.
+ -->
<_name>French Guiana</_name>
<iso-code>GF</iso-code>
<tz-hint>America/Cayenne</tz-hint>
@@ -28180,6 +28609,7 @@
</location>
</country>
<country>
+ <!-- PY - Paraguay -->
<_name>Paraguay</_name>
<iso-code>PY</iso-code>
<tz-hint>America/Asuncion</tz-hint>
@@ -28195,6 +28625,7 @@
</location>
</country>
<country>
+ <!-- PE - Peru -->
<_name>Peru</_name>
<iso-code>PE</iso-code>
<tz-hint>America/Lima</tz-hint>
@@ -28285,6 +28716,15 @@
</location>
</country>
<country>
+ <!-- GS - South Georgia and the South Sandwich Islands, a British
+ territory in the South Atlantic.
+ -->
+ <_name>South Georgia and the South Sandwich Islands</_name>
+ <iso-code>GS</iso-code>
+ <tz-hint>Atlantic/South_Georgia</tz-hint>
+ </country>
+ <country>
+ <!-- SR - Suriname -->
<_name>Suriname</_name>
<iso-code>SR</iso-code>
<tz-hint>America/Paramaribo</tz-hint>
@@ -28295,6 +28735,7 @@
</location>
</country>
<country>
+ <!-- UY - Uruguay -->
<_name>Uruguay</_name>
<iso-code>UY</iso-code>
<tz-hint>America/Montevideo</tz-hint>
@@ -28355,6 +28796,7 @@
</location>
</country>
<country>
+ <!-- VE - Venezuela -->
<_name>Venezuela</_name>
<iso-code>VE</iso-code>
<tz-hint>America/Caracas</tz-hint>
@@ -28535,6 +28977,7 @@
</location>
</country>
<country>
+ <!-- AR - Argentina -->
<_name>Argentina</_name>
<iso-code>AR</iso-code>
<tz-hint>America/Argentina/Buenos_Aires</tz-hint>
@@ -28775,6 +29218,7 @@
</location>
</country>
<country>
+ <!-- BR - Brazil -->
<_name>Brazil</_name>
<iso-code>BR</iso-code>
<tz-hint>America/Sao_Paulo</tz-hint>
@@ -29171,6 +29615,13 @@
<!-- FIXME: rename this to Atlantic Ocean -->
<_name>Atlantic</_name>
<country>
+ <!-- AI - Anguilla, a British territory in the Caribbean -->
+ <_name>Anguilla</_name>
+ <iso-code>AI</iso-code>
+ <tz-hint>America/Anguilla</tz-hint>
+ </country>
+ <country>
+ <!-- AG - Antigua and Barbuda -->
<_name>Antigua and Barbuda</_name>
<iso-code>AG</iso-code>
<tz-hint>America/Antigua</tz-hint>
@@ -29181,6 +29632,7 @@
</location>
</country>
<country>
+ <!-- BM - Bermuda, a British territory off the coast of the United States -->
<_name>Bermuda</_name>
<iso-code>BM</iso-code>
<tz-hint>Atlantic/Bermuda</tz-hint>
@@ -29191,6 +29643,9 @@
</location>
</country>
<country>
+ <!-- DM - Dominica, a Caribbean island nation, not to be confused
+ with the Domincan Republic.
+ -->
<_name>Dominica</_name>
<iso-code>DM</iso-code>
<tz-hint>America/Dominica</tz-hint>
@@ -29206,6 +29661,9 @@
</location>
</country>
<country>
+ <!-- GL - Greenland, an autonomous province of Denmark in the
+ North Atlantic.
+ -->
<_name>Greenland</_name>
<iso-code>GL</iso-code>
<!-- FIXME: parts of Greenland are on other time zones -->
@@ -29248,6 +29706,9 @@
</location>
</country>
<country>
+ <!-- PR - Puerto Rico, a territory of the United States in the
+ Caribbean.
+ -->
<_name>Puerto Rico</_name>
<iso-code>PR</iso-code>
<tz-hint>America/Puerto_Rico</tz-hint>
@@ -29283,6 +29744,15 @@
</location>
</country>
<country>
+ <!-- BL - Saint BarthÃlemy, an overseas territory of France in the
+ Caribbean, formerly part of Guadeloupe.
+ -->
+ <_name>Saint BarthÃlemy</_name>
+ <iso-code>BL</iso-code>
+ <tz-hint>America/St_Barthelemy</tz-hint>
+ </country>
+ <country>
+ <!-- SH - Saint Helena, a British territory in the South Atlantic -->
<_name>Saint Helena</_name>
<iso-code>SH</iso-code>
<tz-hint>Atlantic/St_Helena</tz-hint>
@@ -29293,7 +29763,10 @@
</location>
</country>
<country>
- <_name>Virgin Islands</_name>
+ <!-- VI - United States Virgin Islands, a territory of the United
+ States in the Caribbean
+ -->
+ <_name>United States Virgin Islands</_name>
<iso-code>VI</iso-code>
<tz-hint>America/St_Thomas</tz-hint>
<location>
@@ -29308,6 +29781,7 @@
</location>
</country>
<country>
+ <!-- BB - Barbados -->
<_name>Barbados</_name>
<iso-code>BB</iso-code>
<tz-hint>America/Barbados</tz-hint>
@@ -29318,6 +29792,7 @@
</location>
</country>
<country>
+ <!-- KN - Saint Kitts and Nevis -->
<_name>Saint Kitts and Nevis</_name>
<iso-code>KN</iso-code>
<tz-hint>America/St_Kitts</tz-hint>
@@ -29336,6 +29811,7 @@
<region>
<_name>Antarctica</_name>
<country>
+ <!-- AQ - Antarctica -->
<_name>Antarctica</_name>
<iso-code>AQ</iso-code>
<location>
Modified: trunk/data/locations.dtd
==============================================================================
--- trunk/data/locations.dtd (original)
+++ trunk/data/locations.dtd Sun Jun 29 21:47:38 2008
@@ -5,10 +5,10 @@
<!ENTITY % name '(_name|name+)' >
<!ELEMENT region (%name;, country+) >
-<!ELEMENT country (%name;, iso-code, tz-hint?, (location|state|city)+) >
-<!ELEMENT state (%name;, tz-hint?, (location|city)+) >
+<!ELEMENT country (%name;, iso-code, tz-hint?, (location|state|city)*) >
+<!ELEMENT state (%name;, tz-hint?, (location|city)*) >
<!ELEMENT city (%name;, zone?, radar?, location+) >
-<!ELEMENT location (%name;, iso-code?, tz-hint?, code, zone?, radar?, coordinates?) >
+<!ELEMENT location (%name;, tz-hint?, code, zone?, radar?, coordinates?) >
<!ELEMENT _name (#PCDATA) >
<!ELEMENT name (#PCDATA) >
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
