migrate from intltool to gettext

1 files changed, 4405 insertions, 4405 deletions

diff --git a/data/Locations.xml.in b/data/Locations.xml.in
index 7b876e0..5488867 100644
--- a/data/Locations.xml.in
+++ b/data/Locations.xml.in
@@ -2,10 +2,10 @@
 <!DOCTYPE mateweather SYSTEM "locations.dtd">
 <mateweather format="1.0">
 <region>
- <_name>Africa</_name>
+ <name>Africa</name>
 <country>
 <!-- DZ - Algeria -->
- <_name>Algeria</_name>
+ <name>Algeria</name>
 <!-- Could not find information about the following stations,
 which may be in Algeria:
 DAMR 
@@ -18,7 +18,7 @@
 <tz-hint>Africa/Algiers</tz-hint>
 <city>
 <!-- A city in Algeria -->
- <_name>Adrar</_name>
+ <name>Adrar</name>
 <coordinates>27.900000 -0.283333</coordinates>
 <location>
 <name>Adrar</name>
@@ -31,7 +31,7 @@
 "Algiers" is the traditional English name.
 The local name in French is "Alger".
 -->
- <_name>Algiers</_name>
+ <name>Algiers</name>
 <coordinates>36.763056 3.050556</coordinates>
 <location>
 <name>Dar-El-Beida</name>
@@ -41,7 +41,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Annaba</_name>
+ <name>Annaba</name>
 <coordinates>36.900000 7.766667</coordinates>
 <location>
 <name>Annaba</name>
@@ -51,7 +51,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Batna</_name>
+ <name>Batna</name>
 <coordinates>35.555278 6.178611</coordinates>
 <location>
 <name>Batna</name>
@@ -61,7 +61,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Bechar</_name>
+ <name>Bechar</name>
 <coordinates>31.616667 -2.216667</coordinates>
 <location>
 <name>Bechar</name>
@@ -71,7 +71,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Bejaia</_name>
+ <name>Bejaia</name>
 <coordinates>36.750000 5.083333</coordinates>
 <location>
 <name>Bejaia</name>
@@ -81,7 +81,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Berriane</_name>
+ <name>Berriane</name>
 <coordinates>32.833333 3.766667</coordinates>
 <location>
 <name>Tilrempt, Hassi R'mel Airport</name>
@@ -91,7 +91,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Biskra</_name>
+ <name>Biskra</name>
 <coordinates>34.850000 5.733333</coordinates>
 <location>
 <name>Biskra</name>
@@ -101,7 +101,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Bou Saada</_name>
+ <name>Bou Saada</name>
 <coordinates>35.214167 4.182500</coordinates>
 <location>
 <name>Bou Saada</name>
@@ -111,7 +111,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Chlef</_name>
+ <name>Chlef</name>
 <coordinates>36.164722 1.334722</coordinates>
 <location>
 <name>Chlef</name>
@@ -121,7 +121,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Constantine</_name>
+ <name>Constantine</name>
 <coordinates>36.365000 6.614722</coordinates>
 <location>
 <name>Constantine</name>
@@ -131,7 +131,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Dar el Beida</_name>
+ <name>Dar el Beida</name>
 <coordinates>36.713333 3.212500</coordinates>
 <location>
 <name>Dar el Beida</name>
@@ -141,7 +141,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Djanet</_name>
+ <name>Djanet</name>
 <coordinates>24.552500 9.482222</coordinates>
 <location>
 <name>Djanet</name>
@@ -151,7 +151,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>El Golea</_name>
+ <name>El Golea</name>
 <coordinates>30.566667 2.883333</coordinates>
 <location>
 <name>El Golea</name>
@@ -161,7 +161,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Ghardaia</_name>
+ <name>Ghardaia</name>
 <coordinates>32.483333 3.666667</coordinates>
 <location>
 <name>Ghardaia</name>
@@ -171,7 +171,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Hassi Messaoud</_name>
+ <name>Hassi Messaoud</name>
 <coordinates>31.701944 6.054444</coordinates>
 <location>
 <name>Hassi Messaoud</name>
@@ -181,7 +181,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>I-n-Amenas</_name>
+ <name>I-n-Amenas</name>
 <coordinates>28.050000 9.550000</coordinates>
 <location>
 <name>I-n-Amenas</name>
@@ -191,7 +191,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>I-n-Salah</_name>
+ <name>I-n-Salah</name>
 <coordinates>27.216667 2.466667</coordinates>
 <location>
 <name>In Salah North</name>
@@ -201,7 +201,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Illizi</_name>
+ <name>Illizi</name>
 <coordinates>26.483333 8.466667</coordinates>
 <location>
 <name>Illizi</name>
@@ -211,7 +211,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Jijel</_name>
+ <name>Jijel</name>
 <coordinates>36.800000 5.766667</coordinates>
 <location>
 <name>Jijel Achouat</name>
@@ -221,7 +221,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Laghouat</_name>
+ <name>Laghouat</name>
 <coordinates>33.800000 2.883333</coordinates>
 <location>
 <name>Laghouat</name>
@@ -231,7 +231,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Mascara</_name>
+ <name>Mascara</name>
 <coordinates>35.394444 0.139722</coordinates>
 <location>
 <name>Mascara-Ghriss</name>
@@ -241,7 +241,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Oran</_name>
+ <name>Oran</name>
 <coordinates>35.691111 -0.641667</coordinates>
 <location>
 <name>Es Senia Airport</name>
@@ -256,7 +256,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Ouargla</_name>
+ <name>Ouargla</name>
 <coordinates>31.957500 5.327778</coordinates>
 <location>
 <name>Ouargla</name>
@@ -266,7 +266,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Setif</_name>
+ <name>Setif</name>
 <coordinates>36.191389 5.409444</coordinates>
 <location>
 <name>Setif</name>
@@ -276,7 +276,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Sidi Amrane</_name>
+ <name>Sidi Amrane</name>
 <coordinates>33.500000 6.016667</coordinates>
 <location>
 <name>El Oued</name>
@@ -286,7 +286,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Sidi Bel Abbes</_name>
+ <name>Sidi Bel Abbes</name>
 <coordinates>35.193889 -0.641389</coordinates>
 <location>
 <name>Mecheria</name>
@@ -296,7 +296,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Tamanrasset</_name>
+ <name>Tamanrasset</name>
 <coordinates>22.785000 5.522778</coordinates>
 <location>
 <name>Aguenna Airport</name>
@@ -306,7 +306,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Tebessa</_name>
+ <name>Tebessa</name>
 <coordinates>35.404167 8.124167</coordinates>
 <location>
 <name>Tebessa</name>
@@ -316,7 +316,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Tiaret</_name>
+ <name>Tiaret</name>
 <coordinates>35.375833 1.313056</coordinates>
 <location>
 <name>Tiaret</name>
@@ -326,7 +326,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Timimoun</_name>
+ <name>Timimoun</name>
 <coordinates>29.250000 0.250000</coordinates>
 <location>
 <name>Timimoun</name>
@@ -336,7 +336,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Tindouf</_name>
+ <name>Tindouf</name>
 <coordinates>27.651944 -8.214444</coordinates>
 <location>
 <name>Tindouf</name>
@@ -346,7 +346,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Tlemcen</_name>
+ <name>Tlemcen</name>
 <coordinates>34.878333 -1.315000</coordinates>
 <location>
 <name>Tlemcen Zenata</name>
@@ -356,7 +356,7 @@
 </city>
 <city>
 <!-- A city in Algeria -->
- <_name>Touggourt</_name>
+ <name>Touggourt</name>
 <coordinates>33.100000 6.066667</coordinates>
 <location>
 <name>Touggourt</name>
@@ -367,7 +367,7 @@
 </country>
 <country>
 <!-- AO - Angola -->
- <_name>Angola</_name>
+ <name>Angola</name>
 <!-- Could not find weather stations for the following major
 cities:
 Luanda
@@ -381,7 +381,7 @@
 </country>
 <country>
 <!-- BJ - Benin -->
- <_name>Benin</_name>
+ <name>Benin</name>
 <iso-code>BJ</iso-code>
 <fips-code>BN</fips-code>
 <timezones>
@@ -390,7 +390,7 @@
 <tz-hint>Africa/Porto-Novo</tz-hint>
 <city>
 <!-- A city in Benin -->
- <_name>Cotonou</_name>
+ <name>Cotonou</name>
 <coordinates>6.350000 2.433333</coordinates>
 <location>
 <name>Cotonou</name>
@@ -400,7 +400,7 @@
 </city>
 <city>
 <!-- The capital of Benin -->
- <_name>Porto-Novo</_name>
+ <name>Porto-Novo</name>
 <coordinates>6.483333 2.616667</coordinates>
 <location>
 <name>Cotonou</name>
@@ -411,7 +411,7 @@
 </country>
 <country>
 <!-- BW - Botswana -->
- <_name>Botswana</_name>
+ <name>Botswana</name>
 <iso-code>BW</iso-code>
 <fips-code>BC</fips-code>
 <timezones>
@@ -420,7 +420,7 @@
 <tz-hint>Africa/Gaborone</tz-hint>
 <city>
 <!-- A city in Botswana -->
- <_name>Francistown</_name>
+ <name>Francistown</name>
 <coordinates>-21.166667 27.516667</coordinates>
 <location>
 <name>Francistown</name>
@@ -430,7 +430,7 @@
 </city>
 <city>
 <!-- The capital of Botswana -->
- <_name>Gaborone</_name>
+ <name>Gaborone</name>
 <coordinates>-24.646389 25.911944</coordinates>
 <location>
 <name>Seretse Khama International Airport</name>
@@ -440,7 +440,7 @@
 </city>
 <city>
 <!-- A city in Botswana -->
- <_name>Ghanzi</_name>
+ <name>Ghanzi</name>
 <coordinates>-21.566667 21.783333</coordinates>
 <location>
 <name>Ghanzi</name>
@@ -450,7 +450,7 @@
 </city>
 <city>
 <!-- A city in Botswana -->
- <_name>Kasane</_name>
+ <name>Kasane</name>
 <coordinates>-17.816667 25.150000</coordinates>
 <location>
 <name>Kasane</name>
@@ -460,7 +460,7 @@
 </city>
 <city>
 <!-- A city in Botswana -->
- <_name>Letlhakane</_name>
+ <name>Letlhakane</name>
 <coordinates>-21.416667 25.583333</coordinates>
 <location>
 <name>Letlhakane</name>
@@ -470,7 +470,7 @@
 </city>
 <city>
 <!-- A city in Botswana -->
- <_name>Lokerane</_name>
+ <name>Lokerane</name>
 <coordinates>-24.883333 24.666667</coordinates>
 <location>
 <name>Jwaneng</name>
@@ -480,7 +480,7 @@
 </city>
 <city>
 <!-- A city in Botswana -->
- <_name>Maun</_name>
+ <name>Maun</name>
 <coordinates>-19.983333 23.416667</coordinates>
 <location>
 <name>Maun</name>
@@ -490,7 +490,7 @@
 </city>
 <city>
 <!-- A city in Botswana -->
- <_name>Mochudi</_name>
+ <name>Mochudi</name>
 <coordinates>-24.416667 26.150000</coordinates>
 <location>
 <name>Seretse Khama International Airport</name>
@@ -500,7 +500,7 @@
 </city>
 <city>
 <!-- A city in Botswana -->
- <_name>Selebi-Phikwe</_name>
+ <name>Selebi-Phikwe</name>
 <coordinates>-21.966111 27.917222</coordinates>
 <location>
 <name>Selebi-Phikwe</name>
@@ -510,7 +510,7 @@
 </city>
 <city>
 <!-- A city in Botswana -->
- <_name>Tshabong</_name>
+ <name>Tshabong</name>
 <coordinates>-26.050000 22.450000</coordinates>
 <location>
 <name>Tshabong</name>
@@ -521,7 +521,7 @@
 </country>
 <country>
 <!-- BF - Burkina Faso -->
- <_name>Burkina Faso</_name>
+ <name>Burkina Faso</name>
 <iso-code>BF</iso-code>
 <fips-code>UV</fips-code>
 <timezones>
@@ -530,7 +530,7 @@
 <tz-hint>Africa/Ouagadougou</tz-hint>
 <city>
 <!-- The capital of Burkina Faso -->
- <_name>Ouagadougou</_name>
+ <name>Ouagadougou</name>
 <coordinates>12.370278 -1.524722</coordinates>
 <location>
 <name>Ouagadougou</name>
@@ -541,7 +541,7 @@
 </country>
 <country>
 <!-- BI - Burundi -->
- <_name>Burundi</_name>
+ <name>Burundi</name>
 <iso-code>BI</iso-code>
 <fips-code>BY</fips-code>
 <timezones>
@@ -550,7 +550,7 @@
 <tz-hint>Africa/Bujumbura</tz-hint>
 <city>
 <!-- The capital of Burundi -->
- <_name>Bujumbura</_name>
+ <name>Bujumbura</name>
 <coordinates>-3.376111 29.360000</coordinates>
 <location>
 <name>Bujumbura</name>
@@ -561,7 +561,7 @@
 </country>
 <country>
 <!-- CM - Cameroon -->
- <_name>Cameroon</_name>
+ <name>Cameroon</name>
 <!-- Could not find information about the following stations,
 which may be in Cameroon:
 FKKL 
@@ -574,7 +574,7 @@
 <tz-hint>Africa/Douala</tz-hint>
 <city>
 <!-- A city in Cameroon -->
- <_name>Douala</_name>
+ <name>Douala</name>
 <coordinates>4.050278 9.700000</coordinates>
 <location>
 <name>Douala Observatory</name>
@@ -584,7 +584,7 @@
 </city>
 <city>
 <!-- A city in Cameroon -->
- <_name>Garoua</_name>
+ <name>Garoua</name>
 <coordinates>9.300000 13.400000</coordinates>
 <location>
 <name>Garoua</name>
@@ -594,7 +594,7 @@
 </city>
 <city>
 <!-- A city in Cameroon -->
- <_name>Ngaoundere</_name>
+ <name>Ngaoundere</name>
 <coordinates>7.316667 13.583333</coordinates>
 <location>
 <name>Ngaoundere</name>
@@ -604,7 +604,7 @@
 </city>
 <city>
 <!-- The capital of Cameroon -->
- <_name>Yaounde</_name>
+ <name>Yaounde</name>
 <coordinates>3.866667 11.516667</coordinates>
 <location>
 <name>Yaounde</name>
@@ -615,7 +615,7 @@
 </country>
 <country>
 <!-- CV - Cape Verde -->
- <_name>Cape Verde</_name>
+ <name>Cape Verde</name>
 <!-- Could not find information about the following stations,
 which may be in Cape Verde:
 GVNP 
@@ -632,7 +632,7 @@
 <tz-hint>Atlantic/Cape_Verde</tz-hint>
 <city>
 <!-- A city in Cape Verde -->
- <_name>Preguiça</_name>
+ <name>Preguiça</name>
 <coordinates>16.750000 -22.950000</coordinates>
 <location>
 <name>Sal</name>
@@ -643,7 +643,7 @@
 </country>
 <country>
 <!-- CF - Central African Republic -->
- <_name>Central African Republic</_name>
+ <name>Central African Republic</name>
 <iso-code>CF</iso-code>
 <fips-code>CT</fips-code>
 <timezones>
@@ -652,7 +652,7 @@
 <tz-hint>Africa/Bangui</tz-hint>
 <city>
 <!-- A city in the Central African Republic -->
- <_name>Bangassou</_name>
+ <name>Bangassou</name>
 <coordinates>4.733333 22.816667</coordinates>
 <location>
 <name>Bangassou</name>
@@ -662,7 +662,7 @@
 </city>
 <city>
 <!-- The capital of the Central African Republic -->
- <_name>Bangui</_name>
+ <name>Bangui</name>
 <coordinates>4.366667 18.583333</coordinates>
 <location>
 <name>Bangui</name>
@@ -672,7 +672,7 @@
 </city>
 <city>
 <!-- A city in the Central African Republic -->
- <_name>Berberati</_name>
+ <name>Berberati</name>
 <coordinates>4.266667 15.783333</coordinates>
 <location>
 <name>Berberati</name>
@@ -683,7 +683,7 @@
 </country>
 <country>
 <!-- TD - Chad -->
- <_name>Chad</_name>
+ <name>Chad</name>
 <iso-code>TD</iso-code>
 <fips-code>CD</fips-code>
 <timezones>
@@ -692,7 +692,7 @@
 <tz-hint>Africa/Ndjamena</tz-hint>
 <city>
 <!-- A city in Chad -->
- <_name>Moundou</_name>
+ <name>Moundou</name>
 <coordinates>8.566667 16.083333</coordinates>
 <location>
 <name>Moundou</name>
@@ -702,7 +702,7 @@
 </city>
 <city>
 <!-- The capital of Chad -->
- <_name>N'Djamena</_name>
+ <name>N'Djamena</name>
 <coordinates>12.108502 15.048173</coordinates>
 <location>
 <name>N'Djamena</name>
@@ -712,7 +712,7 @@
 </city>
 <city>
 <!-- A city in Chad -->
- <_name>Sarh</_name>
+ <name>Sarh</name>
 <coordinates>9.150000 18.383333</coordinates>
 <location>
 <name>Sarh</name>
@@ -723,7 +723,7 @@
 </country>
 <country>
 <!-- KM - Comoros -->
- <_name>Comoros</_name>
+ <name>Comoros</name>
 <iso-code>KM</iso-code>
 <fips-code>CN</fips-code>
 <timezones>
@@ -732,7 +732,7 @@
 <tz-hint>Indian/Comoro</tz-hint>
 <city>
 <!-- A city in Comoros -->
- <_name>Mbaléni</_name>
+ <name>Mbaléni</name>
 <coordinates>-11.550000 43.274167</coordinates>
 <location>
 <name>Hahaya International Airport</name>
@@ -742,7 +742,7 @@
 </city>
 <city>
 <!-- The capital of Comoros -->
- <_name>Moroni</_name>
+ <name>Moroni</name>
 <coordinates>-11.704167 43.240278</coordinates>
 <location>
 <name>Hahaya International Airport</name>
@@ -753,7 +753,7 @@
 </country>
 <country>
 <!-- CD - Democratic Republic of the Congo -->
- <_name>Congo, Democratic Republic of the</_name>
+ <name>Congo, Democratic Republic of the</name>
 <iso-code>CD</iso-code>
 <fips-code>CG</fips-code>
 <timezones>
@@ -764,7 +764,7 @@
 clear from context. FIXME: is there an official name for
 this zone?
 -->
- <_name>Western Congo</_name>
+ <name>Western Congo</name>
 </timezone>
 <timezone id="Africa/Lubumbashi">
 <!-- The time zone used in the eastern half of the Democratic
@@ -773,12 +773,12 @@
 clear from context. FIXME: is there an official name for
 this zone?
 -->
- <_name>Eastern Congo</_name>
+ <name>Eastern Congo</name>
 </timezone>
 </timezones>
 <city>
 <!-- The capital of the Democratic Republic of the Congo -->
- <_name>Kinshasa</_name>
+ <name>Kinshasa</name>
 <coordinates>-4.329722 15.315000</coordinates>
 <location>
 <name>N'Djili Airport</name>
@@ -794,7 +794,7 @@
 better distinguish it from CD (The Democratic Republic of
 the Congo).
 -->
- <_name>Congo, Republic of the</_name>
+ <name>Congo, Republic of the</name>
 <iso-code>CG</iso-code>
 <fips-code>CF</fips-code>
 <timezones>
@@ -803,7 +803,7 @@
 <tz-hint>Africa/Brazzaville</tz-hint>
 <city>
 <!-- The capital of the Republic of the Congo -->
- <_name>Brazzaville</_name>
+ <name>Brazzaville</name>
 <coordinates>-4.259167 15.284722</coordinates>
 <location>
 <name>Maya-Maya Airport</name>
@@ -813,7 +813,7 @@
 </city>
 <city>
 <!-- A city in the Republic of the Congo -->
- <_name>Pointe-Noire</_name>
+ <name>Pointe-Noire</name>
 <coordinates>-4.794722 11.846111</coordinates>
 <location>
 <name>Pointe-Noire</name>
@@ -824,7 +824,7 @@
 </country>
 <country>
 <!-- CI - Côte d'Ivoire -->
- <_name>Côte d'Ivoire</_name>
+ <name>Côte d'Ivoire</name>
 <!-- Could not find weather stations for the following major
 cities:
 Yamoussoukro
@@ -837,7 +837,7 @@
 <tz-hint>Africa/Abidjan</tz-hint>
 <city>
 <!-- A city in Côte d'Ivoire -->
- <_name>Abidjan</_name>
+ <name>Abidjan</name>
 <coordinates>5.341111 -4.028056</coordinates>
 <location>
 <name>Abidjan</name>
@@ -848,7 +848,7 @@
 </country>
 <country>
 <!-- DJ - Djibouti -->
- <_name msgctxt="Country">Djibouti</_name>
+ <name msgctxt="Country">Djibouti</name>
 <iso-code>DJ</iso-code>
 <fips-code>DJ</fips-code>
 <timezones>
@@ -857,7 +857,7 @@
 <tz-hint>Africa/Djibouti</tz-hint>
 <city>
 <!-- The capital of Djibouti -->
- <_name msgctxt="City in Djibouti">Djibouti</_name>
+ <name msgctxt="City in Djibouti">Djibouti</name>
 <coordinates>11.595000 43.148056</coordinates>
 <location>
 <name>Djibouti / Ambouli</name>
@@ -868,7 +868,7 @@
 </country>
 <country>
 <!-- EG - Egypt -->
- <_name>Egypt</_name>
+ <name>Egypt</name>
 <!-- Could not find information about the following stations,
 which may be in Egypt:
 HEBL HEIS HEMA HESC 
@@ -881,7 +881,7 @@
 <tz-hint>Africa/Cairo</tz-hint>
 <city>
 <!-- A city in Egypt -->
- <_name>Al 'Arish</_name>
+ <name>Al 'Arish</name>
 <coordinates>31.126111 33.801944</coordinates>
 <location>
 <name>Al 'Arish</name>
@@ -891,7 +891,7 @@
 </city>
 <city>
 <!-- A city in Egypt -->
- <_name>Al Ghardaqah</_name>
+ <name>Al Ghardaqah</name>
 <coordinates>27.238889 33.836111</coordinates>
 <location>
 <name>Hurguada</name>
@@ -901,7 +901,7 @@
 </city>
 <city>
 <!-- A city in Egypt -->
- <_name>Al Qabuti</_name>
+ <name>Al Qabuti</name>
 <coordinates>31.237778 32.281389</coordinates>
 <location>
 <name>Port Said</name>
@@ -914,7 +914,7 @@
 "Alexandria" is the traditional English name.
 The local name in Arabic is "Al Iskandariyah".
 -->
- <_name msgctxt="City in Egypt">Alexandria</_name>
+ <name msgctxt="City in Egypt">Alexandria</name>
 <coordinates>31.198056 29.919167</coordinates>
 <location>
 <name>Nouzha Airport</name>
@@ -929,7 +929,7 @@
 </city>
 <city>
 <!-- A city in Egypt -->
- <_name>Aswan</_name>
+ <name>Aswan</name>
 <coordinates>24.087500 32.898889</coordinates>
 <location>
 <name>Asswan</name>
@@ -939,7 +939,7 @@
 </city>
 <city>
 <!-- A city in Egypt -->
- <_name>Asyut</_name>
+ <name>Asyut</name>
 <coordinates>27.182778 31.182778</coordinates>
 <location>
 <name>Asyut</name>
@@ -952,7 +952,7 @@
 "Cairo" is the traditional English name.
 The local name in Arabic is "Al Qahirah".
 -->
- <_name msgctxt="City in Egypt">Cairo</_name>
+ <name msgctxt="City in Egypt">Cairo</name>
 <coordinates>30.050000 31.250000</coordinates>
 <location>
 <name>Cairo Airport</name>
@@ -965,7 +965,7 @@
 "Luxor" is the traditional English name.
 The local name in Arabic is "Al Uqsur".
 -->
- <_name>Luxor</_name>
+ <name>Luxor</name>
 <coordinates>25.683333 32.650000</coordinates>
 <location>
 <name>Luxor</name>
@@ -975,7 +975,7 @@
 </city>
 <city>
 <!-- A city in Egypt -->
- <_name>Marsa Matruh</_name>
+ <name>Marsa Matruh</name>
 <coordinates>31.350000 27.233333</coordinates>
 <location>
 <name>Marsa Matruh</name>
@@ -985,7 +985,7 @@
 </city>
 <city>
 <!-- A city in Egypt -->
- <_name>Sharm ash Shaykh</_name>
+ <name>Sharm ash Shaykh</name>
 <coordinates>27.863611 34.288056</coordinates>
 <location>
 <name>Sharm ash Shaykh International Airport</name>
@@ -995,7 +995,7 @@
 </city>
 <city>
 <!-- A city in Egypt -->
- <_name>Taba</_name>
+ <name>Taba</name>
 <coordinates>29.491944 34.891389</coordinates>
 <location>
 <name>Taba</name>
@@ -1006,7 +1006,7 @@
 </country>
 <country>
 <!-- GQ - Equatorial Guinea -->
- <_name>Equatorial Guinea</_name>
+ <name>Equatorial Guinea</name>
 <!-- Could not find information about the following stations,
 which may be in Equatorial Guinea:
 FGBT 
@@ -1019,7 +1019,7 @@
 <tz-hint>Africa/Malabo</tz-hint>
 <city>
 <!-- The capital of Equatorial Guinea -->
- <_name>Malabo</_name>
+ <name>Malabo</name>
 <coordinates>3.750000 8.783333</coordinates>
 <location>
 <name>Malabo / Fernando Poo</name>
@@ -1030,7 +1030,7 @@
 </country>
 <country>
 <!-- ER - Eritrea -->
- <_name>Eritrea</_name>
+ <name>Eritrea</name>
 <!-- Could not find weather stations for the following major
 cities:
 Asmera
@@ -1044,7 +1044,7 @@
 </country>
 <country>
 <!-- ET - Ethiopia -->
- <_name>Ethiopia</_name>
+ <name>Ethiopia</name>
 <!-- Could not find weather stations for the following major
 cities:
 Addis Ababa
@@ -1062,7 +1062,7 @@
 Indian Ocean. The French name is "Terres australes
 françaises".
 -->
- <_name>French Southern Territories</_name>
+ <name>French Southern Territories</name>
 <iso-code>TF</iso-code>
 <fips-code>FS</fips-code>
 <timezones>
@@ -1072,7 +1072,7 @@
 </country>
 <country>
 <!-- GA - Gabon -->
- <_name>Gabon</_name>
+ <name>Gabon</name>
 <iso-code>GA</iso-code>
 <fips-code>GB</fips-code>
 <timezones>
@@ -1081,7 +1081,7 @@
 <tz-hint>Africa/Libreville</tz-hint>
 <city>
 <!-- A city in Gabon -->
- <_name>Franceville</_name>
+ <name>Franceville</name>
 <coordinates>-1.633333 13.583333</coordinates>
 <location>
 <name>Mvengue Airport</name>
@@ -1091,7 +1091,7 @@
 </city>
 <city>
 <!-- The capital of Gabon -->
- <_name>Libreville</_name>
+ <name>Libreville</name>
 <coordinates>0.383333 9.450000</coordinates>
 <location>
 <name>Libreville</name>
@@ -1101,7 +1101,7 @@
 </city>
 <city>
 <!-- A city in Gabon -->
- <_name>Port-Gentil</_name>
+ <name>Port-Gentil</name>
 <coordinates>-0.716667 8.783333</coordinates>
 <location>
 <name>Port-Gentil</name>
@@ -1112,7 +1112,7 @@
 </country>
 <country>
 <!-- GM - Gambia -->
- <_name>Gambia</_name>
+ <name>Gambia</name>
 <iso-code>GM</iso-code>
 <fips-code>GA</fips-code>
 <timezones>
@@ -1121,7 +1121,7 @@
 <tz-hint>Africa/Banjul</tz-hint>
 <city>
 <!-- The capital of Gambia -->
- <_name>Banjul</_name>
+ <name>Banjul</name>
 <coordinates>13.453056 -16.577500</coordinates>
 <location>
 <name>Banjul / Old Yundum</name>
@@ -1132,7 +1132,7 @@
 </country>
 <country>
 <!-- GH - Ghana -->
- <_name>Ghana</_name>
+ <name>Ghana</name>
 <iso-code>GH</iso-code>
 <fips-code>GH</fips-code>
 <timezones>
@@ -1141,7 +1141,7 @@
 <tz-hint>Africa/Accra</tz-hint>
 <city>
 <!-- The capital of Ghana -->
- <_name>Accra</_name>
+ <name>Accra</name>
 <coordinates>5.550000 -0.216667</coordinates>
 <location>
 <name>Accra</name>
@@ -1152,7 +1152,7 @@
 </country>
 <country>
 <!-- GN - Guinea -->
- <_name>Guinea</_name>
+ <name>Guinea</name>
 <iso-code>GN</iso-code>
 <fips-code>GV</fips-code>
 <timezones>
@@ -1161,7 +1161,7 @@
 <tz-hint>Africa/Conakry</tz-hint>
 <city>
 <!-- The capital of Guinea -->
- <_name>Conakry</_name>
+ <name>Conakry</name>
 <coordinates>9.509167 -13.712222</coordinates>
 <location>
 <name>Conakry / Gbessia</name>
@@ -1172,7 +1172,7 @@
 </country>
 <country>
 <!-- GW - Guinea-Bissau -->
- <_name>Guinea-Bissau</_name>
+ <name>Guinea-Bissau</name>
 <!-- Could not find weather stations for the following major
 cities:
 Bissau
@@ -1186,7 +1186,7 @@
 </country>
 <country>
 <!-- KE - Kenya -->
- <_name>Kenya</_name>
+ <name>Kenya</name>
 <iso-code>KE</iso-code>
 <fips-code>KE</fips-code>
 <timezones>
@@ -1195,7 +1195,7 @@
 <tz-hint>Africa/Nairobi</tz-hint>
 <city>
 <!-- A city in Kenya -->
- <_name>Eldoret</_name>
+ <name>Eldoret</name>
 <coordinates>0.516667 35.283333</coordinates>
 <location>
 <name>Eldoret</name>
@@ -1205,7 +1205,7 @@
 </city>
 <city>
 <!-- A city in Kenya -->
- <_name>Kisumu</_name>
+ <name>Kisumu</name>
 <coordinates>-0.100000 34.750000</coordinates>
 <location>
 <name>Kisumu</name>
@@ -1215,7 +1215,7 @@
 </city>
 <city>
 <!-- A city in Kenya -->
- <_name>Mombasa</_name>
+ <name>Mombasa</name>
 <coordinates>-4.050000 39.666667</coordinates>
 <location>
 <name>Mombasa</name>
@@ -1225,7 +1225,7 @@
 </city>
 <city>
 <!-- The capital of Kenya -->
- <_name>Nairobi</_name>
+ <name>Nairobi</name>
 <coordinates>-1.283333 36.816667</coordinates>
 <location>
 <name>Jomo Kenyatta Airport</name>
@@ -1236,7 +1236,7 @@
 </country>
 <country>
 <!-- LS - Lesotho -->
- <_name>Lesotho</_name>
+ <name>Lesotho</name>
 <!-- Could not find weather stations for the following major
 cities:
 Maseru
@@ -1250,7 +1250,7 @@
 </country>
 <country>
 <!-- LR - Liberia -->
- <_name msgctxt="Country">Liberia</_name>
+ <name msgctxt="Country">Liberia</name>
 <!-- Could not find weather stations for the following major
 cities:
 Monrovia
@@ -1264,7 +1264,7 @@
 </country>
 <country>
 <!-- LY - Libyan Arab Jamahiriya -->
- <_name>Libya</_name>
+ <name>Libya</name>
 <iso-code>LY</iso-code>
 <fips-code>LY</fips-code>
 <timezones>
@@ -1273,7 +1273,7 @@
 <tz-hint>Africa/Tripoli</tz-hint>
 <city>
 <!-- A city in Libya -->
- <_name>Baninah</_name>
+ <name>Baninah</name>
 <coordinates>32.083333 20.266667</coordinates>
 <location>
 <name>Baninah</name>
@@ -1283,7 +1283,7 @@
 </city>
 <city>
 <!-- A city in Libya -->
- <_name>Sabha</_name>
+ <name>Sabha</name>
 <coordinates>27.033333 14.433333</coordinates>
 <location>
 <name>Sabha</name>
@@ -1296,7 +1296,7 @@
 "Tripoli" is the traditional English name.
 The local name in Arabic is "Tarabulus / طرابلس".
 -->
- <_name>Tripoli</_name>
+ <name>Tripoli</name>
 <coordinates>32.892500 13.180000</coordinates>
 <location>
 <name>Tripoli International Airport</name>
@@ -1307,7 +1307,7 @@
 </country>
 <country>
 <!-- MG - Madagascar -->
- <_name>Madagascar</_name>
+ <name>Madagascar</name>
 <iso-code>MG</iso-code>
 <fips-code>MA</fips-code>
 <timezones>
@@ -1316,7 +1316,7 @@
 <tz-hint>Indian/Antananarivo</tz-hint>
 <city>
 <!-- A city in Madagascar -->
- <_name>Ankarena</_name>
+ <name>Ankarena</name>
 <coordinates>-17.083333 49.816667</coordinates>
 <location>
 <name>Sainte-Marie Airport</name>
@@ -1326,7 +1326,7 @@
 </city>
 <city>
 <!-- The capital of Madagascar -->
- <_name>Antananarivo</_name>
+ <name>Antananarivo</name>
 <coordinates>-18.916667 47.516667</coordinates>
 <location>
 <name>Ivato Airport</name>
@@ -1336,7 +1336,7 @@
 </city>
 <city>
 <!-- A city in Madagascar -->
- <_name>Antsiranana</_name>
+ <name>Antsiranana</name>
 <coordinates>-12.266667 49.283333</coordinates>
 <location>
 <name>Antsiranana</name>
@@ -1346,7 +1346,7 @@
 </city>
 <city>
 <!-- A city in Madagascar -->
- <_name>Fasenina-Ampasy</_name>
+ <name>Fasenina-Ampasy</name>
 <coordinates>-13.300000 48.316667</coordinates>
 <location>
 <name>Fascene Nossi-Be</name>
@@ -1356,7 +1356,7 @@
 </city>
 <city>
 <!-- A city in Madagascar -->
- <_name>Mahajanga</_name>
+ <name>Mahajanga</name>
 <coordinates>-15.716667 46.316667</coordinates>
 <location>
 <name>Mahajanga</name>
@@ -1366,7 +1366,7 @@
 </city>
 <city>
 <!-- A city in Madagascar -->
- <_name>Toamasina</_name>
+ <name>Toamasina</name>
 <coordinates>-18.166667 49.383333</coordinates>
 <location>
 <name>Toamasina</name>
@@ -1376,7 +1376,7 @@
 </city>
 <city>
 <!-- A city in Madagascar -->
- <_name>Tolanaro</_name>
+ <name>Tolanaro</name>
 <coordinates>-25.033333 47.000000</coordinates>
 <location>
 <name>Tolanaro</name>
@@ -1387,7 +1387,7 @@
 </country>
 <country>
 <!-- MW - Malawi -->
- <_name>Malawi</_name>
+ <name>Malawi</name>
 <!-- Could not find weather stations for the following major
 cities:
 Lilongwe
@@ -1401,7 +1401,7 @@
 </country>
 <country>
 <!-- ML - Mali -->
- <_name>Mali</_name>
+ <name>Mali</name>
 <!-- Could not find weather stations for the following major
 cities:
 Bamako
@@ -1415,7 +1415,7 @@
 </country>
 <country>
 <!-- MR - Mauritania -->
- <_name>Mauritania</_name>
+ <name>Mauritania</name>
 <iso-code>MR</iso-code>
 <fips-code>MR</fips-code>
 <timezones>
@@ -1424,7 +1424,7 @@
 <tz-hint>Africa/Nouakchott</tz-hint>
 <city>
 <!-- A city in Mauritania -->
- <_name>Nouadhibou</_name>
+ <name>Nouadhibou</name>
 <coordinates>20.902500 -17.042222</coordinates>
 <location>
 <name>Nouadhibou</name>
@@ -1434,7 +1434,7 @@
 </city>
 <city>
 <!-- The capital of Mauritania -->
- <_name>Nouakchott</_name>
+ <name>Nouakchott</name>
 <coordinates>18.119444 -16.040556</coordinates>
 <location>
 <name>Nouakchott</name>
@@ -1445,7 +1445,7 @@
 </country>
 <country>
 <!-- MU - Mauritius -->
- <_name>Mauritius</_name>
+ <name>Mauritius</name>
 <iso-code>MU</iso-code>
 <fips-code>MP</fips-code>
 <timezones>
@@ -1454,7 +1454,7 @@
 <tz-hint>Indian/Mauritius</tz-hint>
 <city>
 <!-- A city in Mauritius -->
- <_name>Plaisance</_name>
+ <name>Plaisance</name>
 <coordinates>-20.418333 57.671389</coordinates>
 <location>
 <name>Plaisance Mauritius</name>
@@ -1464,7 +1464,7 @@
 </city>
 <city>
 <!-- The capital of Mauritius -->
- <_name>Port Louis</_name>
+ <name>Port Louis</name>
 <coordinates>-20.161944 57.498889</coordinates>
 <location>
 <name>Plaisance Mauritius</name>
@@ -1474,7 +1474,7 @@
 </city>
 <city>
 <!-- A city in Mauritius -->
- <_name>Port Mathurin</_name>
+ <name>Port Mathurin</name>
 <coordinates>-19.683333 63.416667</coordinates>
 <location>
 <name>Rodrigues</name>
@@ -1485,7 +1485,7 @@
 </country>
 <country>
 <!-- YT - Mayotte -->
- <_name>Mayotte</_name>
+ <name>Mayotte</name>
 <iso-code>YT</iso-code>
 <fips-code>MF</fips-code>
 <timezones>
@@ -1494,7 +1494,7 @@
 <tz-hint>Indian/Mayotte</tz-hint>
 <city>
 <!-- A city in Mayotte -->
- <_name>Dzaoudzi</_name>
+ <name>Dzaoudzi</name>
 <coordinates>-12.779444 45.253611</coordinates>
 <location>
 <name>Dzaoudzi / Pamanzi Mayotte</name>
@@ -1504,7 +1504,7 @@
 </city>
 <city>
 <!-- The capital of Mayotte -->
- <_name>Mamoudzou</_name>
+ <name>Mamoudzou</name>
 <coordinates>-12.779444 45.227222</coordinates>
 <location>
 <name>Dzaoudzi / Pamanzi Mayotte</name>
@@ -1515,7 +1515,7 @@
 </country>
 <country>
 <!-- MA - Morocco -->
- <_name>Morocco</_name>
+ <name>Morocco</name>
 <!-- Could not find cities for the following weather stations:
 GMML - Laayoune, Hassan Isl Airport (27.166667 -13.216389)
 -->
@@ -1527,7 +1527,7 @@
 <tz-hint>Africa/Casablanca</tz-hint>
 <city>
 <!-- A city in Morocco -->
- <_name>Agadir</_name>
+ <name>Agadir</name>
 <coordinates>30.400000 -9.600000</coordinates>
 <location>
 <name>Agadir Al Massira</name>
@@ -1537,7 +1537,7 @@
 </city>
 <city>
 <!-- A city in Morocco -->
- <_name>Al Hoceima</_name>
+ <name>Al Hoceima</name>
 <coordinates>35.240000 -3.930000</coordinates>
 <location>
 <name>Al Hoceima</name>
@@ -1547,7 +1547,7 @@
 </city>
 <city>
 <!-- A city in Morocco -->
- <_name>Fes</_name>
+ <name>Fes</name>
 <coordinates>34.050000 -4.980000</coordinates>
 <location>
 <name>Fes-Sais</name>
@@ -1557,7 +1557,7 @@
 </city>
 <city>
 <!-- A city in Morocco -->
- <_name>Marrakech</_name>
+ <name>Marrakech</name>
 <coordinates>31.630000 -8.000000</coordinates>
 <location>
 <name>Marrakech</name>
@@ -1567,7 +1567,7 @@
 </city>
 <city>
 <!-- A city in Morocco -->
- <_name>Meknes</_name>
+ <name>Meknes</name>
 <coordinates>33.900000 -5.550000</coordinates>
 <location>
 <name>Meknes</name>
@@ -1577,7 +1577,7 @@
 </city>
 <city>
 <!-- A city in Morocco -->
- <_name>Nador</_name>
+ <name>Nador</name>
 <coordinates>35.170000 -2.930000</coordinates>
 <location>
 <name>Arwi Airport</name>
@@ -1587,7 +1587,7 @@
 </city>
 <city>
 <!-- A city in Morocco -->
- <_name>Nouaseur</_name>
+ <name>Nouaseur</name>
 <coordinates>33.380000 -7.610000</coordinates>
 <location>
 <name>Nouasseur</name>
@@ -1597,7 +1597,7 @@
 </city>
 <city>
 <!-- A city in Morocco -->
- <_name>Ouarzazat</_name>
+ <name>Ouarzazat</name>
 <coordinates>30.920000 -6.910000</coordinates>
 <location>
 <name>Ouarzazat</name>
@@ -1607,7 +1607,7 @@
 </city>
 <city>
 <!-- A city in Morocco -->
- <_name>Oujda</_name>
+ <name>Oujda</name>
 <coordinates>34.680000 -1.910000</coordinates>
 <location>
 <name>Oujda</name>
@@ -1617,7 +1617,7 @@
 </city>
 <city>
 <!-- The capital of Morocco -->
- <_name>Rabat</_name>
+ <name>Rabat</name>
 <coordinates>34.020000 -6.830000</coordinates>
 <location>
 <name>Rabat-Sale</name>
@@ -1630,7 +1630,7 @@
 "Tangier" is the traditional English name.
 The local name is "Tanger".
 -->
- <_name>Tangier</_name>
+ <name>Tangier</name>
 <coordinates>35.780000 -5.810000</coordinates>
 <location>
 <name>Tangier Airport</name>
@@ -1640,7 +1640,7 @@
 </city>
 <city>
 <!-- A city in Morocco -->
- <_name>Tetouan</_name>
+ <name>Tetouan</name>
 <coordinates>35.570000 -5.370000</coordinates>
 <location>
 <name>Sania Ramel Airport</name>
@@ -1651,7 +1651,7 @@
 </country>
 <country>
 <!-- MZ - Mozambique -->
- <_name>Mozambique</_name>
+ <name>Mozambique</name>
 <iso-code>MZ</iso-code>
 <fips-code>MZ</fips-code>
 <timezones>
@@ -1660,7 +1660,7 @@
 <tz-hint>Africa/Maputo</tz-hint>
 <city>
 <!-- A city in Mozambique -->
- <_name>Beira</_name>
+ <name>Beira</name>
 <coordinates>-19.843611 34.838889</coordinates>
 <location>
 <name>Beira</name>
@@ -1670,7 +1670,7 @@
 </city>
 <city>
 <!-- A city in Mozambique -->
- <_name>Chimoio</_name>
+ <name>Chimoio</name>
 <coordinates>-19.116389 33.483333</coordinates>
 <location>
 <name>Chimoio</name>
@@ -1680,7 +1680,7 @@
 </city>
 <city>
 <!-- A city in Mozambique -->
- <_name>Lichinga</_name>
+ <name>Lichinga</name>
 <coordinates>-13.312778 35.240556</coordinates>
 <location>
 <name>Lichinga</name>
@@ -1690,7 +1690,7 @@
 </city>
 <city>
 <!-- The capital of Mozambique -->
- <_name>Maputo</_name>
+ <name>Maputo</name>
 <coordinates>-25.965278 32.589167</coordinates>
 <location>
 <name>Maputo / Mavalane</name>
@@ -1700,7 +1700,7 @@
 </city>
 <city>
 <!-- A city in Mozambique -->
- <_name>Nampula</_name>
+ <name>Nampula</name>
 <coordinates>-15.119722 39.264722</coordinates>
 <location>
 <name>Nampula</name>
@@ -1710,7 +1710,7 @@
 </city>
 <city>
 <!-- A city in Mozambique -->
- <_name>Pemba</_name>
+ <name>Pemba</name>
 <coordinates>-12.960833 40.507778</coordinates>
 <location>
 <name>Pemba</name>
@@ -1720,7 +1720,7 @@
 </city>
 <city>
 <!-- A city in Mozambique -->
- <_name>Quelimane</_name>
+ <name>Quelimane</name>
 <coordinates>-17.878611 36.888333</coordinates>
 <location>
 <name>Quelimane</name>
@@ -1731,7 +1731,7 @@
 </country>
 <country>
 <!-- NA - Namibia -->
- <_name>Namibia</_name>
+ <name>Namibia</name>
 <iso-code>NA</iso-code>
 <fips-code>WA</fips-code>
 <timezones>
@@ -1750,7 +1750,7 @@
 </country>
 <country>
 <!-- NE - Niger -->
- <_name>Niger</_name>
+ <name>Niger</name>
 <iso-code>NE</iso-code>
 <fips-code>NG</fips-code>
 <timezones>
@@ -1759,7 +1759,7 @@
 <tz-hint>Africa/Niamey</tz-hint>
 <city>
 <!-- A city in Niger -->
- <_name>Agadez</_name>
+ <name>Agadez</name>
 <coordinates>16.973333 7.991111</coordinates>
 <location>
 <name>Agadez</name>
@@ -1769,7 +1769,7 @@
 </city>
 <city>
 <!-- The capital of Niger -->
- <_name>Niamey</_name>
+ <name>Niamey</name>
 <coordinates>13.516667 2.116667</coordinates>
 <location>
 <name>Niamey Airport</name>
@@ -1779,7 +1779,7 @@
 </city>
 <city>
 <!-- A city in Niger -->
- <_name>Zinder</_name>
+ <name>Zinder</name>
 <coordinates>13.804869 8.988371</coordinates>
 <location>
 <name>Zinder</name>
@@ -1790,7 +1790,7 @@
 </country>
 <country>
 <!-- NG - Nigeria -->
- <_name>Nigeria</_name>
+ <name>Nigeria</name>
 <!-- Could not find information about the following stations,
 which may be in Nigeria:
 DNAA DNMN 
@@ -1812,7 +1812,7 @@
 </city>
 <city>
 <!-- A city in Lagos Nigeria -->
- <_name>Ikeja</_name>
+ <name>Ikeja</name>
 <coordinates>6.596667 3.343056</coordinates>
 <location>
 <name>Ikeja</name>
@@ -1822,7 +1822,7 @@
 </city>
 <city>
 <!-- A city in Nigeria -->
- <_name>Ilorin</_name>
+ <name>Ilorin</name>
 <coordinates>8.500000 4.550000</coordinates>
 <location>
 <name>Ilorin</name>
@@ -1832,7 +1832,7 @@
 </city>
 <city>
 <!-- A city in Nigeria -->
- <_name>Kaduna</_name>
+ <name>Kaduna</name>
 <coordinates>10.523056 7.440278</coordinates>
 <location>
 <name>Kaduna</name>
@@ -1842,7 +1842,7 @@
 </city>
 <city>
 <!-- A city in Nigeria -->
- <_name>Kano</_name>
+ <name>Kano</name>
 <coordinates>11.996389 8.516667</coordinates>
 <location>
 <name>Kano</name>
@@ -1852,7 +1852,7 @@
 </city>
 <city>
 <!-- A city in Nigeria -->
- <_name>Port Harcourt</_name>
+ <name>Port Harcourt</name>
 <coordinates>4.789167 6.998611</coordinates>
 <location>
 <name>Port Harcourt</name>
@@ -1863,7 +1863,7 @@
 </country>
 <country>
 <!-- RW - Rwanda -->
- <_name>Rwanda</_name>
+ <name>Rwanda</name>
 <!-- Could not find weather stations for the following major
 cities:
 Kigali
@@ -1879,7 +1879,7 @@
 <!-- RE - Réunion, an overseas department of France in the Indian
 Ocean.
 -->
- <_name>Réunion</_name>
+ <name>Réunion</name>
 <iso-code>RE</iso-code>
 <fips-code>RE</fips-code>
 <timezones>
@@ -1888,7 +1888,7 @@
 <tz-hint>Indian/Reunion</tz-hint>
 <city>
 <!-- The capital of Réunion -->
- <_name>Saint-Denis</_name>
+ <name>Saint-Denis</name>
 <coordinates>-20.866667 55.466667</coordinates>
 <location>
 <name>Saint-Denis / Gillot</name>
@@ -1898,7 +1898,7 @@
 </city>
 <city>
 <!-- A city in Réunion -->
- <_name msgctxt="City in Réunion">Saint-Pierre</_name>
+ <name msgctxt="City in Réunion">Saint-Pierre</name>
 <coordinates>-21.316667 55.483333</coordinates>
 <location>
 <name>Saint-Pierre</name>
@@ -1912,7 +1912,7 @@
 "São Tomé and Príncipe". The official ISO 3166 short English
 name does not have the accents.
 -->
- <_name>Sao Tome and Principe</_name>
+ <name>Sao Tome and Principe</name>
 <!-- Could not find weather stations for the following major
 cities:
 São Tomé
@@ -1926,7 +1926,7 @@
 </country>
 <country>
 <!-- SN - Senegal -->
- <_name>Senegal</_name>
+ <name>Senegal</name>
 <iso-code>SN</iso-code>
 <fips-code>SG</fips-code>
 <timezones>
@@ -1935,7 +1935,7 @@
 <tz-hint>Africa/Dakar</tz-hint>
 <city>
 <!-- A city in Senegal -->
- <_name>Boukot Ouolof</_name>
+ <name>Boukot Ouolof</name>
 <coordinates>12.416389 -16.750556</coordinates>
 <location>
 <name>Cap-Skirring</name>
@@ -1945,7 +1945,7 @@
 </city>
 <city>
 <!-- The capital of Senegal -->
- <_name>Dakar</_name>
+ <name>Dakar</name>
 <coordinates>14.736667 -17.633889</coordinates>
 <location>
 <name>Dakar-Yoff Airport</name>
@@ -1955,7 +1955,7 @@
 </city>
 <city>
 <!-- A city in Senegal -->
- <_name>Saint-Louis</_name>
+ <name>Saint-Louis</name>
 <coordinates>16.032222 -16.616667</coordinates>
 <location>
 <name>Saint-Louis</name>
@@ -1965,7 +1965,7 @@
 </city>
 <city>
 <!-- A city in Senegal -->
- <_name>Tambacounda</_name>
+ <name>Tambacounda</name>
 <coordinates>13.753889 -13.758611</coordinates>
 <location>
 <name>Tambacounda</name>
@@ -1975,7 +1975,7 @@
 </city>
 <city>
 <!-- A city in Senegal -->
- <_name>Ziguinchor</_name>
+ <name>Ziguinchor</name>
 <coordinates>12.583333 -16.271944</coordinates>
 <location>
 <name>Ziguinchor</name>
@@ -1986,7 +1986,7 @@
 </country>
 <country>
 <!-- SC - Seychelles -->
- <_name>Seychelles</_name>
+ <name>Seychelles</name>
 <iso-code>SC</iso-code>
 <fips-code>SE</fips-code>
 <timezones>
@@ -1995,7 +1995,7 @@
 <tz-hint>Indian/Mahe</tz-hint>
 <city>
 <!-- A city in the Seychelles -->
- <_name>Cascade</_name>
+ <name>Cascade</name>
 <coordinates>-4.666667 55.500000</coordinates>
 <location>
 <name>Seychelles International Airport</name>
@@ -2005,7 +2005,7 @@
 </city>
 <city>
 <!-- The capital of the Seychelles -->
- <_name msgctxt="City in Seychelles">Victoria</_name>
+ <name msgctxt="City in Seychelles">Victoria</name>
 <coordinates>-4.616667 55.450000</coordinates>
 <location>
 <name>Seychelles International Airport</name>
@@ -2016,7 +2016,7 @@
 </country>
 <country>
 <!-- SL - Sierra Leone -->
- <_name>Sierra Leone</_name>
+ <name>Sierra Leone</name>
 <iso-code>SL</iso-code>
 <fips-code>SL</fips-code>
 <timezones>
@@ -2025,7 +2025,7 @@
 <tz-hint>Africa/Freetown</tz-hint>
 <city>
 <!-- The capital of Sierra Leone -->
- <_name>Freetown</_name>
+ <name>Freetown</name>
 <coordinates>8.490000 -13.234167</coordinates>
 <location>
 <name>Lungi</name>
@@ -2035,7 +2035,7 @@
 </city>
 <city>
 <!-- A city in Sierra Leone -->
- <_name>Lungi</_name>
+ <name>Lungi</name>
 <coordinates>8.640833 -13.221944</coordinates>
 <location>
 <name>Lungi</name>
@@ -2046,7 +2046,7 @@
 </country>
 <country>
 <!-- SO - Somalia -->
- <_name>Somalia</_name>
+ <name>Somalia</name>
 <!-- Could not find weather stations for the following major
 cities:
 Mogadishu
@@ -2060,7 +2060,7 @@
 </country>
 <country>
 <!-- ZA - South Africa -->
- <_name>South Africa</_name>
+ <name>South Africa</name>
 <!-- Could not find information about the following stations,
 which may be in South Africa:
 FAGC FAJB FAKN FAPN FAPP 
@@ -2073,7 +2073,7 @@
 <tz-hint>Africa/Johannesburg</tz-hint>
 <city>
 <!-- A city in South Africa -->
- <_name>Bloemfontein</_name>
+ <name>Bloemfontein</name>
 <coordinates>-29.133333 26.200000</coordinates>
 <location>
 <name>Bloemfontein Airport</name>
@@ -2083,7 +2083,7 @@
 </city>
 <city>
 <!-- A city in South Africa -->
- <_name>Cape Town</_name>
+ <name>Cape Town</name>
 <coordinates>-33.916667 18.416667</coordinates>
 <location>
 <name>Cape Town International Airport</name>
@@ -2093,7 +2093,7 @@
 </city>
 <city>
 <!-- A city in South Africa -->
- <_name>Durban</_name>
+ <name>Durban</name>
 <coordinates>-29.850000 31.016667</coordinates>
 <location>
 <name>Durban International Airport</name>
@@ -2103,7 +2103,7 @@
 </city>
 <city>
 <!-- A city in South Africa -->
- <_name>Johannesburg</_name>
+ <name>Johannesburg</name>
 <coordinates>-26.200000 28.083333</coordinates>
 <location>
 <name>O. R. Tambo International Airport</name>
@@ -2118,7 +2118,7 @@
 </city>
 <city>
 <!-- A city in South Africa -->
- <_name>Klerksdorp</_name>
+ <name>Klerksdorp</name>
 <coordinates>-26.866667 26.666667</coordinates>
 <location>
 <name>Klerksdorp</name>
@@ -2128,7 +2128,7 @@
 </city>
 <city>
 <!-- A city in South Africa -->
- <_name>Port Elizabeth</_name>
+ <name>Port Elizabeth</name>
 <coordinates>-33.966667 25.583333</coordinates>
 <location>
 <name>Port Elizabeth, Port E Apt</name>
@@ -2138,7 +2138,7 @@
 </city>
 <city>
 <!-- A city in South Africa -->
- <_name>Potchefstroom</_name>
+ <name>Potchefstroom</name>
 <coordinates>-26.716667 27.100000</coordinates>
 <location>
 <name>Potchefstroom</name>
@@ -2148,7 +2148,7 @@
 </city>
 <city>
 <!-- The capital of South Africa -->
- <_name>Pretoria</_name>
+ <name>Pretoria</name>
 <coordinates>-25.706944 28.229444</coordinates>
 <location>
 <name>Lanseria</name>
@@ -2158,7 +2158,7 @@
 </city>
 <city>
 <!-- A city in South Africa -->
- <_name>Springs</_name>
+ <name>Springs</name>
 <coordinates>-26.250000 28.400000</coordinates>
 <location>
 <name>Springs</name>
@@ -2168,7 +2168,7 @@
 </city>
 <city>
 <!-- A city in South Africa -->
- <_name>Upington</_name>
+ <name>Upington</name>
 <coordinates>-28.450000 21.250000</coordinates>
 <location>
 <name>Upington, Up-Apt</name>
@@ -2178,7 +2178,7 @@
 </city>
 <city>
 <!-- A city in South Africa -->
- <_name>Vereeniging</_name>
+ <name>Vereeniging</name>
 <coordinates>-26.666667 27.933333</coordinates>
 <location>
 <name>Vereeniging</name>
@@ -2189,7 +2189,7 @@
 </country>
 <country>
 <!-- SD - Sudan -->
- <_name>Sudan</_name>
+ <name>Sudan</name>
 <iso-code>SD</iso-code>
 <fips-code>SU</fips-code>
 <timezones>
@@ -2201,7 +2201,7 @@
 "Khartoum" is the traditional English name.
 The local name in Arabic is "Al Khartum".
 -->
- <_name>Khartoum</_name>
+ <name>Khartoum</name>
 <coordinates>15.588056 32.534167</coordinates>
 <location>
 <name>Khartoum</name>
@@ -2212,7 +2212,7 @@
 </country>
 <country>
 <!-- SZ - Swaziland -->
- <_name>Swaziland</_name>
+ <name>Swaziland</name>
 <!-- Could not find information about the following stations,
 which may be in Swaziland:
 FDBB FDHL FDST 
@@ -2225,7 +2225,7 @@
 <tz-hint>Africa/Mbabane</tz-hint>
 <city>
 <!-- The capital of Swaziland -->
- <_name>Lobamba</_name>
+ <name>Lobamba</name>
 <coordinates>-26.466667 31.200000</coordinates>
 <location>
 <name>Manzini, Matsapa Airport</name>
@@ -2235,7 +2235,7 @@
 </city>
 <city>
 <!-- A city in Swaziland -->
- <_name>Manzini</_name>
+ <name>Manzini</name>
 <coordinates>-26.483333 31.366667</coordinates>
 <location>
 <name>Matsapa Airport</name>
@@ -2245,7 +2245,7 @@
 </city>
 <city>
 <!-- The capital of Swaziland -->
- <_name>Mbabane</_name>
+ <name>Mbabane</name>
 <coordinates>-26.316667 31.133333</coordinates>
 <location>
 <name>Manzini, Matsapa Airport</name>
@@ -2256,7 +2256,7 @@
 </country>
 <country>
 <!-- TZ - United Republic of Tanzania -->
- <_name>Tanzania</_name>
+ <name>Tanzania</name>
 <!-- Could not find information about the following stations,
 which may be in Tanzania:
 HTSU 
@@ -2269,7 +2269,7 @@
 <tz-hint>Africa/Dar_es_Salaam</tz-hint>
 <city>
 <!-- A city in Tanzania -->
- <_name>Arusha</_name>
+ <name>Arusha</name>
 <coordinates>-3.366667 36.683333</coordinates>
 <location>
 <name>Arusha</name>
@@ -2279,7 +2279,7 @@
 </city>
 <city>
 <!-- A city in Tanzania -->
- <_name>Bukoba</_name>
+ <name>Bukoba</name>
 <coordinates>-1.331667 31.812222</coordinates>
 <location>
 <name>Bukoba</name>
@@ -2289,7 +2289,7 @@
 </city>
 <city>
 <!-- The capital of Tanzania -->
- <_name>Dar es Salaam</_name>
+ <name>Dar es Salaam</name>
 <coordinates>-6.800000 39.283333</coordinates>
 <location>
 <name>Dar es Salaam Airport</name>
@@ -2299,7 +2299,7 @@
 </city>
 <city>
 <!-- A city in Tanzania -->
- <_name>Dodoma</_name>
+ <name>Dodoma</name>
 <coordinates>-6.183333 35.750000</coordinates>
 <location>
 <name>Dodoma</name>
@@ -2309,7 +2309,7 @@
 </city>
 <city>
 <!-- A city in Tanzania -->
- <_name>Iringa</_name>
+ <name>Iringa</name>
 <coordinates>-7.766667 35.700000</coordinates>
 <location>
 <name>Iringa</name>
@@ -2319,7 +2319,7 @@
 </city>
 <city>
 <!-- A city in Tanzania -->
- <_name>Kigoma</_name>
+ <name>Kigoma</name>
 <coordinates>-4.876944 29.626667</coordinates>
 <location>
 <name>Kigoma</name>
@@ -2329,7 +2329,7 @@
 </city>
 <city>
 <!-- A city in Tanzania -->
- <_name>Mbeya</_name>
+ <name>Mbeya</name>
 <coordinates>-8.900000 33.450000</coordinates>
 <location>
 <name>Mbeya</name>
@@ -2339,7 +2339,7 @@
 </city>
 <city>
 <!-- A city in Tanzania -->
- <_name>Morogoro</_name>
+ <name>Morogoro</name>
 <coordinates>-6.816667 37.666667</coordinates>
 <location>
 <name>Morogoro</name>
@@ -2349,7 +2349,7 @@
 </city>
 <city>
 <!-- A city in Tanzania -->
- <_name>Moshi</_name>
+ <name>Moshi</name>
 <coordinates>-3.350000 37.333333</coordinates>
 <location>
 <name>Kilimanjaro Airport</name>
@@ -2359,7 +2359,7 @@
 </city>
 <city>
 <!-- A city in Tanzania -->
- <_name>Mtwara</_name>
+ <name>Mtwara</name>
 <coordinates>-10.266667 40.183333</coordinates>
 <location>
 <name>Mtwara</name>
@@ -2369,7 +2369,7 @@
 </city>
 <city>
 <!-- A city in Tanzania -->
- <_name>Musoma</_name>
+ <name>Musoma</name>
 <coordinates>-1.500000 33.800000</coordinates>
 <location>
 <name>Musoma</name>
@@ -2379,7 +2379,7 @@
 </city>
 <city>
 <!-- A city in Tanzania -->
- <_name>Mwanza</_name>
+ <name>Mwanza</name>
 <coordinates>-2.516667 32.900000</coordinates>
 <location>
 <name>Mwanza</name>
@@ -2389,7 +2389,7 @@
 </city>
 <city>
 <!-- A city in Tanzania -->
- <_name>Songea</_name>
+ <name>Songea</name>
 <coordinates>-10.683333 35.650000</coordinates>
 <location>
 <name>Songea</name>
@@ -2399,7 +2399,7 @@
 </city>
 <city>
 <!-- A city in Tanzania -->
- <_name>Tabora</_name>
+ <name>Tabora</name>
 <coordinates>-5.016667 32.800000</coordinates>
 <location>
 <name>Tabora Airport</name>
@@ -2409,7 +2409,7 @@
 </city>
 <city>
 <!-- A city in Tanzania -->
- <_name>Zanzibar</_name>
+ <name>Zanzibar</name>
 <coordinates>-6.166667 39.183333</coordinates>
 <location>
 <name>Zanzibar / Kisauni</name>
@@ -2420,7 +2420,7 @@
 </country>
 <country>
 <!-- TG - Togo -->
- <_name>Togo</_name>
+ <name>Togo</name>
 <iso-code>TG</iso-code>
 <fips-code>TO</fips-code>
 <timezones>
@@ -2429,7 +2429,7 @@
 <tz-hint>Africa/Lome</tz-hint>
 <city>
 <!-- The capital of Togo -->
- <_name>Lome</_name>
+ <name>Lome</name>
 <coordinates>6.131944 1.222778</coordinates>
 <location>
 <name>Lome</name>
@@ -2439,7 +2439,7 @@
 </city>
 <city>
 <!-- A city in Togo -->
- <_name>Niamtougou</_name>
+  <name>Niamtougou</name>
 <coordinates>9.768056 1.105278</coordinates>
 <location>
 <name>Niamtougou</name>
@@ -2450,7 +2450,7 @@
 </country>
 <country>
 <!-- TN - Tunisia -->
- <_name>Tunisia</_name>
+ <name>Tunisia</name>
 <iso-code>TN</iso-code>
 <fips-code>TS</fips-code>
 <timezones>
@@ -2459,7 +2459,7 @@
 <tz-hint>Africa/Tunis</tz-hint>
 <city>
 <!-- A city in Tunisia -->
- <_name>Bizerte</_name>
+ <name>Bizerte</name>
 <coordinates>37.274444 9.873889</coordinates>
 <location>
 <name>Bizerte</name>
@@ -2469,7 +2469,7 @@
 </city>
 <city>
 <!-- A city in Tunisia -->
- <_name>El Borma</_name>
+ <name>El Borma</name>
 <coordinates>31.666667 9.133333</coordinates>
 <location>
 <name>El Borma</name>
@@ -2479,7 +2479,7 @@
 </city>
 <city>
 <!-- A city in Tunisia -->
- <_name>Gabes</_name>
+ <name>Gabes</name>
 <coordinates>33.883333 10.116667</coordinates>
 <location>
 <name>Gabes</name>
@@ -2489,7 +2489,7 @@
 </city>
 <city>
 <!-- A city in Tunisia -->
- <_name>Gafsa</_name>
+ <name>Gafsa</name>
 <coordinates>34.425000 8.784167</coordinates>
 <location>
 <name>Gafsa</name>
@@ -2499,7 +2499,7 @@
 </city>
 <city>
 <!-- A city in Tunisia -->
- <_name>Houmt Souk</_name>
+ <name>Houmt Souk</name>
 <coordinates>33.874722 10.859167</coordinates>
 <location>
 <name>Djerba Mellita</name>
@@ -2509,7 +2509,7 @@
 </city>
 <city>
 <!-- A city in Tunisia -->
- <_name>Jendouba</_name>
+ <name>Jendouba</name>
 <coordinates>36.501111 8.779444</coordinates>
 <location>
 <name>Jendouba</name>
@@ -2519,7 +2519,7 @@
 </city>
 <city>
  <!-- A city in Tunisia -->
- <_name>Kairouan</_name>
+ <name>Kairouan</name>
 <coordinates>35.674444 10.101667</coordinates>
 <location>
 <name>Kairouan</name>
@@ -2529,7 +2529,7 @@
 </city>
 <city>
 <!-- A city in Tunisia -->
- <_name>Monastir</_name>
+ <name>Monastir</name>
 <coordinates>35.783333 10.833333</coordinates>
 <location>
 <name>Habib Bourguiba</name>
@@ -2539,7 +2539,7 @@
 </city>
 <city>
 <!-- A city in Tunisia -->
- <_name>Qulaybiyah</_name>
+ <name>Qulaybiyah</name>
 <coordinates>36.850000 11.100000</coordinates>
 <location>
 <name>Qulaybiyah</name>
@@ -2549,7 +2549,7 @@
 </city>
 <city>
 <!-- A city in Tunisia -->
- <_name>Remada</_name>
+ <name>Remada</name>
 <coordinates>32.316667 10.400000</coordinates>
 <location>
 <name>Remada</name>
@@ -2559,7 +2559,7 @@
 </city>
 <city>
 <!-- A city in Tunisia -->
- <_name>Sfax</_name>
+ <name>Sfax</name>
 <coordinates>34.740556 10.760278</coordinates>
 <location>
 <name>Sfax El-Maou</name>
@@ -2569,7 +2569,7 @@
 </city>
 <city>
 <!-- A city in Tunisia -->
- <_name>Tabarka</_name>
+ <name>Tabarka</name>
 <coordinates>36.954444 8.758056</coordinates>
 <location>
 <name>Tabarka</name>
@@ -2579,7 +2579,7 @@
 </city>
 <city>
 <!-- A city in Tunisia -->
- <_name>Tozeur</_name>
+ <name>Tozeur</name>
 <coordinates>33.920556 8.133333</coordinates>
 <location>
 <name>Tozeur</name>
@@ -2589,7 +2589,7 @@
 </city>
 <city>
 <!-- The capital of Tunisia -->
- <_name>Tunis</_name>
+ <name>Tunis</name>
 <coordinates>36.802778 10.179722</coordinates>
 <location>
 <name>Tunis-Carthage</name>
@@ -2600,7 +2600,7 @@
 </country>
 <country>
 <!-- UG - Uganda -->
- <_name>Uganda</_name>
+ <name>Uganda</name>
 <iso-code>UG</iso-code>
 <fips-code>UG</fips-code>
 <timezones>
@@ -2609,7 +2609,7 @@
 <tz-hint>Africa/Kampala</tz-hint>
 <city>
 <!-- A city in Uganda -->
- <_name>Arua</_name>
+ <name>Arua</name>
 <coordinates>3.019167 30.930833</coordinates>
 <location>
 <name>Arua</name>
@@ -2619,7 +2619,7 @@
 </city>
 <city>
 <!-- A city in Uganda -->
- <_name>Entebbe</_name>
+ <name>Entebbe</name>
 <coordinates>0.064444 32.446944</coordinates>
 <location>
 <name>Entebbe Airport</name>
@@ -2629,7 +2629,7 @@
 </city>
 <city>
 <!-- A city in Uganda -->
- <_name>Kabale</_name>
+ <name>Kabale</name>
 <coordinates>-1.326111 30.003889</coordinates>
 <location>
 <name>Kabale</name>
@@ -2639,7 +2639,7 @@
 </city>
 <city>
 <!-- The capital of Uganda -->
- <_name>Kampala</_name>
+ <name>Kampala</name>
 <coordinates>0.315556 32.565556</coordinates>
 <location>
 <name>Entebbe Airport</name>
@@ -2650,7 +2650,7 @@
 </country>
 <country>
 <!-- EH - Western Sahara, a disputed territory in western Africa -->
- <_name>Western Sahara</_name>
+ <name>Western Sahara</name>
 <iso-code>EH</iso-code>
 <fips-code>WI</fips-code>
 <timezones>
@@ -2660,7 +2660,7 @@
 </country>
 <country>
 <!-- ZM - Zambia -->
- <_name>Zambia</_name>
+ <name>Zambia</name>
 <iso-code>ZM</iso-code>
 <fips-code>ZA</fips-code>
 <timezones>
@@ -2669,7 +2669,7 @@
 <tz-hint>Africa/Lusaka</tz-hint>
 <city>
 <!-- A city in Zambia -->
- <_name>Chinganze</_name>
+ <name>Chinganze</name>
 <coordinates>-13.266667 31.916667</coordinates>
 <location>
 <name>Mfuwe</name>
@@ -2679,7 +2679,7 @@
 </city>
 <city>
 <!-- A city in Zambia -->
- <_name>Livingstone</_name>
+ <name>Livingstone</name>
 <coordinates>-17.850000 25.866667</coordinates>
 <location>
 <name>Livingstone</name>
@@ -2689,7 +2689,7 @@
 </city>
 <city>
 <!-- The capital of Zambia -->
- <_name>Lusaka</_name>
+ <name>Lusaka</name>
 <coordinates>-15.416667 28.283333</coordinates>
 <location>
 <name>Lusaka International Airport</name>
@@ -2699,7 +2699,7 @@
 </city>
 <city>
 <!-- A city in Zambia -->
- <_name>Ndola</_name>
+ <name>Ndola</name>
 <coordinates>-12.966667 28.633333</coordinates>
 <location>
 <name>Ndola</name>
@@ -2710,7 +2710,7 @@
 </country>
 <country>
 <!-- ZW - Zimbabwe -->
- <_name>Zimbabwe</_name>
+ <name>Zimbabwe</name>
 <!-- Could not find weather stations for the following major
 cities:
 Harare
@@ -2724,10 +2724,10 @@
 </country>
 </region>
 <region>
- <_name msgctxt="Region">Antarctica</_name>
+ <name msgctxt="Region">Antarctica</name>
 <country>
 <!-- AQ - Antarctica -->
- <_name msgctxt="Country">Antarctica</_name>
+ <name msgctxt="Country">Antarctica</name>
 <iso-code>AQ</iso-code>
 <fips-code>AY</fips-code>
 <timezones>
@@ -2737,42 +2737,42 @@
 in places where "Antarctica" is already clear from
 context.
 -->
- <_name>Palmer Station (Chile Time)</_name>
+ <name>Palmer Station (Chile Time)</name>
 </timezone>
 <timezone id="Antarctica/Rothera">
 <!-- A British research station in Antarctica. The string is
 only used in places where "Antarctica" is already clear
 from context.
 -->
- <_name>Rothera Research Station</_name>
+ <name>Rothera Research Station</name>
 </timezone>
 <timezone id="Antarctica/Syowa">
 <!-- A Japanese research station in Antarctica. The string is
 only used in places where "Antarctica" is already clear
 from context.
 -->
- <_name>Showa Station</_name>
+ <name>Showa Station</name>
 </timezone>
 <timezone id="Antarctica/Mawson">
 <!-- An Australian research station in Antarctica. The string
 is only used in places where "Antarctica" is already
 clear from context.
 -->
- <_name>Mawson Station</_name>
+ <name>Mawson Station</name>
 </timezone>
 <timezone id="Antarctica/Vostok">
 <!-- A Russian research station in Antarctica. The string is
 only used in places where "Antarctica" is already clear
 from context.
 -->
- <_name>Vostok Station</_name>
+ <name>Vostok Station</name>
 </timezone>
 <timezone id="Antarctica/Davis">
 <!-- An Australian research station in Antarctica. The string
 is only used in places where "Antarctica" is already
 clear from context.
 -->
- <_name>Davis Station</_name>
+ <name>Davis Station</name>
 </timezone>
 <timezone id="Antarctica/Casey">
 <!-- An Australian research station in Antarctica, which
@@ -2780,28 +2780,28 @@
 only used in places where "Antarctica" is already clear
 from context.
 -->
- <_name>Casey Station (Western Australia Time)</_name>
+ <name>Casey Station (Western Australia Time)</name>
 </timezone>
 <timezone id="Antarctica/DumontDUrville">
 <!-- A French research station in Antarctica. The string is
 only used in places where "Antarctica" is already clear
 from context.
 -->
- <_name>Dumont d'Urville Station</_name>
+ <name>Dumont d'Urville Station</name>
 </timezone>
 <timezone id="Antarctica/McMurdo">
 <!-- An American research station in Antarctica, which keeps
 the same time as New Zealand. The string is only used in
 places where "Antarctica" is already clear from context.
 -->
- <_name>McMurdo Station (New Zealand Time)</_name>
+ <name>McMurdo Station (New Zealand Time)</name>
 </timezone>
 <timezone id="Antarctica/South_Pole">
 <!-- An American research station in Antarctica, which keeps
 the same time as New Zealand. The string is only used in
 places where "Antarctica" is already clear from context.
 -->
- <_name>Amundsen-Scott South Pole Station (New Zealand Time)</_name>
+ <name>Amundsen-Scott South Pole Station (New Zealand Time)</name>
 </timezone>
 </timezones>
 <tz-hint>Antarctica/McMurdo</tz-hint>
@@ -2820,10 +2820,10 @@
 </country>
 </region>
 <region>
- <_name>Asia</_name>
+ <name>Asia</name>
 <country>
 <!-- AF - Afghanistan -->
- <_name>Afghanistan</_name>
+ <name>Afghanistan</name>
 <iso-code>AF</iso-code>
 <fips-code>AF</fips-code>
 <timezones>
@@ -2832,7 +2832,7 @@
 <tz-hint>Asia/Kabul</tz-hint>
 <city>
 <!-- A city in Afghanistan -->
- <_name>Herat</_name>
+ <name>Herat</name>
 <coordinates>34.346944 62.198333</coordinates>
 <location>
 <name>Herat</name>
@@ -2845,7 +2845,7 @@
 "Kabul" is the traditional English name.
 The local name in Persian is "Kabol".
 -->
- <_name>Kabul</_name>
+ <name>Kabul</name>
 <coordinates>34.516667 69.183333</coordinates>
 <location>
 <name>Kabul Airport</name>
@@ -2856,7 +2856,7 @@
 </country>
 <country>
 <!-- AM - Armenia -->
- <_name>Armenia</_name>
+ <name>Armenia</name>
 <!-- Could not find information about the following stations,
 which may be in Armenia:
 UDSG 
@@ -2869,7 +2869,7 @@
 <tz-hint>Asia/Yerevan</tz-hint>
 <city>
 <!-- The capital of Armenia -->
- <_name>Yerevan</_name>
+ <name>Yerevan</name>
 <coordinates>40.181111 44.513611</coordinates>
 <location>
 <name>Yerevan</name>
@@ -2880,7 +2880,7 @@
 </country>
 <country>
 <!-- AZ - Azerbaijan -->
- <_name>Azerbaijan</_name>
+ <name>Azerbaijan</name>
 <!-- Could not find information about the following stations,
 which may be in Azerbaijan:
 UBBN 
@@ -2896,7 +2896,7 @@
 "Baku" is the traditional English name.
 The local name is "Baki".
 -->
- <_name>Baku</_name>
+ <name>Baku</name>
 <coordinates>40.395278 49.882222</coordinates>
 <location>
 <name>Bine Airport</name>
@@ -2906,7 +2906,7 @@
 </city>
 <city>
 <!-- A city in Azerbaijan -->
- <_name>Ganca</_name>
+ <name>Ganca</name>
 <coordinates>40.682778 46.360556</coordinates>
 <location>
 <name>Ganca Airport</name>
@@ -2917,7 +2917,7 @@
 </country>
 <country>
 <!-- BD - Bangladesh -->
- <_name>Bangladesh</_name>
+ <name>Bangladesh</name>
 <!-- Could not find weather stations for the following major
 cities:
 Barisal, Cox's Bazar, Habiganj, Khulna, Rajshahi, Sylhet
@@ -2932,7 +2932,7 @@
 <!-- A city in Bangladesh.
 The local name in Bengali is "চট্টগ্রাম".
 -->
- <_name>Chittagong</_name>
+ <name>Chittagong</name>
 <coordinates>22.333056 91.836389</coordinates>
 <location>
 <name>Chittagong Patenga</name>
@@ -2944,7 +2944,7 @@
 <!-- The capital of Bangladesh.
 The local name in Bengali is "ঢাকা".
 -->
- <_name>Dhaka</_name>
+ <name>Dhaka</name>
 <coordinates>23.723056 90.408611</coordinates>
 <location>
 <name>Kurmitola, Dia</name>
@@ -2954,7 +2954,7 @@
 </city>
 <city>
 <!-- A city in Bangladesh -->
- <_name>Solpur</_name>
+ <name>Solpur</name>
 <coordinates>23.850000 90.400000</coordinates>
 <location>
 <name>Kurmitola, Dia</name>
@@ -2965,7 +2965,7 @@
 </country>
 <country>
 <!-- BT - Bhutan -->
- <_name>Bhutan</_name>
+ <name>Bhutan</name>
 <!-- Could not find weather stations for the following major
 cities:
 Thimphu
@@ -2979,7 +2979,7 @@
 </country>
 <country>
 <!-- BN - Brunei Darussalam -->
- <_name>Brunei</_name>
+ <name>Brunei</name>
 <iso-code>BN</iso-code>
 <fips-code>BX</fips-code>
 <timezones>
@@ -2988,7 +2988,7 @@
 <tz-hint>Asia/Brunei</tz-hint>
 <city>
 <!-- The capital of Brunei -->
- <_name>Bandar Seri Begawan</_name>
+ <name>Bandar Seri Begawan</name>
 <coordinates>4.883333 114.933333</coordinates>
 <location>
 <name>Bandar Seri Begawan Airport</name>
@@ -2999,7 +2999,7 @@
 </country>
 <country>
 <!-- KH - Cambodia -->
- <_name>Cambodia</_name>
+ <name>Cambodia</name>
 <iso-code>KH</iso-code>
 <fips-code>CB</fips-code>
 <timezones>
@@ -3011,7 +3011,7 @@
 "Phnom Penh" is the traditional English name.
 The local name in Khmer is "Phnum Penh".
 -->
- <_name>Phnom Penh</_name>
+ <name>Phnom Penh</name>
 <coordinates>11.550000 104.916667</coordinates>
 <location>
 <name>Phnom Penh / Pouthichentong</name>
@@ -3021,7 +3021,7 @@
 </city>
 <city>
 <!-- A city in Cambodia -->
- <_name>Siemreab</_name>
+ <name>Siemreab</name>
 <coordinates>13.366667 103.850000</coordinates>
 <location>
 <name>Siemreab</name>
@@ -3034,7 +3034,7 @@
 <!-- CN - China. (The official ISO 3166 short English name does
 not include "The People's Republic of".)
 -->
- <_name>China</_name>
+ <name>China</name>
 <!-- Could not find information about the following stations,
 which may be in China:
 ZBSJ ZJHK 
@@ -3052,13 +3052,13 @@
 <tz-hint>Asia/Shanghai</tz-hint>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Anhui</_name>
+ <name>Anhui</name>
 <fips-code>CH01</fips-code>
 <city>
 <!-- A city in Anhui in China.
 The name is also written "合肥".
 -->
- <_name>Hefei</_name>
+ <name>Hefei</name>
 <coordinates>31.863889 117.280833</coordinates>
 <location>
 <name>Hefei</name>
@@ -3069,11 +3069,11 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name msgctxt="State in China">Beijing</_name>
+ <name msgctxt="State in China">Beijing</name>
 <fips-code>CH22</fips-code>
 <city>
 <!-- The capital of China -->
- <_name msgctxt="City in Beijing, China">Beijing</_name>
+ <name msgctxt="City in Beijing, China">Beijing</name>
 <coordinates>39.928889 116.388333</coordinates>
 <location>
 <name>Beijing</name>
@@ -3084,13 +3084,13 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name msgctxt="State in China">Chongqing</_name>
+ <name msgctxt="State in China">Chongqing</name>
 <fips-code>CH33</fips-code>
 <city>
 <!-- A city in Chongqing in China.
 The name is also written "重庆".
 -->
- <_name msgctxt="City in Chongqing, China">Chongqing</_name>
+ <name msgctxt="City in Chongqing, China">Chongqing</name>
 <coordinates>29.562778 106.552778</coordinates>
 <location>
 <name>Chongqing</name>
@@ -3101,13 +3101,13 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Fujian</_name>
+ <name>Fujian</name>
 <fips-code>CH07</fips-code>
 <city>
 <!-- A city in Fujian in China.
 The name is also written "福州".
 -->
- <_name>Fuzhou</_name>
+ <name>Fuzhou</name>
 <coordinates>26.061389 119.306111</coordinates>
 <location>
 <name>Fuzhou</name>
@@ -3119,7 +3119,7 @@
 <!-- A city in Fujian in China.
 The name is also written "厦门".
 -->
- <_name>Xiamen</_name>
+ <name>Xiamen</name>
 <coordinates>24.479794 118.081869</coordinates>
 <location>
 <name>Xiamen</name>
@@ -3130,13 +3130,13 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Gansu</_name>
+ <name>Gansu</name>
 <fips-code>CH15</fips-code>
 <city>
 <!-- A city in Gansu in China.
 The name is also written "兰州".
 -->
- <_name>Lanzhou</_name>
+ <name>Lanzhou</name>
 <coordinates>36.056389 103.792222</coordinates>
 <location>
 <name>Zhongchuan Airport</name>
@@ -3147,13 +3147,13 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Guangdong</_name>
+ <name>Guangdong</name>
 <fips-code>CH30</fips-code>
 <city>
 <!-- A city in Guangdong in China.
 The name is also written "广州".
 -->
- <_name>Guangzhou</_name>
+ <name>Guangzhou</name>
 <coordinates>23.116667 113.250000</coordinates>
 <location>
 <name>Guangzhou</name>
@@ -3163,7 +3163,7 @@
 </city>
 <city>
 <!-- A city in Guangdong in China -->
- <_name>Shantou</_name>
+ <name>Shantou</name>
 <coordinates>23.368140 116.714790</coordinates>
 <location>
 <name>Shantou</name>
@@ -3173,7 +3173,7 @@
 </city>
 <city>
 <!-- A city in Guangdong in China -->
- <_name>Shenzhen</_name>
+ <name>Shenzhen</name>
 <coordinates>22.533333 114.133333</coordinates>
 <location>
 <name>Shenzhen</name>
@@ -3184,11 +3184,11 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Guangxi</_name>
+ <name>Guangxi</name>
 <fips-code>CH16</fips-code>
 <city>
 <!-- A city in Guangxi in China -->
- <_name>Guilin</_name>
+ <name>Guilin</name>
 <coordinates>25.281944 110.286389</coordinates>
 <location>
 <name>Guilin</name>
@@ -3200,7 +3200,7 @@
 <!-- A city in Guangxi in China.
 The name is also written "南宁".
 -->
- <_name>Nanning</_name>
+ <name>Nanning</name>
 <coordinates>22.816667 108.316667</coordinates>
 <location>
 <name>Nanning</name>
@@ -3211,16 +3211,16 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Guizhou</_name>
+ <name>Guizhou</name>
 <fips-code>CH18</fips-code>
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Hainan</_name>
+ <name>Hainan</name>
 <fips-code>CH31</fips-code>
 <city>
 <!-- A city in Hainan in China -->
- <_name>Sanya</_name>
+ <name>Sanya</name>
 <coordinates>18.243056 109.505000</coordinates>
 <location>
 <name>Fenghuang Airport</name>
@@ -3231,13 +3231,13 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Heilongjiang</_name>
+ <name>Heilongjiang</name>
 <fips-code>CH08</fips-code>
 <city>
 <!-- A city in Heilongjiang in China.
 The name is also written "哈尔滨".
 -->
- <_name>Harbin</_name>
+ <name>Harbin</name>
 <coordinates>45.750000 126.650000</coordinates>
 <location>
 <name>Harbin</name>
@@ -3248,13 +3248,13 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Henan</_name>
+ <name>Henan</name>
 <fips-code>CH09</fips-code>
 <city>
 <!-- A city in Henan in China.
 The name is also written "郑州".
 -->
- <_name>Zhengzhou</_name>
+ <name>Zhengzhou</name>
 <coordinates>34.757778 113.648611</coordinates>
 <location>
 <name>Zhengzhou</name>
@@ -3265,13 +3265,13 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Hubei</_name>
+ <name>Hubei</name>
 <fips-code>CH12</fips-code>
 <city>
 <!-- A city in Hubei in China.
 The name is also written "武汉".
 -->
- <_name>Wuhan</_name>
+ <name>Wuhan</name>
 <coordinates>30.583333 114.266667</coordinates>
 <location>
 <name>Wuhan</name>
@@ -3282,13 +3282,13 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Hunan</_name>
+ <name>Hunan</name>
 <fips-code>CH11</fips-code>
 <city>
 <!-- A city in Hunan in China.
 The name is also written "长沙".
 -->
- <_name>Changsha</_name>
+ <name>Changsha</name>
 <coordinates>28.200000 112.966667</coordinates>
 <location>
 <name>Changsha</name>
@@ -3299,13 +3299,13 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Inner Mongolia</_name>
+ <name>Inner Mongolia</name>
 <fips-code>CH20</fips-code>
 <city>
 <!-- A city in Inner Mongolia in China.
 The name is also written "呼和浩特".
 -->
- <_name>Hohhot</_name>
+ <name>Hohhot</name>
 <coordinates>40.810556 111.652222</coordinates>
 <location>
 <name>Hohhot</name>
@@ -3316,13 +3316,13 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Jiangsu</_name>
+ <name>Jiangsu</name>
 <fips-code>CH04</fips-code>
 <city>
 <!-- A city in Jiangsu in China.
 The name is also written "南京".
 -->
- <_name>Nanjing</_name>
+ <name>Nanjing</name>
 <coordinates>32.061667 118.777778</coordinates>
 <location>
 <name>Nanjing</name>
@@ -3333,13 +3333,13 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Jilin</_name>
+ <name>Jilin</name>
 <fips-code>CH05</fips-code>
 <city>
 <!-- A city in Jilin in China.
 The name is also written "长春".
 -->
- <_name>Changchun</_name>
+ <name>Changchun</name>
 <coordinates>43.880000 125.322778</coordinates>
 <location>
 <name>Changchun</name>
@@ -3350,11 +3350,11 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Liaoning</_name>
+ <name>Liaoning</name>
 <fips-code>CH19</fips-code>
 <city>
 <!-- A city in Liaoning in China -->
- <_name>Dalian</_name>
+ <name>Dalian</name>
 <coordinates>38.912222 121.602222</coordinates>
 <location>
 <name>Dalian</name>
@@ -3366,7 +3366,7 @@
 <!-- A city in Liaoning in China.
 The name is also written "沈阳".
 -->
- <_name>Shenyang</_name>
+ <name>Shenyang</name>
 <coordinates>41.792222 123.432778</coordinates>
 <location>
 <name>Taokian Airport</name>
@@ -3377,13 +3377,13 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Shaanxi</_name>
+ <name>Shaanxi</name>
 <fips-code>CH26</fips-code>
 <city>
 <!-- A city in Shaanxi in China.
 The name is also written "西安".
 -->
- <_name>Xi'an</_name>
+ <name>Xi'an</name>
 <coordinates>34.258333 108.928611</coordinates>
 <location>
 <name>Xi'anyang Airport</name>
@@ -3394,11 +3394,11 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Shandong</_name>
+ <name>Shandong</name>
 <fips-code>CH25</fips-code>
 <city>
 <!-- A city in Shandong in China -->
- <_name>Qingdao</_name>
+ <name>Qingdao</name>
 <coordinates>36.098611 120.371944</coordinates>
 <location>
 <name>Qingdao</name>
@@ -3409,13 +3409,13 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name msgctxt="State in China">Shanghai</_name>
+ <name msgctxt="State in China">Shanghai</name>
 <fips-code>CH23</fips-code>
 <city>
 <!-- A city in Shanghai in China.
 The name is also written "上海".
 -->
- <_name msgctxt="City in Shanghai, China">Shanghai</_name>
+ <name msgctxt="City in Shanghai, China">Shanghai</name>
 <coordinates>31.222222 121.458056</coordinates>
 <location>
 <name>Hongqiao Airport</name>
@@ -3431,13 +3431,13 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Shanxi</_name>
+ <name>Shanxi</name>
 <fips-code>CH24</fips-code>
 <city>
 <!-- A city in Shanxi in China.
 The name is also written "太原".
 -->
- <_name>Taiyuan</_name>
+ <name>Taiyuan</name>
 <coordinates>37.869444 112.560278</coordinates>
 <location>
 <name>Taiyuan</name>
@@ -3448,13 +3448,13 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Sichuan</_name>
+ <name>Sichuan</name>
 <fips-code>CH32</fips-code>
 <city>
 <!-- A city in Sichuan in China.
 The name is also written "成都".
 -->
- <_name>Chengdu</_name>
+ <name>Chengdu</name>
 <coordinates>30.666667 104.066667</coordinates>
 <location>
 <name>Chengdu</name>
@@ -3465,13 +3465,13 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name msgctxt="State in China">Tianjin</_name>
+ <name msgctxt="State in China">Tianjin</name>
 <fips-code>CH28</fips-code>
 <city>
 <!-- A city in Tianjin in China.
 The name is also written "天津".
 -->
- <_name msgctxt="City in Tianjin, China">Tianjin</_name>
+ <name msgctxt="City in Tianjin, China">Tianjin</name>
 <coordinates>39.142222 117.176667</coordinates>
 <location>
 <name>Zhangguizhu Airport</name>
@@ -3482,11 +3482,11 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Xinjiang</_name>
+ <name>Xinjiang</name>
 <fips-code>CH13</fips-code>
 <city>
 <!-- A city in Xinjiang in China -->
- <_name>Kashi</_name>
+ <name>Kashi</name>
 <coordinates>39.454722 75.979722</coordinates>
 <location>
 <name>Kashi</name>
@@ -3498,7 +3498,7 @@
 <!-- A city in Xinjiang in China.
 The name is also written "乌鲁木齐".
 -->
- <_name>Urumqi</_name>
+ <name>Urumqi</name>
 <coordinates>43.800000 87.583333</coordinates>
 <location>
 <name>Diwopu Airport</name>
@@ -3509,13 +3509,13 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Yunnan</_name>
+ <name>Yunnan</name>
 <fips-code>CH29</fips-code>
 <city>
 <!-- A city in Yunnan in China.
 The name is also written "昆明".
 -->
- <_name>Kunming</_name>
+ <name>Kunming</name>
 <coordinates>25.038889 102.718333</coordinates>
 <location>
 <name>Kunming</name>
@@ -3526,13 +3526,13 @@
 </state>
 <state>
 <!-- A state/province/territory in China -->
- <_name>Zhejiang</_name>
+ <name>Zhejiang</name>
 <fips-code>CH02</fips-code>
 <city>
 <!-- A city in Zhejiang in China.
 The name is also written "杭州".
 -->
- <_name>Hangzhou</_name>
+ <name>Hangzhou</name>
 <coordinates>30.255278 120.168889</coordinates>
 <location>
 <name>Hangzhou</name>
@@ -3544,7 +3544,7 @@
 </country>
 <country>
 <!-- GE - Georgia (the country, not the US state) -->
- <_name msgctxt="Country">Georgia</_name>
+ <name msgctxt="Country">Georgia</name>
 <iso-code>GE</iso-code>
 <fips-code>GG</fips-code>
 <timezones>
@@ -3570,7 +3570,7 @@
 <!-- HK - Hong Kong, aka "Hong Kong Special Administrative Region
 of China"
 -->
- <_name>Hong Kong</_name>
+ <name>Hong Kong</name>
 <iso-code>HK</iso-code>
 <fips-code>HK</fips-code>
 <timezones>
@@ -3579,7 +3579,7 @@
 <tz-hint>Asia/Hong_Kong</tz-hint>
 <city>
 <!-- A city in Hong Kong -->
- <_name>Kowloon</_name>
+ <name>Kowloon</name>
 <coordinates>22.316667 114.183333</coordinates>
 <location>
 <name>Hong Kong International Airport</name>
@@ -3590,7 +3590,7 @@
 </country>
 <country>
 <!-- IN - India -->
- <_name>India</_name>
+ <name>India</name>
 <!-- Could not find information about the following stations,
 which may be in India:
 VOBL VOHS 
@@ -3613,7 +3613,7 @@
 <city>
 <!-- A city in India
 the local name in Bengali is "আগরতলা/Agortôla"-->
- <_name>Agartala</_name>
+ <name>Agartala</name>
 <coordinates>23.50000 91.20000</coordinates>
 <location>
 <name>Agartala Airport</name>
@@ -3625,7 +3625,7 @@
 <!-- A city in India
 the local name in Hindi is "आगरा"
 -->
- <_name>Agra</_name>
+ <name>Agra</name>
 <coordinates>27.18000 78.02000</coordinates>
 <location>
 <name>Agra Air Force Station</name>
@@ -3635,7 +3635,7 @@
 </city>
 <city>
 <!-- A city in India -->
- <_name>Ahmadabad</_name>
+ <name>Ahmadabad</name>
 <coordinates>23.033333 72.616667</coordinates>
 <location>
 <name>Ahmadabad</name>
@@ -3646,7 +3646,7 @@
 <city>
 <!-- A city in India
 the local name in Hindi is "इलाहाबाद"-->
- <_name>Allahabad</_name>
+ <name>Allahabad</name>
 <coordinates>25.45000 81.85000</coordinates>
 <location>
 <name>Allahabad Airport</name>
@@ -3658,7 +3658,7 @@
 <!-- A city in India
 the local name in Punjabi is "ਅੰਮ੍ਰਿਤਸਰ"
 -->
- <_name>Amritsar</_name>
+ <name>Amritsar</name>
 <coordinates>31.633056 74.865556</coordinates>
 <location>
 <name>Raja Sansi International Airport</name>
@@ -3669,7 +3669,7 @@
 <city>
 <!-- A city in India
 the local name in Marathi is "औरंगाबाद"-->
- <_name>Aurangabad</_name>
+ <name>Aurangabad</name>
 <coordinates>19.78000 75.29000</coordinates>
 <location>
 <name>Chikkalthan Airport</name>
@@ -3679,7 +3679,7 @@
 </city>
 <city>
 <!-- A city in India -->
- <_name>Bagdogra</_name>
+ <name>Bagdogra</name>
 <coordinates>26.68000 88.33000</coordinates>
 <location>
 <name>Bagdogra Airport</name>
@@ -3691,7 +3691,7 @@
 <!-- A city in India - local airport
 "Bengaluru" is the new name
 -->
-	<_name>Bangalore</_name>
+	<name>Bangalore</name>
 <coordinates>12.966666 77.566666</coordinates>
 <location>
 <name>Bangalore Airport/Bengaluru Airport</name>
@@ -3708,7 +3708,7 @@
 <!-- A city in India 
 the local name in Gujrati is "ભાવનગર"
 the local name in Hindi is "भावनगर"-->
- <_name>Bhavnagar</_name>
+ <name>Bhavnagar</name>
 <coordinates>21.76000 72.15000</coordinates>
 <location>
 <name>Bhavnagar Airport</name>
@@ -3722,7 +3722,7 @@
 The local name is "Varanasi".
 The local name in Hindi is "वाराणसी".
 -->
- <_name>Benares</_name>
+ <name>Benares</name>
 <coordinates>25.333333 83.000000</coordinates>
 <location>
 <name>Benares / Babatpur</name>
@@ -3734,7 +3734,7 @@
 <!-- A city in India.
 The local name in Hindi is "भोपाल".
 -->
- <_name>Bhopal</_name>
+ <name>Bhopal</name>
 <coordinates>23.25000 77.42000</coordinates>
 <location>
 <name>Raja Bhoj Airport</name>
@@ -3746,7 +3746,7 @@
 <!-- A city in India.
 The local name in Oriya is "ଭୁବେନଶ୍ବର".
 -->
- <_name>Bhubaneshwar</_name>
+ <name>Bhubaneshwar</name>
 <coordinates>20.27000 85.84000</coordinates>
 <location>
 <name>Biju Patnaik Airport</name>
@@ -3756,7 +3756,7 @@
 </city>
 <city>
 <!-- A city in India.-->
- <_name>Bhuj</_name>
+ <name>Bhuj</name>
 <coordinates>23.27000 69.67000</coordinates>
 <location>
 <name>Bhuj Airport</name>
@@ -3768,7 +3768,7 @@
 <!-- A union territory in India.
 The local name in Hindi is "चण्डीगढ़ / चंडीगढ़"
 The local name in Punjabi is "ਚੰਡੀਗੜ੍ਹ"-->
- <_name>Chandigarh</_name>
+ <name>Chandigarh</name>
 <coordinates>30.75000 76.78000</coordinates>
 <location>
 <name>Chandigarh Airport</name>
@@ -3781,7 +3781,7 @@
 "Madras" is the traditional English name.
 The local name in Tamil is "Chennai / சென்னை".
 -->
- <_name>Chennai</_name>
+ <name>Chennai</name>
 <coordinates>13.083333 80.283333</coordinates>
 <location>
 <name>Madras / Minambakkam</name>
@@ -3793,7 +3793,7 @@
 <!-- A city in India.
 The local name in Tamil is "கோயம்புத்தூர்".
 -->
- <_name>Coimbatore</_name>
+ <name>Coimbatore</name>
 <coordinates>11.018333 76.97250</coordinates>
 <location>
 <name>Peelamedu Airport</name>
@@ -3805,7 +3805,7 @@
 <!-- A city in India
 also known as Dehra Doon
 the local name in Hindi is "देहरादून"-->
- <_name>Dehradun</_name>
+ <name>Dehradun</name>
 <coordinates>30.33000 78.06000</coordinates>
 <location>
 <name>Jolly Grant Airport</name>
@@ -3815,7 +3815,7 @@
 </city>
 <city>
 <!-- A city in India -->
- <_name>Dibrugarh</_name>
+ <name>Dibrugarh</name>
 <coordinates>27.48000 94.90000</coordinates>
 <location>
 <name>Mohanbari Airport</name>
@@ -3826,7 +3826,7 @@
 <city>
 <!-- A city in India
 the local name in Hindi is "दीमापुर"-->
- <_name>Dimapur</_name>
+ <name>Dimapur</name>
 <coordinates>25.92000 93.73000</coordinates>
 <location>
 <name>Dimapur Airport</name>
@@ -3836,7 +3836,7 @@
 </city>
 <city>
 <!-- A city in India -->
- <_name>Hyderabad</_name>
+ <name>Hyderabad</name>
 <coordinates>17.375278 78.474444</coordinates>
 <location>
 <name>Hyderabad Airport</name>
@@ -3846,7 +3846,7 @@
 </city>
 <city>
 <!-- A city in India -->
- <_name>Jaipur</_name>
+ <name>Jaipur</name>
 <coordinates>26.916667 75.816667</coordinates>
 <location>
 <name>Jaipur / Sanganer</name>
@@ -3857,7 +3857,7 @@
 <city>
 <!-- A city in India. 
 The local name in Dogri is "जम्मू" -->
- <_name>Jammu</_name>
+ <name>Jammu</name>
 <coordinates>32.73000 74.87000</coordinates>
 <location>
 <name>Jammu Airport</name>
@@ -3868,7 +3868,7 @@
 <city>
 <!-- A city in India.
 The old name is "Cochin" -->
- <_name>Kochi</_name>
+ <name>Kochi</name>
 <coordinates>9.977000 76.27000</coordinates>
 <location>
 <name>Cochin International Airport</name>
@@ -3881,7 +3881,7 @@
 "Calcutta" is the traditional English name.
 The local name in Bengali is "Kolkata / কলকাতা".
 -->
- <_name>Kolkata</_name>
+ <name>Kolkata</name>
 <coordinates>22.569722 88.369722</coordinates>
 <location>
 <name>Calcutta / Dam Dam</name>
@@ -3892,7 +3892,7 @@
 <city>
 <!-- A city in India. 
 The local name in Hindi is "लेह" -->
- <_name>Leh</_name>
+ <name>Leh</name>
 <coordinates>34.17000 77.58000</coordinates>
 <location>
 <name>Leh Kushok Bakula Rimpochee Airport</name>
@@ -3904,7 +3904,7 @@
 <!-- A city in India.
 The local name in Hindi is "लखनऊ".
 -->
- <_name>Lucknow</_name>
+ <name>Lucknow</name>
 <coordinates>26.850000 80.916667</coordinates>
 <location>
 <name>Lucknow / Amausi</name>
@@ -3917,7 +3917,7 @@
 "Bombay" is the traditional English name.
 The local name in Marathi is "Mumbai / मुंबई".
 -->
- <_name>Mumbai</_name>
+ <name>Mumbai</name>
 <coordinates>18.975000 72.825833</coordinates>
 <location>
 <name>Bombay / Santa Cruz</name>
@@ -3927,7 +3927,7 @@
 </city>
 <city>
 <!-- A city in India -->
- <_name>Nagpur</_name>
+ <name>Nagpur</name>
 <coordinates>21.150000 79.100000</coordinates>
 <location>
 <name>Nagpur Sonegaon</name>
@@ -3941,7 +3941,7 @@
 The local name in Panjabi is "ਨਵੀਂ ਦਿੱਲੀ".
 The local name in Hindi is "नई दिल्ली".
 -->
- <_name>New Delhi</_name>
+ <name>New Delhi</name>
 <coordinates>28.600000 77.200000</coordinates>
 <location>
 <name>New Delhi / Palam</name>
@@ -3951,7 +3951,7 @@
 </city>
 <city>
 <!-- A city in India -->
- <_name>Patna</_name>
+ <name>Patna</name>
 <coordinates>25.600000 85.116667</coordinates>
 <location>
 <name>Patna</name>
@@ -3961,7 +3961,7 @@
 </city>
 <city>
 <!-- A city in India -->
- <_name>Pune</_name>
+ <name>Pune</name>
 <coordinates>18.53 73.85</coordinates>
 <location>
 <name>Pune International Airport</name>
@@ -3972,7 +3972,7 @@
 <city>
 <!-- A city in India.
 The local name in Hindi is "शिमला" -->
- <_name>Shimla</_name>
+ <name>Shimla</name>
 <coordinates>31.11100 77.15400</coordinates>
 <location>
 <name>Shimla Airport</name>
@@ -3984,7 +3984,7 @@
 <!-- A city in India.
 The local name in Dogri is "श्रीनगर"
 The local name in Urdu is "شرینگر"-->
- <_name>Srinagar</_name>
+ <name>Srinagar</name>
 <coordinates>34.09000 74.79000</coordinates>
 <location>
 <name>Srinagar Airport</name>
@@ -3996,7 +3996,7 @@
 <!-- A city in India.
 The local name in Malayalam is "തിരുവനന്തപുരം".
 -->
- <_name>Thiruvananthapuram</_name>
+ <name>Thiruvananthapuram</name>
 <coordinates>8.506944 76.956944</coordinates>
 <location>
 <name>Thiruvananthapuram</name>
@@ -4008,7 +4008,7 @@
 <!-- A city in India.
 The local name in Tamil is "திருச்சிராப்பள்ளி".
 -->
- <_name>Tiruchchirappalli</_name>
+ <name>Tiruchchirappalli</name>
 <coordinates>10.805000 78.685556</coordinates>
 <location>
 <name>Tiruchchirapalli</name>
@@ -4019,7 +4019,7 @@
 </country>
 <country>
 <!-- ID - Indonesia -->
- <_name>Indonesia</_name>
+ <name>Indonesia</name>
 <!-- Could not find information about the following stations,
 which may be in Indonesia:
 WADD WALL WARR WARS WIDD WIPT
@@ -4031,26 +4031,26 @@
 <!-- The timezone on the western islands of Indonesia. The
 name in Indonesian is "Waktu Indonesia Bagian Barat".
 -->
- <_name>Western Indonesia Time</_name>
+ <name>Western Indonesia Time</name>
 <obsoletes>Asia/Pontianak</obsoletes>
 </timezone>
 <timezone id="Asia/Makassar">
 <!-- The timezone on the central islands of Indonesia. The
 name in Indonesian is "Waktu Indonesia Bagian Tengah".
 -->
- <_name>Central Indonesia Time</_name>
+ <name>Central Indonesia Time</name>
 </timezone>
 <timezone id="Asia/Jayapura">
 <!-- The timezone on the eastern islands of Indonesia. The
 name in Indonesian is "Waktu Indonesia Bagian Timur".
 -->
- <_name>Eastern Indonesia Time</_name>
+ <name>Eastern Indonesia Time</name>
 </timezone>
 </timezones>
 <tz-hint>Asia/Jakarta</tz-hint>
 <city>
 <!-- The capital of Indonesia -->
- <_name>Jakarta</_name>
+ <name>Jakarta</name>
 <coordinates>-6.174444 106.829444</coordinates>
 <location>
 <name>Soekarno-Hatta Airport</name>
@@ -4060,7 +4060,7 @@
 </city>
 <city>
 <!-- A city in Indonesia -->
- <_name>Makassar</_name>
+ <name>Makassar</name>
 <coordinates>-5.140000 119.422100</coordinates>
 <location>
 <name>Hasanuddin Airport</name>
@@ -4071,7 +4071,7 @@
 </city>
 <city>
 <!-- A city in Indonesia -->
- <_name>Medan</_name>
+ <name>Medan</name>
 <coordinates>3.583333 98.666667</coordinates>
 <location>
 <name>Polonia Airport</name>
@@ -4081,7 +4081,7 @@
 </city>
 <city>
 <!-- A city in Indonesia -->
- <_name>Palembang</_name>
+ <name>Palembang</name>
 <coordinates>-2.916667 104.750000</coordinates>
 <location>
 <name>Talangbetutu Airport</name>
@@ -4091,7 +4091,7 @@
 </city>
 <city>
 <!-- A city in Indonesia -->
- <_name>Pekanbaru</_name>
+ <name>Pekanbaru</name>
 <coordinates>0.533333 101.450000</coordinates>
 <location>
 <name>Simpangtiga Airport</name>
@@ -4101,7 +4101,7 @@
 </city>
 <city>
 <!-- A city in Indonesia -->
- <_name>Yogyakarta</_name>
+ <name>Yogyakarta</name>
 <coordinates>-7.803164 110.3398254</coordinates>
 <location>
 <name>Adisucipto International Airport</name>
@@ -4112,7 +4112,7 @@
 </country>
 <country>
 <!-- JP - Japan -->
- <_name>Japan</_name>
+ <name>Japan</name>
 <!-- Could not find information about the following stations,
 which may be in Japan:
 RJBE RJNW 
@@ -4125,7 +4125,7 @@
 <tz-hint>Asia/Tokyo</tz-hint>
 <city>
 <!-- A city in Japan -->
- <_name>Akita</_name>
+ <name>Akita</name>
 <coordinates>39.716667 140.066667</coordinates>
 <location>
 <name>Akita Airport</name>
@@ -4135,7 +4135,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Ami</_name>
+ <name>Ami</name>
 <coordinates>36.033333 140.200000</coordinates>
 <location>
 <name>Kasumigaura Air Base</name>
@@ -4145,7 +4145,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Aomori</_name>
+ <name>Aomori</name>
 <coordinates>40.821111 140.751111</coordinates>
 <location>
 <name>Aomori Airport</name>
@@ -4155,7 +4155,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Asahikawa</_name>
+ <name>Asahikawa</name>
 <coordinates>43.767778 142.370278</coordinates>
 <location>
 <name>Asahikawa Airport</name>
@@ -4165,7 +4165,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Ashiya</_name>
+ <name>Ashiya</name>
 <coordinates>33.883333 130.666667</coordinates>
 <location>
 <name>Ashiya Air Base</name>
@@ -4175,7 +4175,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Chitose</_name>
+ <name>Chitose</name>
 <coordinates>42.819444 141.652222</coordinates>
 <location>
 <name>Chitose Air Base</name>
@@ -4190,7 +4190,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Chofu</_name>
+ <name>Chofu</name>
 <coordinates>35.655556 139.552222</coordinates>
 <location>
 <name>Chofu Airport</name>
@@ -4200,7 +4200,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Fuji</_name>
+ <name>Fuji</name>
 <coordinates>35.166667 138.683333</coordinates>
 <location>
 <name>Fuji Air Base</name>
@@ -4210,7 +4210,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Fukue</_name>
+ <name>Fukue</name>
 <coordinates>32.688056 128.841944</coordinates>
 <location>
 <name>Fukue Airport</name>
@@ -4220,7 +4220,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Fukuoka</_name>
+ <name>Fukuoka</name>
 <coordinates>33.583333 130.400000</coordinates>
 <location>
 <name>Fukuoka Airport</name>
@@ -4230,7 +4230,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Futemma</_name>
+ <name>Futemma</name>
 <coordinates>26.287222 127.773056</coordinates>
 <location>
 <name>Futenma Marine Corps Air Facility</name>
@@ -4240,7 +4240,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Gifu</_name>
+ <name>Gifu</name>
 <coordinates>35.416667 136.750000</coordinates>
 <location>
 <name>Gifu Air Base</name>
@@ -4250,7 +4250,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Hakodate</_name>
+ <name>Hakodate</name>
 <coordinates>41.775833 140.736667</coordinates>
 <location>
 <name>Hakodate Airport</name>
@@ -4260,7 +4260,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Hamamatsu</_name>
+ <name>Hamamatsu</name>
 <coordinates>34.700000 137.733333</coordinates>
 <location>
 <name>Hamamatsu Air Base</name>
@@ -4270,7 +4270,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Hamanaka</_name>
+ <name>Hamanaka</name>
 <coordinates>38.816667 139.783333</coordinates>
 <location>
 <name>Shonai</name>
@@ -4280,7 +4280,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Hanamaki</_name>
+ <name>Hanamaki</name>
 <coordinates>39.383333 141.116667</coordinates>
 <location>
 <name>Hanamaki Airport</name>
@@ -4290,7 +4290,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Hiroshima</_name>
+ <name>Hiroshima</name>
 <coordinates>34.400000 132.450000</coordinates>
 <location>
 <name>Hiroshimanishi</name>
@@ -4305,7 +4305,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Hofu</_name>
+ <name>Hofu</name>
 <coordinates>34.050000 131.566667</coordinates>
 <location>
 <name>Hofu Air Base</name>
@@ -4315,7 +4315,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Ishigaki</_name>
+ <name>Ishigaki</name>
 <coordinates>24.333333 124.150000</coordinates>
 <location>
 <name>Ishigakijima</name>
@@ -4325,7 +4325,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Iwakuni</_name>
+ <name>Iwakuni</name>
 <coordinates>34.150000 132.183333</coordinates>
 <location>
 <name>Iwakuni Marine Corps Air Station</name>
@@ -4335,7 +4335,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Izumo</_name>
+ <name>Izumo</name>
 <coordinates>35.366667 132.766667</coordinates>
 <location>
 <name>Izumo Airport</name>
@@ -4345,7 +4345,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Janado</_name>
+ <name>Janado</name>
 <coordinates>26.333333 126.800000</coordinates>
 <location>
 <name>Kumejima</name>
@@ -4355,7 +4355,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Kadena</_name>
+ <name>Kadena</name>
 <coordinates>26.366667 127.750000</coordinates>
 <location>
 <name>Kadena Air Base</name>
@@ -4365,7 +4365,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Kagoshima</_name>
+ <name>Kagoshima</name>
 <coordinates>31.600000 130.550000</coordinates>
 <location>
 <name>Kagoshima Airport</name>
@@ -4375,7 +4375,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Kanayama</_name>
+ <name>Kanayama</name>
 <coordinates>33.683333 135.350000</coordinates>
 <location>
 <name>Nankishirahama Airport</name>
@@ -4385,7 +4385,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Kanoya</_name>
+ <name>Kanoya</name>
 <coordinates>31.383333 130.850000</coordinates>
 <location>
 <name>Kanoya Air Base</name>
@@ -4395,7 +4395,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Kashoji</_name>
+ <name>Kashoji</name>
 <coordinates>34.400000 135.283333</coordinates>
 <location>
 <name>Kansai International Airport</name>
@@ -4405,7 +4405,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Kitakyushu</_name>
+ <name>Kitakyushu</name>
 <coordinates>33.833333 130.833333</coordinates>
 <location>
 <name>Kitakyushu Airport</name>
@@ -4415,7 +4415,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Kochi</_name>
+ <name>Kochi</name>
 <coordinates>33.550000 133.550000</coordinates>
 <location>
 <name>Kochi Airport</name>
@@ -4425,7 +4425,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Komatsu</_name>
+ <name>Komatsu</name>
 <coordinates>36.400000 136.450000</coordinates>
 <location>
 <name>Komatsu Air Base</name>
@@ -4435,7 +4435,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Komatsushima</_name>
+ <name>Komatsushima</name>
 <coordinates>34.000000 134.583333</coordinates>
 <location>
 <name>Komatsujima Air Base</name>
@@ -4445,7 +4445,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Kumamoto</_name>
+ <name>Kumamoto</name>
 <coordinates>32.800000 130.716667</coordinates>
 <location>
 <name>Kumamoto Airport</name>
@@ -4455,7 +4455,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Kushiro</_name>
+ <name>Kushiro</name>
 <coordinates>42.975000 144.374722</coordinates>
 <location>
 <name>Kushiro Airport</name>
@@ -4465,7 +4465,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Matsubara</_name>
+ <name>Matsubara</name>
 <coordinates>24.783333 125.266667</coordinates>
 <location>
 <name>Miyakojima</name>
@@ -4475,7 +4475,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Matsumoto</_name>
+ <name>Matsumoto</name>
 <coordinates>36.233333 137.966667</coordinates>
 <location>
 <name>Matsumoto Airport</name>
@@ -4485,7 +4485,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Matsushima</_name>
+ <name>Matsushima</name>
 <coordinates>38.366667 141.071667</coordinates>
 <location>
 <name>Matsushima Air Base</name>
@@ -4495,7 +4495,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Matsuyama</_name>
+ <name>Matsuyama</name>
 <coordinates>33.836389 132.753056</coordinates>
 <location>
 <name>Matsuyama Airport</name>
@@ -4505,7 +4505,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Memambetsu</_name>
+ <name>Memambetsu</name>
 <coordinates>43.907222 144.173889</coordinates>
 <location>
 <name>Memambetsu Airport</name>
@@ -4515,7 +4515,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Mihonoseki</_name>
+ <name>Mihonoseki</name>
 <coordinates>35.566667 133.316667</coordinates>
 <location>
 <name>Miho Air Base</name>
@@ -4525,7 +4525,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Minami</_name>
+ <name>Minami</name>
 <coordinates>24.783333 141.316667</coordinates>
 <location>
 <name>Iwojima</name>
@@ -4535,7 +4535,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Misawa</_name>
+ <name>Misawa</name>
 <coordinates>40.683611 141.359722</coordinates>
 <location>
 <name>Misawa Air Base</name>
@@ -4545,7 +4545,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Mito</_name>
+ <name>Mito</name>
 <coordinates>36.366667 140.466667</coordinates>
 <location>
 <name>Hyakuri Air Base</name>
@@ -4555,7 +4555,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Miyazaki</_name>
+ <name>Miyazaki</name>
 <coordinates>31.900000 131.433333</coordinates>
 <location>
 <name>Miyazaki Airport</name>
@@ -4565,7 +4565,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Mombetsu</_name>
+ <name>Mombetsu</name>
 <coordinates>44.352500 143.352500</coordinates>
 <location>
 <name>Mombetsu Airport</name>
@@ -4575,7 +4575,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Nagasaki</_name>
+ <name>Nagasaki</name>
 <coordinates>32.755000 129.868333</coordinates>
 <location>
 <name>Nagasaki Airport</name>
@@ -4585,7 +4585,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Nagoya</_name>
+ <name>Nagoya</name>
 <coordinates>35.166667 136.916667</coordinates>
 <location>
 <name>Nagoya Airport</name>
@@ -4595,7 +4595,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Naha</_name>
+ <name>Naha</name>
 <coordinates>26.207222 127.673333</coordinates>
 <location>
 <name>Naha Airport</name>
@@ -4605,7 +4605,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Naka-shibetsu</_name>
+ <name>Naka-shibetsu</name>
 <coordinates>43.550000 144.983333</coordinates>
 <location>
 <name>Naka-shibetsu Airport</name>
@@ -4615,7 +4615,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Niigata</_name>
+ <name>Niigata</name>
 <coordinates>37.916667 139.050000</coordinates>
 <location>
 <name>Niigata Airport</name>
@@ -4625,7 +4625,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Obihiro</_name>
+ <name>Obihiro</name>
 <coordinates>42.917222 143.204444</coordinates>
 <location>
 <name>Tokachi Japanese Ground Self Defense Force</name>
@@ -4640,7 +4640,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Odaira</_name>
+ <name>Odaira</name>
 <coordinates>30.550000 130.966667</coordinates>
 <location>
 <name>Tanegashima Airport</name>
@@ -4650,7 +4650,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Odaka</_name>
+ <name>Odaka</name>
 <coordinates>37.200000 140.416667</coordinates>
 <location>
 <name>Fukushima Airport</name>
@@ -4660,7 +4660,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Odate</_name>
+ <name>Odate</name>
 <coordinates>40.268611 140.568333</coordinates>
 <location>
 <name>Odate-Noshiro Airport</name>
@@ -4670,7 +4670,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Ofunakoshi</_name>
+ <name>Ofunakoshi</name>
 <coordinates>34.273333 129.354722</coordinates>
 <location>
 <name>Tsushima Airport</name>
@@ -4680,7 +4680,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Ogimachiya</_name>
+ <name>Ogimachiya</name>
 <coordinates>35.833333 139.400000</coordinates>
 <location>
 <name>Iruma Air Base</name>
@@ -4690,7 +4690,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Oita</_name>
+ <name>Oita</name>
 <coordinates>33.237222 131.604444</coordinates>
 <location>
 <name>Oita Airport</name>
@@ -4700,7 +4700,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Okata</_name>
+ <name>Okata</name>
 <coordinates>34.783333 139.383333</coordinates>
 <location>
 <name>Oshima Airport</name>
@@ -4710,7 +4710,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Okayama</_name>
+ <name>Okayama</name>
 <coordinates>34.650000 133.916667</coordinates>
 <location>
 <name>Okayama Airport</name>
@@ -4720,7 +4720,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Okazato</_name>
+ <name>Okazato</name>
 <coordinates>33.100000 139.783333</coordinates>
  <location>
 <name>Hachijojima Airport</name>
@@ -4730,7 +4730,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Osaka</_name>
+ <name>Osaka</name>
 <coordinates>34.666667 135.500000</coordinates>
 <location>
 <name>Osaka International Airport</name>
@@ -4740,7 +4740,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Ozuki</_name>
+ <name>Ozuki</name>
 <coordinates>34.066667 131.033333</coordinates>
 <location>
 <name>Ozuki Air Base</name>
@@ -4750,7 +4750,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Saga</_name>
+ <name>Saga</name>
 <coordinates>33.250000 130.300000</coordinates>
 <location>
 <name>Saga Airport</name>
@@ -4760,7 +4760,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Sanrizuka</_name>
+ <name>Sanrizuka</name>
 <coordinates>35.750000 140.383333</coordinates>
 <location>
 <name>New Tokyo International Airport</name>
@@ -4770,7 +4770,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Sawada</_name>
+ <name>Sawada</name>
 <coordinates>24.833333 125.166667</coordinates>
 <location>
 <name>Shimoji-Shima Island</name>
@@ -4780,7 +4780,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Sendai</_name>
+ <name>Sendai</name>
 <coordinates>38.254722 140.884722</coordinates>
 <location>
 <name>Kasuminome Air Base</name>
@@ -4795,7 +4795,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Shiroi</_name>
+ <name>Shiroi</name>
 <coordinates>35.800000 140.066667</coordinates>
 <location>
 <name>Shimofusa Air Base</name>
@@ -4805,7 +4805,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Takamatsu</_name>
+ <name>Takamatsu</name>
 <coordinates>34.333333 134.050000</coordinates>
 <location>
 <name>Takamatsu Airport</name>
@@ -4815,7 +4815,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Takatsu</_name>
+ <name>Takatsu</name>
 <coordinates>34.683333 131.783333</coordinates>
 <location>
 <name>Iwami Airport</name>
@@ -4825,7 +4825,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Tateyama</_name>
+ <name>Tateyama</name>
 <coordinates>34.983333 139.866667</coordinates>
 <location>
 <name>Tateyama Air Base</name>
@@ -4835,7 +4835,7 @@
 </city>
 <city>
 <!-- The capital of Japan -->
- <_name>Tokyo</_name>
+ <name>Tokyo</name>
 <coordinates>35.685000 139.751389</coordinates>
 <location>
 <name>Tokyo Heliport</name>
@@ -4850,7 +4850,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Tottori</_name>
+ <name>Tottori</name>
 <coordinates>35.500000 134.233333</coordinates>
 <location>
 <name>Tottori Airport</name>
@@ -4860,7 +4860,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Toyama</_name>
+ <name>Toyama</name>
 <coordinates>36.683333 137.216667</coordinates>
 <location>
 <name>Toyama Airport</name>
@@ -4870,7 +4870,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Toyooka</_name>
+ <name>Toyooka</name>
 <coordinates>35.533333 134.833333</coordinates>
 <location>
 <name>Tajima</name>
@@ -4880,7 +4880,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Tsuiki</_name>
+ <name>Tsuiki</name>
 <coordinates>33.666667 131.050000</coordinates>
 <location>
 <name>Tsuiki Air Base</name>
@@ -4890,7 +4890,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Ushuku</_name>
+ <name>Ushuku</name>
 <coordinates>28.450000 129.716667</coordinates>
 <location>
 <name>Amami Airport</name>
@@ -4900,7 +4900,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Wakkanai</_name>
+ <name>Wakkanai</name>
 <coordinates>45.409444 141.673889</coordinates>
 <location>
 <name>Wakkanai Airport</name>
@@ -4910,7 +4910,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Yamagata</_name>
+ <name>Yamagata</name>
 <coordinates>38.252778 140.337500</coordinates>
 <location>
 <name>Yamagata Airport</name>
@@ -4920,7 +4920,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Yamaguchi</_name>
+ <name>Yamaguchi</name>
 <coordinates>34.166667 131.483333</coordinates>
 <location>
 <name>Yamaguchi Ube Airport</name>
@@ -4930,7 +4930,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Yao</_name>
+ <name>Yao</name>
 <coordinates>34.616667 135.600000</coordinates>
 <location>
 <name>Yao Airport</name>
@@ -4940,7 +4940,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Yokota</_name>
+ <name>Yokota</name>
 <coordinates>35.750000 139.383333</coordinates>
 <location>
 <name>Yokota Air Base</name>
@@ -4950,7 +4950,7 @@
 </city>
 <city>
 <!-- A city in Japan -->
- <_name>Yoshinaga</_name>
+ <name>Yoshinaga</name>
 <coordinates>34.800000 138.300000</coordinates>
 <location>
 <name>Shizuhama Air Base</name>
@@ -4961,7 +4961,7 @@
 </country>
 <country>
 <!-- KZ - Kazakhstan -->
- <_name>Kazakhstan</_name>
+ <name>Kazakhstan</name>
 <iso-code>KZ</iso-code>
 <fips-code>KZ</fips-code>
 <pref-lang>kaz</pref-lang>
@@ -4970,14 +4970,14 @@
 <!-- The time zone used in the eastern half of Kazakhstan.
 FIXME: is there an official name for this zone?
 -->
- <_name>Eastern Kazakhstan</_name>
+ <name>Eastern Kazakhstan</name>
 <obsoletes>Asia/Qyzylorda</obsoletes>
 </timezone>
 <timezone id="Asia/Aqtobe">
 <!-- The time zone used in the western half of Kazakhstan.
 FIXME: is there an official name for this zone?
 -->
- <_name>Western Kazakhstan</_name>
+ <name>Western Kazakhstan</name>
 <obsoletes>Asia/Aqtau</obsoletes>
 <obsoletes>Asia/Oral</obsoletes>
 </timezone>
@@ -4985,7 +4985,7 @@
 <tz-hint>Asia/Almaty</tz-hint>
 <city>
 <!-- A city in Kazakhstan -->
- <_name>Almaty</_name>
+ <name>Almaty</name>
 <coordinates>43.250000 76.950000</coordinates>
 <location>
 <name>Almaty</name>
@@ -4995,7 +4995,7 @@
 </city>
 <city>
 <!-- A city in Kazakhstan -->
- <_name>Aktau</_name>
+ <name>Aktau</name>
 <coordinates>43.650000 51.200000</coordinates>
 <location>
 <name>Aktau</name>
@@ -5006,7 +5006,7 @@
 </city>
 <city>
 <!-- A city in Kazakhstan -->
- <_name>Aktobe</_name>
+ <name>Aktobe</name>
 <coordinates>50.298056 57.181389</coordinates>
 <location>
 <name>Aktobe</name>
@@ -5017,7 +5017,7 @@
 </city>
 <city>
 <!-- The capital of Kazakhstan -->
- <_name>Astana</_name>
+ <name>Astana</name>
 <coordinates>51.181111 71.427778</coordinates>
 <location>
 <name>Astana</name>
@@ -5027,7 +5027,7 @@
 </city>
 <city>
 <!-- A city in Kazakhstan -->
- <_name>Atyrau</_name>
+ <name>Atyrau</name>
 <coordinates>47.105000 51.920000</coordinates>
 <location>
 <name>Atyrau Airport</name>
@@ -5040,7 +5040,7 @@
 <!-- A city in Kazakhstan.
 The local name in Russian is "Balkhash". 
 -->
- <_name>Balqash</_name>
+ <name>Balqash</name>
 <coordinates>46.840000 74.975000</coordinates>
 <location>
 <name>Balqash Airport</name>
@@ -5050,7 +5050,7 @@
 </city>
 <city>
 <!-- A city in Kazakhstan -->
- <_name>Karaganda</_name>
+ <name>Karaganda</name>
 <coordinates>49.798889 73.099444</coordinates>
 <location>
 <name>Karaganda</name>
@@ -5060,7 +5060,7 @@
 </city>
 <city>
 <!-- A city in Kazakhstan -->
- <_name>Kokshetau</_name>
+ <name>Kokshetau</name>
 <coordinates>53.275000 69.390000</coordinates>
 <location>
 <name>Kokshetau Airport</name>
@@ -5070,7 +5070,7 @@
 </city>
 <city>
 <!-- A city in Kazakhstan -->
- <_name>Kostanay</_name>
+ <name>Kostanay</name>
 <coordinates>53.166667 63.583333</coordinates>
 <location>
 <name>Kostanay</name>
@@ -5080,7 +5080,7 @@
 </city>
 <city>
 <!-- A city in Kazakhstan -->
- <_name>Kyzylorda</_name>
+ <name>Kyzylorda</name>
 <coordinates>44.852778 65.509167</coordinates>
 <location>
 <name>Kyzylorda</name>
@@ -5092,7 +5092,7 @@
 <!-- A city in Kazakhstan.
 The local name in Russian is "Ural'sk".
 -->
- <_name>Oral</_name>
+ <name>Oral</name>
 <coordinates>51.233333 51.366667</coordinates>
 <location>
 <name>Oral</name>
@@ -5104,7 +5104,7 @@
 <city>
 <!-- A city in Kazakhstan.
 -->
- <_name>Oskemen</_name>
+ <name>Oskemen</name>
 <coordinates>49.960000 82.606000</coordinates>
 <location>
 <name>Oskemen Airport</name>
@@ -5116,7 +5116,7 @@
 <!-- A city in Kazakhstan.
 The local name in Russian is "Petropavlovsk".
 -->
- <_name>Petropavl</_name>
+ <name>Petropavl</name>
  <coordinates>54.864427 69.133755</coordinates>
 <location>
 <name>Petropavl Airport</name>
@@ -5126,7 +5126,7 @@
 </city>
 <city>
 <!-- A city in Kazakhstan -->
- <_name>Pavlodar</_name>
+ <name>Pavlodar</name>
 <coordinates>52.264656, 76.970022</coordinates>
 <location>
 <name>Pavlodar Airport</name>
@@ -5136,7 +5136,7 @@
 </city>
 <city>
 <!-- A city in Kazakhstan -->
- <_name>Semey</_name>
+ <name>Semey</name>
 <coordinates>50.413720 80.233534</coordinates>
 <location>
 <name>Semey Airport</name>
@@ -5146,7 +5146,7 @@
 </city>
 <city>
 <!-- A city in Kazakhstan -->
- <_name>Shymkent</_name>
+ <name>Shymkent</name>
 <coordinates>42.300000 69.600000</coordinates>
 <location>
 <name>Shymkent</name>
@@ -5156,7 +5156,7 @@
 </city>
 <city>
 <!-- A city in Kazakhstan -->
- <_name>Taraz</_name>
+ <name>Taraz</name>
 <coordinates>42.901070 71.378531</coordinates>
 <location>
 <name>Taraz Airport</name>
@@ -5167,7 +5167,7 @@
 </country>
 <country>
 <!-- KG - Kyrgyzstan -->
- <_name>Kyrgyzstan</_name>
+ <name>Kyrgyzstan</name>
 <!-- Could not find information about the following stations,
 which may be in Kyrgyzstan:
 UAFO 
@@ -5180,7 +5180,7 @@
 <tz-hint>Asia/Bishkek</tz-hint>
 <city>
 <!-- The capital of Kyrgyzstan -->
- <_name>Bishkek</_name>
+ <name>Bishkek</name>
 <coordinates>42.873056 74.600278</coordinates>
 <location>
 <name>Manas Airport</name>
@@ -5191,7 +5191,7 @@
 </country>
 <country>
 <!-- LA - Lao People's Democratic Republic -->
- <_name>Laos</_name>
+ <name>Laos</name>
 <!-- Could not find weather stations for the following major
 cities:
 Muang Phonsavan
@@ -5207,7 +5207,7 @@
 "Vientiane" is the traditional English name.
  The local name in Lao is "Viangchan".
 -->
- <_name>Vientiane</_name>
+ <name>Vientiane</name>
 <coordinates>17.966667 102.600000</coordinates>
 <location>
 <name>Vientiane</name>
@@ -5222,7 +5222,7 @@
 used. The "u" spelling is currently slightly more popular in
 English.)
 -->
- <_name msgctxt="Country">Macau</_name>
+ <name msgctxt="Country">Macau</name>
 <iso-code>MO</iso-code>
 <fips-code>MC</fips-code>
 <timezones>
@@ -5233,7 +5233,7 @@
 <!-- The capital of Macau.
 The local name in Chinese is "Aomen / 澳门".
 -->
- <_name msgctxt="City in Macau">Macau</_name>
+ <name msgctxt="City in Macau">Macau</name>
 <coordinates>22.200556 113.546111</coordinates>
 <location>
 <name>Taipa</name>
@@ -5245,7 +5245,7 @@
 <!-- A city in Macau.
 The local name in Chinese is "Dangzai / 氹仔".
 -->
- <_name>Taipa</_name>
+ <name>Taipa</name>
 <coordinates>22.155833 113.556944</coordinates>
 <location>
 <name>Taipa</name>
@@ -5256,7 +5256,7 @@
 </country>
 <country>
 <!-- MY - Malaysia -->
- <_name>Malaysia</_name>
+ <name>Malaysia</name>
 <!-- Could not find information about the following stations,
 which may be in Malaysia:
 WBGY WMAU WMKA WMKB WMKI WMKN 
@@ -5271,7 +5271,7 @@
 <tz-hint>Asia/Kuala_Lumpur</tz-hint>
 <city>
 <!-- A city in Malaysia -->
- <_name>Bintulu</_name>
+ <name>Bintulu</name>
 <coordinates>3.166667 113.033333</coordinates>
 <location>
 <name>Bintulu</name>
@@ -5281,7 +5281,7 @@
 </city>
 <city>
 <!-- A city in Malaysia -->
- <_name msgctxt="City in Malaysia">George Town</_name>
+ <name msgctxt="City in Malaysia">George Town</name>
 <coordinates>5.416667 100.333333</coordinates>
 <location>
 <name>Bayan Lepas Airport</name>
@@ -5291,7 +5291,7 @@
 </city>
 <city>
 <!-- A city in Malaysia -->
- <_name>Johor Bahru</_name>
+ <name>Johor Bahru</name>
 <coordinates>1.466667 103.750000</coordinates>
 <location>
 <name>Senai Airport</name>
@@ -5301,7 +5301,7 @@
 </city>
 <city>
 <!-- A city in Malaysia -->
- <_name>Klang</_name>
+ <name>Klang</name>
 <coordinates>3.033333 101.450000</coordinates>
 <location>
 <name>Subang, Sultan Abdul Aziz Shah Airport</name>
@@ -5311,7 +5311,7 @@
 </city>
 <city>
 <!-- A city in Malaysia -->
- <_name>Kota Baharu</_name>
+ <name>Kota Baharu</name>
 <coordinates>6.133333 102.250000</coordinates>
 <location>
 <name>Kota Baharu</name>
@@ -5321,7 +5321,7 @@
 </city>
 <city>
 <!-- A city in Malaysia -->
- <_name>Kota Kinabalu</_name>
+ <name>Kota Kinabalu</name>
 <coordinates>5.983333 116.066667</coordinates>
 <location>
 <name>Kota Kinabalu</name>
@@ -5331,7 +5331,7 @@
 </city>
 <city>
 <!-- A city in Malaysia -->
- <_name>Kuah</_name>
+ <name>Kuah</name>
 <coordinates>6.316667 99.850000</coordinates>
 <location>
 <name>Kuah</name>
@@ -5341,7 +5341,7 @@
 </city>
 <city>
 <!-- The capital of Malaysia -->
- <_name>Kuala Lumpur</_name>
+ <name>Kuala Lumpur</name>
 <coordinates>3.166667 101.700000</coordinates>
 <location>
 <name>Subang, Sultan Abdul Aziz Shah Airport</name>
@@ -5351,7 +5351,7 @@
 </city>
 <city>
 <!-- A city in Malaysia -->
- <_name>Kuantan</_name>
+ <name>Kuantan</name>
 <coordinates>3.800000 103.333333</coordinates>
 <location>
 <name>Kuantan</name>
@@ -5361,7 +5361,7 @@
 </city>
 <city>
 <!-- A city in Malaysia -->
- <_name>Kuching</_name>
+ <name>Kuching</name>
 <coordinates>1.550000 110.333333</coordinates>
 <location>
 <name>Kuching</name>
@@ -5371,7 +5371,7 @@
 </city>
 <city>
 <!-- A city in Malaysia -->
- <_name>Kudat</_name>
+ <name>Kudat</name>
 <coordinates>6.879722 116.849167</coordinates>
 <location>
 <name>Kudat</name>
@@ -5381,7 +5381,7 @@
 </city>
 <city>
 <!-- A city in Malaysia -->
- <_name>Melaka</_name>
+ <name>Melaka</name>
 <coordinates>2.196944 102.248056</coordinates>
 <location>
 <name>Melaka</name>
@@ -5391,7 +5391,7 @@
 </city>
 <city>
 <!-- A city in Malaysia -->
- <_name>Miri</_name>
+ <name>Miri</name>
 <coordinates>4.383333 113.983333</coordinates>
 <location>
 <name>Miri</name>
@@ -5401,7 +5401,7 @@
 </city>
 <city>
 <!-- A city in Malaysia -->
- <_name>Sandakan</_name>
+ <name>Sandakan</name>
 <coordinates>5.833333 118.116667</coordinates>
 <location>
 <name>Sandakan</name>
@@ -5411,7 +5411,7 @@
 </city>
 <city>
 <!-- A city in Malaysia -->
- <_name>Sepang</_name>
+ <name>Sepang</name>
 <coordinates>2.700000 101.750000</coordinates>
 <location>
 <name>KL International Airport</name>
@@ -5421,7 +5421,7 @@
 </city>
 <city>
 <!-- A city in Malaysia -->
- <_name>Sibu</_name>
+ <name>Sibu</name>
 <coordinates>2.300000 111.816667</coordinates>
 <location>
 <name>Sibu</name>
@@ -5431,7 +5431,7 @@
 </city>
 <city>
 <!-- A city in Malaysia -->
- <_name>Sitiawan</_name>
+ <name>Sitiawan</name>
 <coordinates>4.216667 100.700000</coordinates>
 <location>
 <name>Sitiawan</name>
@@ -5441,7 +5441,7 @@
 </city>
 <city>
 <!-- A city in Malaysia -->
- <_name>Tawau</_name>
+ <name>Tawau</name>
 <coordinates>4.250000 117.900000</coordinates>
 <location>
 <name>Tawau</name>
@@ -5451,7 +5451,7 @@
 </city>
 <city>
 <!-- A city in Malaysia -->
- <_name msgctxt="City in Malaysia">Victoria</_name>
+ <name msgctxt="City in Malaysia">Victoria</name>
 <coordinates>5.276667 115.241667</coordinates>
 <location>
 <name>Victoria</name>
@@ -5462,7 +5462,7 @@
 </country>
 <country>
 <!-- MV - Maldives -->
- <_name>Maldives</_name>
+ <name>Maldives</name>
 <iso-code>MV</iso-code>
 <fips-code>MV</fips-code>
 <timezones>
@@ -5474,7 +5474,7 @@
 "Male" is the traditional English name.
 The local name in Dhivehi is "Maale".
 -->
- <_name>Male</_name>
+ <name>Male</name>
 <coordinates>4.166667 73.500000</coordinates>
 <location>
 <name>Male</name>
@@ -5485,7 +5485,7 @@
 </country>
 <country>
 <!-- MN - Mongolia -->
- <_name>Mongolia</_name>
+ <name>Mongolia</name>
 <iso-code>MN</iso-code>
 <fips-code>MG</fips-code>
 <timezones>
@@ -5493,19 +5493,19 @@
 <!-- The time zone used in the eastern part of Mongolia.
 FIXME: Is there an official name for this zone?
 -->
- <_name>Eastern Mongolia</_name>
+ <name>Eastern Mongolia</name>
 </timezone>
 <timezone id="Asia/Hovd">
 <!-- The time zone used in the western part of Mongolia.
 FIXME: Is there an official name for this zone?
 -->
- <_name>Western Mongolia</_name>
+ <name>Western Mongolia</name>
 </timezone>
 <timezone id="Asia/Ulaanbaatar">
 <!-- The time zone used in the central part of Mongolia.
 FIXME: Is there an official name for this zone?
 -->
- <_name>Central Mongolia</_name>
+ <name>Central Mongolia</name>
 </timezone>
 </timezones>
 <tz-hint>Asia/Ulaanbaatar</tz-hint>
@@ -5513,7 +5513,7 @@
 <!-- The capital of Mongolia.
 The name is also written "Улаанбаатар".
 -->
-  <_name>Ulaanbaatar</_name>
+ <name>Ulaanbaatar</name>
 <coordinates>47.916667 106.916667</coordinates>
 <location>
 <name>Ulaanbaatar</name>
@@ -5527,7 +5527,7 @@
 currently the official ISO 3166 short English name, and gets
 more Google hits in English)
 -->
- <_name>Myanmar</_name>
+ <name>Myanmar</name>
 <!-- Could not find information about the following stations,
 which may be in Myanmar:
 VYMD 
@@ -5543,7 +5543,7 @@
 "Rangoon" is the traditional English name.
 The local name in Burmese is "Yangon".
 -->
- <_name>Rangoon</_name>
+ <name>Rangoon</name>
 <coordinates>16.805278 96.156111</coordinates>
 <location>
 <name>Rangoon</name>
@@ -5554,7 +5554,7 @@
 </country>
 <country>
 <!-- NP - Nepal -->
- <_name>Nepal</_name>
+ <name>Nepal</name>
 <iso-code>NP</iso-code>
 <fips-code>NP</fips-code>
 <timezones>
@@ -5565,7 +5565,7 @@
 <!-- The capital of Nepal.
 The local name in Nepali is "काठमाडौं".
 -->
- <_name>Kathmandu</_name>
+ <name>Kathmandu</name>
 <coordinates>27.716667 85.316667</coordinates>
 <location>
 <name>Kathmandu Airport</name>
@@ -5578,7 +5578,7 @@
 <!-- KP - The Democratic People's Republic of Korea, aka North
 Korea
 -->
- <_name>North Korea</_name>
+ <name>North Korea</name>
 <!-- Could not find weather stations for the following major
 cities:
 Pyongyang
@@ -5592,7 +5592,7 @@
 </country>
 <country>
 <!-- PK - Pakistan -->
- <_name>Pakistan</_name>
+ <name>Pakistan</name>
 <iso-code>PK</iso-code>
 <fips-code>PK</fips-code>
 <timezones>
@@ -5601,7 +5601,7 @@
 <tz-hint>Asia/Karachi</tz-hint>
 <city>
 <!-- The capital of Pakistan -->
- <_name>Islamabad</_name>
+ <name>Islamabad</name>
 <coordinates>33.700000 73.166667</coordinates>
 <location>
 <name>Islamabad Airport</name>
@@ -5611,7 +5611,7 @@
 </city>
 <city>
 <!-- A city in Pakistan -->
- <_name>Karachi</_name>
+ <name>Karachi</name>
 <coordinates>24.866667 67.050000</coordinates>
 <location>
 <name>Karachi Airport</name>
@@ -5621,7 +5621,7 @@
 </city>
 <city>
 <!-- A city in Pakistan -->
- <_name>Lahore</_name>
+ <name>Lahore</name>
 <coordinates>31.549722 74.343611</coordinates>
 <location>
 <name>Lahore Airport</name>
@@ -5631,7 +5631,7 @@
 </city>
 <city>
 <!-- A city in Pakistan -->
- <_name>Nawabshah</_name>
+ <name>Nawabshah</name>
 <coordinates>26.250000 68.416667</coordinates>
 <location>
 <name>Nawabshah</name>
@@ -5642,7 +5642,7 @@
 </country>
 <country>
 <!-- PH - Philippines -->
- <_name>Philippines</_name>
+ <name>Philippines</name>
 <iso-code>PH</iso-code>
 <fips-code>RP</fips-code>
 <timezones>
@@ -5651,7 +5651,7 @@
 <tz-hint>Asia/Manila</tz-hint>
 <city>
 <!-- A city in the Philippines -->
- <_name>Angeles</_name>
+ <name>Angeles</name>
 <coordinates>15.135833 120.591111</coordinates>
 <location>
 <name>Clarkfield Pampanga International Airport</name>
@@ -5661,7 +5661,7 @@
 </city>
 <city>
 <!-- A city in the Philippines -->
- <_name>Davao</_name>
+ <name>Davao</name>
 <coordinates>7.073056 125.612778</coordinates>
 <location>
 <name>Davao Airport</name>
@@ -5671,7 +5671,7 @@
 </city>
 <city>
 <!-- A city in the Philippines -->
- <_name>Laoag</_name>
+ <name>Laoag</name>
 <coordinates>18.198889 120.593611</coordinates>
 <location>
 <name>Laoag</name>
@@ -5681,7 +5681,7 @@
 </city>
 <city>
 <!-- The capital of the Philippines -->
- <_name>Manila</_name>
+ <name>Manila</name>
 <coordinates>14.604167 120.982222</coordinates>
 <location>
 <name>Ninoy Aquino International Airport</name>
@@ -5691,7 +5691,7 @@
 </city>
 <city>
 <!-- A city in the Philippines -->
- <_name>Masbate</_name>
+ <name>Masbate</name>
 <coordinates>12.366667 123.616667</coordinates>
 <location>
 <name>Masbate</name>
@@ -5701,7 +5701,7 @@
 </city>
 <city>
 <!-- A city in the Philippines -->
- <_name>Pildira</_name>
+ <name>Pildira</name>
 <coordinates>14.516667 121.000000</coordinates>
 <location>
 <name>Ninoy Aquino International Airport</name>
@@ -5711,7 +5711,7 @@
 </city>
 <city>
 <!-- A city in the Philippines -->
- <_name>Subic</_name>
+ <name>Subic</name>
 <coordinates>14.879722 120.233333</coordinates>
 <location>
 <name>Subic Bay Weather Station</name>
@@ -5721,7 +5721,7 @@
 </city>
 <city>
 <!-- A city in the Philippines -->
- <_name>Zamboanga City</_name>
+ <name>Zamboanga City</name>
 <coordinates>6.910255 122.071715</coordinates>
 <location>
 <name>Zamboanga City</name>
@@ -5732,7 +5732,7 @@
 </country>
 <country>
 <!-- SG - Singapore -->
- <_name msgctxt="Country">Singapore</_name>
+ <name msgctxt="Country">Singapore</name>
 <!-- Could not find information about the following stations,
 which may be in Singapore:
 WSSL 
@@ -5745,7 +5745,7 @@
 <tz-hint>Asia/Singapore</tz-hint>
 <city>
 <!-- The capital of Singapore -->
- <_name msgctxt="City in Singapore">Singapore</_name>
+ <name msgctxt="City in Singapore">Singapore</name>
 <coordinates>1.293056 103.855833</coordinates>
 <location>
 <name>Paya Lebar Airport</name>
@@ -5761,7 +5761,7 @@
 </country>
 <country>
 <!-- KR - The Republic of Korea, aka South Korea -->
- <_name>South Korea</_name>
+ <name>South Korea</name>
 <!-- Could not find information about the following stations,
 which may be in South Korea:
 RKJB RKNY 
@@ -5774,7 +5774,7 @@
 <tz-hint>Asia/Seoul</tz-hint>
 <city>
 <!-- A city in South Korea -->
- <_name>Ch'ongju</_name>
+ <name>Ch'ongju</name>
 <coordinates>36.637222 127.489722</coordinates>
 <location>
 <name>Chongju Air Base</name>
@@ -5784,7 +5784,7 @@
 </city>
 <city>
 <!-- A city in South Korea -->
- <_name>Cheju</_name>
+ <name>Cheju</name>
 <coordinates>33.509722 126.521944</coordinates>
 <location>
 <name>Cheju International Airport</name>
@@ -5794,7 +5794,7 @@
 </city>
 <city>
 <!-- A city in South Korea -->
- <_name>Inch'on</_name>
+ <name>Inch'on</name>
 <coordinates>37.453611 126.731667</coordinates>
 <location>
 <name>Inch'on International Airport</name>
@@ -5804,7 +5804,7 @@
 </city>
 <city>
 <!-- A city in South Korea -->
- <_name>Kunsan</_name>
+ <name>Kunsan</name>
 <coordinates>35.978611 126.711389</coordinates>
 <location>
 <name>Kunsan Air Base</name>
@@ -5816,7 +5816,7 @@
 <!-- A city in South Korea.
 The name is also written "오산".
 -->
- <_name>Osan</_name>
+ <name>Osan</name>
 <coordinates>37.152222 127.070556</coordinates>
 <location>
 <name>Osan Air Base</name>
@@ -5826,7 +5826,7 @@
 </city>
 <city>
 <!-- A city in South Korea -->
- <_name>P'yongt'aek</_name>
+ <name>P'yongt'aek</name>
 <coordinates>36.994722 127.088889</coordinates>
 <location>
 <name>Pyongtaek Air Base</name>
@@ -5836,7 +5836,7 @@
 </city>
 <city>
 <!-- A city in South Korea -->
- <_name>Pusan</_name>
+ <name>Pusan</name>
 <coordinates>35.102778 129.040278</coordinates>
 <location>
 <name>Kimhae International Airport</name>
@@ -5849,7 +5849,7 @@
  "Seoul" is the traditional English name.
 The local name in Korean is "Soul".
 -->
- <_name>Seoul</_name>
+ <name>Seoul</name>
 <coordinates>37.566389 126.999722</coordinates>
 <location>
 <name>Kimp'o International Airport</name>
@@ -5859,7 +5859,7 @@
 </city>
 <city>
 <!-- A city in South Korea -->
- <_name>Taegu</_name>
+ <name>Taegu</name>
 <coordinates>35.870278 128.591111</coordinates>
 <location>
 <name>Taegu Air Base</name>
@@ -5870,7 +5870,7 @@
 </country>
 <country>
 <!-- LK - Sri Lanka -->
- <_name>Sri Lanka</_name>
+ <name>Sri Lanka</name>
 <iso-code>LK</iso-code>
 <fips-code>CE</fips-code>
 <timezones>
@@ -5879,7 +5879,7 @@
 <tz-hint>Asia/Colombo</tz-hint>
 <city>
 <!-- The capital of Sri Lanka -->
- <_name>Colombo</_name>
+ <name>Colombo</name>
 <coordinates>6.931944 79.847778</coordinates>
 <location>
 <name>Katunayake</name>
@@ -5889,7 +5889,7 @@
 </city>
 <city>
 <!-- A city in Sri Lanka -->
- <_name>Katunayaka</_name>
+ <name>Katunayaka</name>
 <coordinates>7.164722 79.873056</coordinates>
 <location>
 <name>Katunayaka</name>
@@ -5899,7 +5899,7 @@
 </city>
 <city>
 <!-- The capital of Sri Lanka -->
- <_name>Sri Jayewardenepura Kotte</_name>
+ <name>Sri Jayewardenepura Kotte</name>
 <coordinates>6.902778 79.908333</coordinates>
 <location>
 <name>Katunayake</name>
@@ -5912,7 +5912,7 @@
 <!-- TW - Taiwan, Province of China. (That's the official ISO
 3166 short English name.)
 -->
- <_name>Taiwan</_name>
+ <name>Taiwan</name>
 <iso-code>TW</iso-code>
 <fips-code>TW</fips-code>
 <timezones>
@@ -5923,7 +5923,7 @@
 <!-- A city in Taiwan.
 The name is also written "高雄".
 -->
- <_name>Kaohsiung</_name>
+ <name>Kaohsiung</name>
 <coordinates>22.616256 120.313329</coordinates>
 <location>
 <name>Kaohsiung City</name>
@@ -5935,7 +5935,7 @@
 <!-- A city in Taiwan.
 The name is also written "埔頂".
 -->
- <_name>Taoyuan</_name>
+ <name>Taoyuan</name>
 <coordinates>25.083498 121.215105</coordinates>
 <location>
 <name>Taoyuan International Airport</name>
@@ -5947,7 +5947,7 @@
 <!-- The capital of Taiwan.
 The name is also written "臺北".
 -->
- <_name>Taipei</_name>
+ <name>Taipei</name>
 <coordinates>25.047763 121.531846</coordinates>
 <location>
 <name>Taipei / Songshan Domestic Airport</name>
@@ -5958,7 +5958,7 @@
 </country>
 <country>
 <!-- TJ - Tajikistan -->
- <_name>Tajikistan</_name>
+ <name>Tajikistan</name>
 <iso-code>TJ</iso-code>
 <fips-code>TI</fips-code>
 <timezones>
@@ -5967,7 +5967,7 @@
 <tz-hint>Asia/Dushanbe</tz-hint>
 <city>
 <!-- The capital of Tajikistan -->
- <_name>Dushanbe</_name>
+ <name>Dushanbe</name>
 <coordinates>38.560000 68.773889</coordinates>
 <location>
 <name>Dushanbe</name>
@@ -5978,7 +5978,7 @@
 </country>
 <country>
 <!-- TH - Thailand -->
- <_name>Thailand</_name>
+ <name>Thailand</name>
 <!-- Could not find information about the following stations,
 which may be in Thailand:
 VTBO VTCT VTPO VTPP VTSC VTSF VTSG VTSM VTUI VTUO VTUV VTUW 
@@ -5994,7 +5994,7 @@
 "Bangkok" is the traditional English name.
 The local name in Thai is "Krung Thep / กรุงเทพฯ".
 -->
- <_name>Bangkok</_name>
+ <name>Bangkok</name>
 <coordinates>13.750000 100.516667</coordinates>
 <location>
 <name>Bangkok</name>
@@ -6004,7 +6004,7 @@
 </city>
 <city>
 <!-- A city in Thailand -->
- <_name>Chiang Mai</_name>
+ <name>Chiang Mai</name>
 <coordinates>18.790278 98.981667</coordinates>
 <location>
 <name>Chiang Mai</name>
@@ -6014,7 +6014,7 @@
 </city>
 <city>
 <!-- A city in Thailand -->
- <_name>Chon Buri</_name>
+ <name>Chon Buri</name>
 <coordinates>13.366667 100.983333</coordinates>
 <location>
 <name>Chon Buri</name>
@@ -6024,7 +6024,7 @@
 </city>
 <city>
 <!-- A city in Thailand -->
- <_name>Hat Yai</_name>
+ <name>Hat Yai</name>
 <coordinates>7.016667 100.466667</coordinates>
 <location>
 <name>Hat Yai</name>
@@ -6034,7 +6034,7 @@
 </city>
 <city>
 <!-- A city in Thailand -->
- <_name>Hua Hin</_name>
+ <name>Hua Hin</name>
 <coordinates>12.566667 99.966667</coordinates>
 <location>
 <name>Hua Hin</name>
@@ -6044,7 +6044,7 @@
 </city>
 <city>
 <!-- A city in Thailand -->
- <_name>Khon Kaen</_name>
+ <name>Khon Kaen</name>
 <coordinates>16.433333 102.833333</coordinates>
 <location>
 <name>Khon Kaen</name>
@@ -6054,7 +6054,7 @@
 </city>
 <city>
 <!-- A city in Thailand -->
- <_name>Lampang</_name>
+ <name>Lampang</name>
 <coordinates>18.298333 99.507222</coordinates>
 <location>
 <name>Lampang</name>
@@ -6064,7 +6064,7 @@
 </city>
 <city>
 <!-- A city in Thailand -->
- <_name>Mae Hong Son</_name>
+ <name>Mae Hong Son</name>
 <coordinates>19.266667 97.933333</coordinates>
 <location>
 <name>Mae Hong Son</name>
@@ -6074,7 +6074,7 @@
 </city>
 <city>
 <!-- A city in Thailand -->
- <_name>Nan</_name>
+ <name>Nan</name>
 <coordinates>18.783333 100.783333</coordinates>
 <location>
 <name>Nan</name>
@@ -6084,7 +6084,7 @@
 </city>
 <city>
 <!-- A city in Thailand -->
- <_name>Phrae</_name>
+ <name>Phrae</name>
 <coordinates>18.150000 100.133333</coordinates>
 <location>
 <name>Phrae</name>
@@ -6094,7 +6094,7 @@
 </city>
 <city>
 <!-- A city in Thailand -->
- <_name>Phuket</_name>
+ <name>Phuket</name>
 <coordinates>7.883333 98.400000</coordinates>
 <location>
 <name>Phuket Airport</name>
@@ -6104,7 +6104,7 @@
 </city>
 <city>
 <!-- A city in Thailand -->
- <_name>Ranong</_name>
+ <name>Ranong</name>
 <coordinates>9.966667 98.633333</coordinates>
 <location>
 <name>Ranong</name>
@@ -6114,7 +6114,7 @@
 </city>
 <city>
 <!-- A city in Thailand -->
- <_name>Rayong</_name>
+ <name>Rayong</name>
 <coordinates>12.666667 101.283333</coordinates>
 <location>
 <name>Rayong</name>
@@ -6124,7 +6124,7 @@
 </city>
 <city>
 <!-- A city in Thailand -->
- <_name>Surat Thani</_name>
+ <name>Surat Thani</name>
 <coordinates>9.133333 99.316667</coordinates>
 <location>
 <name>Surat Thani</name>
@@ -6134,7 +6134,7 @@
 </city>
 <city>
 <!-- A city in Thailand -->
- <_name>Trang</_name>
+ <name>Trang</name>
 <coordinates>7.550000 99.600000</coordinates>
 <location>
 <name>Trang</name>
@@ -6144,7 +6144,7 @@
 </city>
 <city>
 <!-- A city in Thailand -->
- <_name>Ubon Ratchathani</_name>
+ <name>Ubon Ratchathani</name>
 <coordinates>15.233056 104.863056</coordinates>
 <location>
 <name>Ubon Ratchathani</name>
@@ -6154,7 +6154,7 @@
 </city>
 <city>
 <!-- A city in Thailand -->
- <_name>Udon Thani</_name>
+ <name>Udon Thani</name>
 <coordinates>17.407500 102.793056</coordinates>
 <location>
 <name>Udon Thani</name>
@@ -6165,7 +6165,7 @@
 </country>
 <country>
 <!-- TM - Turkmenistan -->
- <_name>Turkmenistan</_name>
+ <name>Turkmenistan</name>
 <iso-code>TM</iso-code>
 <fips-code>TX</fips-code>
 <timezones>
@@ -6177,7 +6177,7 @@
 "Ashgabat" is the traditional English name.
 The local name in Turkmen is "Asgabat".
 -->
- <_name>Ashgabat</_name>
+ <name>Ashgabat</name>
 <coordinates>37.950000 58.383333</coordinates>
 <location>
 <name>Ashgabat</name>
@@ -6188,7 +6188,7 @@
 </country>
 <country>
 <!-- UZ - Uzbekistan -->
- <_name>Uzbekistan</_name>
+ <name>Uzbekistan</name>
 <!-- Could not find information about the following stations,
 which may be in Uzbekistan:
 UTAK UTAM UTAT UTAV UTDL UTFN UTSB UTSH UTSK 
@@ -6203,7 +6203,7 @@
 <tz-hint>Asia/Tashkent</tz-hint>
 <city>
 <!-- A city in Uzbekistan -->
- <_name>Nukus</_name>
+ <name>Nukus</name>
 <coordinates>42.453056 59.610278</coordinates>
 <location>
 <name>Nukus / Karakalpakstan</name>
@@ -6213,7 +6213,7 @@
 </city>
 <city>
 <!-- A city in Uzbekistan -->
- <_name>Samarqand</_name>
+ <name>Samarqand</name>
 <coordinates>39.654167 66.959722</coordinates>
 <location>
 <name>Samarqand</name>
@@ -6226,7 +6226,7 @@
 "Tashkent" is the traditional English name.
 The local name is "Toshkent".
 -->
- <_name>Tashkent</_name>
+ <name>Tashkent</name>
 <coordinates>41.316667 69.250000</coordinates>
 <location>
 <name>Tashkent</name>
@@ -6236,7 +6236,7 @@
 </city>
 <city>
 <!-- A city in Uzbekistan -->
- <_name>Termiz</_name>
+ <name>Termiz</name>
 <coordinates>37.224167 67.278333</coordinates>
 <location>
 <name>Termiz</name>
@@ -6246,7 +6246,7 @@
 </city>
 <city>
 <!-- A city in Uzbekistan -->
- <_name>Urganch</_name>
+ <name>Urganch</name>
 <coordinates>41.550000 60.633333</coordinates>
 <location>
 <name>Urganch</name>
@@ -6260,7 +6260,7 @@
 includes a space, though it is also frequently written
 without one.)
 -->
- <_name>Viet Nam</_name>
+ <name>Viet Nam</name>
 <iso-code>VN</iso-code>
 <fips-code>VM</fips-code>
 <timezones>
@@ -6269,7 +6269,7 @@
 <tz-hint>Asia/Ho_Chi_Minh</tz-hint>
 <city>
 <!-- A city in Viet Nam -->
- <_name>Da Nang</_name>
+ <name>Da Nang</name>
 <coordinates>16.067778 108.220833</coordinates>
 <location>
 <name>Da Nang</name>
@@ -6282,7 +6282,7 @@
 "Hanoi" is the traditional English name.
 The local name in Vietnamese is "Ha Noi".
 -->
- <_name>Hanoi</_name>
+ <name>Hanoi</name>
 <coordinates>21.033333 105.850000</coordinates>
 <location>
 <name>Hanoi</name>
@@ -6295,7 +6295,7 @@
 "Ho Chi Minh City" is the traditional English name.
 The local name in Vietnamese is "Thanh Pho Ho Chi Minh".
 -->
- <_name>Ho Chi Minh City</_name>
+ <name>Ho Chi Minh City</name>
 <coordinates>10.750000 106.666667</coordinates>
 <location>
 <name>Ho Chi Minh</name>
@@ -6307,10 +6307,10 @@
 </region>
 <region>
 <!-- FIXME: rename this to Atlantic Ocean -->
- <_name msgctxt="Region">Atlantic</_name>
+ <name msgctxt="Region">Atlantic</name>
 <country>
 <!-- AI - Anguilla, a British territory in the Caribbean -->
- <_name>Anguilla</_name>
+ <name>Anguilla</name>
 <iso-code>AI</iso-code>
 <fips-code>AV</fips-code>
 <timezones>
@@ -6319,7 +6319,7 @@
 <tz-hint>America/Anguilla</tz-hint>
 <city>
 <!-- The capital of Anguilla -->
- <_name>The Valley</_name>
+ <name>The Valley</name>
 <coordinates>18.216667 -63.050000</coordinates>
 <location>
 <name>Wallblake</name>
@@ -6330,7 +6330,7 @@
 </country>
 <country>
 <!-- AG - Antigua and Barbuda -->
- <_name>Antigua and Barbuda</_name>
+ <name>Antigua and Barbuda</name>
 <iso-code>AG</iso-code>
 <fips-code>AC</fips-code>
 <timezones>
@@ -6339,7 +6339,7 @@
 <tz-hint>America/Antigua</tz-hint>
 <city>
 <!-- A city in Antigua and Barbuda -->
- <_name>Fitches Creek</_name>
+ <name>Fitches Creek</name>
 <coordinates>17.116667 -61.783333</coordinates>
 <location>
 <name>V. C. Bird International Airport, Antigua</name>
@@ -6349,7 +6349,7 @@
 </city>
 <city>
 <!-- The capital of Antigua and Barbuda -->
- <_name msgctxt="City in Antigua and Barbuda">Saint John's</_name>
+ <name msgctxt="City in Antigua and Barbuda">Saint John's</name>
 <coordinates>17.116667 -61.850000</coordinates>
 <location>
 <name>V. C. Bird International Airport, Antigua</name>
@@ -6360,7 +6360,7 @@
 </country>
 <country>
 <!-- BB - Barbados -->
- <_name>Barbados</_name>
+ <name>Barbados</name>
 <iso-code>BB</iso-code>
 <fips-code>BB</fips-code>
 <timezones>
@@ -6369,7 +6369,7 @@
 <tz-hint>America/Barbados</tz-hint>
 <city>
 <!-- The capital of Barbados -->
- <_name>Bridgetown</_name>
+ <name>Bridgetown</name>
 <coordinates>13.100000 -59.616667</coordinates>
 <location>
 <name>Grantley Adams</name>
@@ -6379,7 +6379,7 @@
 </city>
 <city>
 <!-- A city in Barbados -->
- <_name>Paragon</_name>
+ <name>Paragon</name>
 <coordinates>13.066667 -59.483333</coordinates>
 <location>
 <name>Grantley Adams</name>
@@ -6392,7 +6392,7 @@
 <!-- BM - Bermuda, a British territory off the coast of the
 United States
 -->
- <_name>Bermuda</_name>
+ <name>Bermuda</name>
 <iso-code>BM</iso-code>
 <fips-code>BD</fips-code>
 <timezones>
@@ -6401,7 +6401,7 @@
 <tz-hint>Atlantic/Bermuda</tz-hint>
 <city>
 <!-- The capital of Bermuda -->
- <_name msgctxt="City in Bermuda">Hamilton</_name>
+ <name msgctxt="City in Bermuda">Hamilton</name>
 <coordinates>32.294167 -64.783889</coordinates>
 <location>
 <name>Bermuda</name>
@@ -6411,7 +6411,7 @@
 </city>
 <city>
 <!-- A city in Bermuda -->
- <_name msgctxt="City in Bermuda">Saint George</_name>
+ <name msgctxt="City in Bermuda">Saint George</name>
 <coordinates>32.381667 -64.678056</coordinates>
 <location>
 <name>Bermuda</name>
@@ -6424,7 +6424,7 @@
 <!-- DM - Dominica, a Caribbean island nation, not to be confused
 with the Domincan Republic.
 -->
- <_name>Dominica</_name>
+ <name>Dominica</name>
 <iso-code>DM</iso-code>
 <fips-code>DO</fips-code>
 <timezones>
@@ -6433,7 +6433,7 @@
 <tz-hint>America/Dominica</tz-hint>
 <city>
 <!-- A city in Dominica -->
- <_name>Marigot</_name>
+ <name>Marigot</name>
 <coordinates>15.533333 -61.300000</coordinates>
 <location>
 <name>Melville Hall Airport</name>
@@ -6443,7 +6443,7 @@
 </city>
 <city>
 <!-- The capital of Dominica -->
- <_name msgctxt="City in Dominica">Roseau</_name>
+ <name msgctxt="City in Dominica">Roseau</name>
 <coordinates>15.300000 -61.400000</coordinates>
 <location>
 <name>Canefield Airport</name>
@@ -6453,7 +6453,7 @@
 </city>
 <city>
 <!-- A city in Dominica -->
- <_name>Saint Joseph</_name>
+ <name>Saint Joseph</name>
 <coordinates>15.400000 -61.433333</coordinates>
 <location>
 <name>Canefield Airport</name>
@@ -6466,7 +6466,7 @@
 <!-- GL - Greenland, an autonomous province of Denmark in the
 North Atlantic.
 -->
- <_name>Greenland</_name>
+ <name>Greenland</name>
 <!-- Could not find information about the following stations,
 which may be in Greenland:
 BGAA BGMQ BGPT BGQQ BGSS BGUK 
@@ -6480,26 +6480,26 @@
 The string is only used in places where "Greenland" is
 already clear from context.
 -->
- <_name>Danmarkshavn</_name>
+ <name>Danmarkshavn</name>
 </timezone>
 <timezone id="America/Godthab">
 <!-- The primary timezone for Greenland, although sources
 seem to point towards calling the area "Western
 Greenland" rathern than just "Greenland".
 -->
- <_name>Western Greenland</_name>
+ <name>Western Greenland</name>
 </timezone>
 <timezone id="America/Scoresbysund">
 <!-- The timezone around Scoresbysund / Ittoqqortoormiit on
 the east coast of Greenland.
 -->
- <_name>Eastern Greenland</_name>
+ <name>Eastern Greenland</name>
 </timezone>
 <timezone id="America/Thule">
 <!-- The timezone at the Thule US Air Force Base on the west
 coast of Greenland.
 -->
- <_name>Thule AFB</_name>
+ <name>Thule AFB</name>
 </timezone>
 </timezones>
 <tz-hint>America/Godthab</tz-hint>
@@ -6507,7 +6507,7 @@
 <!-- A city in Greenland.
 The local name in Kalaallisut is "Uummannaq".
 -->
- <_name>Dundas</_name>
+ <name>Dundas</name>
 <coordinates>76.550000 -68.800000</coordinates>
 <location>
 <name>Thule A. B.</name>
@@ -6520,7 +6520,7 @@
 <!-- The capital of Greenland.
 The local name in Kalaallisut is "Nuuk".
 -->
- <_name>Godthåb</_name>
+ <name>Godthåb</name>
 <coordinates>64.183333 -51.750000</coordinates>
 <location>
 <name>Godthåb / Godthåb</name>
@@ -6530,7 +6530,7 @@
 </city>
 <city>
 <!-- A city in Greenland -->
- <_name>Ittorisseq</_name>
+ <name>Ittorisseq</name>
 <coordinates>70.450000 -22.450000</coordinates>
 <location>
 <name>Constable Pynt</name>
@@ -6542,7 +6542,7 @@
 <!-- A city in Greenland.
 The local name in Kalaallisut is "Ilulissat".
 -->
- <_name>Jakobshavn</_name>
+ <name>Jakobshavn</name>
 <coordinates>69.216667 -51.100000</coordinates>
 <location>
 <name>Jacobshavn Airport</name>
@@ -6552,7 +6552,7 @@
 </city>
 <city>
 <!-- A city in Greenland -->
- <_name>Kulusuk</_name>
+ <name>Kulusuk</name>
 <coordinates>65.566667 -37.183333</coordinates>
 <location>
 <name>Kulusuk Airport</name>
@@ -6562,7 +6562,7 @@
 </city>
 <city>
 <!-- A city in Greenland -->
- <_name>Narsarsuaq</_name>
+ <name>Narsarsuaq</name>
 <coordinates>61.166667 -45.416667</coordinates>
 <location>
 <name>Narsarsuaq</name>
@@ -6572,7 +6572,7 @@
 </city>
 <city>
 <!-- A city in Greenland -->
- <_name>Søndre Strømfjord</_name>
+ <name>Søndre Strømfjord</name>
 <coordinates>67.000000 -50.700000</coordinates>
 <location>
 <name>Sdr Stroemfjord</name>
@@ -6592,18 +6592,18 @@
 * Ponce: TJPS
 * Vieques: TJVQ
 -->
- <_name>Puerto Rico</_name>
+ <name>Puerto Rico</name>
 <iso-code>PR</iso-code>
 <fips-code>US72</fips-code>
 <timezones>
 <timezone id="America/Puerto_Rico">
- <_name>Atlantic Time</_name>
+ <name>Atlantic Time</name>
 </timezone>
 </timezones>
 <tz-hint>America/Puerto_Rico</tz-hint>
 <city>
 <!-- A municipality of Puerto Rico -->
- <_name>Aguadilla</_name>
+ <name>Aguadilla</name>
 <coordinates>18.430000 -67.154444</coordinates>
 <location>
 <name>Rafael Hernández International Airport</name>
@@ -6615,7 +6615,7 @@
 </city>
 <city>
 <!-- A municipality of Puerto Rico -->
- <_name>Carolina</_name>
+ <name>Carolina</name>
 <coordinates>18.406111 -65.967222</coordinates>
 <location>
 <name>Luis Muñoz Marín International Airport</name>
@@ -6647,7 +6647,7 @@
 </city>
 <city>
 <!-- A municipality of Puerto Rico -->
- <_name>San Juan</_name>
+ <name>San Juan</name>
 <coordinates>18.466334 -66.105722</coordinates>
 <location>
 <name>Fernando Luis Ribas Dominicci Airport (Isla Grande Airport)</name>
@@ -6662,7 +6662,7 @@
 <!-- BL - Saint Barthélemy, an overseas territory of France in
 the Caribbean, formerly part of Guadeloupe.
 -->
- <_name>Saint Barthélemy</_name>
+ <name>Saint Barthélemy</name>
 <iso-code>BL</iso-code>
 <fips-code>TB</fips-code>
 <timezones>
@@ -6672,7 +6672,7 @@
 </country>
 <country>
 <!-- SH - Saint Helena, a British territory in the South Atlantic -->
- <_name>Saint Helena</_name>
+ <name>Saint Helena</name>
 <!-- Could not find weather stations for the following major
 cities:
 Jamestown
@@ -6685,7 +6685,7 @@
 <tz-hint>Atlantic/St_Helena</tz-hint>
 <city>
 <!-- A city in Saint Helena -->
- <_name msgctxt="City in Saint Helena">Georgetown</_name>
+ <name msgctxt="City in Saint Helena">Georgetown</name>
 <coordinates>-7.933333 -14.416667</coordinates>
 <location>
 <name>Wide Awake Field Ascension Island</name>
@@ -6696,7 +6696,7 @@
 </country>
 <country>
 <!-- KN - Saint Kitts and Nevis -->
- <_name>Saint Kitts and Nevis</_name>
+ <name>Saint Kitts and Nevis</name>
 <iso-code>KN</iso-code>
 <fips-code>SC</fips-code>
 <timezones>
@@ -6705,7 +6705,7 @@
 <tz-hint>America/St_Kitts</tz-hint>
 <city>
 <!-- The capital of Saint Kitts and Nevis -->
- <_name>Basseterre</_name>
+ <name>Basseterre</name>
 <coordinates>17.300000 -62.716667</coordinates>
 <location>
 <name>Golden Rock</name>
@@ -6715,7 +6715,7 @@
 </city>
 <city>
 <!-- A city in Saint Kitts and Nevis -->
- <_name>Golden Rock</_name>
+ <name>Golden Rock</name>
 <coordinates>17.316667 -62.716667</coordinates>
 <location>
 <name>Golden Rock</name>
@@ -6725,7 +6725,7 @@
 </city>
 <city>
 <!-- A city in Saint Kitts and Nevis -->
- <_name msgctxt="City in Saint Kitts and Nevis">Newcastle</_name>
+ <name msgctxt="City in Saint Kitts and Nevis">Newcastle</name>
 <coordinates>17.200000 -62.583333</coordinates>
 <location>
 <name>Charlestown / Newcastle</name>
@@ -6738,18 +6738,18 @@
 <!-- VI - United States Virgin Islands, a territory of the United
 States in the Caribbean
 -->
- <_name>United States Virgin Islands</_name>
+ <name>United States Virgin Islands</name>
 <iso-code>VI</iso-code>
 <fips-code>US78</fips-code>
 <timezones>
 <timezone id="America/St_Thomas">
- <_name>Atlantic Time</_name>
+ <name>Atlantic Time</name>
 </timezone>
 </timezones>
 <tz-hint>America/St_Thomas</tz-hint>
 <city>
 <!-- A city in the United States Virgin Islands -->
- <_name>Charlotte Amalie</_name>
+ <name>Charlotte Amalie</name>
 <coordinates>18.341900 -64.930701</coordinates>
 <location>
 <name>Charlotte Amalie St. Thomas, Cyril E. King Airport</name>
@@ -6759,7 +6759,7 @@
 </city>
 <city>
 <!-- A city in the United States Virgin Islands -->
- <_name>Christiansted</_name>
+ <name>Christiansted</name>
 <coordinates>17.746640 -64.703198</coordinates>
 <location>
 <name>Henry E. Rohlsen Airport</name>
@@ -6770,13 +6770,13 @@
 </country>
 </region>
 <region>
- <_name>Australasia &amp; Oceania</_name>
+ <name>Australasia &amp; 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>
+ <name>American Samoa</name>
 <iso-code>AS</iso-code>
 <fips-code>US60</fips-code>
 <timezones>
@@ -6785,7 +6785,7 @@
 <tz-hint>Pacific/Pago_Pago</tz-hint>
 <city>
 <!-- A city in American Samoa -->
- <_name>Pago Pago</_name>
+ <name>Pago Pago</name>
 <coordinates>-14.278056 -170.702500</coordinates>
 <location>
 <name>Pago Pago International Airport</name>
@@ -6796,7 +6796,7 @@
 </country>
 <country>
 <!-- AU - Australia -->
- <_name>Australia</_name>
+ <name>Australia</name>
 <!-- Could not find information about the following stations,
 which may be in Australia:
  YBHM 
@@ -6809,7 +6809,7 @@
 only used in places where "Australia" is already clear
 from context.
 -->
- <_name>Western Time</_name>
+ <name>Western Time</name>
 </timezone>
 <timezone id="Australia/Eucla">
 <!-- The commonly-used name for an unofficial time zone used
@@ -6817,7 +6817,7 @@
 used in places where "Australia" is already clear from
 context.
 -->
- <_name>Central Western Time</_name>
+ <name>Central Western Time</name>
 </timezone>
 <timezone id="Australia/Adelaide">
 <!-- The time zone used in Central Australia. This string is
@@ -6825,7 +6825,7 @@
 state of South Australia, and is only used in places
 where "Australia" is already clear from context.
 -->
- <_name>Central Time (South Australia)</_name>
+ <name>Central Time (South Australia)</name>
 </timezone>
 <timezone id="Australia/Broken_Hill">
 <!-- The time zone used in Central Australia. This string is
@@ -6835,7 +6835,7 @@
 state uses Eastern Time. This string is only used in
 places where "Australia" is already clear from context.
 -->
- <_name>Central Time (Yancowinna, NSW)</_name>
+ <name>Central Time (Yancowinna, NSW)</name>
 </timezone>
 <timezone id="Australia/Darwin">
 <!-- The time zone used in Central Australia. This string is
@@ -6844,7 +6844,7 @@
 string is only used in places where "Australia" is
 already clear from context.
 -->
- <_name>Central Time (Northern Territory)</_name>
+ <name>Central Time (Northern Territory)</name>
 </timezone>
 <timezone id="Australia/Hobart">
 <!-- The time zone used in Eastern Australia. This string is
@@ -6852,7 +6852,7 @@
 state of Tasmania, and is only used in places where
 "Australia" is already clear from context.
 -->
- <_name>Eastern Time (Tasmania)</_name>
+ <name>Eastern Time (Tasmania)</name>
 <obsoletes>Australia/Currie</obsoletes>
 </timezone>
 <timezone id="Australia/Melbourne">
@@ -6861,7 +6861,7 @@
 state of Victoria, and is only used in places where
 "Australia" is already clear from context.
 -->
-  <_name>Eastern Time (Victoria)</_name>
+ <name>Eastern Time (Victoria)</name>
 </timezone>
 <timezone id="Australia/Sydney">
 <!-- The time zone used in Eastern Australia. This string is
@@ -6869,7 +6869,7 @@
 state of New South Wales, and is only used in places
 where "Australia" is already clear from context.
 -->
- <_name>Eastern Time (New South Wales)</_name>
+ <name>Eastern Time (New South Wales)</name>
 </timezone>
 <timezone id="Australia/Brisbane">
 <!-- The time zone used in Eastern Australia. This string is
@@ -6878,7 +6878,7 @@
 This string is only used in places where "Australia" is
 already clear from context.
 -->
- <_name>Eastern Time (Queensland)</_name>
+ <name>Eastern Time (Queensland)</name>
 <obsoletes>Australia/Lindeman</obsoletes>
 </timezone>
 <timezone id="Australia/Lord_Howe">
@@ -6886,17 +6886,17 @@
 coast of Australia. This string is only used in places
 where "Australia" is already clear from context.
 -->
- <_name>Lord Howe Island</_name>
+ <name>Lord Howe Island</name>
 </timezone>
 </timezones>
 <state>
 <!-- A state/province/territory in Australia -->
- <_name>Australian Capital Territory</_name>
+ <name>Australian Capital Territory</name>
 <fips-code>AS01</fips-code>
 <tz-hint>Australia/Sydney</tz-hint>
 <city>
 <!-- The capital of Australia -->
- <_name>Canberra</_name>
+ <name>Canberra</name>
 <coordinates>-35.283333 149.216667</coordinates>
 <location>
 <name>Canberra</name>
@@ -6908,12 +6908,12 @@
 </state>
 <state>
 <!-- A state/province/territory in Australia -->
- <_name>New South Wales</_name>
+ <name>New South Wales</name>
 <fips-code>AS02</fips-code>
 <tz-hint>Australia/Sydney</tz-hint>
 <city>
 <!-- A city in New South Wales in Australia -->
- <_name>Dubbo</_name>
+ <name>Dubbo</name>
 <coordinates>-32.250000 148.616667</coordinates>
 <location>
 <name>Dubbo</name>
@@ -6923,7 +6923,7 @@
 </city>
 <city>
 <!-- A city in New South Wales in Australia -->
- <_name>Forest Hill</_name>
+ <name>Forest Hill</name>
 <coordinates>-35.150000 147.466667</coordinates>
 <location>
 <name>Wagga Airport</name>
@@ -6933,7 +6933,7 @@
 </city>
 <city>
 <!-- A city in New South Wales in Australia -->
- <_name msgctxt="City in New South Wales, Australia">Richmond</_name>
+ <name msgctxt="City in New South Wales, Australia">Richmond</name>
 <coordinates>-33.600000 150.766667</coordinates>
 <location>
 <name>Richmond Air Force Base</name>
@@ -6943,7 +6943,7 @@
 </city>
 <city>
 <!-- A city in New South Wales in Australia -->
- <_name msgctxt="City in New South Wales, Australia">Sydney</_name>
+ <name msgctxt="City in New South Wales, Australia">Sydney</name>
 <coordinates>-33.883333 151.216667</coordinates>
 <location>
 <name>Sydney Airport</name>
@@ -6954,7 +6954,7 @@
 </city>
 <city>
 <!-- A city in New South Wales in Australia -->
- <_name>Tamworth</_name>
+ <name>Tamworth</name>
 <coordinates>-31.100000 150.933333</coordinates>
 <location>
 <name>Tamworth Airport</name>
@@ -6965,12 +6965,12 @@
 </state>
 <state>
 <!-- A state/province/territory in Australia -->
- <_name>Northern Territory</_name>
+ <name>Northern Territory</name>
 <fips-code>AS03</fips-code>
 <tz-hint>Australia/Darwin</tz-hint>
 <city>
 <!-- A city in Northern Territory in Australia -->
- <_name>Alice Springs</_name>
+ <name>Alice Springs</name>
 <coordinates>-23.700000 133.883333</coordinates>
 <location>
 <name>Alice Springs Airport</name>
@@ -6981,7 +6981,7 @@
 </city>
 <city>
 <!-- A city in Northern Territory in Australia -->
- <_name>Darwin</_name>
+ <name>Darwin</name>
 <coordinates>-12.466667 130.833333</coordinates>
 <location>
 <name>Darwin Airport</name>
@@ -6992,7 +6992,7 @@
 </city>
 <city>
 <!-- A city in Northern Territory in Australia -->
- <_name>Katherine</_name>
+ <name>Katherine</name>
 <coordinates>-14.466667 132.266667</coordinates>
 <location>
 <name>Tindal / Katherine</name>
@@ -7003,12 +7003,12 @@
 </state>
 <state>
 <!-- A state/province/territory in Australia -->
- <_name>Queensland</_name>
+ <name>Queensland</name>
 <fips-code>AS04</fips-code>
 <tz-hint>Australia/Brisbane</tz-hint>
 <city>
 <!-- A city in Queensland in Australia -->
- <_name>Brisbane</_name>
+ <name>Brisbane</name>
 <coordinates>-27.500000 153.016667</coordinates>
 <location>
 <name>Brisbane Airport</name>
@@ -7019,7 +7019,7 @@
 </city>
 <city>
 <!-- A city in Queensland in Australia -->
- <_name>Cairns</_name>
+ <name>Cairns</name>
 <coordinates>-16.916667 145.766667</coordinates>
 <location>
 <name>Cairns Airport</name>
@@ -7029,7 +7029,7 @@
 </city>
 <city>
 <!-- A city in Queensland in Australia -->
- <_name>Coolangatta</_name>
+ <name>Coolangatta</name>
 <coordinates>-28.166667 153.533333</coordinates>
 <location>
 <name>Coolangatta Airport</name>
@@ -7039,7 +7039,7 @@
 </city>
 <city>
 <!-- A city in Queensland in Australia -->
- <_name>Mount Isa</_name>
+ <name>Mount Isa</name>
 <coordinates>-20.733333 139.500000</coordinates>
 <location>
 <name>Mount Isa Airport</name>
@@ -7049,7 +7049,7 @@
 </city>
 <city>
 <!-- A city in Queensland in Australia -->
- <_name>Rockhampton</_name>
+ <name>Rockhampton</name>
 <coordinates>-23.383333 150.500000</coordinates>
 <location>
 <name>Rockhampton Airport</name>
@@ -7059,7 +7059,7 @@
 </city>
 <city>
 <!-- A city in Queensland in Australia -->
- <_name>Townsville</_name>
+ <name>Townsville</name>
 <coordinates>-19.250000 146.800000</coordinates>
 <location>
 <name>Townsville Airport</name>
@@ -7070,12 +7070,12 @@
 </state>
 <state>
 <!-- A state/province/territory in Australia -->
- <_name>South Australia</_name>
+ <name>South Australia</name>
 <fips-code>AS05</fips-code>
 <tz-hint>Australia/Adelaide</tz-hint>
 <city>
 <!-- A city in South Australia in Australia -->
- <_name>Adelaide</_name>
+ <name>Adelaide</name>
 <coordinates>-34.933333 138.600000</coordinates>
 <location>
 <name>Adelaide Airport</name>
@@ -7086,7 +7086,7 @@
 </city>
 <city>
 <!-- A city in South Australia in Australia -->
- <_name>Woomera</_name>
+ <name>Woomera</name>
 <coordinates>-31.150000 136.800000</coordinates>
 <location>
 <name>Woomera Airport</name>
@@ -7097,12 +7097,12 @@
 </state>
 <state>
 <!-- A state/province/territory in Australia -->
- <_name>Tasmania</_name>
+ <name>Tasmania</name>
 <fips-code>AS06</fips-code>
 <tz-hint>Australia/Hobart</tz-hint>
 <city>
 <!-- A city in Tasmania in Australia -->
- <_name msgctxt="City in Tasmania, Australia">Hobart</_name>
+ <name msgctxt="City in Tasmania, Australia">Hobart</name>
 <coordinates>-42.916667 147.333333</coordinates>
 <location>
 <name>Hobart Airport</name>
@@ -7113,7 +7113,7 @@
 </city>
 <city>
 <!-- A city in Tasmania in Australia -->
- <_name>Launceston</_name>
+ <name>Launceston</name>
 <coordinates>-41.450000 147.166667</coordinates>
 <location>
 <name>Launceston Airport</name>
@@ -7124,12 +7124,12 @@
 </state>
 <state>
 <!-- A state/province/territory in Australia -->
- <_name msgctxt="State in Australia">Victoria</_name>
+ <name msgctxt="State in Australia">Victoria</name>
 <fips-code>AS07</fips-code>
 <tz-hint>Australia/Melbourne</tz-hint>
 <city>
 <!-- A city in Victoria in Australia -->
- <_name>Lara</_name>
+ <name>Lara</name>
 <coordinates>-38.016667 144.400000</coordinates>
 <location>
 <name>Avalon, Avalon Airport</name>
@@ -7139,7 +7139,7 @@
 </city>
 <city>
 <!-- A city in Victoria in Australia -->
- <_name msgctxt="City in Victoria, Australia">Melbourne</_name>
+ <name msgctxt="City in Victoria, Australia">Melbourne</name>
 <coordinates>-37.816667 144.966667</coordinates>
 <location>
 <name>Melbourne Airport</name>
@@ -7151,12 +7151,12 @@
 </state>
 <state>
 <!-- A state/province/territory in Australia -->
- <_name>Western Australia</_name>
+ <name>Western Australia</name>
 <fips-code>AS08</fips-code>
 <tz-hint>Australia/Perth</tz-hint>
 <city>
 <!-- A city in Western Australia in Australia -->
- <_name>Broome</_name>
+ <name>Broome</name>
 <coordinates>-17.966667 122.233333</coordinates>
 <location>
 <name>Broome Airport</name>
@@ -7166,7 +7166,7 @@
 </city>
 <city>
 <!-- A city in Western Australia in Australia -->
- <_name>Bullsbrook</_name>
+ <name>Bullsbrook</name>
 <coordinates>-31.666667 116.000000</coordinates>
 <location>
 <name>Bullsbrook Pearce Airport</name>
@@ -7176,7 +7176,7 @@
 </city>
 <city>
 <!-- A city in Western Australia in Australia -->
- <_name>Kalgoorlie</_name>
+ <name>Kalgoorlie</name>
 <coordinates>-30.750000 121.466667</coordinates>
 <location>
 <name>Kalgoorlie Boulder Airport</name>
@@ -7186,7 +7186,7 @@
 </city>
 <city>
 <!-- A city in Western Australia in Australia -->
- <_name>Kununurra</_name>
+ <name>Kununurra</name>
 <coordinates>-15.766667 128.733333</coordinates>
 <location>
 <name>Kununurra Kununurra</name>
@@ -7196,7 +7196,7 @@
 </city>
 <city>
 <!-- A city in Western Australia in Australia -->
- <_name>Learmonth</_name>
+ <name>Learmonth</name>
 <coordinates>-22.250000 114.083333</coordinates>
 <location>
 <name>Learmonth Airport</name>
@@ -7206,7 +7206,7 @@
 </city>
 <city>
 <!-- A city in Western Australia in Australia -->
- <_name>Perth</_name>
+ <name>Perth</name>
 <coordinates>-31.933333 115.833333</coordinates>
 <location>
 <name>Belmont Perth Airport</name>
@@ -7217,7 +7217,7 @@
 </city>
 <city>
 <!-- A city in Western Australia in Australia -->
- <_name>Shellborough</_name>
+ <name>Shellborough</name>
 <coordinates>-20.016667 119.366667</coordinates>
 <location>
 <name>Port Hedland Pardoo</name>
@@ -7231,7 +7231,7 @@
 <!-- IO - British Indian Ocean Territory, which is exactly what
 it sounds like.
 -->
- <_name>British Indian Ocean Territory</_name>
+ <name>British Indian Ocean Territory</name>
 <!-- Could not find cities for the following weather stations:
 FJDG - Diego Garcia (-7.300000 72.400000)
 -->
@@ -7247,7 +7247,7 @@
 Indian Ocean, not to be confused with various other islands
 of the same name.
 -->
- <_name>Christmas Island</_name>
+ <name>Christmas Island</name>
 <!-- Could not find information about the following stations,
 which may be in Christmas Island:
 YPGV 
@@ -7260,7 +7260,7 @@
 <tz-hint>Indian/Christmas</tz-hint>
 <city>
 <!-- A city in Christmas Island -->
- <_name>Drumsite</_name>
+ <name>Drumsite</name>
 <coordinates>-10.433333 105.683333</coordinates>
 <location>
 <name>Christmas Island Airport</name>
@@ -7270,7 +7270,7 @@
 </city>
 <city>
 <!-- The capital of Christmas Island -->
- <_name>Flying Fish Cove</_name>
+ <name>Flying Fish Cove</name>
 <coordinates>-10.416667 105.716667</coordinates>
 <location>
 <name>Christmas Island Airport</name>
@@ -7284,7 +7284,7 @@
 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>
+ <name>Cocos (Keeling) Islands</name>
 <iso-code>CC</iso-code>
 <fips-code>CK</fips-code>
 <timezones>
@@ -7293,7 +7293,7 @@
 <tz-hint>Indian/Cocos</tz-hint>
 <city>
 <!-- A city in the Cocos (Keeling) Islands -->
- <_name>Bantam Village</_name>
+ <name>Bantam Village</name>
 <coordinates>-12.116667 96.883333</coordinates>
 <location>
 <name>Cocos Island Airport</name>
@@ -7305,7 +7305,7 @@
 </country>
 <country>
 <!-- CK - Cook Islands -->
- <_name>Cook Islands</_name>
+ <name>Cook Islands</name>
 <iso-code>CK</iso-code>
 <fips-code>CW</fips-code>
 <timezones>
@@ -7314,7 +7314,7 @@
 <tz-hint>Pacific/Rarotonga</tz-hint>
 <city>
 <!-- The capital of the Cook Islands -->
- <_name>Avarua</_name>
+ <name>Avarua</name>
 <coordinates>-21.207778 -159.775000</coordinates>
 <location>
 <name>Rarotonga</name>
@@ -7325,7 +7325,7 @@
 </country>
 <country>
 <!-- FJ - Fiji -->
- <_name>Fiji</_name>
+ <name>Fiji</name>
 <!-- Could not find weather stations for the following major
 cities:
 Suva
@@ -7341,7 +7341,7 @@
 <!-- PF - French Polynesia, a French territory in the South
 Pacific
 -->
- <_name>French Polynesia</_name>
+ <name>French Polynesia</name>
 <iso-code>PF</iso-code>
 <fips-code>FP</fips-code>
 <timezones>
@@ -7351,27 +7351,27 @@
 Tahiti). This string is only used in places where
 "French Polynesia" is already clear from context.
 -->
- <_name>Tahiti / Society Islands</_name>
+ <name>Tahiti / Society Islands</name>
 </timezone>
 <timezone id="Pacific/Marquesas">
 <!-- This refers to the time zone in the Marquesas Islands of
 French Polynesia. This string is only used in places
 where "French Polynesia" is already clear from context.
 -->
- <_name>Marquesas Islands</_name>
+ <name>Marquesas Islands</name>
 </timezone>
 <timezone id="Pacific/Gambier">
 <!-- This refers to the time zone in the Gambier Islands of
 French Polynesia. This string is only used in places
 where "French Polynesia" is already clear from context.
 -->
- <_name>Gambier Islands</_name>
+ <name>Gambier Islands</name>
 </timezone>
 </timezones>
 <tz-hint>Pacific/Tahiti</tz-hint>
 <city>
 <!-- The capital of French Polynesia -->
- <_name>Papeete</_name>
+ <name>Papeete</name>
 <coordinates>-17.533333 -149.566667</coordinates>
 <location>
 <name>Tahiti-Faaa</name>
@@ -7384,7 +7384,7 @@
 <!-- GU - Guam, a territory of the United States in the South
 Pacific.
 -->
- <_name>Guam</_name>
+ <name>Guam</name>
 <!-- Could not find information about the following stations,
 which may be in Guam:
 PGRO 
@@ -7397,7 +7397,7 @@
 <tz-hint>Pacific/Guam</tz-hint>
 <city>
 <!-- A city in Guam -->
- <_name>Asatdas</_name>
+ <name>Asatdas</name>
 <coordinates>13.516944 144.863611</coordinates>
 <location>
 <name>Andersen, Mariana Is, Andersen Air Force Base</name>
@@ -7407,7 +7407,7 @@
 </city>
 <city>
 <!-- A city in Guam -->
- <_name>Hagåtña</_name>
+ <name>Hagåtña</name>
 <coordinates>13.474167 144.747778</coordinates>
 <location>
 <name>Guam International Airport</name>
@@ -7418,7 +7418,7 @@
 </country>
 <country>
 <!-- KI - Kiribati -->
- <_name>Kiribati</_name>
+ <name>Kiribati</name>
 <!-- Could not find weather stations for the following major
 cities:
 Bairiki, Tarawa
@@ -7431,27 +7431,27 @@
 main island groups of Kiribati. This string is only used
 in places where "Kiribati" is already clear from context.
 -->
- <_name>Gilbert Islands</_name>
+ <name>Gilbert Islands</name>
 </timezone>
 <timezone id="Pacific/Enderbury">
 <!-- The time zone in the Phoenix Islands, one of the three
 main island groups of Kiribati. This string is only used
 in places where "Kiribati" is already clear from context.
 -->
- <_name>Phoenix Islands</_name>
+ <name>Phoenix Islands</name>
 </timezone>
 <timezone id="Pacific/Kiritimati">
 <!-- The time zone in the Line Islands, one of the three main
 island groups of Kiribati. This string is only used in
 places where "Kiribati" is already clear from context.
 -->
- <_name>Line Islands</_name>
+ <name>Line Islands</name>
 </timezone>
 </timezones>
 <tz-hint>Pacific/Tarawa</tz-hint>
 <city>
 <!-- A city in Kiribati -->
- <_name msgctxt="City in Kiribati">London</_name>
+ <name msgctxt="City in Kiribati">London</name>
 <coordinates>1.983333 -157.466667</coordinates>
 <location>
 <name>Christmas, Cassidy Airport</name>
@@ -7462,7 +7462,7 @@
 </country>
 <country>
 <!-- MH - Marshall Islands -->
- <_name>Marshall Islands</_name>
+ <name>Marshall Islands</name>
 <!-- Could not find cities for the following weather stations:
 PKWA - Kwajalein, Bucholz AAF, Kwajalein KMR ATOL Airport
 (8.716667 167.733333)
@@ -7478,7 +7478,7 @@
 <tz-hint>Pacific/Majuro</tz-hint>
 <city>
 <!-- The capital of the Marshall Islands -->
- <_name>Majuro</_name>
+ <name>Majuro</name>
 <coordinates>7.100000 171.383333</coordinates>
 <location>
 <name>Majuro Atoll, Marshall Islands International Airport</name>
@@ -7494,7 +7494,7 @@
 </country>
 <country>
 <!-- FM - Federated States of Micronesia -->
- <_name>Micronesia, Federated States of</_name>
+ <name>Micronesia, Federated States of</name>
 <!-- Could not find information about the following stations,
 which may be in Micronesia, Federated States of:
 PTKK PTPN PTSA PTYA 
@@ -7509,7 +7509,7 @@
 The string is only used in places where "Micronesia" is
 already clear from context.
 -->
- <_name>Pohnpei / Kosrae</_name>
+ <name>Pohnpei / Kosrae</name>
 <obsoletes>Pacific/Kosrae</obsoletes>
 <obsoletes>Pacific/Ponape</obsoletes>
 </timezone>
@@ -7519,13 +7519,13 @@
 string is only used in places where "Micronesia" is
 already clear from context.
 -->
- <_name>Yap / Chuuk</_name>
+ <name>Yap / Chuuk</name>
 <obsoletes>Pacific/Truk</obsoletes>
 </timezone>
 </timezones>
 <city>
 <!-- The capital of the Federated States of Micronesia -->
- <_name>Palikir</_name>
+ <name>Palikir</name>
 <coordinates>6.916667 158.150000</coordinates>
 <location>
 <name>Pohnpei</name>
@@ -7537,7 +7537,7 @@
 </country>
 <country>
 <!-- NR - Nauru -->
- <_name>Nauru</_name>
+ <name>Nauru</name>
 <iso-code>NR</iso-code>
 <fips-code>NR</fips-code>
 <timezones>
@@ -7549,7 +7549,7 @@
 <!-- NC - New Caledonia, a French territory in the South Pacific.
 The French name is "Nouvelle-Calédonie".
 -->
- <_name>New Caledonia</_name>
+ <name>New Caledonia</name>
 <iso-code>NC</iso-code>
 <fips-code>NC</fips-code>
 <timezones>
@@ -7558,7 +7558,7 @@
 <tz-hint>Pacific/Noumea</tz-hint>
 <city>
 <!-- A city in New Caledonia -->
- <_name>Karenga</_name>
+ <name>Karenga</name>
 <coordinates>-22.016667 166.233333</coordinates>
 <location>
 <name>La Tontouta</name>
@@ -7568,7 +7568,7 @@
 </city>
 <city>
 <!-- The capital of New Caledonia -->
- <_name>Nouméa</_name>
+ <name>Nouméa</name>
 <coordinates>-22.266667 166.450000</coordinates>
 <location>
 <name>La Tontouta</name>
@@ -7579,7 +7579,7 @@
 </country>
 <country>
 <!-- NZ - New Zealand -->
- <_name>New Zealand</_name>
+ <name>New Zealand</name>
 <iso-code>NZ</iso-code>
 <fips-code>NZ</fips-code>
 <timezones>
@@ -7591,19 +7591,19 @@
 there a better name for this? "Mainland" seems odd in
 reference to an island nation...
 -->
- <_name>Mainland New Zealand</_name>
+ <name>Mainland New Zealand</name>
 </timezone>
 <timezone id="Pacific/Chatham">
 <!-- This refers to the time zone in the Chatham Islands of
 New Zealand.
 -->
- <_name>Chatham Islands</_name>
+ <name>Chatham Islands</name>
 </timezone>
 </timezones>
 <tz-hint>Pacific/Auckland</tz-hint>
 <city>
 <!-- A city in New Zealand -->
- <_name>Auckland</_name>
+ <name>Auckland</name>
 <coordinates>-36.866667 174.766667</coordinates>
 <location>
 <name>Auckland Airport</name>
@@ -7613,7 +7613,7 @@
 </city>
 <city>
 <!-- A city in New Zealand -->
- <_name>Christchurch</_name>
+ <name>Christchurch</name>
 <coordinates>-43.533333 172.633333</coordinates>
 <location>
 <name>Christchurch</name>
@@ -7623,7 +7623,7 @@
 </city>
 <city>
 <!-- A city in New Zealand -->
- <_name>Dunedin</_name>
+ <name>Dunedin</name>
 <coordinates>-45.8741 170.5035</coordinates>
 <location>
 <name>Dunedin Airport</name>
@@ -7633,7 +7633,7 @@
 </city>
 <city>
 <!-- The capital of New Zealand -->
- <_name>Wellington</_name>
+ <name>Wellington</name>
 <coordinates>-41.300000 174.783333</coordinates>
 <location>
 <name>Wellington Airport</name>
@@ -7644,7 +7644,7 @@
 </country>
 <country>
 <!-- NU - Niue -->
- <_name>Niue</_name>
+ <name>Niue</name>
 <iso-code>NU</iso-code>
 <fips-code>NE</fips-code>
 <timezones>
@@ -7653,7 +7653,7 @@
 <tz-hint>Pacific/Niue</tz-hint>
 <city>
 <!-- The capital of Niue -->
- <_name>Alofi</_name>
+ <name>Alofi</name>
 <coordinates>-19.016667 -169.916667</coordinates>
 <location>
 <name>Alofi / Niue</name>
@@ -7664,7 +7664,7 @@
 </country>
 <country>
 <!-- NF - Norfolk Island, a territory of Australia -->
- <_name>Norfolk Island</_name>
+ <name>Norfolk Island</name>
 <iso-code>NF</iso-code>
 <fips-code>NF</fips-code>
 <timezones>
@@ -7673,7 +7673,7 @@
 <tz-hint>Pacific/Norfolk</tz-hint>
 <city>
 <!-- A city in Norfolk Island -->
- <_name msgctxt="City in Norfolk Island">Kingston</_name>
+ <name msgctxt="City in Norfolk Island">Kingston</name>
 <coordinates>-29.050000 167.950000</coordinates>
 <location>
 <name>Norfolk Island Airport</name>
@@ -7687,7 +7687,7 @@
 <!-- MP - Northern Mariana Islands, a semi-independent territory
 of the United States in the western Pacific Ocean.
 -->
- <_name>Northern Mariana Islands</_name>
+ <name>Northern Mariana Islands</name>
 <iso-code>MP</iso-code>
 <fips-code>US69</fips-code>
 <timezones>
@@ -7696,7 +7696,7 @@
 <tz-hint>Pacific/Saipan</tz-hint>
 <city>
 <!-- A city in the Northern Mariana Islands -->
- <_name>Chalan Kanoa</_name>
+ <name>Chalan Kanoa</name>
 <coordinates>15.145556 145.699167</coordinates>
 <location>
 <name>Saipan Island, Saipan International Airport</name>
@@ -7712,7 +7712,7 @@
 </country>
 <country>
 <!-- PW - Palau -->
- <_name>Palau</_name>
+ <name>Palau</name>
 <iso-code>PW</iso-code>
 <fips-code>PS|US70</fips-code>
 <timezones>
@@ -7721,7 +7721,7 @@
 <tz-hint>Pacific/Palau</tz-hint>
 <city>
 <!-- The capital of Palau -->
- <_name>Koror</_name>
+ <name>Koror</name>
 <coordinates>7.333333 134.483333</coordinates>
 <location>
 <name>Koror, Palau</name>
@@ -7736,7 +7736,7 @@
 </city>
 <city>
 <!-- The capital of Palau -->
- <_name>Melekeok</_name>
+ <name>Melekeok</name>
 <coordinates>7.493333 134.634167</coordinates>
 <location>
 <name>Babelthuap Island, Babelthuap / Koror Airport</name>
@@ -7747,7 +7747,7 @@
 </country>
 <country>
 <!-- PG - Papua New Guinea -->
- <_name>Papua New Guinea</_name>
+ <name>Papua New Guinea</name>
 <!-- Could not find information about the following stations,
 which may be in Papua New Guinea:
 AYGN 
@@ -7760,7 +7760,7 @@
 <tz-hint>Pacific/Port_Moresby</tz-hint>
 <city>
 <!-- The capital of Papua New Guinea -->
- <_name>Port Moresby</_name>
+ <name>Port Moresby</name>
 <coordinates>-9.464722 147.192500</coordinates>
 <location>
 <name>Moresby</name>
@@ -7771,7 +7771,7 @@
 </country>
 <country>
 <!-- PN - Pitcairn, a British territory in the South Pacific -->
- <_name>Pitcairn</_name>
+ <name>Pitcairn</name>
 <!-- Could not find weather stations for the following major
 cities:
 Adamstown
@@ -7787,7 +7787,7 @@
 <!-- WS - Samoa, an independent nation not to be confused with
 "American Samoa"
 -->
- <_name>Samoa</_name>
+ <name>Samoa</name>
 <iso-code>WS</iso-code>
 <fips-code>WS</fips-code>
 <timezones>
@@ -7796,7 +7796,7 @@
 <tz-hint>Pacific/Apia</tz-hint>
 <city>
 <!-- The capital of Samoa -->
- <_name>Apia</_name>
+ <name>Apia</name>
 <coordinates>-13.833333 -171.733333</coordinates>
 <location>
 <name>Faleolo International / Apia</name>
@@ -7807,7 +7807,7 @@
 </country>
 <country>
 <!-- SB - Solomon Islands -->
- <_name>Solomon Islands</_name>
+ <name>Solomon Islands</name>
 <iso-code>SB</iso-code>
 <fips-code>BP</fips-code>
 <timezones>
@@ -7816,7 +7816,7 @@
 <tz-hint>Pacific/Guadalcanal</tz-hint>
 <city>
 <!-- The capital of the Solomon Islands -->
- <_name>Honiara</_name>
+ <name>Honiara</name>
 <coordinates>-9.433333 159.950000</coordinates>
 <location>
 <name>Henderson Airport</name>
@@ -7827,7 +7827,7 @@
 </country>
 <country>
 <!-- TL - Timor-Leste (formerly known as "East Timor") -->
- <_name>Timor-Leste</_name>
+ <name>Timor-Leste</name>
 <iso-code>TL</iso-code>
 <fips-code>TT</fips-code>
 <timezones>
@@ -7837,7 +7837,7 @@
 </country>
 <country>
 <!-- TK - Tokelau, a territory of New Zealand -->
- <_name>Tokelau</_name>
+ <name>Tokelau</name>
 <iso-code>TK</iso-code>
 <fips-code>TL</fips-code>
 <timezones>
@@ -7847,7 +7847,7 @@
 </country>
 <country>
 <!-- TO - Tonga -->
- <_name>Tonga</_name>
+ <name>Tonga</name>
 <iso-code>TO</iso-code>
 <fips-code>TN</fips-code>
 <timezones>
@@ -7856,7 +7856,7 @@
 <tz-hint>Pacific/Tongatapu</tz-hint>
 <city>
 <!-- A city in Tonga -->
- <_name>Fua'amotu</_name>
+ <name>Fua'amotu</name>
 <coordinates>-21.250000 -175.133333</coordinates>
 <location>
 <name>Fua'amotu</name>
@@ -7866,7 +7866,7 @@
 </city>
 <city>
 <!-- The capital of Tonga -->
- <_name>Nuku'alofa</_name>
+ <name>Nuku'alofa</name>
 <coordinates>-21.133333 -175.200000</coordinates>
 <location>
 <name>Fua'amotu</name>
@@ -7877,7 +7877,7 @@
 </country>
 <country>
 <!-- TV - Tuvalu -->
- <_name>Tuvalu</_name>
+ <name>Tuvalu</name>
 <iso-code>TV</iso-code>
 <fips-code>TV</fips-code>
 <timezones>
@@ -7886,7 +7886,7 @@
 <tz-hint>Pacific/Funafuti</tz-hint>
 <city>
  <!-- The capital of Tuvalu -->
- <_name>Funafuti</_name>
+ <name>Funafuti</name>
 <coordinates>-8.516667 179.216667</coordinates>
 <location>
 <name>Funafuti</name>
@@ -7900,7 +7900,7 @@
 mostly-uninhabited United States territories in the South
 Pacific.
 -->
- <_name>United States Minor Outlying Islands</_name>
+ <name>United States Minor Outlying Islands</name>
 <iso-code>UM</iso-code>
 <fips-code>US74</fips-code>
 <timezones>
@@ -7911,7 +7911,7 @@
 places where "US Minor Outlying Islands" is already
 clear from context.
 -->
- <_name>Johnston Atoll (Hawaii Time)</_name>
+ <name>Johnston Atoll (Hawaii Time)</name>
 </timezone>
 <timezone id="Pacific/Midway">
 <!-- The time zone for the Midway Atoll in the United States
@@ -7921,7 +7921,7 @@
 places where "US Minor Outlying Islands" is already
 clear from context.
 -->
- <_name>Midway Atoll (Samoa Time)</_name>
+ <name>Midway Atoll (Samoa Time)</name>
 </timezone>
 <timezone id="Pacific/Wake">
 <!-- The time zone for Wake Island in the United States Minor
@@ -7929,12 +7929,12 @@
 where "US Minor Outlying Islands" is already clear from
 context.
 -->
- <_name>Wake Island</_name>
+ <name>Wake Island</name>
 </timezone>
 </timezones>
 <city>
 <!-- A city in the United States Minor Outlying Islands -->
- <_name>Wake Island, Wake Island Army Airfield Airport</_name>
+ <name>Wake Island, Wake Island Army Airfield Airport</name>
 <coordinates>19.283333 166.650000</coordinates>
 <location>
 <name>Wake Island, Wake Island Army Airfield Airport</name>
@@ -7945,7 +7945,7 @@
 </country>
 <country>
 <!-- VU - Vanuatu -->
- <_name>Vanuatu</_name>
+ <name>Vanuatu</name>
 <!-- Could not find weather stations for the following major
 cities:
 Port-Vila
@@ -7961,7 +7961,7 @@
 <!-- WF - Wallis and Futuna, a French territory in the South
 Pacific
 -->
- <_name>Wallis and Futuna</_name>
+ <name>Wallis and Futuna</name>
 <iso-code>WF</iso-code>
 <fips-code>WF</fips-code>
 <timezones>
@@ -7970,7 +7970,7 @@
 <tz-hint>Pacific/Wallis</tz-hint>
 <city>
 <!-- A city in Wallis and Futuna -->
- <_name>Mata'utu</_name>
+ <name>Mata'utu</name>
 <coordinates>-13.283333 -176.133333</coordinates>
 <location>
 <name>Hihifo Ile Wallis</name>
@@ -7981,10 +7981,10 @@
 </country>
 </region>
 <region>
- <_name>Central and South America</_name>
+ <name>Central and South America</name>
 <country>
 <!-- AR - Argentina -->
- <_name>Argentina</_name>
+ <name>Argentina</name>
 <iso-code>AR</iso-code>
 <fips-code>AR</fips-code>
 <timezones>
@@ -8004,7 +8004,7 @@
 <tz-hint>America/Argentina/Buenos_Aires</tz-hint>
 <city>
 <!-- The capital of Argentina -->
- <_name>Buenos Aires</_name>
+ <name>Buenos Aires</name>
 <coordinates>-34.587500 -58.672500</coordinates>
 <location>
 <name>Jorge Newbery Airport</name>
@@ -8014,7 +8014,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name>Comodoro Rivadavia</_name>
+ <name>Comodoro Rivadavia</name>
 <coordinates>-45.866667 -67.500000</coordinates>
 <location>
 <name>Comodoro Rivadavia Airport</name>
@@ -8024,7 +8024,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name>Corrientes</_name>
+ <name>Corrientes</name>
 <coordinates>-27.466667 -58.833333</coordinates>
 <location>
 <name>Corrientes Airport</name>
@@ -8034,7 +8034,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name msgctxt="City in Argentina">Córdoba</_name>
+ <name msgctxt="City in Argentina">Córdoba</name>
 <coordinates>-31.400000 -64.183333</coordinates>
 <location>
 <name>Córdoba Airport</name>
@@ -8044,7 +8044,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name>El Palomar</_name>
+ <name>El Palomar</name>
 <coordinates>-34.541667 -58.615278</coordinates>
 <location>
 <name>El Palomar Airport</name>
@@ -8054,7 +8054,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name>Ezeiza</_name>
+ <name>Ezeiza</name>
 <coordinates>-34.838056 -58.517222</coordinates>
 <location>
 <name>Ezeiza Airport</name>
@@ -8064,7 +8064,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name>Formosa</_name>
+ <name>Formosa</name>
 <coordinates>-26.183333 -58.183333</coordinates>
 <location>
 <name>Formosa Airport</name>
@@ -8074,7 +8074,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name>Mar del Plata</_name>
+ <name>Mar del Plata</name>
 <coordinates>-38.000000 -57.550000</coordinates>
 <location>
 <name>Mar del Plata Airport</name>
@@ -8084,7 +8084,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name>Mendoza</_name>
+ <name>Mendoza</name>
 <coordinates>-32.883333 -68.816667</coordinates>
 <location>
 <name>Mendoza Airport</name>
@@ -8094,7 +8094,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name>Neuquén</_name>
+ <name>Neuquén</name>
 <coordinates>-38.950000 -68.066667</coordinates>
 <location>
 <name>Neuquén Airport</name>
@@ -8104,7 +8104,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name>Posadas</_name>
+ <name>Posadas</name>
 <coordinates>-27.383333 -55.883333</coordinates>
 <location>
 <name>Posadas Airport</name>
@@ -8114,7 +8114,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name>Puerto Iguazú</_name>
+ <name>Puerto Iguazú</name>
 <coordinates>-25.566667 -54.566667</coordinates>
 <location>
 <name>Puerto Iguazú Airport</name>
@@ -8124,7 +8124,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name>Reconquista</_name>
+ <name>Reconquista</name>
 <coordinates>-29.150000 -59.650000</coordinates>
 <location>
 <name>Reconquista</name>
@@ -8134,7 +8134,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name>Resistencia</_name>
+ <name>Resistencia</name>
 <coordinates>-27.450000 -58.983333</coordinates>
 <location>
 <name>Resistencia Airport</name>
@@ -8144,7 +8144,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name>Rosario</_name>
+ <name>Rosario</name>
 <coordinates>-32.951111 -60.666389</coordinates>
 <location>
 <name>Rosario Airport</name>
@@ -8154,7 +8154,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name>Río Gallegos</_name>
+ <name>Río Gallegos</name>
 <coordinates>-51.633333 -69.216667</coordinates>
 <location>
 <name>Río Gallegos Airport</name>
@@ -8164,7 +8164,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name>Río Grande</_name>
+ <name>Río Grande</name>
 <coordinates>-53.783333 -67.700000</coordinates>
 <location>
 <name>Rio Grande B. A.</name>
@@ -8174,7 +8174,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name>Salta</_name>
+ <name>Salta</name>
 <coordinates>-24.783333 -65.416667</coordinates>
 <location>
 <name>Salta Airport</name>
@@ -8184,7 +8184,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name>San Carlos de Bariloche</_name>
+ <name>San Carlos de Bariloche</name>
 <coordinates>-41.150000 -71.300000</coordinates>
 <location>
 <name>San Carlos de Bariloche Airport</name>
@@ -8194,7 +8194,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name msgctxt="City in Argentina">San Fernando</_name>
+ <name msgctxt="City in Argentina">San Fernando</name>
 <coordinates>-34.444167 -58.577500</coordinates>
 <location>
 <name>San Fernando</name>
@@ -8204,7 +8204,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name>San Salvador de Jujuy</_name>
+ <name>San Salvador de Jujuy</name>
 <coordinates>-24.183333 -65.300000</coordinates>
 <location>
 <name>San Salvador de Jujuy Airport</name>
@@ -8214,7 +8214,7 @@
 </city>
 <city>
 <!-- A city in Argentina -->
- <_name>Ushuaia</_name>
+ <name>Ushuaia</name>
 <coordinates>-54.800000 -68.300000</coordinates>
 <location>
 <name>Ushuaia Airport</name>
@@ -8227,7 +8227,7 @@
 <!-- AW - Aruba, a Caribbean island that is one of the three
 constituent countries of the Kingdom of the Netherlands.
 -->
- <_name>Aruba</_name>
+ <name>Aruba</name>
 <iso-code>AW</iso-code>
 <fips-code>AA</fips-code>
 <timezones>
@@ -8236,7 +8236,7 @@
 <tz-hint>America/Aruba</tz-hint>
 <city>
 <!-- A city in Aruba -->
- <_name>Camacuri</_name>
+ <name>Camacuri</name>
 <coordinates>12.500000 -70.016667</coordinates>
 <location>
 <name>Queen Beatrix Airport</name>
@@ -8246,7 +8246,7 @@
 </city>
 <city>
 <!-- The capital of Aruba -->
- <_name>Oranjestad</_name>
+ <name>Oranjestad</name>
 <coordinates>12.516667 -70.033333</coordinates>
 <location>
 <name>Queen Beatrix Airport</name>
@@ -8257,7 +8257,7 @@
 </country>
 <country>
 <!-- BS - Bahamas -->
- <_name>Bahamas</_name>
+ <name>Bahamas</name>
 <iso-code>BS</iso-code>
 <fips-code>BF</fips-code>
 <timezones>
@@ -8266,7 +8266,7 @@
 <tz-hint>America/Nassau</tz-hint>
 <city>
 <!-- A city in the Bahamas -->
- <_name msgctxt="City in Bahamas">Freeport</_name>
+ <name msgctxt="City in Bahamas">Freeport</name>
 <coordinates>26.533333 -78.700000</coordinates>
 <location>
 <name>Freeport, Grand Bahama</name>
@@ -8276,7 +8276,7 @@
 </city>
 <city>
 <!-- A city in the Bahamas -->
- <_name msgctxt="City in Bahamas">Georgetown</_name>
+ <name msgctxt="City in Bahamas">Georgetown</name>
 <coordinates>23.500000 -75.766667</coordinates>
 <location>
 <name>Georgetown, Exuma</name>
@@ -8286,7 +8286,7 @@
 </city>
 <city>
 <!-- The capital of the Bahamas -->
- <_name>Nassau</_name>
+ <name>Nassau</name>
 <coordinates>25.083333 -77.350000</coordinates>
 <location>
 <name>Nassau Airport</name>
@@ -8297,7 +8297,7 @@
 </country>
 <country>
 <!-- BZ - Belize -->
- <_name>Belize</_name>
+ <name>Belize</name>
 <!-- Could not find weather stations for the following major
 cities:
 Belmopan
@@ -8310,7 +8310,7 @@
 <tz-hint>America/Belize</tz-hint>
 <city>
 <!-- A city in Belize -->
- <_name>Belize City</_name>
+ <name>Belize City</name>
 <coordinates>17.483333 -88.183333</coordinates>
 <location>
 <name>Phillip Goldston International Airport</name>
@@ -8321,7 +8321,7 @@
 </country>
 <country>
 <!-- BO - Bolivia -->
- <_name>Bolivia</_name>
+ <name>Bolivia</name>
 <iso-code>BO</iso-code>
 <fips-code>BL</fips-code>
 <timezones>
@@ -8330,7 +8330,7 @@
 <tz-hint>America/La_Paz</tz-hint>
 <city>
 <!-- A city in Bolivia -->
- <_name>Camiri</_name>
+ <name>Camiri</name>
 <coordinates>-20.050000 -63.516667</coordinates>
 <location>
 <name>Camiri</name>
@@ -8340,7 +8340,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name>Cobija</_name>
+ <name>Cobija</name>
 <coordinates>-11.033333 -68.733333</coordinates>
 <location>
 <name>Cobija</name>
@@ -8350,7 +8350,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name>Cochabamba</_name>
+ <name>Cochabamba</name>
 <coordinates>-17.383333 -66.150000</coordinates>
 <location>
 <name>Cochabamba</name>
@@ -8360,7 +8360,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name msgctxt="City in Bolivia">Concepción</_name>
+ <name msgctxt="City in Bolivia">Concepción</name>
 <coordinates>-16.133333 -62.033333</coordinates>
 <location>
 <name>Concepción</name>
@@ -8370,7 +8370,7 @@
 </city>
 <city>
 <!-- The capital of Bolivia -->
- <_name msgctxt="City in Bolivia">La Paz</_name>
+ <name msgctxt="City in Bolivia">La Paz</name>
 <coordinates>-16.500000 -68.150000</coordinates>
 <location>
 <name>Alto Airport</name>
@@ -8380,7 +8380,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name>Magdalena</_name>
+ <name>Magdalena</name>
 <coordinates>-13.233333 -64.200000</coordinates>
 <location>
 <name>Magdalena</name>
@@ -8390,7 +8390,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name>Oruro</_name>
+ <name>Oruro</name>
 <coordinates>-17.983333 -67.150000</coordinates>
 <location>
 <name>Oruro</name>
@@ -8400,7 +8400,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name>Potosí</_name>
+ <name>Potosí</name>
 <coordinates>-19.583611 -65.753056</coordinates>
 <location>
 <name>Potosí</name>
@@ -8410,7 +8410,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name>Puerto Suárez</_name>
+ <name>Puerto Suárez</name>
 <coordinates>-18.950000 -57.800000</coordinates>
 <location>
 <name>Puerto Suárez</name>
@@ -8420,7 +8420,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name>Reyes</_name>
+ <name>Reyes</name>
 <coordinates>-14.316667 -67.383333</coordinates>
 <location>
 <name>Reyes</name>
@@ -8430,7 +8430,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name>Riberalta</_name>
+ <name>Riberalta</name>
 <coordinates>-10.983333 -66.100000</coordinates>
 <location>
 <name>Riberalta</name>
@@ -8440,7 +8440,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name>Roboré</_name>
+ <name>Roboré</name>
 <coordinates>-18.333333 -59.750000</coordinates>
 <location>
 <name>Roboré</name>
@@ -8450,7 +8450,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name>Rurrenabaque</_name>
+ <name>Rurrenabaque</name>
 <coordinates>-14.466667 -67.566667</coordinates>
 <location>
 <name>Rurrenabaque</name>
@@ -8460,7 +8460,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name>San Borja</_name>
+ <name>San Borja</name>
 <coordinates>-14.816667 -66.850000</coordinates>
 <location>
 <name>San Borja</name>
@@ -8470,7 +8470,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name>San Ignacio de Velasco</_name>
+ <name>San Ignacio de Velasco</name>
 <coordinates>-16.366667 -60.950000</coordinates>
 <location>
 <name>San Ignacio de Velasco</name>
@@ -8480,7 +8480,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name>San Joaquín</_name>
+ <name>San Joaquín</name>
 <coordinates>-13.066667 -64.816667</coordinates>
 <location>
 <name>San Joaquín</name>
@@ -8492,7 +8492,7 @@
 <!-- A city in Bolivia.
 One of several cities in Bolivia called "San José".
 -->
- <_name>San José de Chiquitos</_name>
+ <name>San José de Chiquitos</name>
 <coordinates>-17.850000 -60.750000</coordinates>
 <location>
  <name>San José de Chiquitos</name>
@@ -8502,7 +8502,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name>Santa Ana de Yacuma</_name>
+ <name>Santa Ana de Yacuma</name>
 <coordinates>-13.750000 -65.433333</coordinates>
 <location>
 <name>Santa Ana de Yacuma</name>
@@ -8512,7 +8512,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name>Santa Cruz</_name>
+ <name>Santa Cruz</name>
 <coordinates>-17.800000 -63.166667</coordinates>
 <location>
 <name>El Trompillo Airport</name>
@@ -8522,7 +8522,7 @@
 </city>
 <city>
 <!-- The capital of Bolivia -->
- <_name>Sucre</_name>
+ <name>Sucre</name>
 <coordinates>-19.043056 -65.259167</coordinates>
 <location>
 <name>Sucre</name>
@@ -8532,7 +8532,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name>Tarija</_name>
+ <name>Tarija</name>
 <coordinates>-21.516667 -64.750000</coordinates>
 <location>
 <name>Tarija</name>
@@ -8542,7 +8542,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name msgctxt="City in Bolivia">Trinidad</_name>
+ <name msgctxt="City in Bolivia">Trinidad</name>
 <coordinates>-14.833333 -64.900000</coordinates>
 <location>
 <name>Trinidad</name>
@@ -8552,7 +8552,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name>Villamontes</_name>
+ <name>Villamontes</name>
 <coordinates>-21.250000 -63.500000</coordinates>
 <location>
 <name>Villamontes</name>
@@ -8562,7 +8562,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name>Viro Viro</_name>
+ <name>Viro Viro</name>
 <coordinates>-17.650000 -63.133333</coordinates>
 <location>
 <name>Viro Viro</name>
@@ -8572,7 +8572,7 @@
 </city>
 <city>
 <!-- A city in Bolivia -->
- <_name>Yacuiba</_name>
+ <name>Yacuiba</name>
 <coordinates>-22.033333 -63.683333</coordinates>
 <location>
 <name>Yacuiba</name>
@@ -8583,7 +8583,7 @@
 </country>
 <country>
 <!-- BR - Brazil -->
- <_name>Brazil</_name>
+ <name>Brazil</name>
 <!-- Could not find cities for the following weather stations:
 SBCJ - Carajas, Maraba Airport (-6.116667 -50.000000)
 -->
@@ -8600,7 +8600,7 @@
 details. This string is only used in places where
 "Brazil" is already clear from context.
 -->
- <_name>Tocantins</_name>
+ <name>Tocantins</name>
 </timezone>
 <timezone id="America/Bahia">
 <!-- This represents the time zone in the Brazilian state of
@@ -8608,7 +8608,7 @@
 details. This string is only used in places where
 "Brazil" is already clear from context.
 -->
- <_name msgctxt="Timezone">Bahia</_name>
+ <name msgctxt="Timezone">Bahia</name>
 </timezone>
 <timezone id="America/Belem">
 <!-- This represents the time zone in the Brazilian state of
@@ -8617,7 +8617,7 @@
 used in places where "Brazil" is already clear from
 context.
 -->
- <_name>Amapá / East Pará</_name>
+ <name>Amapá / East Pará</name>
 </timezone>
 <timezone id="America/Boa_Vista">
 <!-- This represents the time zone in the Brazilian state of
@@ -8625,7 +8625,7 @@
 details. This string is only used in places where
 "Brazil" is already clear from context.
 -->
- <_name msgctxt="Timezone">Roraima</_name>
+ <name msgctxt="Timezone">Roraima</name>
 </timezone>
 <timezone id="America/Campo_Grande">
 <!-- This represents the time zone in the Brazilian state of
@@ -8633,7 +8633,7 @@
 for more details. This string is only used in places
 where "Brazil" is already clear from context.
 -->
- <_name msgctxt="Timezone">Mato Grosso do Sul</_name>
+ <name msgctxt="Timezone">Mato Grosso do Sul</name>
 </timezone>
 <timezone id="America/Cuiaba">
 <!-- This represents the time zone in the Brazilian state of
@@ -8641,7 +8641,7 @@
 details. This string is only used in places where
 "Brazil" is already clear from context.
 -->
- <_name msgctxt="Timezone">Mato Grosso</_name>
+ <name msgctxt="Timezone">Mato Grosso</name>
 </timezone>
 <timezone id="America/Eirunepe">
 <!-- This represents the time zone in the western part of the
@@ -8650,7 +8650,7 @@
 used in places where "Brazil" is already clear from
 context.
 -->
- <_name>West Amazonas</_name>
+ <name>West Amazonas</name>
 </timezone>
 <timezone id="America/Fortaleza">
 <!-- This represents the time zone in the Brazilian states of
@@ -8659,7 +8659,7 @@
 details. This string is only used in places where
 "Brazil" is already clear from context.
 -->
- <_name>Ceará, Maranhão, Paraíba, Piauí, Rio Grande do Norte</_name>
+ <name>Ceará, Maranhão, Paraíba, Piauí, Rio Grande do Norte</name>
 </timezone>
 <timezone id="America/Maceio">
 <!-- This represents the time zone in the Brazilian states of
@@ -8667,7 +8667,7 @@
 for more details. This string is only used in places
 where "Brazil" is already clear from context.
 -->
- <_name>Alagoas, Sergipe</_name>
+ <name>Alagoas, Sergipe</name>
 </timezone>
 <timezone id="America/Manaus">
 <!-- This represents the time zone in the eastern part of the
@@ -8676,7 +8676,7 @@
 used in places where "Brazil" is already clear from
 context.
 -->
- <_name>East Amazonas</_name>
+ <name>East Amazonas</name>
 </timezone>
 <timezone id="America/Noronha">
 <!-- This represents the time zone on the Brazilian island of
@@ -8684,7 +8684,7 @@
 for more details. This string is only used in places
 where "Brazil" is already clear from context.
 -->
- <_name>Fernando de Noronha</_name>
+ <name>Fernando de Noronha</name>
 </timezone>
 <timezone id="America/Porto_Velho">
 <!-- This represents the time zone in the Brazilian state of
@@ -8693,7 +8693,7 @@
 used in places where "Brazil" is already clear from
 context.
 -->
- <_name>West Pará, Rondônia</_name>
+ <name>West Pará, Rondônia</name>
 </timezone>
 <timezone id="America/Recife">
 <!-- This represents the time zone in the Brazilian state of
@@ -8701,7 +8701,7 @@
 details. This string is only used in places where
 "Brazil" is already clear from context.
 -->
- <_name msgctxt="Timezone">Pernambuco</_name>
+ <name msgctxt="Timezone">Pernambuco</name>
 </timezone>
 <timezone id="America/Rio_Branco">
 <!-- This represents the time zone in the Brazilian state of
@@ -8709,7 +8709,7 @@
 details. This string is only used in places where
 "Brazil" is already clear from context.
 -->
- <_name msgctxt="Timezone">Acre</_name>
+ <name msgctxt="Timezone">Acre</name>
 </timezone>
 <timezone id="America/Sao_Paulo">
 <!-- This represents the official "base" time zone in Brazil,
@@ -8730,17 +8730,17 @@
 Paulo). This string is only used in places where
 "Brazil" is already clear from context.
 -->
- <_name>Brasília Time</_name>
+ <name>Brasília Time</name>
 </timezone>
 </timezones>
 <tz-hint>America/Sao_Paulo</tz-hint>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name msgctxt="State in Brazil">Acre</_name>
+ <name msgctxt="State in Brazil">Acre</name>
 <fips-code>BR01</fips-code>
 <city>
 <!-- A city in Acre in Brazil -->
- <_name>Cruzeiro do Sul</_name>
+ <name>Cruzeiro do Sul</name>
 <coordinates>-7.633333 -72.600000</coordinates>
 <location>
 <name>Cruzeiro do Sul</name>
@@ -8751,7 +8751,7 @@
 </city>
 <city>
 <!-- A city in Acre in Brazil -->
- <_name>Rio Branco</_name>
+ <name>Rio Branco</name>
 <coordinates>-9.966667 -67.800000</coordinates>
 <location>
 <name>Rio Branco</name>
@@ -8762,7 +8762,7 @@
 </city>
 <city>
 <!-- A city in Acre in Brazil -->
- <_name>Tarauacá</_name>
+ <name>Tarauacá</name>
 <coordinates>-8.166667 -70.766667</coordinates>
 <location>
 <name>Tarauacá</name>
@@ -8773,11 +8773,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name>Alagoas</_name>
+ <name>Alagoas</name>
 <fips-code>BR02</fips-code>
 <city>
 <!-- A city in Alagoas in Brazil -->
- <_name>Maceió</_name>
+ <name>Maceió</name>
 <coordinates>-9.666667 -35.716667</coordinates>
 <location>
 <name>Maceió Airport</name>
@@ -8789,11 +8789,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name>Amapá</_name>
+ <name>Amapá</name>
 <fips-code>BR03</fips-code>
 <city>
 <!-- A city in Amapá in Brazil -->
- <_name>Oiapoque</_name>
+ <name>Oiapoque</name>
 <coordinates>3.833333 -51.833333</coordinates>
 <location>
 <name>Oiapoque</name>
@@ -8804,11 +8804,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name>Amazonas</_name>
+ <name>Amazonas</name>
 <fips-code>BR04</fips-code>
 <city>
 <!-- A city in Amazonas in Brazil -->
- <_name>Manaus</_name>
+ <name>Manaus</name>
 <coordinates>-3.113333 -60.025278</coordinates>
 <location>
 <name>Manaus Airport</name>
@@ -8824,7 +8824,7 @@
 </city>
 <city>
 <!-- A city in Amazonas in Brazil -->
- <_name>Manicoré</_name>
+ <name>Manicoré</name>
 <coordinates>-5.812222 -61.297500</coordinates>
 <location>
 <name>Manicoré</name>
@@ -8834,7 +8834,7 @@
 </city>
 <city>
 <!-- A city in Amazonas in Brazil -->
- <_name>São Félix</_name>
+ <name>São Félix</name>
 <coordinates>-3.750000 -69.483333</coordinates>
 <location>
 <name>Tabatinga</name>
@@ -8845,7 +8845,7 @@
 </city>
 <city>
 <!-- A city in Amazonas in Brazil -->
- <_name>São Gabriel</_name>
+ <name>São Gabriel</name>
 <coordinates>-0.133333 -67.083333</coordinates>
 <location>
 <name>São Gabriel</name>
@@ -8855,7 +8855,7 @@
 </city>
 <city>
 <!-- A city in Amazonas in Brazil -->
- <_name>Tefé</_name>
+ <name>Tefé</name>
 <coordinates>-3.366667 -64.700000</coordinates>
 <location>
 <name>Tefé</name>
@@ -8867,11 +8867,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name msgctxt="State in Brazil">Bahia</_name>
+ <name msgctxt="State in Brazil">Bahia</name>
 <fips-code>BR05</fips-code>
 <city>
 <!-- A city in Bahia in Brazil -->
- <_name>Bom Jesus da Lapa</_name>
+ <name>Bom Jesus da Lapa</name>
 <coordinates>-13.250000 -43.416667</coordinates>
 <location>
 <name>Bom Jesus da Lapa</name>
@@ -8881,7 +8881,7 @@
 </city>
 <city>
 <!-- A city in Bahia in Brazil -->
- <_name>Feira de Santana</_name>
+ <name>Feira de Santana</name>
 <coordinates>-12.255082 -38.972638</coordinates>
 <location>
 <name>Feira de Santana Airport</name>
@@ -8892,7 +8892,7 @@
 </city>
 <city>
 <!-- A city in Bahia in Brazil -->
- <_name>Ilhéus</_name>
+ <name>Ilhéus</name>
 <coordinates>-14.816667 -39.033333</coordinates>
 <location>
 <name>Ilhéus Airport</name>
@@ -8902,7 +8902,7 @@
 </city>
 <city>
 <!-- A city in Bahia in Brazil -->
- <_name>Paulo Afonso</_name>
+ <name>Paulo Afonso</name>
 <coordinates>-9.350000 -38.233333</coordinates>
 <location>
 <name>Paulo Afonso</name>
@@ -8912,7 +8912,7 @@
 </city>
 <city>
 <!-- A city in Bahia in Brazil -->
- <_name>Pôrto Seguro</_name>
+ <name>Pôrto Seguro</name>
 <coordinates>-16.433333 -39.083333</coordinates>
 <location>
 <name>Pôrto Seguro</name>
@@ -8922,7 +8922,7 @@
 </city>
 <city>
 <!-- A city in Bahia in Brazil -->
- <_name>Salvador</_name>
+ <name>Salvador</name>
 <coordinates>-12.983333 -38.516667</coordinates>
 <location>
 <name>Salvador Airport</name>
@@ -8933,7 +8933,7 @@
 </city>
 <city>
 <!-- A city in Bahia in Brazil -->
- <_name>Vitória da Conquista</_name>
+ <name>Vitória da Conquista</name>
 <coordinates>-14.850000 -40.850000</coordinates>
 <location>
 <name>Vitória da Conquista</name>
@@ -8944,11 +8944,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name>Ceará</_name>
+ <name>Ceará</name>
 <fips-code>BR06</fips-code>
 <city>
 <!-- A city in Ceará in Brazil -->
- <_name>Fortaleza</_name>
+ <name>Fortaleza</name>
 <coordinates>-3.716667 -38.500000</coordinates>
 <location>
 <name>Pinto Martins Airport</name>
@@ -8960,11 +8960,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name msgctxt="State in Brazil">Distrito Federal</_name>
+ <name msgctxt="State in Brazil">Distrito Federal</name>
 <fips-code>BR07</fips-code>
 <city>
 <!-- The capital of Brazil -->
- <_name>Brasília</_name>
+ <name>Brasília</name>
 <coordinates>-15.783333 -47.916667</coordinates>
 <location>
 <name>Brasília Airport</name>
@@ -8976,11 +8976,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name>Espírito Santo</_name>
+ <name>Espírito Santo</name>
 <fips-code>BR08</fips-code>
 <city>
 <!-- A city in Espírito Santo in Brazil -->
- <_name>Vitória</_name>
+ <name>Vitória</name>
 <coordinates>-20.316667 -40.350000</coordinates>
 <location>
 <name>Vitória Airport</name>
@@ -8992,11 +8992,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name>Goiás</_name>
+ <name>Goiás</name>
 <fips-code>BR29</fips-code>
 <city>
 <!-- A city in Goiás in Brazil -->
- <_name>Anápolis</_name>
+ <name>Anápolis</name>
 <coordinates>-16.333333 -48.966667</coordinates>
 <location>
 <name>Anapolis Air Force Base</name>
@@ -9006,7 +9006,7 @@
 </city>
 <city>
 <!-- A city in Goiás in Brazil -->
- <_name>Goiânia</_name>
+ <name>Goiânia</name>
 <coordinates>-16.666667 -49.266667</coordinates>
 <location>
 <name>Goiânia Airport</name>
@@ -9018,11 +9018,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name>Maranhão</_name>
+ <name>Maranhão</name>
 <fips-code>BR13</fips-code>
 <city>
 <!-- A city in Maranhão in Brazil -->
- <_name>Imperatriz</_name>
+ <name>Imperatriz</name>
 <coordinates>-5.533333 -47.483333</coordinates>
 <location>
 <name>Imperatriz</name>
@@ -9032,7 +9032,7 @@
 </city>
 <city>
 <!-- A city in Maranhão in Brazil -->
- <_name>São Luís</_name>
+ <name>São Luís</name>
 <coordinates>-2.516667 -44.266667</coordinates>
 <location>
 <name>São Luís Airport</name>
@@ -9044,11 +9044,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name msgctxt="State in Brazil">Mato Grosso</_name>
+ <name msgctxt="State in Brazil">Mato Grosso</name>
 <fips-code>BR14</fips-code>
 <city>
 <!-- A city in Mato Grosso in Brazil -->
- <_name>Alta Floresta</_name>
+ <name>Alta Floresta</name>
 <coordinates>-9.900000 -55.900000</coordinates>
 <location>
 <name>Alta Floresta Airport</name>
@@ -9058,7 +9058,7 @@
 </city>
 <city>
 <!-- A city in Mato Grosso in Brazil -->
- <_name>Barra do Garças</_name>
+ <name>Barra do Garças</name>
 <coordinates>-15.883333 -52.250000</coordinates>
 <location>
 <name>Barra do Garças</name>
@@ -9068,7 +9068,7 @@
 </city>
 <city>
 <!-- A city in Mato Grosso in Brazil -->
- <_name>Cuiabá</_name>
+ <name>Cuiabá</name>
 <coordinates>-15.583333 -56.083333</coordinates>
 <location>
 <name>Cuiabá Airport</name>
@@ -9080,11 +9080,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name msgctxt="State in Brazil">Mato Grosso do Sul</_name>
+ <name msgctxt="State in Brazil">Mato Grosso do Sul</name>
 <fips-code>BR11</fips-code>
 <city>
 <!-- A city in Mato Grosso do Sul in Brazil -->
- <_name>Campo Grande</_name>
+ <name>Campo Grande</name>
 <coordinates>-20.450000 -54.616667</coordinates>
 <location>
 <name>Campo Grande Airport</name>
@@ -9095,7 +9095,7 @@
 </city>
 <city>
 <!-- A city in Mato Grosso do Sul in Brazil -->
- <_name>Corumbá</_name>
+ <name>Corumbá</name>
 <coordinates>-19.016667 -57.650000</coordinates>
 <location>
 <name>Corumbá</name>
@@ -9106,7 +9106,7 @@
 </city>
 <city>
 <!-- A city in Mato Grosso do Sul in Brazil -->
- <_name>Ponta Porã</_name>
+ <name>Ponta Porã</name>
 <coordinates>-22.533333 -55.716667</coordinates>
 <location>
 <name>Ponta Porã International Airport</name>
@@ -9118,11 +9118,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name>Minas Gerais</_name>
+ <name>Minas Gerais</name>
 <fips-code>BR15</fips-code>
 <city>
 <!-- A city in Minas Gerais in Brazil -->
- <_name>Barbacena</_name>
+ <name>Barbacena</name>
 <coordinates>-21.233333 -43.766667</coordinates>
 <location>
 <name>Barbacena</name>
@@ -9132,7 +9132,7 @@
 </city>
 <city>
 <!-- A city in Minas Gerais in Brazil -->
- <_name>Belo Horizonte</_name>
+ <name>Belo Horizonte</name>
 <coordinates>-19.916667 -43.933333</coordinates>
 <location>
 <name>Belo Horizonte</name>
@@ -9148,7 +9148,7 @@
 </city>
 <city>
 <!-- A city in Minas Gerais in Brazil -->
- <_name>Juiz de Fora</_name>
+ <name>Juiz de Fora</name>
 <coordinates>-21.751667 -43.352778</coordinates>
 <location>
 <name>Juiz de Fora</name>
@@ -9158,7 +9158,7 @@
 </city>
 <city>
 <!-- A city in Minas Gerais in Brazil -->
- <_name>Montes Claros</_name>
+ <name>Montes Claros</name>
 <coordinates>-16.716667 -43.866667</coordinates>
 <location>
 <name>Montes Claros</name>
@@ -9168,7 +9168,7 @@
 </city>
 <city>
 <!-- A city in Minas Gerais in Brazil -->
- <_name>Poços de Caldas</_name>
+ <name>Poços de Caldas</name>
 <coordinates>-21.800000 -46.566667</coordinates>
 <location>
 <name>Poços de Caldas</name>
@@ -9178,7 +9178,7 @@
 </city>
 <city>
 <!-- A city in Minas Gerais in Brazil -->
- <_name>Uberaba</_name>
+ <name>Uberaba</name>
 <coordinates>-19.750000 -47.916667</coordinates>
 <location>
 <name>Uberaba</name>
@@ -9188,7 +9188,7 @@
 </city>
 <city>
 <!-- A city in Minas Gerais in Brazil -->
- <_name>Uberlândia</_name>
+ <name>Uberlândia</name>
 <coordinates>-18.916667 -48.300000</coordinates>
 <location>
 <name>Uberlândia</name>
@@ -9199,11 +9199,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name>Paraná</_name>
+ <name>Paraná</name>
 <fips-code>BR18</fips-code>
 <city>
 <!-- A city in Paraná in Brazil -->
- <_name>Curitiba</_name>
+ <name>Curitiba</name>
 <coordinates>-25.416667 -49.250000</coordinates>
 <location>
 <name>Curitiba</name>
@@ -9219,7 +9219,7 @@
 </city>
 <city>
 <!-- A city in Paraná in Brazil -->
- <_name>Foz do Iguaçu</_name>
+ <name>Foz do Iguaçu</name>
 <coordinates>-25.550000 -54.583333</coordinates>
 <location>
 <name>Foz do Iguaçu Airport</name>
@@ -9230,7 +9230,7 @@
 </city>
 <city>
 <!-- A city in Paraná in Brazil -->
- <_name>Londrina</_name>
+ <name>Londrina</name>
 <coordinates>-23.300000 -51.150000</coordinates>
 <location>
 <name>Londrina Airport</name>
@@ -9241,7 +9241,7 @@
 </city>
 <city>
 <!-- A city in Paraná in Brazil -->
- <_name>Maringá</_name>
+ <name>Maringá</name>
 <coordinates>-23.416667 -51.916667</coordinates>
 <location>
 <name>Maringá</name>
@@ -9252,11 +9252,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name>Paraíba</_name>
+ <name>Paraíba</name>
 <fips-code>BR17</fips-code>
 <city>
 <!-- A city in Paraíba in Brazil -->
- <_name>Campina Grande</_name>
+ <name>Campina Grande</name>
 <coordinates>-7.216667 -35.883333</coordinates>
 <location>
 <name>Campina Grande</name>
@@ -9266,7 +9266,7 @@
 </city>
 <city>
 <!-- A city in Paraíba in Brazil -->
- <_name>João Pessoa</_name>
+ <name>João Pessoa</name>
 <coordinates>-7.116667 -34.866667</coordinates>
 <location>
 <name>João Pessoa</name>
@@ -9278,11 +9278,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name>Pará</_name>
+ <name>Pará</name>
 <fips-code>BR16</fips-code>
 <city>
 <!-- A city in Pará in Brazil -->
- <_name>Altamira</_name>
+ <name>Altamira</name>
 <coordinates>-3.200000 -52.200000</coordinates>
 <location>
 <name>Altamira</name>
@@ -9292,7 +9292,7 @@
  </city>
 <city>
 <!-- A city in Pará in Brazil -->
- <_name>Belém</_name>
+ <name>Belém</name>
 <coordinates>-1.450000 -48.483333</coordinates>
 <location>
 <name>Belém Airport</name>
@@ -9303,7 +9303,7 @@
 </city>
 <city>
 <!-- A city in Pará in Brazil -->
- <_name>Cachimbo</_name>
+ <name>Cachimbo</name>
 <coordinates>-8.950000 -54.900000</coordinates>
 <location>
 <name>Cachimbo</name>
@@ -9313,7 +9313,7 @@
 </city>
 <city>
 <!-- A city in Pará in Brazil -->
- <_name>Conceição do Araguaia</_name>
+ <name>Conceição do Araguaia</name>
 <coordinates>-8.241111 -49.296111</coordinates>
 <location>
 <name>Conceição do Araguaia</name>
@@ -9323,7 +9323,7 @@
 </city>
 <city>
 <!-- A city in Pará in Brazil -->
- <_name>Itaituba</_name>
+ <name>Itaituba</name>
 <coordinates>-4.216667 -56.016667</coordinates>
 <location>
 <name>Itaituba</name>
@@ -9333,7 +9333,7 @@
 </city>
 <city>
 <!-- A city in Pará in Brazil -->
- <_name>Jacareacanga</_name>
+ <name>Jacareacanga</name>
 <coordinates>-6.266667 -57.650000</coordinates>
 <location>
 <name>Jacareacanga</name>
@@ -9343,7 +9343,7 @@
 </city>
 <city>
 <!-- A city in Pará in Brazil -->
- <_name>Marabá</_name>
+ <name>Marabá</name>
 <coordinates>-5.350000 -49.116667</coordinates>
 <location>
 <name>Marabá</name>
@@ -9354,7 +9354,7 @@
 </city>
 <city>
 <!-- A city in Pará in Brazil -->
- <_name>Piri Grande</_name>
+ <name>Piri Grande</name>
 <coordinates>0.066667 -50.000000</coordinates>
 <location>
 <name>Macapa</name>
@@ -9365,7 +9365,7 @@
 </city>
 <city>
 <!-- A city in Pará in Brazil -->
- <_name>Santarém</_name>
+ <name>Santarém</name>
 <coordinates>-2.433333 -54.700000</coordinates>
 <location>
 <name>Santarém Airport</name>
@@ -9376,7 +9376,7 @@
 </city>
 <city>
 <!-- A city in Pará in Brazil -->
- <_name>Tucuruí</_name>
+ <name>Tucuruí</name>
 <coordinates>-3.700000 -49.700000</coordinates>
 <location>
 <name>Tucuruí</name>
@@ -9387,11 +9387,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name msgctxt="State in Brazil">Pernambuco</_name>
+ <name msgctxt="State in Brazil">Pernambuco</name>
 <fips-code>BR30</fips-code>
 <city>
 <!-- A city in Pernambuco in Brazil -->
- <_name>Petrolina</_name>
+ <name>Petrolina</name>
 <coordinates>-9.400000 -40.500000</coordinates>
 <location>
 <name>Petrolina</name>
@@ -9401,7 +9401,7 @@
 </city>
 <city>
 <!-- A city in Pernambuco in Brazil -->
- <_name>Recife</_name>
+ <name>Recife</name>
 <coordinates>-8.050000 -34.900000</coordinates>
 <location>
 <name>Recife Airport</name>
@@ -9412,7 +9412,7 @@
 </city>
 <city>
 <!-- A city in Pernambuco in Brazil -->
- <_name>Vila dos Remédios</_name>
+ <name>Vila dos Remédios</name>
 <coordinates>-3.850000 -32.400000</coordinates>
 <location>
 <name>Fernando de Noronha</name>
@@ -9424,11 +9424,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name>Piauí</_name>
+ <name>Piauí</name>
 <fips-code>BR20</fips-code>
 <city>
 <!-- A city in Piauí in Brazil -->
- <_name>Parnaíba</_name>
+ <name>Parnaíba</name>
 <coordinates>-2.909167 -41.774722</coordinates>
 <location>
 <name>Parnaíba Airport</name>
@@ -9438,7 +9438,7 @@
 </city>
 <city>
 <!-- A city in Piauí in Brazil -->
- <_name>Teresina</_name>
+ <name>Teresina</name>
 <coordinates>-5.083333 -42.816667</coordinates>
 <location>
 <name>Teresina Airport</name>
@@ -9450,11 +9450,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name>Rio Grande do Norte</_name>
+ <name>Rio Grande do Norte</name>
 <fips-code>BR22</fips-code>
 <city>
 <!-- A city in Rio Grande do Norte in Brazil -->
- <_name>Mossoró</_name>
+ <name>Mossoró</name>
 <coordinates>-5.191389 -37.344722</coordinates>
 <location>
 <name>17 Rosado Airport</name>
@@ -9464,7 +9464,7 @@
 </city>
 <city>
 <!-- A city in Rio Grande do Norte in Brazil -->
- <_name msgctxt="City in Rio Grande do Norte, Brazil">Natal</_name>
+ <name msgctxt="City in Rio Grande do Norte, Brazil">Natal</name>
 <coordinates>-5.783333 -35.216667</coordinates>
 <location>
 <name>Natal Airport</name>
@@ -9476,11 +9476,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name>Rio Grande do Sul</_name>
+ <name>Rio Grande do Sul</name>
 <fips-code>BR23</fips-code>
 <city>
 <!-- A city in Rio Grande do Sul in Brazil -->
- <_name>Pelotas</_name>
+ <name>Pelotas</name>
 <coordinates>-31.766667 -52.333333</coordinates>
 <location>
 <name>Pelotas</name>
@@ -9491,7 +9491,7 @@
 </city>
 <city>
 <!-- A city in Rio Grande do Sul in Brazil -->
- <_name>Porto Alegre</_name>
+ <name>Porto Alegre</name>
 <coordinates>-30.033333 -51.200000</coordinates>
 <location>
 <name>Porto Alegre</name>
@@ -9507,7 +9507,7 @@
 </city>
 <city>
 <!-- A city in Rio Grande do Sul in Brazil -->
- <_name msgctxt="City in Rio Grande do Sul, Brazil">Santa Maria</_name>
+ <name msgctxt="City in Rio Grande do Sul, Brazil">Santa Maria</name>
 <coordinates>-29.683333 -53.800000</coordinates>
 <location>
 <name>Santa Maria Airport</name>
@@ -9517,7 +9517,7 @@
 </city>
 <city>
 <!-- A city in Rio Grande do Sul in Brazil -->
- <_name>Uruguaiana</_name>
+ <name>Uruguaiana</name>
 <coordinates>-29.750000 -57.083333</coordinates>
 <location>
 <name>Uruguaiana Airport</name>
@@ -9529,11 +9529,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name msgctxt="State in Brazil">Rio de Janeiro</_name>
+ <name msgctxt="State in Brazil">Rio de Janeiro</name>
 <fips-code>BR21</fips-code>
 <city>
 <!-- A city in Rio de Janeiro in Brazil -->
- <_name>Campos</_name>
+ <name>Campos</name>
 <coordinates>-21.750000 -41.300000</coordinates>
 <location>
 <name>Campos</name>
@@ -9543,7 +9543,7 @@
 </city>
 <city>
 <!-- A city in Rio de Janeiro in Brazil -->
- <_name msgctxt="City in Rio de Janeiro, Brazil">Rio de Janeiro</_name>
+ <name msgctxt="City in Rio de Janeiro, Brazil">Rio de Janeiro</name>
 <coordinates>-22.900000 -43.233333</coordinates>
 <location>
 <name>Rio de Janeiro Airport</name>
@@ -9575,7 +9575,7 @@
 </city>
 <city>
 <!-- A city in Rio de Janeiro in Brazil -->
- <_name>São Pedro da Aldeia</_name>
+ <name>São Pedro da Aldeia</name>
 <coordinates>-22.850000 -42.100000</coordinates>
 <location>
 <name>S. P. Aldeia Airport</name>
@@ -9586,11 +9586,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name>Rondônia</_name>
+ <name>Rondônia</name>
 <fips-code>BR24</fips-code>
 <city>
  <!-- A city in Rondônia in Brazil -->
- <_name>Pôrto Velho</_name>
+ <name>Pôrto Velho</name>
 <coordinates>-8.766667 -63.900000</coordinates>
 <location>
 <name>Pôrto Velho Airport</name>
@@ -9601,7 +9601,7 @@
 </city>
 <city>
 <!-- A city in Rondônia in Brazil -->
- <_name>Vilhena</_name>
+ <name>Vilhena</name>
 <coordinates>-12.716667 -60.116667</coordinates>
 <location>
 <name>Vilhena Airport</name>
@@ -9613,11 +9613,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name msgctxt="State in Brazil">Roraima</_name>
+ <name msgctxt="State in Brazil">Roraima</name>
 <fips-code>BR25</fips-code>
 <city>
 <!-- A city in Roraima in Brazil -->
- <_name>Boa Vista</_name>
+ <name>Boa Vista</name>
 <coordinates>2.816667 -60.666667</coordinates>
 <location>
 <name>Boa Vista International Airport</name>
@@ -9629,11 +9629,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name>Santa Catarina</_name>
+ <name>Santa Catarina</name>
 <fips-code>BR26</fips-code>
 <city>
 <!-- A city in Santa Catarina in Brazil -->
- <_name>Florianópolis</_name>
+ <name>Florianópolis</name>
 <coordinates>-27.583333 -48.566667</coordinates>
 <location>
 <name>Florianópolis Airport</name>
@@ -9645,11 +9645,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name>Sergipe</_name>
+ <name>Sergipe</name>
 <fips-code>BR28</fips-code>
 <city>
 <!-- A city in Sergipe in Brazil -->
- <_name>Aracaju</_name>
+ <name>Aracaju</name>
 <coordinates>-10.916667 -37.066667</coordinates>
 <location>
 <name>Aracaju Airport</name>
@@ -9661,11 +9661,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name msgctxt="State in Brazil">São Paulo</_name>
+ <name msgctxt="State in Brazil">São Paulo</name>
 <fips-code>BR27</fips-code>
 <city>
 <!-- A city in São Paulo in Brazil -->
- <_name>Bauru</_name>
+ <name>Bauru</name>
 <coordinates>-22.316667 -49.066667</coordinates>
 <location>
 <name>Bauru</name>
@@ -9675,7 +9675,7 @@
 </city>
 <city>
 <!-- A city in São Paulo in Brazil -->
- <_name>Campinas</_name>
+ <name>Campinas</name>
 <coordinates>-22.900000 -47.083333</coordinates>
 <location>
 <name>Campinas Airport</name>
@@ -9686,7 +9686,7 @@
 </city>
 <city>
 <!-- A city in São Paulo in Brazil -->
- <_name>Guaratinguetá</_name>
+ <name>Guaratinguetá</name>
 <coordinates>-22.816667 -45.216667</coordinates>
 <location>
 <name>Guaratinguetá</name>
@@ -9696,7 +9696,7 @@
 </city>
 <city>
 <!-- A city in São Paulo in Brazil -->
- <_name>Guarulhos</_name>
+ <name>Guarulhos</name>
 <coordinates>-23.466667 -46.533333</coordinates>
 <location>
 <name>Guarulhos Airport</name>
@@ -9707,7 +9707,7 @@
 </city>
 <city>
 <!-- A city in São Paulo in Brazil -->
- <_name>Palmeiras</_name>
+ <name>Palmeiras</name>
 <coordinates>-21.133333 -47.750000</coordinates>
 <location>
 <name>Leite Lopes, Ribeir Airport</name>
@@ -9718,7 +9718,7 @@
 </city>
 <city>
 <!-- A city in São Paulo in Brazil -->
- <_name>Piraçununga</_name>
+ <name>Piraçununga</name>
 <coordinates>-21.983333 -47.416667</coordinates>
 <location>
 <name>Piraçununga</name>
@@ -9728,7 +9728,7 @@
 </city>
 <city>
 <!-- A city in São Paulo in Brazil -->
- <_name>Presidente Prudente</_name>
+ <name>Presidente Prudente</name>
 <coordinates>-22.116667 -51.366667</coordinates>
 <location>
 <name>Presidente Prudente</name>
@@ -9738,7 +9738,7 @@
 </city>
 <city>
 <!-- A city in São Paulo in Brazil -->
- <_name>Santos</_name>
+ <name>Santos</name>
 <coordinates>-23.950000 -46.333333</coordinates>
 <location>
 <name>Santos Airport</name>
@@ -9748,7 +9748,7 @@
 </city>
 <city>
 <!-- A city in São Paulo in Brazil -->
- <_name>São José dos Campos</_name>
+ <name>São José dos Campos</name>
 <coordinates>-23.183333 -45.883333</coordinates>
 <location>
 <name>Sao Jose Dos Campo</name>
@@ -9759,7 +9759,7 @@
 </city>
 <city>
 <!-- A city in São Paulo in Brazil -->
- <_name msgctxt="City in São Paulo, Brazil">São Paulo</_name>
+ <name msgctxt="City in São Paulo, Brazil">São Paulo</name>
 <coordinates>-23.533333 -46.616667</coordinates>
 <location>
 <name>Marte Airport</name>
@@ -9776,7 +9776,7 @@
 </state>
 <state>
 <!-- A state/province/territory in Brazil -->
- <_name>Tocantis</_name>
+ <name>Tocantis</name>
 <fips-code>BR31</fips-code>
 </state>
 </country>
@@ -9784,7 +9784,7 @@
 <!-- VG - British Virgin Islands, a British territory in the
 Caribbean
 -->
- <_name>British Virgin Islands</_name>
+ <name>British Virgin Islands</name>
 <iso-code>VG</iso-code>
 <fips-code>VI</fips-code>
 <timezones>
@@ -9793,7 +9793,7 @@
 <tz-hint>America/Tortola</tz-hint>
 <city>
 <!-- The capital of the British Virgin Islands -->
- <_name>Road Town</_name>
+ <name>Road Town</name>
 <coordinates>18.416667 -64.616667</coordinates>
 <location>
 <name>Beef Island, Tortola</name>
@@ -9803,7 +9803,7 @@
 </city>
 <city>
 <!-- A city in the British Virgin Islands -->
- <_name>The Mill</_name>
+ <name>The Mill</name>
 <coordinates>18.450000 -64.533333</coordinates>
 <location>
 <name>Beef Island, Tortola</name>
@@ -9814,7 +9814,7 @@
 </country>
 <country>
 <!-- KY - Cayman Islands, a British territory in the Caribbean -->
- <_name>Cayman Islands</_name>
+ <name>Cayman Islands</name>
 <iso-code>KY</iso-code>
 <fips-code>CJ</fips-code>
 <timezones>
@@ -9823,7 +9823,7 @@
 <tz-hint>America/Cayman</tz-hint>
 <city>
 <!-- The capital of the Cayman Islands -->
- <_name msgctxt="City in Cayman Islands">George Town</_name>
+ <name msgctxt="City in Cayman Islands">George Town</name>
 <coordinates>19.300000 -81.383333</coordinates>
 <location>
 <name>Owen Roberts Airport, Grand Cayman</name>
@@ -9833,7 +9833,7 @@
 </city>
 <city>
 <!-- A city in the Cayman Islands -->
- <_name>Knob Hill</_name>
+ <name>Knob Hill</name>
 <coordinates>19.683333 -79.883333</coordinates>
 <location>
 <name>Gerrard Smith International / Cayman Brac</name>
@@ -9843,7 +9843,7 @@
 </city>
 <city>
 <!-- A city in the Cayman Islands -->
- <_name>Red Bay Estate</_name>
+ <name>Red Bay Estate</name>
 <coordinates>19.283333 -81.350000</coordinates>
 <location>
 <name>Owen Roberts Airport, Grand Cayman</name>
@@ -9854,7 +9854,7 @@
 </country>
 <country>
 <!-- CL - Chile -->
- <_name>Chile</_name>
+ <name>Chile</name>
 <!-- Could not find information about the following stations,
 which may be in Chile:
 SCAT SCCF SCJO 
@@ -9866,20 +9866,20 @@
 <!-- This refers to the time zone for mainland Chile (as
 opposed to the time zone for Easter Island).
 -->
- <_name>Mainland Chile</_name>
+ <name>Mainland Chile</name>
 </timezone>
 <timezone id="Pacific/Easter">
 <!-- This refers to the time zone for Easter Island. The
 string is only used in places where "Chile" is already
 understood from context.
 -->
- <_name>Easter Island</_name>
+ <name>Easter Island</name>
 </timezone>
 </timezones>
 <tz-hint>America/Santiago</tz-hint>
 <city>
 <!-- A city in Chile -->
- <_name>Antofagasta</_name>
+ <name>Antofagasta</name>
 <coordinates>-23.650000 -70.400000</coordinates>
 <location>
 <name>Antofagasta</name>
@@ -9889,7 +9889,7 @@
 </city>
 <city>
 <!-- A city in Chile -->
- <_name>Arica</_name>
+ <name>Arica</name>
 <coordinates>-18.483333 -70.333333</coordinates>
 <location>
 <name>Arica</name>
@@ -9899,7 +9899,7 @@
 </city>
 <city>
 <!-- A city in Chile -->
- <_name>Balmaceda</_name>
+ <name>Balmaceda</name>
 <coordinates>-45.916667 -71.683333</coordinates>
 <location>
 <name>Balmaceda</name>
@@ -9909,7 +9909,7 @@
 </city>
 <city>
 <!-- A city in Chile -->
- <_name msgctxt="City in Chile">Concepción</_name>
+ <name msgctxt="City in Chile">Concepción</name>
 <coordinates>-36.833333 -73.050000</coordinates>
 <location>
 <name>Concepción</name>
@@ -9919,7 +9919,7 @@
 </city>
 <city>
 <!-- A city in Chile -->
- <_name>Hanga Roa</_name>
+ <name>Hanga Roa</name>
 <coordinates>-27.150000 -109.433333</coordinates>
 <location>
 <name>Isla de Pascua</name>
@@ -9929,7 +9929,7 @@
 </city>
 <city>
 <!-- A city in Chile -->
- <_name>Iquique</_name>
+ <name>Iquique</name>
 <coordinates>-20.216667 -70.166667</coordinates>
 <location>
 <name>Diego Arac Airport</name>
@@ -9939,7 +9939,7 @@
 </city>
 <city>
 <!-- A city in Chile -->
- <_name>La Serena</_name>
+ <name>La Serena</name>
 <coordinates>-29.907778 -71.254167</coordinates>
 <location>
 <name>La Serena</name>
@@ -9949,7 +9949,7 @@
 </city>
 <city>
 <!-- A city in Chile -->
- <_name>Puerto Montt</_name>
+ <name>Puerto Montt</name>
 <coordinates>-41.471667 -72.936944</coordinates>
 <location>
 <name>Puerto Montt</name>
@@ -9959,7 +9959,7 @@
 </city>
 <city>
 <!-- A city in Chile -->
- <_name>Punta Arenas</_name>
+ <name>Punta Arenas</name>
 <coordinates>-53.150000 -70.916667</coordinates>
 <location>
 <name>Punta Arenas</name>
@@ -9969,7 +9969,7 @@
 </city>
 <city>
 <!-- A city in Chile -->
- <_name>Santa Teresa de Lo Ovalle</_name>
+ <name>Santa Teresa de Lo Ovalle</name>
 <coordinates>-33.383333 -70.783333</coordinates>
 <location>
 <name>Pudahuel</name>
@@ -9979,7 +9979,7 @@
 </city>
 <city>
 <!-- The capital of Chile -->
- <_name msgctxt="City in Chile">Santiago</_name>
+ <name msgctxt="City in Chile">Santiago</name>
 <coordinates>-33.450000 -70.666667</coordinates>
 <location>
 <name>Pudahuel</name>
@@ -9989,7 +9989,7 @@
 </city>
 <city>
 <!-- A city in Chile -->
- <_name>Temuco</_name>
+ <name>Temuco</name>
 <coordinates>-38.733333 -72.600000</coordinates>
 <location>
 <name>Temuco</name>
@@ -10000,7 +10000,7 @@
 </country>
 <country>
 <!-- CO - Colombia -->
- <_name>Colombia</_name>
+ <name>Colombia</name>
 <iso-code>CO</iso-code>
 <fips-code>CO</fips-code>
 <timezones>
@@ -10009,7 +10009,7 @@
 <tz-hint>America/Bogota</tz-hint>
 <city>
 <!-- A city in Colombia -->
- <_name>Armenia</_name>
+ <name>Armenia</name>
 <coordinates>4.528740 -75.704292</coordinates>
 <location>
 <name>El Eden Airport</name>
@@ -10019,7 +10019,7 @@
 </city>
 <city>
 <!-- A city in Colombia -->
- <_name>Barranquilla</_name>
+ <name>Barranquilla</name>
 <coordinates>10.963889 -74.796389</coordinates>
 <location>
 <name>Ernestocortissoz Airport</name>
@@ -10029,7 +10029,7 @@
 </city>
 <city>
 <!-- The capital of Colombia -->
- <_name>Bogotá</_name>
+ <name>Bogotá</name>
 <coordinates>4.600000 -74.083333</coordinates>
 <location>
 <name>Eldorado Airport</name>
@@ -10039,7 +10039,7 @@
 </city>
 <city>
 <!-- A city in Colombia -->
- <_name>Bucaramanga</_name>
+ <name>Bucaramanga</name>
 <coordinates>7.129722 -73.125833</coordinates>
 <location>
 <name>Palonegro Airport</name>
@@ -10049,7 +10049,7 @@
 </city>
 <city>
 <!-- A city in Colombia -->
- <_name>Cali</_name>
+ <name>Cali</name>
 <coordinates>3.437222 -76.522500</coordinates>
 <location>
 <name>Alfonso Bonillaaragon Airport</name>
@@ -10059,7 +10059,7 @@
 </city>
 <city>
 <!-- A city in Colombia -->
- <_name>Cartagena</_name>
+ <name>Cartagena</name>
 <coordinates>10.399722 -75.514444</coordinates>
 <location>
 <name>Rafael Nunez Airport</name>
@@ -10069,7 +10069,7 @@
 </city>
 <city>
 <!-- A city in Colombia -->
- <_name>Cúcuta</_name>
+ <name>Cúcuta</name>
 <coordinates>7.883333 -72.505278</coordinates>
 <location>
 <name>Camilo Daza Airport</name>
@@ -10079,7 +10079,7 @@
 </city>
 <city>
 <!-- A city in Colombia -->
- <_name>Ibagué</_name>
+ <name>Ibagué</name>
 <coordinates>4.436428 -75.19165</coordinates>
 <location>
 <name>Perales Airport</name>
@@ -10089,7 +10089,7 @@
 </city>
 <city>
 <!-- A city in Colombia -->
- <_name>Ipiales</_name>
+ <name>Ipiales</name>
 <coordinates>0.829810 -77.629761</coordinates>
 <location>
 <name>San Luis Airport</name>
@@ -10099,7 +10099,7 @@
 </city>
 <city>
 <!-- A city in Colombia -->
- <_name>Leticia</_name>
+ <name>Leticia</name>
 <coordinates>-4.215278 -69.940556</coordinates>
 <location>
 <name>Vasquez Cobo Airport</name>
@@ -10109,7 +10109,7 @@
 </city>
 <city>
 <!-- A city in Colombia -->
- <_name>Medellín</_name>
+ <name>Medellín</name>
 <coordinates>6.251290 -75.575974</coordinates>
 <location>
 <name>Olaya Herrera Airport</name>
@@ -10119,7 +10119,7 @@
 </city>
 <city>
 <!-- A city in Colombia -->
- <_name>Monteria</_name>
+ <name>Monteria</name>
 <coordinates>8.759794 -75.887344</coordinates>
 <location>
 <name>Los Garzones Airport</name>
@@ -10129,7 +10129,7 @@
 </city>
 <city>
 <!-- A city in Colombia -->
- <_name>Pasto</_name>
+ <name>Pasto</name>
 <coordinates>1.211935 -77.270432</coordinates>
 <location>
 <name>Antonio Nariño Airport</name>
@@ -10139,7 +10139,7 @@
 </city>
 <city>
 <!-- A city in Colombia -->
- <_name>Pereira</_name>
+ <name>Pereira</name>
 <coordinates>4.813333 -75.696111</coordinates>
 <location>
 <name>Matecana Airport</name>
@@ -10149,7 +10149,7 @@
 </city>
 <city>
 <!-- A city in Colombia -->
- <_name>Popayán</_name>
+ <name>Popayán</name>
 <coordinates>2.445701 -76.603317</coordinates>
 <location>
 <name>Guillermo Leon Valencia Airport</name>
@@ -10159,7 +10159,7 @@
 </city>
 <city>
 <!-- A city in Colombia -->
- <_name>Quibdó</_name>
+ <name>Quibdó</name>
 <coordinates>5.692062 -76.655693</coordinates>
 <location>
 <name>El Carano Airport</name>
@@ -10169,7 +10169,7 @@
 </city>
 <city>
 <!-- A city in Colombia -->
- <_name>Riohacha</_name>
+ <name>Riohacha</name>
 <coordinates>11.545551 -72.913444</coordinates>
 <location>
 <name>Almirante Padilla Airport</name>
@@ -10179,7 +10179,7 @@
 </city>
 <city>
 <!-- A city in Colombia -->
- <_name>Rionegro</_name>
+ <name>Rionegro</name>
 <coordinates>6.155278 -75.388889</coordinates>
 <location>
 <name>J. M. Cordova Airport</name>
@@ -10189,7 +10189,7 @@
 </city>
 <city>
 <!-- A city in Colombia -->
- <_name>San Andrés</_name>
+ <name>San Andrés</name>
 <coordinates>12.584722 -81.700556</coordinates>
 <location>
 <name>San Andres Isla, Sesquicentenario Airport</name>
@@ -10199,7 +10199,7 @@
 </city>
 <city>
 <!-- A city in Colombia -->
- <_name>Santa Marta</_name>
+ <name>Santa Marta</name>
 <coordinates>11.248362 -74.204849</coordinates>
 <location>
 <name>Simon Bolivar Airport</name>
@@ -10209,7 +10209,7 @@
 </city>
 <city>
 <!-- A city in Colombia -->
- <_name>Villavicencio</_name>
+ <name>Villavicencio</name>
 <coordinates>4.157307 -73.637428</coordinates>
 <location>
 <name>Vanguardia Airport</name>
@@ -10220,7 +10220,7 @@
 </country>
 <country>
 <!-- CR - Costa Rica -->
- <_name>Costa Rica</_name>
+ <name>Costa Rica</name>
 <iso-code>CR</iso-code>
 <fips-code>CS</fips-code>
 <timezones>
@@ -10229,7 +10229,7 @@
 <tz-hint>America/Costa_Rica</tz-hint>
 <city>
 <!-- A city in Costa Rica -->
- <_name>Alajuela</_name>
+ <name>Alajuela</name>
 <coordinates>10.016667 -84.216667</coordinates>
 <location>
 <name>Juan Santamaria</name>
@@ -10239,7 +10239,7 @@
 </city>
 <city>
 <!-- A city in Costa Rica -->
- <_name msgctxt="City in Costa Rica">Liberia</_name>
+ <name msgctxt="City in Costa Rica">Liberia</name>
 <coordinates>10.633333 -85.433333</coordinates>
 <location>
 <name>Liberia</name>
@@ -10249,7 +10249,7 @@
 </city>
 <city>
 <!-- A city in Costa Rica -->
- <_name>Mata de Palo</_name>
+ <name>Mata de Palo</name>
 <coordinates>9.950000 -84.150000</coordinates>
 <location>
 <name>Tobias Bolanos International Airport</name>
@@ -10259,7 +10259,7 @@
 </city>
 <city>
 <!-- A city in Costa Rica -->
- <_name>Puerto Limón</_name>
+ <name>Puerto Limón</name>
 <coordinates>10.000000 -83.033333</coordinates>
 <location>
 <name>Puerto Limón</name>
@@ -10269,7 +10269,7 @@
 </city>
 <city>
 <!-- The capital of Costa Rica -->
- <_name>San José</_name>
+ <name>San José</name>
 <coordinates>9.933333 -84.083333</coordinates>
 <location>
 <name>Tobias Bolanos International Airport</name>
@@ -10280,7 +10280,7 @@
 </country>
 <country>
 <!-- CU - Cuba -->
- <_name>Cuba</_name>
+ <name>Cuba</name>
 <!-- Could not find cities for the following weather stations:
 MUCL - Cayo Largo del Sur (21.616667 -81.550000)
 -->
@@ -10292,7 +10292,7 @@
 <tz-hint>America/Havana</tz-hint>
 <city>
 <!-- A city in Cuba -->
- <_name>Camagüey</_name>
+ <name>Camagüey</name>
 <coordinates>21.380833 -77.916944</coordinates>
 <location>
 <name>Camagüey Airport</name>
@@ -10302,7 +10302,7 @@
 </city>
 <city>
 <!-- A city in Cuba -->
- <_name>Cienfuegos</_name>
+ <name>Cienfuegos</name>
 <coordinates>22.146111 -80.435556</coordinates>
 <location>
 <name>Cienfuegos, Las Villas</name>
@@ -10312,7 +10312,7 @@
 </city>
 <city>
 <!-- A city in Cuba -->
- <_name>Guantánamo</_name>
+ <name>Guantánamo</name>
 <coordinates>20.144444 -75.209167</coordinates>
 <location>
 <name>Leeward Point Field</name>
@@ -10325,7 +10325,7 @@
 "Havana" is the traditional English name.
 The local name in Spanish is "La Habana".
 -->
- <_name>Havana</_name>
+ <name>Havana</name>
 <coordinates>23.131944 -82.364167</coordinates>
 <location>
 <name>Jose Marti Airport, Rancho Boyeros</name>
@@ -10335,7 +10335,7 @@
 </city>
 <city>
 <!-- A city in Cuba -->
- <_name>Holguín</_name>
+ <name>Holguín</name>
 <coordinates>20.887222 -76.263056</coordinates>
 <location>
 <name>Holguín Airport</name>
@@ -10345,7 +10345,7 @@
 </city>
 <city>
 <!-- A city in Cuba -->
- <_name msgctxt="City in Cuba">Manzanillo</_name>
+ <name msgctxt="City in Cuba">Manzanillo</name>
 <coordinates>20.343333 -77.116667</coordinates>
 <location>
 <name>Manzanillo</name>
@@ -10355,7 +10355,7 @@
 </city>
 <city>
 <!-- A city in Cuba -->
- <_name>Matanzas</_name>
+ <name>Matanzas</name>
 <coordinates>23.041111 -81.577500</coordinates>
 <location>
 <name>Varadero</name>
@@ -10365,7 +10365,7 @@
 </city>
 <city>
 <!-- A city in Cuba -->
- <_name>Santiago de Cuba</_name>
+ <name>Santiago de Cuba</name>
 <coordinates>20.024722 -75.821944</coordinates>
 <location>
 <name>Santiago de Cuba</name>
@@ -10376,7 +10376,7 @@
 </country>
 <country>
 <!-- DO - Dominican Republic -->
- <_name>Dominican Republic</_name>
+ <name>Dominican Republic</name>
 <!-- Could not find information about the following stations,
 which may be in Dominican Republic:
 MDCY MDJB 
@@ -10389,7 +10389,7 @@
 <tz-hint>America/Santo_Domingo</tz-hint>
 <city>
 <!-- A city in the Dominican Republic -->
- <_name>Barahona</_name>
+ <name>Barahona</name>
 <coordinates>18.200000 -71.100000</coordinates>
 <location>
 <name>Barahona</name>
@@ -10399,7 +10399,7 @@
 </city>
 <city>
 <!-- A city in the Dominican Republic -->
- <_name>La Romana</_name>
+ <name>La Romana</name>
 <coordinates>18.416667 -68.966667</coordinates>
 <location>
 <name>La Romana International Airport</name>
@@ -10409,7 +10409,7 @@
 </city>
 <city>
 <!-- A city in the Dominican Republic -->
- <_name>Mancha Nueva</_name>
+ <name>Mancha Nueva</name>
 <coordinates>18.433333 -69.683333</coordinates>
 <location>
 <name>Las Americas</name>
@@ -10419,7 +10419,7 @@
 </city>
 <city>
 <!-- A city in the Dominican Republic -->
- <_name>Pantanal</_name>
+ <name>Pantanal</name>
 <coordinates>18.533333 -68.366667</coordinates>
 <location>
 <name>Pantanal</name>
@@ -10429,7 +10429,7 @@
 </city>
 <city>
 <!-- A city in the Dominican Republic -->
- <_name>Puerto Plata</_name>
+ <name>Puerto Plata</name>
 <coordinates>19.800000 -70.683333</coordinates>
 <location>
 <name>Puerto Plata International Airport</name>
@@ -10439,7 +10439,7 @@
 </city>
 <city>
 <!-- A city in the Dominican Republic -->
- <_name msgctxt="City in Dominican Republic">Santiago</_name>
+ <name msgctxt="City in Dominican Republic">Santiago</name>
 <coordinates>19.450000 -70.700000</coordinates>
 <location>
 <name>Santiago</name>
@@ -10449,7 +10449,7 @@
 </city>
 <city>
 <!-- The capital of the Dominican Republic -->
- <_name>Santo Domingo</_name>
+ <name>Santo Domingo</name>
 <coordinates>18.466667 -69.900000</coordinates>
 <location>
 <name>Las Americas</name>
@@ -10460,7 +10460,7 @@
 </country>
 <country>
 <!-- EC - Ecuador -->
- <_name>Ecuador</_name>
+ <name>Ecuador</name>
 <!-- Could not find information about the following stations,
 which may be in Ecuador:
 SESG 
@@ -10472,17 +10472,17 @@
 <!-- This refers to the time zone for mainland Ecuador (as
 opposed to the time zone for the Galapagos Islands).
 -->
- <_name>Mainland Ecuador</_name>
+ <name>Mainland Ecuador</name>
 </timezone>
 <timezone id="Pacific/Galapagos">
 <!-- The time zone for the Galapagos Islands. -->
- <_name>Galapagos Islands</_name>
+ <name>Galapagos Islands</name>
 </timezone>
 </timezones>
 <tz-hint>America/Guayaquil</tz-hint>
 <city>
 <!-- A city in Ecuador -->
- <_name>Guayaquil</_name>
+ <name>Guayaquil</name>
 <coordinates>-2.166667 -79.900000</coordinates>
 <location>
 <name>Simon Bolivar Airport</name>
@@ -10492,7 +10492,7 @@
 </city>
 <city>
 <!-- A city in Ecuador -->
- <_name>Latacunga</_name>
+ <name>Latacunga</name>
 <coordinates>-0.933333 -78.616667</coordinates>
 <location>
 <name>Latacunga</name>
@@ -10502,7 +10502,7 @@
 </city>
 <city>
 <!-- A city in Ecuador -->
- <_name>Manta</_name>
+ <name>Manta</name>
 <coordinates>-0.950000 -80.733333</coordinates>
 <location>
 <name>Manta</name>
@@ -10512,7 +10512,7 @@
 </city>
 <city>
 <!-- The capital of Ecuador -->
- <_name>Quito</_name>
+ <name>Quito</name>
 <coordinates>-0.216667 -78.500000</coordinates>
 <location>
 <name>Mariscal Sucre Airport</name>
@@ -10523,7 +10523,7 @@
 </country>
 <country>
 <!-- SV - El Salvador -->
- <_name>El Salvador</_name>
+ <name>El Salvador</name>
 <iso-code>SV</iso-code>
 <fips-code>ES</fips-code>
 <timezones>
@@ -10532,7 +10532,7 @@
 <tz-hint>America/El_Salvador</tz-hint>
 <city>
 <!-- A city in El Salvador -->
- <_name>Comalapa</_name>
+ <name>Comalapa</name>
 <coordinates>13.501111 -89.075833</coordinates>
 <location>
 <name>El Salvador International Airport</name>
@@ -10542,7 +10542,7 @@
 </city>
 <city>
 <!-- A city in El Salvador -->
- <_name>Ilopango</_name>
+ <name>Ilopango</name>
 <coordinates>13.701667 -89.109444</coordinates>
 <location>
 <name>San Salvador Airport</name>
@@ -10552,7 +10552,7 @@
 </city>
 <city>
 <!-- The capital of El Salvador -->
- <_name>San Salvador</_name>
+ <name>San Salvador</name>
 <coordinates>13.708611 -89.203056</coordinates>
 <location>
 <name>San Salvador Airport, Ilopango</name>
@@ -10568,7 +10568,7 @@
 Malvinas". The parenthesized form is the compromise used by
 ISO and the UN.)
 -->
- <_name>Falkland Islands (Malvinas)</_name>
+ <name>Falkland Islands (Malvinas)</name>
 <iso-code>FK</iso-code>
 <fips-code>FK</fips-code>
 <timezones>
@@ -10577,7 +10577,7 @@
 <tz-hint>Atlantic/Stanley</tz-hint>
 <city>
 <!-- The capital of the Falkland Islands (Malvinas) -->
- <_name msgctxt="City in Falkland Islands (Malvinas)">Stanley</_name>
+ <name msgctxt="City in Falkland Islands (Malvinas)">Stanley</name>
 <coordinates>-51.700000 -57.850000</coordinates>
 <location>
 <name>Mount Pleasant Airport</name>
@@ -10590,7 +10590,7 @@
 <!-- GF - French Guiana, an overseas department of France on the
 northern coast of South America.
 -->
- <_name>French Guiana</_name>
+ <name>French Guiana</name>
 <iso-code>GF</iso-code>
 <fips-code>FG</fips-code>
 <timezones>
@@ -10599,7 +10599,7 @@
 <tz-hint>America/Cayenne</tz-hint>
 <city>
 <!-- The capital of French Guiana -->
- <_name>Cayenne</_name>
+ <name>Cayenne</name>
 <coordinates>4.933333 -52.333333</coordinates>
 <location>
 <name>Rochambeau Airport</name>
@@ -10610,7 +10610,7 @@
 </country>
 <country>
 <!-- GD - Grenada -->
- <_name>Grenada</_name>
+ <name>Grenada</name>
 <iso-code>GD</iso-code>
 <fips-code>GJ</fips-code>
 <timezones>
@@ -10619,7 +10619,7 @@
 <tz-hint>America/Grenada</tz-hint>
 <city>
 <!-- A city in Grenada -->
- <_name>Bamboo</_name>
+ <name>Bamboo</name>
 <coordinates>12.000000 -61.783333</coordinates>
 <location>
 <name>Point Salines Airport</name>
@@ -10629,7 +10629,7 @@
 </city>
 <city>
 <!-- The capital of Grenada -->
- <_name>Saint George's</_name>
+ <name>Saint George's</name>
 <coordinates>12.050000 -61.750000</coordinates>
 <location>
 <name>Point Salines Airport</name>
@@ -10642,7 +10642,7 @@
 <!-- GP - Guadeloupe, an overseas department of France in the
 Caribbean.
 -->
- <_name>Guadeloupe</_name>
+ <name>Guadeloupe</name>
 <iso-code>GP</iso-code>
 <fips-code>GP</fips-code>
 <timezones>
@@ -10651,7 +10651,7 @@
 <tz-hint>America/Guadeloupe</tz-hint>
 <city>
 <!-- The capital of Guadeloupe -->
- <_name>Basse-Terre</_name>
+ <name>Basse-Terre</name>
 <coordinates>16.000000 -61.716667</coordinates>
 <location>
 <name>Le Raizet, Guadeloupe</name>
@@ -10661,7 +10661,7 @@
 </city>
 <city>
 <!-- A city in Guadeloupe -->
- <_name>Les Abymes</_name>
+ <name>Les Abymes</name>
 <coordinates>16.266667 -61.500000</coordinates>
 <location>
 <name>Le Raizet, Guadeloupe</name>
@@ -10672,7 +10672,7 @@
 </country>
 <country>
 <!-- GT - Guatemala -->
- <_name msgctxt="Country">Guatemala</_name>
+ <name msgctxt="Country">Guatemala</name>
 <iso-code>GT</iso-code>
 <fips-code>GT</fips-code>
 <timezones>
@@ -10681,7 +10681,7 @@
 <tz-hint>America/Guatemala</tz-hint>
 <city>
 <!-- The capital of Guatemala -->
- <_name msgctxt="City in Guatemala">Guatemala</_name>
+ <name msgctxt="City in Guatemala">Guatemala</name>
 <coordinates>14.621111 -90.526944</coordinates>
 <location>
 <name>Guatemala Aurora Airport</name>
@@ -10691,7 +10691,7 @@
 </city>
 <city>
 <!-- A city in Guatemala -->
- <_name>Huehuetenango</_name>
+ <name>Huehuetenango</name>
 <coordinates>15.319722 -91.470833</coordinates>
 <location>
 <name>Huehuetenango</name>
@@ -10701,7 +10701,7 @@
 </city>
 <city>
 <!-- A city in Guatemala -->
- <_name>Puerto Barrios</_name>
+ <name>Puerto Barrios</name>
 <coordinates>15.716667 -88.600000</coordinates>
 <location>
 <name>Puerto Barrios</name>
@@ -10711,7 +10711,7 @@
 </city>
 <city>
 <!-- A city in Guatemala -->
- <_name>Puerto San José</_name>
+ <name>Puerto San José</name>
 <coordinates>13.925556 -90.824444</coordinates>
 <location>
 <name>Puerto San José</name>
@@ -10721,7 +10721,7 @@
 </city>
 <city>
 <!-- A city in Guatemala -->
- <_name>Retalhuleu</_name>
+ <name>Retalhuleu</name>
 <coordinates>14.533333 -91.683333</coordinates>
 <location>
 <name>Retalhuleu</name>
@@ -10731,7 +10731,7 @@
 </city>
 <city>
 <!-- A city in Guatemala -->
- <_name>Tikal</_name>
+ <name>Tikal</name>
 <coordinates>17.225000 -89.613333</coordinates>
 <location>
 <name>Tikal</name>
@@ -10742,7 +10742,7 @@
 </country>
 <country>
 <!-- GY - Guyana -->
- <_name>Guyana</_name>
+ <name>Guyana</name>
 <iso-code>GY</iso-code>
 <fips-code>GY</fips-code>
 <timezones>
@@ -10751,7 +10751,7 @@
 <tz-hint>America/Guyana</tz-hint>
 <city>
 <!-- The capital of Guyana -->
- <_name msgctxt="City in Guyana">Georgetown</_name>
+ <name msgctxt="City in Guyana">Georgetown</name>
 <coordinates>6.800000 -58.166667</coordinates>
 <location>
 <name>Cheddi Jagan International Airport</name>
@@ -10762,7 +10762,7 @@
 </country>
 <country>
 <!-- HT - Haiti -->
- <_name>Haiti</_name>
+ <name>Haiti</name>
 <iso-code>HT</iso-code>
 <fips-code>HA</fips-code>
 <timezones>
@@ -10771,7 +10771,7 @@
 <tz-hint>America/Port-au-Prince</tz-hint>
 <city>
 <!-- Capital of Haiti -->
- <_name>Port-au-Prince</_name>
+ <name>Port-au-Prince</name>
 <coordinates>18.580050 -72.292542</coordinates>
 <location>
 <name>Port-Au-Prince / Aeroport International</name>
@@ -10782,7 +10782,7 @@
 </country>
 <country>
 <!-- HN - Honduras -->
- <_name>Honduras</_name>
+ <name>Honduras</name>
 <!-- Could not find information about the following stations,
 which may be in Honduras:
 MHTR 
@@ -10795,7 +10795,7 @@
 <tz-hint>America/Tegucigalpa</tz-hint>
 <city>
 <!-- A city in Honduras -->
- <_name>Amapala</_name>
+ <name>Amapala</name>
 <coordinates>13.292222 -87.653889</coordinates>
 <location>
 <name>Amapala</name>
@@ -10805,7 +10805,7 @@
 </city>
 <city>
 <!-- A city in Honduras -->
- <_name>Catacamas</_name>
+ <name>Catacamas</name>
 <coordinates>14.800000 -85.900000</coordinates>
 <location>
 <name>Catacamas</name>
@@ -10815,7 +10815,7 @@
 </city>
 <city>
 <!-- A city in Honduras -->
- <_name>Ciudad Choluteca</_name>
+ <name>Ciudad Choluteca</name>
 <coordinates>13.300278 -87.190833</coordinates>
 <location>
 <name>Ciudad Choluteca</name>
@@ -10825,7 +10825,7 @@
 </city>
 <city>
 <!-- A city in Honduras -->
- <_name>Comayagua</_name>
+ <name>Comayagua</name>
 <coordinates>14.450000 -87.633333</coordinates>
 <location>
 <name>Coronel Enrique Soto Cano Air Base</name>
@@ -10835,7 +10835,7 @@
 </city>
 <city>
 <!-- A city in Honduras -->
- <_name>Guanaja</_name>
+ <name>Guanaja</name>
 <coordinates>16.400000 -85.900000</coordinates>
 <location>
 <name>Guanaja</name>
@@ -10845,7 +10845,7 @@
 </city>
 <city>
 <!-- A city in Honduras -->
- <_name>La Ceiba</_name>
+ <name>La Ceiba</name>
 <coordinates>15.783333 -86.800000</coordinates>
 <location>
 <name>La Ceiba Airport</name>
@@ -10855,7 +10855,7 @@
 </city>
 <city>
 <!-- A city in Honduras -->
- <_name>La Esperanza</_name>
+ <name>La Esperanza</name>
 <coordinates>14.300000 -88.183333</coordinates>
 <location>
 <name>La Esperanza</name>
@@ -10865,7 +10865,7 @@
 </city>
 <city>
 <!-- A city in Honduras -->
- <_name>La Mesa</_name>
+ <name>La Mesa</name>
 <coordinates>15.416667 -87.883333</coordinates>
 <location>
 <name>La Mesa San Pedro Sula</name>
@@ -10875,7 +10875,7 @@
 </city>
 <city>
 <!-- A city in Honduras -->
- <_name>Puerto Lempira</_name>
+ <name>Puerto Lempira</name>
 <coordinates>15.266667 -83.766667</coordinates>
 <location>
 <name>Puerto Lempira</name>
@@ -10885,7 +10885,7 @@
 </city>
 <city>
 <!-- A city in Honduras -->
- <_name>Roatán</_name>
+ <name>Roatán</name>
 <coordinates>16.300000 -86.550000</coordinates>
 <location>
 <name>Roatán</name>
@@ -10895,7 +10895,7 @@
 </city>
 <city>
 <!-- A city in Honduras -->
- <_name>Santa Rosa de Copán</_name>
+ <name>Santa Rosa de Copán</name>
 <coordinates>14.766667 -88.783333</coordinates>
 <location>
 <name>Santa Rosa de Copán</name>
@@ -10905,7 +10905,7 @@
 </city>
 <city>
 <!-- The capital of Honduras -->
- <_name>Tegucigalpa</_name>
+ <name>Tegucigalpa</name>
 <coordinates>14.100000 -87.216667</coordinates>
 <location>
 <name>Tegucigalpa</name>
@@ -10915,7 +10915,7 @@
 </city>
 <city>
 <!-- A city in Honduras -->
- <_name>Tela</_name>
+ <name>Tela</name>
 <coordinates>15.783333 -87.450000</coordinates>
 <location>
 <name>Tela</name>
@@ -10925,7 +10925,7 @@
 </city>
 <city>
 <!-- A city in Honduras -->
- <_name>Yoro</_name>
+ <name>Yoro</name>
 <coordinates>15.133333 -87.133333</coordinates>
 <location>
 <name>Yoro</name>
@@ -10936,7 +10936,7 @@
 </country>
 <country>
 <!-- JM - Jamaica -->
- <_name>Jamaica</_name>
+ <name>Jamaica</name>
 <iso-code>JM</iso-code>
 <fips-code>JM</fips-code>
 <timezones>
@@ -10945,7 +10945,7 @@
 <tz-hint>America/Jamaica</tz-hint>
 <city>
 <!-- The capital of Jamaica -->
- <_name msgctxt="City in Jamaica">Kingston</_name>
+ <name msgctxt="City in Jamaica">Kingston</name>
 <coordinates>18.000000 -76.800000</coordinates>
 <location>
 <name>Norman Manley Airport</name>
@@ -10955,7 +10955,7 @@
 </city>
 <city>
 <!-- A city in Jamaica -->
- <_name>Montego Bay</_name>
+ <name>Montego Bay</name>
 <coordinates>18.466667 -77.916667</coordinates>
 <location>
 <name>Sangster Airport</name>
@@ -10968,7 +10968,7 @@
 <!-- MQ - Martinique, an overseas department of France in the
 Caribbean.
 -->
- <_name>Martinique</_name>
+ <name>Martinique</name>
 <iso-code>MQ</iso-code>
 <fips-code>MB</fips-code>
 <timezones>
@@ -10977,7 +10977,7 @@
 <tz-hint>America/Martinique</tz-hint>
 <city>
 <!-- The capital of Martinique -->
- <_name>Fort-de-France</_name>
+ <name>Fort-de-France</name>
 <coordinates>14.600000 -61.083333</coordinates>
 <location>
 <name>Le Lamentin</name>
@@ -10987,7 +10987,7 @@
 </city>
 <city>
 <!-- A city in Martinique -->
- <_name>Le Lamentin</_name>
+ <name>Le Lamentin</name>
 <coordinates>14.600000 -61.000000</coordinates>
 <location>
 <name>Le Lamentin</name>
@@ -10998,7 +10998,7 @@
 </country>
 <country>
 <!-- MS - Montserrat, a British territory in the Caribbean. -->
- <_name>Montserrat</_name>
+ <name>Montserrat</name>
 <!-- Could not find weather stations for the following major
 cities:
 Plymouth
@@ -11015,7 +11015,7 @@
 of the three constituent countries of the Kingdom of the
 Netherlands.
 -->
- <_name>Netherlands Antilles</_name>
+ <name>Netherlands Antilles</name>
 <iso-code>AN</iso-code>
 <fips-code>NT</fips-code>
 <timezones>
@@ -11024,7 +11024,7 @@
 <tz-hint>America/Curacao</tz-hint>
 <city>
 <!-- A city in the Netherlands Antilles -->
- <_name>Benners</_name>
+ <name>Benners</name>
 <coordinates>17.483333 -62.983333</coordinates>
 <location>
 <name>Roosevelt Airport, Saint Eustatius</name>
@@ -11034,7 +11034,7 @@
 </city>
 <city>
 <!-- A city in the Netherlands Antilles -->
- <_name>Cupe Coy</_name>
+ <name>Cupe Coy</name>
 <coordinates>18.050000 -63.133333</coordinates>
 <location>
 <name>Juliana Airport, Saint Maarten</name>
@@ -11044,7 +11044,7 @@
 </city>
 <city>
 <!-- A city in the Netherlands Antilles -->
- <_name>Dorp Nikiboko</_name>
+ <name>Dorp Nikiboko</name>
 <coordinates>12.150000 -68.266667</coordinates>
 <location>
 <name>Flamingo Airport, Bonaire</name>
@@ -11054,7 +11054,7 @@
 </city>
 <city>
 <!-- A city in the Netherlands Antilles -->
- <_name>Gato</_name>
+ <name>Gato</name>
 <coordinates>12.166667 -68.966667</coordinates>
 <location>
 <name>Hato Airport, Curacao</name>
@@ -11065,7 +11065,7 @@
 </country>
 <country>
 <!-- NI - Nicaragua -->
- <_name>Nicaragua</_name>
+ <name>Nicaragua</name>
 <iso-code>NI</iso-code>
 <fips-code>NU</fips-code>
 <timezones>
@@ -11074,7 +11074,7 @@
 <tz-hint>America/Managua</tz-hint>
 <city>
 <!-- A city in Nicaragua -->
- <_name>Bluefields</_name>
+ <name>Bluefields</name>
 <coordinates>12.000000 -83.750000</coordinates>
 <location>
 <name>Bluefields</name>
@@ -11084,7 +11084,7 @@
 </city>
 <city>
 <!-- A city in Nicaragua -->
- <_name>Chinandega</_name>
+ <name>Chinandega</name>
 <coordinates>12.616667 -87.150000</coordinates>
 <location>
 <name>Chinandega</name>
@@ -11094,7 +11094,7 @@
 </city>
 <city>
 <!-- A city in Nicaragua -->
- <_name>Jinotega</_name>
+  <name>Jinotega</name>
 <coordinates>13.100000 -86.000000</coordinates>
 <location>
 <name>Jinotega</name>
@@ -11104,7 +11104,7 @@
 </city>
 <city>
 <!-- A city in Nicaragua -->
- <_name>Juigalpa</_name>
+ <name>Juigalpa</name>
 <coordinates>12.083333 -85.400000</coordinates>
 <location>
 <name>Juigalpa</name>
@@ -11114,7 +11114,7 @@
 </city>
 <city>
 <!-- The capital of Nicaragua -->
- <_name>Managua</_name>
+ <name>Managua</name>
 <coordinates>12.150833 -86.268333</coordinates>
 <location>
 <name>A. C. Sandino Airport</name>
@@ -11124,7 +11124,7 @@
 </city>
 <city>
 <!-- A city in Nicaragua -->
- <_name>Puerto Cabezas</_name>
+ <name>Puerto Cabezas</name>
 <coordinates>14.033333 -83.383333</coordinates>
 <location>
 <name>Puerto Cabezas</name>
@@ -11134,7 +11134,7 @@
 </city>
 <city>
 <!-- A city in Nicaragua -->
- <_name>Rivas</_name>
+ <name>Rivas</name>
 <coordinates>11.433333 -85.833333</coordinates>
 <location>
 <name>Rivas</name>
@@ -11147,7 +11147,7 @@
 <!-- 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>
+ <name>Panama</name>
 <iso-code>PA</iso-code>
 <fips-code>PM</fips-code>
 <timezones>
@@ -11156,7 +11156,7 @@
 <tz-hint>America/Panama</tz-hint>
 <city>
 <!-- A city in Panama -->
- <_name>David</_name>
+ <name>David</name>
 <coordinates>8.433333 -82.433333</coordinates>
 <location>
 <name>David</name>
@@ -11166,7 +11166,7 @@
 </city>
 <city>
 <!-- A city in Panama -->
- <_name>Fuerte Kobbe</_name>
+ <name>Fuerte Kobbe</name>
 <coordinates>8.916667 -79.583333</coordinates>
 <location>
 <name>Howard Air Force Base</name>
@@ -11176,7 +11176,7 @@
 </city>
 <city>
 <!-- The capital of Panama -->
- <_name>Panamá</_name>
+ <name>Panamá</name>
 <coordinates>8.966667 -79.533333</coordinates>
 <location>
 <name>Howard Air Force Base</name>
@@ -11186,7 +11186,7 @@
 </city>
 <city>
 <!-- A city in Panama -->
- <_name>Tocumen</_name>
+ <name>Tocumen</name>
 <coordinates>9.083333 -79.383333</coordinates>
 <location>
 <name>Tocumen</name>
@@ -11197,7 +11197,7 @@
 </country>
 <country>
 <!-- PY - Paraguay -->
- <_name>Paraguay</_name>
+ <name>Paraguay</name>
 <iso-code>PY</iso-code>
 <fips-code>PA</fips-code>
 <timezones>
@@ -11206,7 +11206,7 @@
 <tz-hint>America/Asuncion</tz-hint>
 <city>
 <!-- The capital of Paraguay -->
- <_name>Asunción</_name>
+ <name>Asunción</name>
 <coordinates>-25.266667 -57.666667</coordinates>
 <location>
 <name>Asunción Airport</name>
@@ -11216,7 +11216,7 @@
 </city>
 <city>
 <!-- A city in Paraguay -->
- <_name>Colonia Félix de Azara</_name>
+ <name>Colonia Félix de Azara</name>
 <coordinates>-25.483333 -54.766667</coordinates>
 <location>
 <name>Guarany Airport</name>
@@ -11227,7 +11227,7 @@
 </country>
 <country>
 <!-- PE - Peru -->
- <_name msgctxt="Country">Peru</_name>
+ <name msgctxt="Country">Peru</name>
 <iso-code>PE</iso-code>
 <fips-code>PE</fips-code>
 <timezones>
@@ -11236,7 +11236,7 @@
 <tz-hint>America/Lima</tz-hint>
 <city>
 <!-- A city in Peru -->
- <_name>Andahuaylas</_name>
+ <name>Andahuaylas</name>
 <coordinates>-13.655556 -73.387222</coordinates>
 <location>
 <name>Andahuaylas</name>
@@ -11246,7 +11246,7 @@
 </city>
 <city>
 <!-- A city in Peru -->
- <_name>Arequipa</_name>
+ <name>Arequipa</name>
 <coordinates>-16.398889 -71.535000</coordinates>
 <location>
 <name>Arequipa</name>
@@ -11256,7 +11256,7 @@
 </city>
 <city>
 <!-- A city in Peru -->
- <_name>Ayacucho</_name>
+ <name>Ayacucho</name>
 <coordinates>-13.158333 -74.223889</coordinates>
 <location>
 <name>Ayacucho</name>
@@ -11266,7 +11266,7 @@
 </city>
 <city>
 <!-- A city in Peru -->
- <_name>Chiclayo</_name>
+ <name>Chiclayo</name>
 <coordinates>-6.773611 -79.841667</coordinates>
 <location>
 <name>Chiclayo</name>
@@ -11276,7 +11276,7 @@
 </city>
 <city>
 <!-- A city in Peru -->
- <_name>Cusco</_name>
+ <name>Cusco</name>
 <coordinates>-13.518333 -71.978056</coordinates>
 <location>
 <name>Cusco</name>
@@ -11286,7 +11286,7 @@
 </city>
 <city>
 <!-- A city in Peru -->
- <_name>Iquitos</_name>
+ <name>Iquitos</name>
 <coordinates>-3.748056 -73.247222</coordinates>
 <location>
 <name>Iquitos</name>
@@ -11296,7 +11296,7 @@
 </city>
 <city>
 <!-- A city in Peru -->
- <_name>Juliaca</_name>
+ <name>Juliaca</name>
 <coordinates>-15.500000 -70.133333</coordinates>
 <location>
 <name>Juliaca</name>
@@ -11306,7 +11306,7 @@
 </city>
 <city>
 <!-- The capital of Peru -->
- <_name msgctxt="City in Peru">Lima</_name>
+ <name msgctxt="City in Peru">Lima</name>
 <coordinates>-12.050000 -77.050000</coordinates>
 <location>
 <name>Lima-Callao, Jorge Chavez International Airport</name>
@@ -11316,7 +11316,7 @@
 </city>
 <city>
 <!-- A city in Peru -->
- <_name>Pisco</_name>
+ <name>Pisco</name>
 <coordinates>-13.700000 -76.216667</coordinates>
 <location>
 <name>Pisco</name>
@@ -11326,7 +11326,7 @@
 </city>
 <city>
 <!-- A city in Peru -->
- <_name>Pucallpa</_name>
+ <name>Pucallpa</name>
 <coordinates>-8.382500 -74.538056</coordinates>
 <location>
 <name>Pucallpa</name>
@@ -11336,7 +11336,7 @@
 </city>
 <city>
 <!-- A city in Peru -->
- <_name>Puerto Maldonado</_name>
+ <name>Puerto Maldonado</name>
 <coordinates>-12.600000 -69.183333</coordinates>
 <location>
 <name>Puerto Maldonado</name>
@@ -11346,7 +11346,7 @@
 </city>
 <city>
 <!-- A city in Peru -->
- <_name>Tacna</_name>
+ <name>Tacna</name>
 <coordinates>-17.994722 -70.241111</coordinates>
 <location>
 <name>Tacna</name>
@@ -11356,7 +11356,7 @@
 </city>
 <city>
 <!-- A city in Peru -->
- <_name>Talara</_name>
+ <name>Talara</name>
 <coordinates>-4.577222 -81.271944</coordinates>
 <location>
 <name>Talara</name>
@@ -11366,7 +11366,7 @@
 </city>
 <city>
 <!-- A city in Peru -->
- <_name>Tarapoto</_name>
+ <name>Tarapoto</name>
 <coordinates>-6.501389 -76.365556</coordinates>
 <location>
 <name>Tarapoto</name>
@@ -11376,7 +11376,7 @@
 </city>
 <city>
 <!-- A city in Peru -->
- <_name>Trujillo</_name>
+ <name>Trujillo</name>
 <coordinates>-8.111944 -79.025556</coordinates>
 <location>
 <name>Trujillo</name>
@@ -11386,7 +11386,7 @@
 </city>
 <city>
 <!-- A city in Peru -->
- <_name>Tumbes</_name>
+ <name>Tumbes</name>
 <coordinates>-3.566667 -80.441389</coordinates>
 <location>
 <name>Tumbes</name>
@@ -11397,7 +11397,7 @@
 </country>
 <country>
 <!-- LC - Saint Lucia -->
- <_name>Saint Lucia</_name>
+ <name>Saint Lucia</name>
 <iso-code>LC</iso-code>
  <fips-code>ST</fips-code>
 <timezones>
@@ -11406,7 +11406,7 @@
 <tz-hint>America/St_Lucia</tz-hint>
 <city>
 <!-- The capital of Saint Lucia -->
- <_name>Castries</_name>
+ <name>Castries</name>
 <coordinates>14.000000 -61.000000</coordinates>
 <location>
 <name>Vigie</name>
@@ -11416,7 +11416,7 @@
 </city>
 <city>
 <!-- A city in Saint Lucia -->
- <_name>Pointe Sable</_name>
+ <name>Pointe Sable</name>
 <coordinates>13.750000 -60.950000</coordinates>
 <location>
 <name>Hewanorra International Airport</name>
@@ -11426,7 +11426,7 @@
 </city>
 <city>
 <!-- A city in Saint Lucia -->
- <_name>Vigie</_name>
+ <name>Vigie</name>
 <coordinates>14.033333 -61.016667</coordinates>
 <location>
 <name>Vigie</name>
@@ -11440,7 +11440,7 @@
 Martin / Sint Maarten. (The Dutch half is considered part of
 the Netherlands Antilles.)
 -->
- <_name>Saint Martin</_name>
+ <name>Saint Martin</name>
 <iso-code>MF</iso-code>
 <fips-code>RN</fips-code>
 <timezones>
@@ -11450,7 +11450,7 @@
 </country>
 <country>
 <!-- VC - Saint Vincent and the Grenadines -->
- <_name>Saint Vincent and the Grenadines</_name>
+ <name>Saint Vincent and the Grenadines</name>
 <iso-code>VC</iso-code>
 <fips-code>VC</fips-code>
 <timezones>
@@ -11459,7 +11459,7 @@
 <tz-hint>America/St_Vincent</tz-hint>
 <city>
 <!-- A city in Saint Vincent and the Grenadines -->
- <_name>Arnos Vale</_name>
+ <name>Arnos Vale</name>
 <coordinates>13.133333 -61.200000</coordinates>
 <location>
 <name>Arnos Vale</name>
@@ -11469,7 +11469,7 @@
 </city>
 <city>
 <!-- The capital of Saint Vincent and the Grenadines -->
- <_name>Kingstown</_name>
+ <name>Kingstown</name>
 <coordinates>13.133333 -61.216667</coordinates>
 <location>
 <name>Arnos Vale</name>
@@ -11482,7 +11482,7 @@
 <!-- GS - South Georgia and the South Sandwich Islands, a British
 territory in the South Atlantic.
 -->
- <_name>South Georgia and the South Sandwich Islands</_name>
+ <name>South Georgia and the South Sandwich Islands</name>
 <iso-code>GS</iso-code>
 <fips-code>SX</fips-code>
 <timezones>
@@ -11492,7 +11492,7 @@
 </country>
 <country>
 <!-- SR - Suriname -->
- <_name>Suriname</_name>
+ <name>Suriname</name>
 <!-- Could not find information about the following stations,
 which may be in Suriname:
 SMNI SMZO 
@@ -11505,7 +11505,7 @@
 <tz-hint>America/Paramaribo</tz-hint>
 <city>
 <!-- The capital of Suriname -->
- <_name>Paramaribo</_name>
+ <name>Paramaribo</name>
 <coordinates>5.833333 -55.166667</coordinates>
 <location>
 <name>Johan A. Pengel</name>
@@ -11515,7 +11515,7 @@
 </city>
 <city>
 <!-- A city in Suriname -->
- <_name>Zanderij</_name>
+ <name>Zanderij</name>
 <coordinates>5.450000 -55.200000</coordinates>
 <location>
 <name>Johan A. Pengel</name>
@@ -11526,7 +11526,7 @@
 </country>
 <country>
 <!-- TT - Trinidad and Tobago -->
- <_name>Trinidad and Tobago</_name>
+ <name>Trinidad and Tobago</name>
 <iso-code>TT</iso-code>
 <fips-code>TD</fips-code>
 <timezones>
@@ -11535,7 +11535,7 @@
 <tz-hint>America/Port_of_Spain</tz-hint>
 <city>
 <!-- A city in Trinidad and Tobago -->
- <_name>Bon Accord</_name>
+ <name>Bon Accord</name>
 <coordinates>11.150000 -60.833333</coordinates>
 <location>
 <name>Crown Pt. Airport, Scarborou</name>
@@ -11545,7 +11545,7 @@
 </city>
 <city>
 <!-- A city in Trinidad and Tobago -->
- <_name>Piarco</_name>
+ <name>Piarco</name>
 <coordinates>10.583333 -61.333333</coordinates>
 <location>
 <name>Piarco International Airport, Trinidad</name>
@@ -11555,7 +11555,7 @@
 </city>
 <city>
 <!-- The capital of Trinidad and Tobago -->
- <_name>Port-of-Spain</_name>
+ <name>Port-of-Spain</name>
 <coordinates>10.650000 -61.516667</coordinates>
 <location>
 <name>Piarco International Airport, Trinidad</name>
@@ -11568,7 +11568,7 @@
 <!-- TC - Turks and Caicos Islands, a British territory in the
 Caribbean
 -->
- <_name>Turks and Caicos Islands</_name>
+ <name>Turks and Caicos Islands</name>
 <!-- Could not find weather stations for the following major
 cities:
 Grand Turk
@@ -11582,7 +11582,7 @@
 </country>
 <country>
 <!-- UY - Uruguay -->
- <_name>Uruguay</_name>
+ <name>Uruguay</name>
 <iso-code>UY</iso-code>
 <fips-code>UY</fips-code>
 <timezones>
@@ -11591,7 +11591,7 @@
 <tz-hint>America/Montevideo</tz-hint>
 <city>
 <!-- A city in Uruguay -->
- <_name>Carrasco</_name>
+ <name>Carrasco</name>
 <coordinates>-34.885278 -56.060556</coordinates>
 <location>
 <name>Carrasco</name>
@@ -11601,7 +11601,7 @@
 </city>
 <city>
 <!-- A city in Uruguay -->
- <_name>Colonia</_name>
+ <name>Colonia</name>
 <coordinates>-34.466667 -57.850000</coordinates>
 <location>
 <name>Colonia</name>
@@ -11611,7 +11611,7 @@
 </city>
 <city>
 <!-- A city in Uruguay -->
- <_name>Durazno</_name>
+ <name>Durazno</name>
 <coordinates>-33.413056 -56.500556</coordinates>
 <location>
 <name>Durazno</name>
@@ -11621,7 +11621,7 @@
 </city>
 <city>
 <!-- A city in Uruguay -->
- <_name>Maldonado</_name>
+ <name>Maldonado</name>
 <coordinates>-34.900000 -54.950000</coordinates>
 <location>
 <name>Capitan Corbeta</name>
@@ -11631,7 +11631,7 @@
 </city>
 <city>
 <!-- The capital of Uruguay -->
- <_name msgctxt="City in Uruguay">Montevideo</_name>
+ <name msgctxt="City in Uruguay">Montevideo</name>
  <coordinates>-34.858056 -56.170833</coordinates>
 <location>
 <name>Melilla</name>
@@ -11642,7 +11642,7 @@
 </country>
 <country>
 <!-- VE - Venezuela -->
- <_name>Venezuela</_name>
+ <name>Venezuela</name>
 <iso-code>VE</iso-code>
 <fips-code>VE</fips-code>
 <timezones>
@@ -11651,7 +11651,7 @@
 <tz-hint>America/Caracas</tz-hint>
 <city>
 <!-- A city in Venezuela -->
- <_name>Acarigua</_name>
+ <name>Acarigua</name>
 <coordinates>9.559722 -69.201944</coordinates>
 <location>
 <name>Acarigua</name>
@@ -11661,7 +11661,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name msgctxt="City in Venezuela">Barcelona</_name>
+ <name msgctxt="City in Venezuela">Barcelona</name>
 <coordinates>10.133333 -64.700000</coordinates>
 <location>
 <name>Barcelona</name>
@@ -11671,7 +11671,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>Barinas</_name>
+ <name>Barinas</name>
 <coordinates>8.629167 -70.207222</coordinates>
 <location>
 <name>Barinas</name>
@@ -11681,7 +11681,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>Barquisimeto</_name>
+ <name>Barquisimeto</name>
 <coordinates>10.073889 -69.322778</coordinates>
 <location>
 <name>Barquisimeto</name>
@@ -11691,7 +11691,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>Calabozo</_name>
+ <name>Calabozo</name>
 <coordinates>8.934444 -67.426667</coordinates>
 <location>
 <name>Calabozo</name>
@@ -11701,7 +11701,7 @@
 </city>
 <city>
 <!-- The capital of Venezuela -->
- <_name>Caracas</_name>
+ <name>Caracas</name>
 <coordinates>10.500000 -66.916667</coordinates>
 <location>
 <name>La Carlota Airport</name>
@@ -11721,7 +11721,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>Ciudad Bolívar</_name>
+ <name>Ciudad Bolívar</name>
 <coordinates>8.122222 -63.549722</coordinates>
 <location>
 <name>Ciudad Bolívar</name>
@@ -11731,7 +11731,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>Coro</_name>
+ <name>Coro</name>
 <coordinates>11.409167 -69.667222</coordinates>
 <location>
 <name>Coro</name>
@@ -11741,7 +11741,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>El Variante</_name>
+ <name>El Variante</name>
 <coordinates>7.579444 -72.073889</coordinates>
 <location>
 <name>Sto. Domingo</name>
@@ -11751,7 +11751,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>El Vigía</_name>
+ <name>El Vigía</name>
 <coordinates>8.621944 -71.650556</coordinates>
 <location>
 <name>Perez Alph Airport</name>
@@ -11761,7 +11761,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>Guanare</_name>
+ <name>Guanare</name>
 <coordinates>9.050000 -69.750000</coordinates>
 <location>
 <name>Guanare</name>
@@ -11771,7 +11771,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>Guaricure</_name>
+ <name>Guaricure</name>
 <coordinates>11.766667 -70.131111</coordinates>
 <location>
 <name>Paraguana, Josefa Airport</name>
@@ -11781,7 +11781,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>Guasdalito</_name>
+ <name>Guasdalito</name>
 <coordinates>7.247222 -70.729444</coordinates>
 <location>
 <name>Guasdalito</name>
@@ -11791,7 +11791,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>Güiria</_name>
+ <name>Güiria</name>
 <coordinates>10.571111 -62.294444</coordinates>
 <location>
 <name>Güiria</name>
@@ -11801,7 +11801,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>La Chica</_name>
+ <name>La Chica</name>
 <coordinates>10.933333 -64.016667</coordinates>
 <location>
 <name>Margarita, Del Carib Airport</name>
@@ -11811,7 +11811,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>Maracaibo</_name>
+ <name>Maracaibo</name>
 <coordinates>10.631667 -71.640556</coordinates>
 <location>
 <name>Maracaibo-La Chinita</name>
@@ -11821,7 +11821,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>Maracay</_name>
+ <name>Maracay</name>
 <coordinates>10.246944 -67.595833</coordinates>
 <location>
 <name>Maracay-B. A. Sucre</name>
@@ -11831,7 +11831,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>Maturín</_name>
+ <name>Maturín</name>
 <coordinates>9.750000 -63.176667</coordinates>
 <location>
 <name>Maturín</name>
@@ -11841,7 +11841,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>Mene Grande</_name>
+ <name>Mene Grande</name>
 <coordinates>9.850278 -70.925556</coordinates>
 <location>
 <name>Mene Grande</name>
@@ -11851,7 +11851,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>Morocure</_name>
+ <name>Morocure</name>
 <coordinates>8.260278 -62.707500</coordinates>
 <location>
 <name>Guayana, Manuel Car Airport</name>
@@ -11861,7 +11861,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name msgctxt="City in Venezuela">Mérida</_name>
+ <name msgctxt="City in Venezuela">Mérida</name>
 <coordinates>8.598333 -71.145000</coordinates>
 <location>
 <name>Mérida</name>
@@ -11871,7 +11871,7 @@
  </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>Paramillo</_name>
+ <name>Paramillo</name>
 <coordinates>7.805556 -72.216944</coordinates>
 <location>
 <name>Paramillo Private</name>
@@ -11881,7 +11881,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>Puerto Ayacucho</_name>
+ <name>Puerto Ayacucho</name>
 <coordinates>5.663889 -67.623611</coordinates>
 <location>
 <name>Puerto Ayacucho</name>
@@ -11891,7 +11891,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>Puerto Borburata</_name>
+ <name>Puerto Borburata</name>
 <coordinates>10.483889 -67.983889</coordinates>
 <location>
 <name>Pto. Cabello</name>
@@ -11901,7 +11901,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>San Antonio del Táchira</_name>
+ <name>San Antonio del Táchira</name>
 <coordinates>7.817778 -72.442500</coordinates>
 <location>
 <name>San Antonio del Táchira</name>
@@ -11911,7 +11911,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>San Felipe</_name>
+ <name>San Felipe</name>
 <coordinates>10.340556 -68.737222</coordinates>
 <location>
 <name>San Felipe</name>
@@ -11921,7 +11921,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name msgctxt="City in Venezuela">San Fernando</_name>
+ <name msgctxt="City in Venezuela">San Fernando</name>
 <coordinates>7.896667 -67.467222</coordinates>
 <location>
 <name>San Fernando</name>
@@ -11931,7 +11931,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>San Juan de los Morros</_name>
+ <name>San Juan de los Morros</name>
 <coordinates>9.911111 -67.358333</coordinates>
 <location>
 <name>San Juan de los Morros</name>
@@ -11941,7 +11941,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>San Tomé</_name>
+ <name>San Tomé</name>
 <coordinates>8.940833 -64.130833</coordinates>
 <location>
 <name>San Tome Private</name>
@@ -11951,7 +11951,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>Santa Bárbara</_name>
+ <name>Santa Bárbara</name>
 <coordinates>8.983333 -71.900000</coordinates>
 <location>
 <name>Santa Barbara Zulia</name>
@@ -11961,7 +11961,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name msgctxt="City in Venezuela">Valencia</_name>
+ <name msgctxt="City in Venezuela">Valencia</name>
 <coordinates>10.180556 -68.003889</coordinates>
 <location>
 <name>Valencia</name>
@@ -11971,7 +11971,7 @@
 </city>
 <city>
 <!-- A city in Venezuela -->
- <_name>Valera</_name>
+ <name>Valera</name>
 <coordinates>9.317778 -70.603611</coordinates>
 <location>
 <name>Valera</name>
@@ -11982,10 +11982,10 @@
 </country>
 </region>
 <region>
- <_name>Europe</_name>
+ <name>Europe</name>
 <country>
 <!-- AL - Albania -->
- <_name>Albania</_name>
+ <name>Albania</name>
 <iso-code>AL</iso-code>
 <fips-code>AL</fips-code>
 <timezones>
@@ -11997,7 +11997,7 @@
 "Tirana" is the traditional English name.
 The local name is "Tiranë".
 -->
- <_name>Tirana</_name>
+ <name>Tirana</name>
 <coordinates>41.327500 19.818889</coordinates>
 <location>
 <name>Tirana</name>
@@ -12008,7 +12008,7 @@
 </country>
 <country>
 <!-- AD - Andorra -->
- <_name>Andorra</_name>
+ <name>Andorra</name>
 <!-- Could not find weather stations for the following major
 cities:
 Andorra la Vella
@@ -12022,7 +12022,7 @@
 </country>
 <country>
 <!-- AT - Austria -->
- <_name>Austria</_name>
+ <name>Austria</name>
 <iso-code>AT</iso-code>
 <fips-code>AU</fips-code>
 <timezones>
@@ -12033,7 +12033,7 @@
 <!-- A city in Austria.
 One of several cities in Austria called "Aigen".
 -->
- <_name>Aigen im Ennstal</_name>
+ <name>Aigen im Ennstal</name>
 <coordinates>47.516667 14.133333</coordinates>
 <location>
 <name>Aigen im Ennstal</name>
@@ -12043,7 +12043,7 @@
 </city>
 <city>
 <!-- A city in Austria -->
- <_name>Graz</_name>
+ <name>Graz</name>
 <coordinates>47.066667 15.450000</coordinates>
 <location>
 <name>Graz-Thalerhof Airport</name>
@@ -12053,7 +12053,7 @@
 </city>
 <city>
 <!-- A city in Austria -->
- <_name>Hohenems</_name>
+ <name>Hohenems</name>
 <coordinates>47.366667 9.683056</coordinates>
 <location>
 <name>Hohenems-Dornbirn</name>
@@ -12063,7 +12063,7 @@
 </city>
 <city>
 <!-- A city in Austria -->
- <_name>Innsbruck</_name>
+ <name>Innsbruck</name>
 <coordinates>47.266667 11.400000</coordinates>
 <location>
 <name>Innsbruck Airport</name>
@@ -12073,7 +12073,7 @@
 </city>
 <city>
 <!-- A city in Austria -->
- <_name>Klagenfurt</_name>
+ <name>Klagenfurt</name>
 <coordinates>46.624722 14.305278</coordinates>
 <location>
 <name>Klagenfurt Airport</name>
@@ -12083,7 +12083,7 @@
 </city>
 <city>
 <!-- A city in Austria -->
- <_name>Linz</_name>
+ <name>Linz</name>
 <coordinates>48.300000 14.300000</coordinates>
 <location>
 <name>Linz / Hoersching Airport</name>
@@ -12093,7 +12093,7 @@
 </city>
 <city>
 <!-- A city in Austria -->
- <_name>Salzburg</_name>
+ <name>Salzburg</name>
 <coordinates>47.800000 13.033333</coordinates>
 <location>
 <name>Salzburg Airport</name>
@@ -12103,7 +12103,7 @@
 </city>
 <city>
 <!-- A city in Austria -->
- <_name>Teesdorf</_name>
+ <name>Teesdorf</name>
 <coordinates>47.950000 16.283333</coordinates>
 <location>
 <name>Niederosterreich / Airport Voslau</name>
@@ -12113,7 +12113,7 @@
 </city>
 <city>
 <!-- A city in Austria -->
- <_name>Tulln</_name>
+ <name>Tulln</name>
 <coordinates>48.333333 16.050000</coordinates>
 <location>
 <name>Tulln</name>
@@ -12126,7 +12126,7 @@
 "Vienna" is the traditional English name.
 The local name in German is "Wien".
 -->
- <_name>Vienna</_name>
+ <name>Vienna</name>
 <coordinates>48.200000 16.366667</coordinates>
 <location>
 <name>Vienna / Schwechat Airport</name>
@@ -12136,7 +12136,7 @@
 </city>
 <city>
 <!-- A city in Austria -->
- <_name>Wiener Neustadt</_name>
+ <name>Wiener Neustadt</name>
 <coordinates>47.800000 16.250000</coordinates>
 <location>
 <name>Niederosterreich / Wiener Neustadt-Ost Airport</name>
@@ -12146,7 +12146,7 @@
 </city>
 <city>
 <!-- A city in Austria -->
- <_name>Zell am See</_name>
+ <name>Zell am See</name>
 <coordinates>47.316667 12.783333</coordinates>
 <location>
 <name>Zell am See</name>
@@ -12156,7 +12156,7 @@
 </city>
 <city>
 <!-- A city in Austria -->
- <_name>Zeltweg</_name>
+ <name>Zeltweg</name>
 <coordinates>47.183333 14.750000</coordinates>
 <location>
 <name>Zeltweg</name>
@@ -12167,7 +12167,7 @@
 </country>
 <country>
 <!-- BY - Belarus -->
- <_name>Belarus</_name>
+ <name>Belarus</name>
 <iso-code>BY</iso-code>
 <fips-code>BO</fips-code>
 <timezones>
@@ -12176,7 +12176,7 @@
 <tz-hint>Europe/Minsk</tz-hint>
 <city>
 <!-- A city in Belarus -->
- <_name msgctxt="City in Belarus">Brest</_name>
+ <name msgctxt="City in Belarus">Brest</name>
 <coordinates>52.100000 23.700000</coordinates>
 <location>
 <name>Brest</name>
@@ -12186,7 +12186,7 @@
 </city>
 <city>
 <!-- A city in Belarus -->
- <_name>Homyel'</_name>
+ <name>Homyel'</name>
 <coordinates>52.441667 30.983333</coordinates>
 <location>
 <name>Homyel'</name>
@@ -12196,7 +12196,7 @@
 </city>
 <city>
 <!-- A city in Belarus -->
- <_name>Hrodna</_name>
+ <name>Hrodna</name>
 <coordinates>53.681389 23.814722</coordinates>
 <location>
 <name>Hrodna</name>
@@ -12206,7 +12206,7 @@
 </city>
 <city>
 <!-- The capital of Belarus -->
- <_name>Minsk</_name>
+ <name>Minsk</name>
 <coordinates>53.900000 27.566667</coordinates>
 <location>
 <name>Loshitsa / Minsk International</name>
@@ -12221,7 +12221,7 @@
 </city>
 <city>
 <!-- A city in Belarus -->
- <_name>Vitsyebsk</_name>
+ <name>Vitsyebsk</name>
 <coordinates>55.192500 30.194444</coordinates>
 <location>
 <name>Vitsyebsk</name>
@@ -12234,7 +12234,7 @@
 <!-- BE - Belgium. The local names for the country are "België"
 (Dutch), Belgique (French), and Belgien (German).
 -->
- <_name>Belgium</_name>
+ <name>Belgium</name>
 <!-- Could not find information about the following stations,
 which may be in Belgium:
 EBLH 
@@ -12249,14 +12249,14 @@
 <!-- A state in Belgium. local name (nl): Antwerpen. local name
 (fr): Anvers. local name (de): Antwerpen.
 -->
- <_name msgctxt="State in Belgium">Antwerp</_name>
+ <name msgctxt="State in Belgium">Antwerp</name>
 <fips-code>BE01</fips-code>
 <city>
 <!-- A city in Antwerp in Belgium.
 "Antwerp" is the traditional English name.
 The local name is "Antwerpen".
 -->
- <_name msgctxt="City in Antwerp, Belgium">Antwerp</_name>
+ <name msgctxt="City in Antwerp, Belgium">Antwerp</name>
 <coordinates>51.216667 4.416667</coordinates>
 <location>
 <name>Antwerp / Deurne</name>
@@ -12271,7 +12271,7 @@
 et wallon. local name (de): Brüssel, Flämish- und
 Wallonisch-Brabant.
 -->
- <_name>Brussels, Flemish and Walloon Brabant</_name>
+ <name>Brussels, Flemish and Walloon Brabant</name>
 <fips-code>BE02</fips-code>
 <fips-code>BE10</fips-code>
 <fips-code>BE11</fips-code>
@@ -12280,7 +12280,7 @@
 <!-- A city in Brussels, Flemish and Walloon Brabant in
 Belgium
 -->
- <_name>Beauvechain</_name>
+ <name>Beauvechain</name>
 <coordinates>50.783333 4.766667</coordinates>
 <location>
 <name>Beauvechain</name>
@@ -12294,7 +12294,7 @@
 The local name in French is "Bruxelles".
 The local name in Dutch is "Brussel".
 -->
- <_name>Brussels</_name>
+ <name>Brussels</name>
 <coordinates>50.833333 4.333333</coordinates>
 <location>
 <name>Bruxelles National</name>
@@ -12306,7 +12306,7 @@
 <!-- A city in Brussels, Flemish and Walloon Brabant in
 Belgium
 -->
- <_name>Schaffen</_name>
+ <name>Schaffen</name>
 <coordinates>51.000000 5.083333</coordinates>
 <location>
 <name>Schaffen</name>
@@ -12317,7 +12317,7 @@
 </state>
 <state>
 <!-- A state/province/territory in Belgium -->
- <_name>East-Flanders</_name>
+ <name>East-Flanders</name>
 <fips-code>BE08</fips-code>
 </state>
 <state>
@@ -12325,11 +12325,11 @@
 (fr_BE): Hinnot. local name (nl): Henegouwen. local name
 (de): Hennegau.
 -->
- <_name>Hainaut</_name>
+ <name>Hainaut</name>
 <fips-code>BE03</fips-code>
 <city>
 <!-- A city in Hainaut in Belgium -->
- <_name>Chièvres</_name>
+ <name>Chièvres</name>
 <coordinates>50.583333 3.800000</coordinates>
 <location>
 <name>Chièvres</name>
@@ -12339,7 +12339,7 @@
 </city>
 <city>
 <!-- A city in Hainaut in Belgium -->
- <_name>Gosselies</_name>
+ <name>Gosselies</name>
 <coordinates>50.466667 4.416667</coordinates>
 <location>
 <name>Charleroi / Gosselies</name>
@@ -12352,11 +12352,11 @@
 <!-- A state in Belgium. local name (nl): Limburg. local name
 (fr): Limbourg. local name (de): Limburg.
 -->
- <_name>Limburg</_name>
+ <name>Limburg</name>
 <fips-code>BE05</fips-code>
 <city>
 <!-- A city in Limburg in Belgium -->
- <_name>Kleine-Brogel</_name>
+ <name>Kleine-Brogel</name>
 <coordinates>51.166667 5.433333</coordinates>
 <location>
 <name>Kleine-Brogel</name>
@@ -12370,11 +12370,11 @@
 (fr_BE): Lîdje. local name (nl): Luik. local name (de):
 Lüttich.
 -->
- <_name>Liège</_name>
+ <name>Liège</name>
 <fips-code>BE04</fips-code>
 <city>
 <!-- A city in Liège in Belgium -->
- <_name>Bierset</_name>
+ <name>Bierset</name>
 <coordinates>50.650000 5.433333</coordinates>
 <location>
 <name>Bierset</name>
@@ -12384,7 +12384,7 @@
 </city>
 <city>
 <!-- A city in Liège in Belgium -->
- <_name>Elsenborn</_name>
+ <name>Elsenborn</name>
 <coordinates>50.450000 6.216667</coordinates>
 <location>
  <name>Elsenborn</name>
@@ -12395,16 +12395,16 @@
 </state>
 <state>
 <!-- A state/province/territory in Belgium -->
- <_name msgctxt="State in Belgium">Luxembourg</_name>
+ <name msgctxt="State in Belgium">Luxembourg</name>
 <fips-code>BE06</fips-code>
 </state>
 <state>
 <!-- A state/province/territory in Belgium -->
- <_name>Namur</_name>
+ <name>Namur</name>
 <fips-code>BE07</fips-code>
 <city>
 <!-- A city in Namur in Belgium -->
- <_name>Florennes</_name>
+ <name>Florennes</name>
 <coordinates>50.250000 4.616667</coordinates>
 <location>
 <name>Florennes</name>
@@ -12418,11 +12418,11 @@
 local name (fr): Flandre occidentale. local name (de):
 Westflandern.
 -->
- <_name>West-Flanders</_name>
+ <name>West-Flanders</name>
 <fips-code>BE09</fips-code>
 <city>
 <!-- A city in West-Flanders in Belgium -->
- <_name>Koksijde</_name>
+ <name>Koksijde</name>
 <coordinates>51.100000 2.650000</coordinates>
 <location>
 <name>Koksijde</name>
@@ -12432,7 +12432,7 @@
 </city>
 <city>
 <!-- A city in West-Flanders in Belgium -->
- <_name>Oostende</_name>
+ <name>Oostende</name>
 <coordinates>51.216667 2.916667</coordinates>
 <location>
 <name>Oostende Airport</name>
@@ -12444,7 +12444,7 @@
 </country>
 <country>
 <!-- BA - Bosnia and Herzegovina -->
- <_name>Bosnia and Herzegovina</_name>
+ <name>Bosnia and Herzegovina</name>
 <iso-code>BA</iso-code>
 <fips-code>BK</fips-code>
 <timezones>
@@ -12453,7 +12453,7 @@
 <tz-hint>Europe/Sarajevo</tz-hint>
 <city>
 <!-- A city in Bosnia and Herzegovina -->
- <_name>Banja Luka</_name>
+ <name>Banja Luka</name>
 <coordinates>44.775833 17.185556</coordinates>
 <location>
 <name>Banja Luka</name>
@@ -12463,7 +12463,7 @@
 </city>
  <city>
 <!-- A city in Bosnia and Herzegovina -->
- <_name>Mostar</_name>
+ <name>Mostar</name>
 <coordinates>43.343333 17.808056</coordinates>
 <location>
 <name>Mostar</name>
@@ -12473,7 +12473,7 @@
 </city>
 <city>
 <!-- The capital of Bosnia and Herzegovina -->
- <_name>Sarajevo</_name>
+ <name>Sarajevo</name>
 <coordinates>43.850000 18.383333</coordinates>
 <location>
 <name>Sarajevo</name>
@@ -12484,7 +12484,7 @@
 </country>
 <country>
 <!-- BG - Bulgaria -->
- <_name>Bulgaria</_name>
+ <name>Bulgaria</name>
 <iso-code>BG</iso-code>
 <fips-code>BU</fips-code>
 <timezones>
@@ -12493,7 +12493,7 @@
 <tz-hint>Europe/Sofia</tz-hint>
 <city>
 <!-- A city in Bulgaria -->
- <_name>Burgas</_name>
+ <name>Burgas</name>
 <coordinates>42.506058 27.467810</coordinates>
 <location>
 <name>Burgas</name>
@@ -12503,7 +12503,7 @@
 </city>
 <city>
 <!-- A city in Bulgaria -->
- <_name>Gorna Oryakhovitsa</_name>
+ <name>Gorna Oryakhovitsa</name>
 <coordinates>43.127778 25.701667</coordinates>
 <location>
 <name>Gorna Oryakhovitsa</name>
@@ -12513,7 +12513,7 @@
 </city>
 <city>
 <!-- A city in Bulgaria -->
- <_name>Plovdiv</_name>
+ <name>Plovdiv</name>
 <coordinates>42.150000 24.750000</coordinates>
 <location>
 <name>Plovdiv</name>
@@ -12526,7 +12526,7 @@
 "Sofia" is the traditional English name.
 The local name is "Sofiya".
 -->
- <_name>Sofia</_name>
+ <name>Sofia</name>
 <coordinates>42.683333 23.316667</coordinates>
 <location>
 <name>Sofia Observatory</name>
@@ -12536,7 +12536,7 @@
 </city>
 <city>
 <!-- A city in Bulgaria -->
- <_name>Varna</_name>
+ <name>Varna</name>
 <coordinates>43.216667 27.916667</coordinates>
 <location>
 <name>Varna</name>
@@ -12547,7 +12547,7 @@
 </country>
 <country>
 <!-- HR - Croatia -->
- <_name>Croatia</_name>
+ <name>Croatia</name>
 <iso-code>HR</iso-code>
 <fips-code>HR</fips-code>
 <timezones>
@@ -12556,7 +12556,7 @@
 <tz-hint>Europe/Zagreb</tz-hint>
 <city>
 <!-- A city in Croatia -->
- <_name>Bol</_name>
+ <name>Bol</name>
 <coordinates>43.261944 16.655000</coordinates>
 <location>
 <name>Brac</name>
@@ -12566,7 +12566,7 @@
 </city>
 <city>
 <!-- A city in Croatia -->
- <_name>Dubrovnik</_name>
+ <name>Dubrovnik</name>
 <coordinates>42.650556 18.091389</coordinates>
 <location>
 <name>Dubrovnik / Čilipi</name>
@@ -12576,7 +12576,7 @@
 </city>
 <city>
 <!-- A city in Croatia -->
- <_name>Jelovice</_name>
+ <name>Jelovice</name>
 <coordinates>45.498056 14.014444</coordinates>
 <location>
 <name>Pula Airport</name>
@@ -12586,7 +12586,7 @@
 </city>
 <city>
 <!-- A city in Croatia -->
- <_name>Liška</_name>
+ <name>Liška</name>
 <coordinates>44.576667 14.376111</coordinates>
 <location>
 <name>Losinj Island</name>
@@ -12596,7 +12596,7 @@
 </city>
 <city>
 <!-- A city in Croatia -->
- <_name>Osijek</_name>
+ <name>Osijek</name>
 <coordinates>45.551111 18.693889</coordinates>
 <location>
 <name>Osijek / Čepin</name>
@@ -12606,7 +12606,7 @@
 </city>
 <city>
 <!-- A city in Croatia -->
- <_name>Rijeka</_name>
+ <name>Rijeka</name>
 <coordinates>45.343056 14.409167</coordinates>
 <location>
 <name>Rijeka / Omišalj</name>
@@ -12616,7 +12616,7 @@
 </city>
 <city>
 <!-- A city in Croatia -->
- <_name>Split</_name>
+ <name>Split</name>
 <coordinates>43.513889 16.455833</coordinates>
 <location>
 <name>Split / Resnik</name>
@@ -12626,7 +12626,7 @@
 </city>
 <city>
 <!-- A city in Croatia -->
- <_name>Zadar</_name>
+ <name>Zadar</name>
 <coordinates>44.119722 15.242222</coordinates>
 <location>
 <name>Zadar / Donji Zemunik</name>
@@ -12636,7 +12636,7 @@
 </city>
 <city>
 <!-- The capital of Croatia -->
- <_name>Zagreb</_name>
+ <name>Zagreb</name>
 <coordinates>45.800000 16.000000</coordinates>
 <location>
 <name>Zagreb / Pleso</name>
@@ -12647,7 +12647,7 @@
 </country>
 <country>
 <!-- CY - Cyprus -->
- <_name>Cyprus</_name>
+ <name>Cyprus</name>
 <iso-code>CY</iso-code>
 <fips-code>CY</fips-code>
 <timezones>
@@ -12656,7 +12656,7 @@
 <tz-hint>Asia/Nicosia</tz-hint>
 <city>
 <!-- A city in Cyprus -->
- <_name>Akrotiri</_name>
+ <name>Akrotiri</name>
 <coordinates>34.604167 32.958333</coordinates>
 <location>
 <name>Akrotiri</name>
@@ -12666,7 +12666,7 @@
 </city>
 <city>
 <!-- A city in Cyprus -->
- <_name>Larnaca</_name>
+ <name>Larnaca</name>
 <coordinates>34.916667 33.629167</coordinates>
 <location>
 <name>Larnaca Airport</name>
@@ -12676,7 +12676,7 @@
 </city>
 <city>
 <!-- The capital of Cyprus -->
- <_name>Nicosia</_name>
+ <name>Nicosia</name>
 <coordinates>35.166667 33.366667</coordinates>
 <location>
 <name>Ercan</name>
@@ -12686,7 +12686,7 @@
 </city>
 <city>
 <!-- A city in Cyprus -->
- <_name>Paphos</_name>
+ <name>Paphos</name>
 <coordinates>34.766667 32.416667</coordinates>
 <location>
 <name>Paphos Airport</name>
@@ -12696,7 +12696,7 @@
 </city>
 <city>
 <!-- A city in Cyprus -->
- <_name>Tymbou</_name>
+ <name>Tymbou</name>
 <coordinates>35.133333 33.512500</coordinates>
 <location>
 <name>Ercan</name>
@@ -12707,7 +12707,7 @@
 </country>
 <country>
 <!-- CZ - Czech Republic -->
- <_name>Czech Republic</_name>
+ <name>Czech Republic</name>
 <!-- Could not find information about the following stations,
 which may be in Czech Republic:
 LKCV LKKB LKLN LKNA LKPD LKPO 
@@ -12720,7 +12720,7 @@
 <tz-hint>Europe/Prague</tz-hint>
 <city>
 <!-- A city in the Czech Republic -->
- <_name>Brno</_name>
+ <name>Brno</name>
 <coordinates>49.200000 16.633333</coordinates>
 <location>
 <name>Brno-Turany Airport</name>
@@ -12730,7 +12730,7 @@
 </city>
 <city>
 <!-- A city in the Czech Republic -->
- <_name>Holešov</_name>
+ <name>Holešov</name>
 <coordinates>49.333333 17.583333</coordinates>
 <location>
 <name>Holešov</name>
@@ -12740,7 +12740,7 @@
 </city>
 <city>
 <!-- A city in the Czech Republic -->
- <_name>Karlovy Vary</_name>
+ <name>Karlovy Vary</name>
 <coordinates>50.216667 12.900000</coordinates>
 <location>
 <name>Karlovy Vary</name>
@@ -12750,7 +12750,7 @@
 </city>
 <city>
 <!-- A city in the Czech Republic -->
- <_name>Liberec</_name>
+ <name>Liberec</name>
 <coordinates>50.763889 15.065278</coordinates>
 <location>
 <name>Liberec</name>
@@ -12760,7 +12760,7 @@
 </city>
 <city>
 <!-- A city in the Czech Republic -->
- <_name>Ostrava</_name>
+ <name>Ostrava</name>
 <coordinates>49.833333 18.283333</coordinates>
 <location>
 <name>Ostrava-Mosnov Airport</name>
@@ -12773,7 +12773,7 @@
 "Prague" is the traditional English name.
 The local name in Czech is "Praha".
 -->
- <_name>Prague</_name>
+ <name>Prague</name>
 <coordinates>50.083333 14.466667</coordinates>
 <location>
 <name>Prague-Ruzyne Airport</name>
@@ -12784,7 +12784,7 @@
 </country>
 <country>
 <!-- DK - Denmark. The Danish name is "Danmark" -->
- <_name>Denmark</_name>
+ <name>Denmark</name>
 <iso-code>DK</iso-code>
 <fips-code>DA</fips-code>
 <timezones>
@@ -12793,7 +12793,7 @@
 <tz-hint>Europe/Copenhagen</tz-hint>
 <city>
 <!-- A city in Denmark -->
- <_name>Billund</_name>
+ <name>Billund</name>
 <coordinates>55.733333 9.116667</coordinates>
 <location>
 <name>Billund Airport</name>
@@ -12806,7 +12806,7 @@
 "Copenhagen" is the traditional English name.
 The local name is "København".
 -->
- <_name>Copenhagen</_name>
+ <name>Copenhagen</name>
 <coordinates>55.666667 12.583333</coordinates>
 <location>
 <name>Koebenhavn / Kastrup</name>
@@ -12816,7 +12816,7 @@
 </city>
 <city>
 <!-- A city in Denmark -->
- <_name>Esbjerg</_name>
+ <name>Esbjerg</name>
 <coordinates>55.466667 8.450000</coordinates>
 <location>
 <name>Esbjerg</name>
@@ -12826,7 +12826,7 @@
 </city>
 <city>
 <!-- A city in Denmark -->
- <_name>Karup</_name>
+ <name>Karup</name>
 <coordinates>56.300000 9.166667</coordinates>
 <location>
 <name>Karup</name>
@@ -12836,7 +12836,7 @@
 </city>
 <city>
 <!-- A city in Denmark -->
- <_name>Kastrup</_name>
+ <name>Kastrup</name>
 <coordinates>55.633333 12.650000</coordinates>
 <location>
 <name>Koebenhavn / Kastrup</name>
@@ -12846,7 +12846,7 @@
 </city>
 <city>
 <!-- A city in Denmark -->
- <_name>Mejlby</_name>
+ <name>Mejlby</name>
 <coordinates>56.000000 8.333333</coordinates>
 <location>
 <name>Stauning Airport</name>
@@ -12856,7 +12856,7 @@
 </city>
 <city>
 <!-- A city in Denmark -->
- <_name>Odense</_name>
+ <name>Odense</name>
 <coordinates>55.400000 10.383333</coordinates>
 <location>
 <name>Odense / Beldringe</name>
@@ -12866,7 +12866,7 @@
 </city>
 <city>
 <!-- A city in Denmark -->
- <_name>Roskilde</_name>
+ <name>Roskilde</name>
 <coordinates>55.650000 12.083333</coordinates>
 <location>
 <name>Koebenhavn / Roskilde</name>
@@ -12876,7 +12876,7 @@
 </city>
 <city>
 <!-- A city in Denmark -->
- <_name>Rønne</_name>
+ <name>Rønne</name>
 <coordinates>55.100000 14.700000</coordinates>
 <location>
 <name>Roenne</name>
@@ -12886,7 +12886,7 @@
 </city>
 <city>
 <!-- A city in Denmark -->
- <_name>Skrydstrup</_name>
+ <name>Skrydstrup</name>
 <coordinates>55.233333 9.250000</coordinates>
 <location>
 <name>Skrydstrup</name>
@@ -12896,7 +12896,7 @@
 </city>
 <city>
 <!-- A city in Denmark -->
- <_name>Sottrupskov</_name>
+ <name>Sottrupskov</name>
 <coordinates>54.966667 9.750000</coordinates>
 <location>
 <name>Soenderborg Airport</name>
@@ -12906,7 +12906,7 @@
 </city>
 <city>
 <!-- A city in Denmark -->
- <_name>Tirstrup</_name>
+ <name>Tirstrup</name>
 <coordinates>56.300000 10.700000</coordinates>
 <location>
 <name>Tirstrup</name>
@@ -12916,7 +12916,7 @@
 </city>
 <city>
 <!-- A city in Denmark -->
- <_name>Vamdrup</_name>
+ <name>Vamdrup</name>
 <coordinates>55.416667 9.283333</coordinates>
 <location>
 <name>Vamdrup</name>
@@ -12926,7 +12926,7 @@
 </city>
 <city>
 <!-- A city in Denmark -->
- <_name>Ålborg</_name>
+ <name>Ålborg</name>
 <coordinates>57.050000 9.933333</coordinates>
 <location>
 <name>Ålborg</name>
@@ -12937,7 +12937,7 @@
 </country>
 <country>
 <!-- EE - Estonia -->
- <_name>Estonia</_name>
+ <name>Estonia</name>
 <iso-code>EE</iso-code>
 <fips-code>EN</fips-code>
 <timezones>
@@ -12946,7 +12946,7 @@
 <tz-hint>Europe/Tallinn</tz-hint>
 <city>
 <!-- A city in Estonia -->
- <_name>Kuressaare</_name>
+ <name>Kuressaare</name>
 <coordinates>58.248056 22.503889</coordinates>
 <location>
 <name>Kuressaare</name>
@@ -12956,7 +12956,7 @@
 </city>
 <city>
 <!-- A city in Estonia -->
- <_name>Kärdla</_name>
+ <name>Kärdla</name>
 <coordinates>58.997778 22.749167</coordinates>
 <location>
 <name>Kärdla</name>
@@ -12966,7 +12966,7 @@
 </city>
 <city>
 <!-- A city in Estonia -->
- <_name>Pärnu</_name>
+ <name>Pärnu</name>
 <coordinates>58.374722 24.513611</coordinates>
 <location>
 <name>Pärnu</name>
@@ -12976,7 +12976,7 @@
 </city>
 <city>
 <!-- The capital of Estonia -->
- <_name>Tallinn</_name>
+ <name>Tallinn</name>
 <coordinates>59.433889 24.728056</coordinates>
 <location>
 <name>Tallinn</name>
@@ -12986,7 +12986,7 @@
 </city>
 <city>
 <!-- A city in Estonia -->
- <_name>Tartu</_name>
+ <name>Tartu</name>
 <coordinates>58.366111 26.736111</coordinates>
 <location>
 <name>Tartu / Ülenurme</name>
@@ -12999,7 +12999,7 @@
 <!-- FO - Faroe Islands, an autonomous province of Denmark in the
 north Atlantic.
 -->
- <_name>Faroe Islands</_name>
+ <name>Faroe Islands</name>
 <!-- Could not find information about the following stations,
 which may be in Faroe Islands:
 EKGF 
@@ -13012,7 +13012,7 @@
 <tz-hint>Atlantic/Faroe</tz-hint>
 <city>
 <!-- A city in the Faroe Islands -->
- <_name>Sørvágur</_name>
+ <name>Sørvágur</name>
 <coordinates>62.066667 -7.300000</coordinates>
 <location>
 <name>Sørvágur / Vagar</name>
@@ -13022,7 +13022,7 @@
 </city>
 <city>
 <!-- The capital of the Faroe Islands -->
- <_name>Tórshavn</_name>
+ <name>Tórshavn</name>
 <coordinates>62.016667 -6.766667</coordinates>
 <location>
 <name>Soervaag / Vagar</name>
@@ -13033,7 +13033,7 @@
 </country>
 <country>
 <!-- FI - Finland -->
- <_name>Finland</_name>
+ <name>Finland</name>
 <iso-code>FI</iso-code>
 <fips-code>FI</fips-code>
 <pref-lang>fin</pref-lang>
@@ -13043,7 +13043,7 @@
 <tz-hint>Europe/Helsinki</tz-hint>
 <city>
 <!-- A city in Finland -->
- <_name>Enontekiö</_name>
+ <name>Enontekiö</name>
 <coordinates>68.383333 23.633333</coordinates>
 <location>
 <name>Enontekiö</name>
@@ -13053,7 +13053,7 @@
 </city>
 <city>
 <!-- A city in Finland -->
- <_name>Halli</_name>
+ <name>Halli</name>
 <coordinates>61.866667 24.833333</coordinates>
 <location>
 <name>Halli</name>
@@ -13065,7 +13065,7 @@
 <!-- The capital of Finland.
 The local name in Swedish is "Helsingfors".
 -->
- <_name>Helsinki</_name>
+ <name>Helsinki</name>
 <coordinates>60.175556 24.934167</coordinates>
 <location>
 <name>Helsinki-Malmi</name>
@@ -13077,7 +13077,7 @@
 <!-- A city in Finland.
 The local name in Swedish is "Vanda".
 -->
- <_name>Vantaa</_name>
+ <name>Vantaa</name>
 <coordinates>60.1760 24.5100</coordinates>
 <location>
 <name>Helsinki-Vantaa</name>
@@ -13087,7 +13087,7 @@
 </city>
 <city>
 <!-- A city in Finland -->
- <_name>Ivalo</_name>
+ <name>Ivalo</name>
 <coordinates>68.650000 27.600000</coordinates>
 <location>
 <name>Ivalo</name>
@@ -13097,7 +13097,7 @@
 </city>
 <city>
 <!-- A city in Finland -->
- <_name>Joensuu</_name>
+ <name>Joensuu</name>
 <coordinates>62.600000 29.766667</coordinates>
 <location>
 <name>Joensuu</name>
@@ -13107,7 +13107,7 @@
 </city>
 <city>
 <!-- A city in Finland -->
- <_name>Jyväskylä</_name>
+ <name>Jyväskylä</name>
 <coordinates>62.233333 25.733333</coordinates>
 <location>
 <name>Jyväskylä</name>
@@ -13117,7 +13117,7 @@
 </city>
 <city>
 <!-- A city in Finland -->
- <_name>Kajaani</_name>
+ <name>Kajaani</name>
 <coordinates>64.233333 27.683333</coordinates>
 <location>
 <name>Kajaani</name>
@@ -13127,7 +13127,7 @@
 </city>
 <city>
 <!-- A city in Finland -->
- <_name>Kauhava</_name>
+ <name>Kauhava</name>
 <coordinates>63.100000 23.083333</coordinates>
 <location>
 <name>Kauhava</name>
@@ -13137,7 +13137,7 @@
 </city>
 <city>
 <!-- A city in Finland -->
- <_name>Kemi</_name>
+ <name>Kemi</name>
 <coordinates>65.733333 24.566667</coordinates>
 <location>
 <name>Kemi</name>
@@ -13147,7 +13147,7 @@
 </city>
 <city>
 <!-- A city in Finland -->
- <_name>Kittilä</_name>
+ <name>Kittilä</name>
 <coordinates>67.666667 24.900000</coordinates>
 <location>
 <name>Kittilä</name>
@@ -13159,7 +13159,7 @@
 <!-- A city in Finland.
 The local name in Swedish is "Kronoby".
 -->
- <_name>Kruunupyy</_name>
+ <name>Kruunupyy</name>
 <coordinates>63.716667 23.033333</coordinates>
 <location>
 <name>Kruunupyy</name>
@@ -13169,7 +13169,7 @@
 </city>
 <city>
  <!-- A city in Finland -->
- <_name>Kuopio</_name>
+ <name>Kuopio</name>
 <coordinates>62.900000 27.683333</coordinates>
 <location>
 <name>Kuopio</name>
@@ -13179,7 +13179,7 @@
 </city>
 <city>
 <!-- A city in Finland -->
- <_name>Kuusamo</_name>
+ <name>Kuusamo</name>
 <coordinates>65.966667 29.183333</coordinates>
 <location>
 <name>Kuusamo</name>
@@ -13189,7 +13189,7 @@
 </city>
 <city>
 <!-- A city in Finland -->
- <_name>Lappeenranta</_name>
+ <name>Lappeenranta</name>
 <coordinates>61.066667 28.183333</coordinates>
 <location>
 <name>Lappeenranta</name>
@@ -13199,7 +13199,7 @@
 </city>
 <city>
 <!-- A city in Finland -->
- <_name>Mikkeli</_name>
+ <name>Mikkeli</name>
 <coordinates>61.683333 27.250000</coordinates>
 <location>
 <name>Mikkeli</name>
@@ -13209,7 +13209,7 @@
 </city>
 <city>
 <!-- A city in Finland -->
- <_name>Oulu</_name>
+ <name>Oulu</name>
 <coordinates>65.016667 25.466667</coordinates>
 <location>
 <name>Oulu</name>
@@ -13219,7 +13219,7 @@
 </city>
 <city>
 <!-- A city in Finland -->
- <_name>Pori</_name>
+ <name>Pori</name>
 <coordinates>61.483333 21.783333</coordinates>
 <location>
 <name>Pori</name>
@@ -13229,7 +13229,7 @@
 </city>
 <city>
 <!-- A city in Finland -->
- <_name>Rovaniemi</_name>
+ <name>Rovaniemi</name>
 <coordinates>66.500000 25.716667</coordinates>
 <location>
 <name>Rovaniemi</name>
@@ -13239,7 +13239,7 @@
 </city>
 <city>
 <!-- A city in Finland -->
- <_name>Savonlinna</_name>
+ <name>Savonlinna</name>
 <coordinates>61.866667 28.883333</coordinates>
 <location>
 <name>Savonlinna</name>
@@ -13249,7 +13249,7 @@
 </city>
 <city>
 <!-- A city in Finland -->
- <_name>Seinäjoki</_name>
+ <name>Seinäjoki</name>
 <coordinates>62.800000 22.833333</coordinates>
 <location>
 <name>Seinajoki-Ilmajok</name>
@@ -13259,7 +13259,7 @@
 </city>
 <city>
 <!-- A city in Finland -->
- <_name>Tampere</_name>
+ <name>Tampere</name>
 <coordinates>61.500000 23.750000</coordinates>
 <location>
 <name>Tampere / Pirkkala</name>
@@ -13271,7 +13271,7 @@
 <!-- A city in Finland.
 The local name in Swedish is "Åbo".
 -->
- <_name>Turku</_name>
+ <name>Turku</name>
 <coordinates>60.450000 22.283333</coordinates>
 <location>
 <name>Turku</name>
@@ -13281,7 +13281,7 @@
 </city>
 <city>
 <!-- A city in Finland -->
- <_name>Utti</_name>
+ <name>Utti</name>
 <coordinates>60.883333 26.933333</coordinates>
 <location>
 <name>Utti</name>
@@ -13293,7 +13293,7 @@
 <!-- A city in Finland.
 The local name in Swedish is "Vasa".
 -->
- <_name>Vaasa</_name>
+ <name>Vaasa</name>
 <coordinates>63.100000 21.600000</coordinates>
 <location>
 <name>Vaasa</name>
@@ -13303,7 +13303,7 @@
 </city>
 <city>
 <!-- A city in Finland -->
- <_name>Varkaus</_name>
+ <name>Varkaus</name>
 <coordinates>62.316667 27.916667</coordinates>
 <location>
 <name>Varkaus</name>
@@ -13314,7 +13314,7 @@
 </country>
 <country>
 <!-- FR - France -->
- <_name>France</_name>
+ <name>France</name>
 <iso-code>FR</iso-code>
 <fips-code>FR</fips-code>
 <timezones>
@@ -13323,7 +13323,7 @@
 <tz-hint>Europe/Paris</tz-hint>
 <city>
 <!-- A city in France -->
- <_name>Abbeville</_name>
+ <name>Abbeville</name>
 <coordinates>50.100000 1.833333</coordinates>
 <location>
 <name>Abbeville</name>
@@ -13333,7 +13333,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Acon</_name>
+ <name>Acon</name>
 <coordinates>48.766667 1.100000</coordinates>
 <location>
 <name>Toussus le Noble</name>
@@ -13343,7 +13343,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Agen</_name>
+ <name>Agen</name>
 <coordinates>44.200000 0.633333</coordinates>
 <location>
 <name>Agen</name>
@@ -13353,7 +13353,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Ajaccio</_name>
+ <name>Ajaccio</name>
 <coordinates>41.916667 8.733333</coordinates>
 <location>
 <name>Ajaccio</name>
@@ -13363,7 +13363,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Alençon</_name>
+ <name>Alençon</name>
 <coordinates>48.433333 0.083333</coordinates>
 <location>
 <name>Alençon</name>
@@ -13375,7 +13375,7 @@
 <!-- A city in France.
 One of several cities in France called "Ambérieu".
 -->
- <_name>Ambérieu-en-Bugey</_name>
+ <name>Ambérieu-en-Bugey</name>
 <coordinates>45.950000 5.350000</coordinates>
 <location>
 <name>Ambérieu-en-Bugey</name>
@@ -13385,7 +13385,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Auch</_name>
+ <name>Auch</name>
 <coordinates>43.650000 0.583333</coordinates>
 <location>
 <name>Auch</name>
@@ -13395,7 +13395,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Aurillac</_name>
+ <name>Aurillac</name>
 <coordinates>44.916667 2.450000</coordinates>
 <location>
 <name>Aurillac</name>
@@ -13405,7 +13405,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Avord</_name>
+ <name>Avord</name>
 <coordinates>47.033333 2.650000</coordinates>
 <location>
 <name>Avord</name>
@@ -13415,7 +13415,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Bastia</_name>
+ <name>Bastia</name>
 <coordinates>42.702778 9.450000</coordinates>
 <location>
 <name>Bastia</name>
@@ -13425,7 +13425,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Beauvais</_name>
+ <name>Beauvais</name>
 <coordinates>49.433333 2.083333</coordinates>
 <location>
 <name>Beauvais</name>
@@ -13435,7 +13435,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Bergerac</_name>
+ <name>Bergerac</name>
 <coordinates>44.850000 0.483333</coordinates>
 <location>
 <name>Bergerac</name>
@@ -13445,7 +13445,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Biarritz</_name>
+ <name>Biarritz</name>
 <coordinates>43.483333 -1.566667</coordinates>
 <location>
 <name>Biarritz</name>
@@ -13455,7 +13455,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name msgctxt="City in France">Bordeaux</_name>
+ <name msgctxt="City in France">Bordeaux</name>
 <coordinates>44.833333 -0.566667</coordinates>
 <location>
 <name>Bordeaux-Merignac Airport</name>
@@ -13465,7 +13465,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Bourges</_name>
+ <name>Bourges</name>
 <coordinates>47.083333 2.400000</coordinates>
 <location>
 <name>Bourges</name>
@@ -13475,7 +13475,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name msgctxt="City in France">Brest</_name>
+ <name msgctxt="City in France">Brest</name>
 <coordinates>48.400000 -4.483333</coordinates>
 <location>
 <name>Brest</name>
@@ -13485,7 +13485,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Brive</_name>
+ <name>Brive</name>
 <coordinates>45.150000 1.533333</coordinates>
 <location>
 <name>Brive</name>
@@ -13495,7 +13495,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Béziers</_name>
+ <name>Béziers</name>
 <coordinates>43.350000 3.250000</coordinates>
 <location>
 <name>Béziers-Vias Airport</name>
@@ -13505,7 +13505,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Caen</_name>
+ <name>Caen</name>
 <coordinates>49.183333 -0.350000</coordinates>
 <location>
 <name>Caen</name>
@@ -13515,7 +13515,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Calvi</_name>
+ <name>Calvi</name>
 <coordinates>42.566667 8.750000</coordinates>
 <location>
 <name>Calvi</name>
@@ -13525,7 +13525,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Cambrai</_name>
+ <name>Cambrai</name>
 <coordinates>50.166667 3.233333</coordinates>
 <location>
 <name>Cambrai</name>
@@ -13535,7 +13535,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Cannes</_name>
+ <name>Cannes</name>
 <coordinates>43.550000 7.016667</coordinates>
 <location>
 <name>Cannes</name>
@@ -13545,7 +13545,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Carcassonne</_name>
+ <name>Carcassonne</name>
 <coordinates>43.216667 2.350000</coordinates>
 <location>
 <name>Carcassonne</name>
@@ -13555,7 +13555,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Cazaux</_name>
+ <name>Cazaux</name>
 <coordinates>44.533333 -1.150000</coordinates>
 <location>
 <name>Cazaux</name>
@@ -13565,7 +13565,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Chambéry</_name>
+ <name>Chambéry</name>
 <coordinates>45.600000 5.900000</coordinates>
 <location>
 <name>Chambéry-Aix-Les-Bains Airport</name>
@@ -13575,7 +13575,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Chartres</_name>
+ <name>Chartres</name>
 <coordinates>48.450000 1.500000</coordinates>
 <location>
 <name>Chartres</name>
@@ -13585,7 +13585,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Cherbourg</_name>
+ <name>Cherbourg</name>
 <coordinates>49.650000 -1.650000</coordinates>
 <location>
 <name>Cherbourg-Maupertus Airport</name>
@@ -13597,7 +13597,7 @@
 <!-- A city in France.
 One of several cities in France called "Châlons".
 -->
- <_name>Châlons-en-Champagne</_name>
+ <name>Châlons-en-Champagne</name>
 <coordinates>48.950000 4.366667</coordinates>
 <location>
 <name>Chalons-Vatry</name>
@@ -13607,7 +13607,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Châteaudun</_name>
+ <name>Châteaudun</name>
 <coordinates>48.083333 1.333333</coordinates>
 <location>
 <name>Châteaudun</name>
@@ -13617,7 +13617,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Châteauroux</_name>
+ <name>Châteauroux</name>
 <coordinates>46.816667 1.700000</coordinates>
 <location>
 <name>Châteauroux</name>
@@ -13627,7 +13627,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Clermont-Ferrand</_name>
+ <name>Clermont-Ferrand</name>
 <coordinates>45.783333 3.083333</coordinates>
 <location>
 <name>Clermont-Ferrand</name>
@@ -13637,7 +13637,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Cognac</_name>
+ <name>Cognac</name>
 <coordinates>45.700000 -0.333333</coordinates>
 <location>
 <name>Cognac</name>
@@ -13647,7 +13647,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Colmar</_name>
+ <name>Colmar</name>
 <coordinates>48.083333 7.366667</coordinates>
 <location>
 <name>Colmar</name>
@@ -13657,7 +13657,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Creil</_name>
+ <name>Creil</name>
 <coordinates>49.266667 2.483333</coordinates>
 <location>
 <name>Creil Fafb</name>
@@ -13667,7 +13667,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Dax</_name>
+ <name>Dax</name>
 <coordinates>43.716667 -1.050000</coordinates>
 <location>
 <name>Dax</name>
@@ -13677,7 +13677,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Dijon</_name>
+ <name>Dijon</name>
 <coordinates>47.316667 5.016667</coordinates>
 <location>
 <name>Dijon</name>
@@ -13687,7 +13687,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Dinard</_name>
+ <name>Dinard</name>
 <coordinates>48.633333 -2.066667</coordinates>
 <location>
 <name>Dinard</name>
@@ -13697,7 +13697,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Dole</_name>
+ <name>Dole</name>
 <coordinates>47.100000 5.500000</coordinates>
 <location>
 <name>Dole Tavaux</name>
@@ -13707,7 +13707,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Dollemard</_name>
+ <name>Dollemard</name>
 <coordinates>49.516667 0.066667</coordinates>
 <location>
 <name>La Heve</name>
@@ -13717,7 +13717,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Grenoble</_name>
+ <name>Grenoble</name>
 <coordinates>45.166667 5.716667</coordinates>
 <location>
 <name>Grenoble-St. Geoirs Airport</name>
@@ -13727,7 +13727,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Hoëricourt</_name>
+ <name>Hoëricourt</name>
 <coordinates>48.633333 4.900000</coordinates>
 <location>
 <name>St-Dizier</name>
@@ -13737,7 +13737,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Hyères</_name>
+ <name>Hyères</name>
 <coordinates>43.116667 6.116667</coordinates>
 <location>
 <name>Hyères</name>
@@ -13747,7 +13747,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Mulhouse</_name>
+ <name>Mulhouse</name>
 <coordinates>47.583333 7.516667</coordinates>
 <location>
 <name>Bale-Mulhouse</name>
@@ -13757,7 +13757,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Istres</_name>
+ <name>Istres</name>
 <coordinates>43.516667 4.983333</coordinates>
 <location>
 <name>Istres</name>
@@ -13767,7 +13767,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>La Roche-sur-Yon</_name>
+ <name>La Roche-sur-Yon</name>
 <coordinates>46.666667 -1.433333</coordinates>
 <location>
 <name>La Roche-sur-Yon</name>
@@ -13777,7 +13777,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>La Rochelle</_name>
+ <name>La Rochelle</name>
 <coordinates>46.166667 -1.150000</coordinates>
 <location>
 <name>La Rochelle</name>
@@ -13787,7 +13787,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Lannion</_name>
+ <name>Lannion</name>
 <coordinates>48.733333 -3.466667</coordinates>
 <location>
 <name>Lannion-Servel Airport</name>
@@ -13797,7 +13797,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Le Mans</_name>
+ <name>Le Mans</name>
 <coordinates>48.000000 0.200000</coordinates>
 <location>
 <name>Le Mans</name>
@@ -13807,7 +13807,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Le Puy</_name>
+ <name>Le Puy</name>
 <coordinates>45.033333 3.883333</coordinates>
 <location>
 <name>Le Puy</name>
@@ -13817,7 +13817,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Lille</_name>
+ <name>Lille</name>
 <coordinates>50.633333 3.066667</coordinates>
 <location>
 <name>Lille</name>
@@ -13827,7 +13827,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Limoges</_name>
+ <name>Limoges</name>
 <coordinates>45.850000 1.250000</coordinates>
 <location>
 <name>Limoges</name>
@@ -13837,7 +13837,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Luxeuil-les-Bains</_name>
+ <name>Luxeuil-les-Bains</name>
 <coordinates>47.816667 6.383333</coordinates>
 <location>
 <name>Luxeuil-les-Bains</name>
@@ -13847,7 +13847,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Lyon</_name>
+ <name>Lyon</name>
 <coordinates>45.750000 4.850000</coordinates>
 <location>
 <name>Lyon-Bron Airport</name>
@@ -13862,7 +13862,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Marseille</_name>
+ <name>Marseille</name>
 <coordinates>43.300000 5.400000</coordinates>
 <location>
 <name>Marseille-Marignane Airport</name>
@@ -13872,7 +13872,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Melun</_name>
+ <name>Melun</name>
 <coordinates>48.533333 2.666667</coordinates>
 <location>
 <name>Melun</name>
@@ -13882,7 +13882,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Metz</_name>
+ <name>Metz</name>
 <coordinates>49.133333 6.166667</coordinates>
 <location>
 <name>Metz-Nancy-Lorraine</name>
@@ -13892,7 +13892,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Mont-de-Marsan</_name>
+ <name>Mont-de-Marsan</name>
 <coordinates>43.883333 -0.500000</coordinates>
 <location>
 <name>Mont-de-Marsan</name>
@@ -13902,7 +13902,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Montgauch</_name>
+ <name>Montgauch</name>
 <coordinates>43.000000 1.083333</coordinates>
 <location>
 <name>St-Girons</name>
@@ -13912,7 +13912,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Montpellier</_name>
+ <name>Montpellier</name>
 <coordinates>43.600000 3.883333</coordinates>
 <location>
 <name>Montpellier</name>
@@ -13922,7 +13922,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Montélimar</_name>
+ <name>Montélimar</name>
 <coordinates>44.566667 4.750000</coordinates>
 <location>
 <name>Montélimar</name>
@@ -13932,7 +13932,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Mâcon</_name>
+ <name>Mâcon</name>
 <coordinates>46.300000 4.833333</coordinates>
 <location>
 <name>Mâcon</name>
@@ -13942,7 +13942,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Méné Guen</_name>
+ <name>Méné Guen</name>
 <coordinates>47.783333 -3.433333</coordinates>
 <location>
 <name>Lann Bihoue</name>
@@ -13952,7 +13952,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Nancy</_name>
+ <name>Nancy</name>
 <coordinates>48.683333 6.200000</coordinates>
 <location>
 <name>Nancy-Essey Airport</name>
@@ -13967,7 +13967,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Nantes</_name>
+ <name>Nantes</name>
 <coordinates>47.216667 -1.550000</coordinates>
 <location>
 <name>Nantes</name>
@@ -13977,7 +13977,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Nevers</_name>
+ <name>Nevers</name>
 <coordinates>46.983333 3.166667</coordinates>
 <location>
 <name>Nevers</name>
@@ -13987,7 +13987,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Nice</_name>
+ <name>Nice</name>
 <coordinates>43.700000 7.250000</coordinates>
 <location>
 <name>Nice</name>
@@ -13997,7 +13997,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Nîmes</_name>
+ <name>Nîmes</name>
 <coordinates>43.833333 4.350000</coordinates>
 <location>
 <name>Nîmes-Garons Airport</name>
@@ -14007,7 +14007,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name msgctxt="City in France">Orange</_name>
+ <name msgctxt="City in France">Orange</name>
 <coordinates>44.133333 4.800000</coordinates>
 <location>
 <name>Orange</name>
@@ -14017,7 +14017,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Orléans</_name>
+ <name>Orléans</name>
 <coordinates>47.916667 1.900000</coordinates>
 <location>
 <name>Orléans</name>
@@ -14027,7 +14027,7 @@
 </city>
 <city>
 <!-- The capital of France -->
- <_name msgctxt="City in France">Paris</_name>
+ <name msgctxt="City in France">Paris</name>
 <coordinates>48.866667 2.333333</coordinates>
 <location>
 <name>Paris-Le Bourget Airport</name>
@@ -14047,7 +14047,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Pau</_name>
+ <name>Pau</name>
 <coordinates>43.300000 -0.366667</coordinates>
 <location>
 <name>Pau</name>
@@ -14057,7 +14057,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Perpignan</_name>
+ <name>Perpignan</name>
 <coordinates>42.683333 2.883333</coordinates>
 <location>
 <name>Perpignan</name>
@@ -14067,7 +14067,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Poggiale</_name>
+ <name>Poggiale</name>
 <coordinates>41.516667 9.083333</coordinates>
 <location>
 <name>Figari</name>
@@ -14077,7 +14077,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Poitiers</_name>
+ <name>Poitiers</name>
 <coordinates>46.583333 0.333333</coordinates>
 <location>
 <name>Poitiers</name>
@@ -14087,7 +14087,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Quimper</_name>
+ <name>Quimper</name>
 <coordinates>48.000000 -4.100000</coordinates>
 <location>
 <name>Quimper</name>
@@ -14097,7 +14097,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Reims</_name>
+ <name>Reims</name>
 <coordinates>49.250000 4.033333</coordinates>
 <location>
 <name>Reims</name>
@@ -14107,7 +14107,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Rennes</_name>
+ <name>Rennes</name>
 <coordinates>48.083333 -1.683333</coordinates>
 <location>
 <name>Rennes</name>
@@ -14117,7 +14117,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Rodez</_name>
+ <name>Rodez</name>
 <coordinates>44.333333 2.566667</coordinates>
 <location>
 <name>Rodez</name>
@@ -14127,7 +14127,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Romorantin</_name>
+ <name>Romorantin</name>
 <coordinates>47.366667 1.750000</coordinates>
 <location>
 <name>Romorantin</name>
@@ -14137,7 +14137,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Rouen</_name>
+ <name>Rouen</name>
 <coordinates>49.433333 1.083333</coordinates>
 <location>
 <name>Rouen</name>
@@ -14147,7 +14147,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Saint-Brieuc</_name>
+ <name>Saint-Brieuc</name>
 <coordinates>48.516667 -2.783333</coordinates>
 <location>
 <name>Saint-Brieuc</name>
@@ -14157,7 +14157,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Saint-Quentin</_name>
+ <name>Saint-Quentin</name>
 <coordinates>49.850000 3.283333</coordinates>
 <location>
 <name>Saint-Quentin</name>
@@ -14167,7 +14167,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Saint-Yan</_name>
+ <name>Saint-Yan</name>
 <coordinates>46.416667 4.033333</coordinates>
 <location>
 <name>Saint-Yan</name>
@@ -14177,7 +14177,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Salon</_name>
+ <name>Salon</name>
 <coordinates>43.633333 5.100000</coordinates>
 <location>
 <name>Salon</name>
@@ -14187,7 +14187,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Strasbourg</_name>
+ <name>Strasbourg</name>
 <coordinates>48.583333 7.750000</coordinates>
 <location>
 <name>Strasbourg</name>
@@ -14197,7 +14197,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Tarbes</_name>
+ <name>Tarbes</name>
 <coordinates>43.233333 0.083333</coordinates>
 <location>
 <name>Tarbes Ossun Lourdes</name>
@@ -14207,7 +14207,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Toulouse</_name>
+ <name>Toulouse</name>
 <coordinates>43.600000 1.433333</coordinates>
 <location>
 <name>Toulouse-Blagnac Airport</name>
@@ -14222,7 +14222,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Tours</_name>
+ <name>Tours</name>
 <coordinates>47.383333 0.683333</coordinates>
 <location>
 <name>Tours</name>
@@ -14232,7 +14232,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Trignac</_name>
+ <name>Trignac</name>
 <coordinates>47.316667 -2.183333</coordinates>
 <location>
 <name>St-Nazaire</name>
@@ -14242,7 +14242,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Troyes</_name>
+ <name>Troyes</name>
 <coordinates>48.300000 4.083333</coordinates>
 <location>
 <name>Troyes</name>
@@ -14252,7 +14252,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Veauche</_name>
+ <name>Veauche</name>
 <coordinates>45.550000 4.283333</coordinates>
 <location>
 <name>St-Etienne Boutheon</name>
@@ -14262,7 +14262,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name msgctxt="City in France">Vichy</_name>
+ <name msgctxt="City in France">Vichy</name>
 <coordinates>46.116667 3.416667</coordinates>
 <location>
 <name>Vichy</name>
@@ -14272,7 +14272,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Vélizy</_name>
+ <name>Vélizy</name>
 <coordinates>48.800000 2.183333</coordinates>
 <location>
 <name>Vélizy</name>
@@ -14282,7 +14282,7 @@
 </city>
 <city>
 <!-- A city in France -->
- <_name>Évreux</_name>
+ <name>Évreux</name>
 <coordinates>49.016667 1.150000</coordinates>
 <location>
 <name>Évreux</name>
@@ -14293,7 +14293,7 @@
 </country>
 <country>
 <!-- DE - Germany -->
- <_name>Germany</_name>
+ <name>Germany</name>
 <!-- Could not find information about the following stations,
 which may be in Germany:
 EDFE EDJA 
@@ -14310,11 +14310,11 @@
 <tz-hint>Europe/Berlin</tz-hint>
 <state>
 <!-- A state/province/territory in Germany -->
- <_name>Baden-Württemberg</_name>
+ <name>Baden-Württemberg</name>
 <fips-code>GM01</fips-code>
 <city>
 <!-- A city in Baden-Württemberg in Germany -->
- <_name>Donaueschingen</_name>
+ <name>Donaueschingen</name>
 <coordinates>47.950000 8.500000</coordinates>
 <location>
 <name>Donaueschingen / Villingen</name>
@@ -14324,7 +14324,7 @@
 </city>
 <city>
 <!-- A city in Baden-Württemberg in Germany -->
- <_name>Friedrichshafen</_name>
+ <name>Friedrichshafen</name>
 <coordinates>47.650000 9.483333</coordinates>
 <location>
 <name>Friedrichshafen</name>
@@ -14334,7 +14334,7 @@
 </city>
 <city>
 <!-- A city in Baden-Württemberg in Germany -->
- <_name>Karlsruhe</_name>
+ <name>Karlsruhe</name>
 <coordinates>49.004722 8.385833</coordinates>
 <location>
 <name>Karlsruhe, Baden Wurttemberg</name>
@@ -14344,7 +14344,7 @@
 </city>
 <city>
 <!-- A city in Baden-Württemberg in Germany -->
- <_name>Lahr</_name>
+ <name>Lahr</name>
 <coordinates>48.350000 7.866667</coordinates>
 <location>
 <name>Lahr Air Force Base</name>
@@ -14354,7 +14354,7 @@
 </city>
 <city>
 <!-- A city in Baden-Württemberg in Germany -->
- <_name>Laupheim</_name>
+ <name>Laupheim</name>
 <coordinates>48.233333 9.883333</coordinates>
 <location>
 <name>Laupheim</name>
@@ -14364,7 +14364,7 @@
 </city>
 <city>
 <!-- A city in Baden-Württemberg in Germany -->
- <_name>Meßstetten</_name>
+ <name>Meßstetten</name>
 <coordinates>48.183333 8.966667</coordinates>
 <location>
 <name>Meßstetten</name>
@@ -14374,7 +14374,7 @@
 </city>
 <city>
 <!-- A city in Baden-Württemberg in Germany -->
- <_name>Neuostheim</_name>
+ <name>Neuostheim</name>
 <coordinates>49.477500 8.514444</coordinates>
 <location>
 <name>Baden Wurttemberg</name>
@@ -14384,7 +14384,7 @@
 </city>
 <city>
 <!-- A city in Baden-Württemberg in Germany -->
- <_name>Niederstetten</_name>
+ <name>Niederstetten</name>
 <coordinates>49.400000 9.919444</coordinates>
 <location>
 <name>Niederstetten</name>
@@ -14394,7 +14394,7 @@
 </city>
 <city>
 <!-- A city in Baden-Württemberg in Germany -->
- <_name msgctxt="City in Baden-Württemberg, Germany">Stuttgart</_name>
+ <name msgctxt="City in Baden-Württemberg, Germany">Stuttgart</name>
 <coordinates>48.766667 9.183333</coordinates>
 <location>
 <name>Stuttgart-Echterdingen</name>
@@ -14408,11 +14408,11 @@
 use that unless you know that it has a different name in
 your language.
 -->
- <_name>Bavaria</_name>
+ <name>Bavaria</name>
 <fips-code>GM02</fips-code>
 <city>
 <!-- A city in Bavaria in Germany -->
- <_name>Augsburg</_name>
+ <name>Augsburg</name>
 <coordinates>48.366667 10.883333</coordinates>
 <location>
 <name>Augsburg</name>
@@ -14422,7 +14422,7 @@
 </city>
  <city>
 <!-- A city in Bavaria in Germany -->
- <_name>Dorfgmünd</_name>
+ <name>Dorfgmünd</name>
 <coordinates>49.700000 11.950000</coordinates>
 <location>
 <name>Grafenwoehr</name>
@@ -14432,7 +14432,7 @@
 </city>
 <city>
 <!-- A city in Bavaria in Germany -->
- <_name>Hof</_name>
+ <name>Hof</name>
 <coordinates>50.316667 11.916667</coordinates>
 <location>
 <name>Hof</name>
@@ -14442,7 +14442,7 @@
 </city>
 <city>
 <!-- A city in Bavaria in Germany -->
- <_name>Illesheim</_name>
+ <name>Illesheim</name>
 <coordinates>49.466667 10.383333</coordinates>
 <location>
 <name>Illesheim</name>
@@ -14452,7 +14452,7 @@
 </city>
 <city>
 <!-- A city in Bavaria in Germany -->
- <_name>Katterbach</_name>
+ <name>Katterbach</name>
 <coordinates>49.316667 10.633333</coordinates>
 <location>
 <name>Ansbach / Katterbach</name>
@@ -14462,7 +14462,7 @@
 </city>
 <city>
 <!-- A city in Bavaria in Germany -->
- <_name>Lager Lechfeld</_name>
+ <name>Lager Lechfeld</name>
 <coordinates>48.166667 10.850000</coordinates>
 <location>
 <name>Lager Lechfeld</name>
@@ -14472,7 +14472,7 @@
 </city>
 <city>
 <!-- A city in Bavaria in Germany -->
- <_name>Landsberg</_name>
+ <name>Landsberg</name>
 <coordinates>48.050000 10.866667</coordinates>
 <location>
 <name>Landsberg</name>
@@ -14485,7 +14485,7 @@
 "Munich" is the traditional English name.
 The local name is "München".
 -->
- <_name>Munich</_name>
+ <name>Munich</name>
 <coordinates>48.150000 11.583333</coordinates>
 <location>
 <name>Munich</name>
@@ -14497,7 +14497,7 @@
 <!-- A city in Bavaria in Germany.
 One of several cities in Germany called "Neuburg".
 -->
- <_name>Neuburg an der Donau</_name>
+ <name>Neuburg an der Donau</name>
 <coordinates>48.733333 11.183333</coordinates>
 <location>
 <name>Neuburg an der Donau / Donau</name>
@@ -14510,7 +14510,7 @@
 "Nuremberg" is the traditional English name.
 The local name is "Nürnberg".
 -->
- <_name>Nuremberg</_name>
+ <name>Nuremberg</name>
 <coordinates>49.447778 11.068333</coordinates>
 <location>
 <name>Nuernberg</name>
@@ -14520,7 +14520,7 @@
 </city>
 <city>
 <!-- A city in Bavaria in Germany -->
- <_name>Oberpfaffenhofen</_name>
+ <name>Oberpfaffenhofen</name>
 <coordinates>48.066667 11.266667</coordinates>
 <location>
 <name>Oberpfaffenhofen</name>
@@ -14530,7 +14530,7 @@
 </city>
 <city>
 <!-- A city in Bavaria in Germany -->
- <_name>Roth</_name>
+ <name>Roth</name>
 <coordinates>49.245000 11.091111</coordinates>
 <location>
 <name>Roth</name>
@@ -14540,7 +14540,7 @@
 </city>
 <city>
 <!-- A city in Bavaria in Germany -->
- <_name>Würzburg</_name>
+ <name>Würzburg</name>
 <coordinates>49.787778 9.936111</coordinates>
 <location>
 <name>Niederstetten</name>
@@ -14551,11 +14551,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Germany -->
- <_name msgctxt="State in Germany">Berlin</_name>
+ <name msgctxt="State in Germany">Berlin</name>
 <fips-code>GM16</fips-code>
 <city>
 <!-- The capital of Germany -->
- <_name msgctxt="City in Berlin, Germany">Berlin</_name>
+ <name msgctxt="City in Berlin, Germany">Berlin</name>
 <coordinates>52.516667 13.400000</coordinates>
 <location>
 <name>Berlin-Tegel</name>
@@ -14571,16 +14571,16 @@
 </state>
 <state>
 <!-- A state/province/territory in Germany -->
- <_name>Brandenburg</_name>
+ <name>Brandenburg</name>
 <fips-code>GM11</fips-code>
 </state>
 <state>
 <!-- A state/province/territory in Germany -->
- <_name msgctxt="State in Germany">Bremen</_name>
+ <name msgctxt="State in Germany">Bremen</name>
 <fips-code>GM03</fips-code>
 <city>
 <!-- A city in Bremen in Germany -->
- <_name msgctxt="City in Bremen, Germany">Bremen</_name>
+ <name msgctxt="City in Bremen, Germany">Bremen</name>
 <coordinates>53.083333 8.800000</coordinates>
 <location>
 <name>Bremen</name>
@@ -14591,11 +14591,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Germany -->
- <_name msgctxt="State in Germany">Hamburg</_name>
+ <name msgctxt="State in Germany">Hamburg</name>
 <fips-code>GM04</fips-code>
 <city>
 <!-- A city in Hamburg in Germany -->
- <_name msgctxt="City in Hamburg, Germany">Hamburg</_name>
+ <name msgctxt="City in Hamburg, Germany">Hamburg</name>
 <coordinates>53.550000 10.000000</coordinates>
 <location>
 <name>Hamburg-Fuhlsbuettel</name>
@@ -14614,11 +14614,11 @@
 use that unless you know that it has a different name in
 your language.
 -->
- <_name>Hesse</_name>
+ <name>Hesse</name>
 <fips-code>GM05</fips-code>
 <city>
 <!-- A city in Hesse in Germany -->
- <_name>Frankfurt</_name>
+ <name>Frankfurt</name>
 <coordinates>50.116667 8.683333</coordinates>
 <location>
 <name>Frankfurt</name>
@@ -14628,7 +14628,7 @@
 </city>
 <city>
 <!-- A city in Hesse in Germany -->
- <_name>Fritzlar</_name>
+ <name>Fritzlar</name>
 <coordinates>51.133333 9.283333</coordinates>
 <location>
 <name>Fritzlar</name>
@@ -14638,7 +14638,7 @@
 </city>
 <city>
 <!-- A city in Hesse in Germany -->
- <_name>Kassel</_name>
+ <name>Kassel</name>
 <coordinates>51.316667 9.500000</coordinates>
 <location>
 <name>Kassel / Calden</name>
@@ -14648,7 +14648,7 @@
 </city>
 <city>
 <!-- A city in Hesse in Germany -->
- <_name>Wiesbaden</_name>
+ <name>Wiesbaden</name>
 <coordinates>50.083333 8.250000</coordinates>
 <location>
 <name>Wiesbaden</name>
@@ -14662,11 +14662,11 @@
 Please use that unless you know that it has a different
 name in your language.
 -->
- <_name>Lower Saxony</_name>
+ <name>Lower Saxony</name>
 <fips-code>GM06</fips-code>
 <city>
 <!-- A city in Lower Saxony in Germany -->
- <_name>Achum</_name>
+ <name>Achum</name>
 <coordinates>52.283333 9.083333</coordinates>
 <location>
 <name>Bueckeburg</name>
@@ -14676,7 +14676,7 @@
 </city>
 <city>
 <!-- A city in Lower Saxony in Germany -->
- <_name>Braunschweig</_name>
+ <name>Braunschweig</name>
 <coordinates>52.266667 10.533333</coordinates>
 <location>
 <name>Braunschweig</name>
@@ -14686,7 +14686,7 @@
 </city>
 <city>
 <!-- A city in Lower Saxony in Germany -->
- <_name>Celle</_name>
+ <name>Celle</name>
 <coordinates>52.616667 10.083333</coordinates>
 <location>
 <name>Celle</name>
@@ -14696,7 +14696,7 @@
 </city>
 <city>
 <!-- A city in Lower Saxony in Germany -->
- <_name>Faßberg</_name>
+ <name>Faßberg</name>
 <coordinates>52.900000 10.166667</coordinates>
 <location>
 <name>Faßberg</name>
@@ -14706,7 +14706,7 @@
 </city>
 <city>
 <!-- A city in Lower Saxony in Germany -->
- <_name>Hannover</_name>
+ <name>Hannover</name>
 <coordinates>52.366667 9.716667</coordinates>
 <location>
 <name>Hannover</name>
@@ -14716,7 +14716,7 @@
 </city>
 <city>
 <!-- A city in Lower Saxony in Germany -->
- <_name>Nordholz</_name>
+ <name>Nordholz</name>
 <coordinates>53.783333 8.600000</coordinates>
 <location>
 <name>Nordholz</name>
@@ -14726,7 +14726,7 @@
 </city>
 <city>
 <!-- A city in Lower Saxony in Germany -->
- <_name>Webershausen</_name>
+ <name>Webershausen</name>
 <coordinates>53.550000 7.666667</coordinates>
 <location>
 <name>Wittmundhaven</name>
@@ -14736,7 +14736,7 @@
 </city>
 <city>
 <!-- A city in Lower Saxony in Germany -->
- <_name>Wunstorf</_name>
+ <name>Wunstorf</name>
 <coordinates>52.433333 9.416667</coordinates>
 <location>
 <name>Wunstorf</name>
@@ -14750,11 +14750,11 @@
 "Mecklenburg-Vorpommern". Please use that unless you know
 that it has a different name in your language.
 -->
- <_name>Mecklenburg-Western Pomerania</_name>
+ <name>Mecklenburg-Western Pomerania</name>
 <fips-code>GM12</fips-code>
 <city>
 <!-- A city in Mecklenburg-Western Pomerania in Germany -->
- <_name>Laage</_name>
+ <name>Laage</name>
 <coordinates>53.933333 12.350000</coordinates>
 <location>
 <name>Laage</name>
@@ -14764,7 +14764,7 @@
 </city>
 <city>
 <!-- A city in Mecklenburg-Western Pomerania in Germany -->
- <_name>Parchim</_name>
+ <name>Parchim</name>
 <coordinates>53.433333 11.850000</coordinates>
 <location>
 <name>Mecklenburg-Vorpommern</name>
@@ -14774,7 +14774,7 @@
 </city>
 <city>
 <!-- A city in Mecklenburg-Western Pomerania in Germany -->
- <_name>Seebad Heringsdorf</_name>
+ <name>Seebad Heringsdorf</name>
 <coordinates>53.966667 14.166667</coordinates>
 <location>
 <name>Seebad Heringsdorf</name>
@@ -14784,7 +14784,7 @@
 </city>
 <city>
 <!-- A city in Mecklenburg-Western Pomerania in Germany -->
- <_name>Trollenhagen</_name>
+ <name>Trollenhagen</name>
 <coordinates>53.600000 13.300000</coordinates>
 <location>
 <name>Trollenhagen</name>
@@ -14798,11 +14798,11 @@
 "Nordrhein-Westfalen". Please use that unless you know
 that it has a different name in your language.
 -->
- <_name>North Rhine-Westphalia</_name>
+ <name>North Rhine-Westphalia</name>
 <fips-code>GM07</fips-code>
 <city>
 <!-- A city in North Rhine-Westphalia in Germany -->
- <_name>Baal</_name>
+ <name>Baal</name>
 <coordinates>51.616667 6.133333</coordinates>
 <location>
 <name>Niederrhein</name>
@@ -14812,7 +14812,7 @@
 </city>
 <city>
 <!-- A city in North Rhine-Westphalia in Germany -->
- <_name>Bonn</_name>
+ <name>Bonn</name>
 <coordinates>50.733333 7.100000</coordinates>
 <location>
 <name>Cologne / Bonn</name>
@@ -14822,7 +14822,7 @@
 </city>
 <city>
 <!-- A city in North Rhine-Westphalia in Germany -->
- <_name>Bredeck</_name>
+ <name>Bredeck</name>
 <coordinates>51.916667 8.300000</coordinates>
 <location>
 <name>Guetersloh</name>
@@ -14832,7 +14832,7 @@
 </city>
 <city>
 <!-- A city in North Rhine-Westphalia in Germany -->
- <_name>Dortmund</_name>
+ <name>Dortmund</name>
 <coordinates>51.516667 7.450000</coordinates>
 <location>
 <name>Dortmund / Wickede</name>
@@ -14842,7 +14842,7 @@
 </city>
 <city>
 <!-- A city in North Rhine-Westphalia in Germany -->
- <_name>Geilenkirchen</_name>
+ <name>Geilenkirchen</name>
 <coordinates>50.966667 6.116667</coordinates>
 <location>
 <name>Geilenkirchen</name>
@@ -14852,7 +14852,7 @@
 </city>
 <city>
 <!-- A city in North Rhine-Westphalia in Germany -->
- <_name>Kalkar</_name>
+ <name>Kalkar</name>
 <coordinates>51.733333 6.300000</coordinates>
 <location>
 <name>Kalkar</name>
@@ -14862,7 +14862,7 @@
 </city>
 <city>
 <!-- A city in North Rhine-Westphalia in Germany -->
- <_name>Kalkum</_name>
+ <name>Kalkum</name>
 <coordinates>51.300000 6.766667</coordinates>
 <location>
 <name>Duesseldorf</name>
@@ -14872,7 +14872,7 @@
 </city>
 <city>
 <!-- A city in North Rhine-Westphalia in Germany -->
- <_name>Klemenshof</_name>
+ <name>Klemenshof</name>
 <coordinates>50.833333 6.666667</coordinates>
 <location>
 <name>Noervenich</name>
@@ -14882,7 +14882,7 @@
 </city>
 <city>
 <!-- A city in North Rhine-Westphalia in Germany -->
- <_name>Mönchengladbach</_name>
+ <name>Mönchengladbach</name>
 <coordinates>51.200000 6.433333</coordinates>
 <location>
 <name>Mönchengladbach</name>
@@ -14892,7 +14892,7 @@
 </city>
 <city>
 <!-- A city in North Rhine-Westphalia in Germany -->
- <_name>Münster</_name>
+ <name>Münster</name>
 <coordinates>51.966667 7.633333</coordinates>
 <location>
 <name>Münster / Osnabrueck</name>
@@ -14902,7 +14902,7 @@
 </city>
 <city>
 <!-- A city in North Rhine-Westphalia in Germany -->
- <_name>Paderborn</_name>
+ <name>Paderborn</name>
 <coordinates>51.716667 8.766667</coordinates>
 <location>
 <name>Paderborn / Lippstadt</name>
@@ -14912,7 +14912,7 @@
 </city>
 <city>
 <!-- A city in North Rhine-Westphalia in Germany -->
- <_name>Rheine</_name>
+ <name>Rheine</name>
 <coordinates>52.283333 7.450000</coordinates>
 <location>
 <name>Rheine-Bentlage</name>
@@ -14926,11 +14926,11 @@
 Please use that unless you know that it has a different
 name in your language.
 -->
- <_name>Rhineland-Palatinate</_name>
+ <name>Rhineland-Palatinate</name>
 <fips-code>GM08</fips-code>
 <city>
 <!-- A city in Rhineland-Palatinate in Germany -->
- <_name>Büchel</_name>
+ <name>Büchel</name>
 <coordinates>50.166667 7.083333</coordinates>
 <location>
 <name>Buechel</name>
@@ -14940,7 +14940,7 @@
 </city>
 <city>
 <!-- A city in Rhineland-Palatinate in Germany -->
- <_name>Hahn</_name>
+ <name>Hahn</name>
 <coordinates>49.966667 7.266667</coordinates>
 <location>
 <name>Hahn</name>
@@ -14950,7 +14950,7 @@
 </city>
 <city>
 <!-- A city in Rhineland-Palatinate in Germany -->
- <_name>Liebenscheid</_name>
+ <name>Liebenscheid</name>
 <coordinates>50.700000 8.100000</coordinates>
 <location>
 <name>Hessen</name>
@@ -14960,7 +14960,7 @@
 </city>
 <city>
 <!-- A city in Rhineland-Palatinate in Germany -->
- <_name>Ramstein</_name>
+ <name>Ramstein</name>
 <coordinates>49.450000 7.533333</coordinates>
 <location>
 <name>Ramstein</name>
@@ -14970,7 +14970,7 @@
 </city>
 <city>
 <!-- A city in Rhineland-Palatinate in Germany -->
- <_name>Spangdahlem</_name>
+ <name>Spangdahlem</name>
 <coordinates>49.983333 6.683333</coordinates>
 <location>
 <name>Spangdahlem</name>
@@ -14980,7 +14980,7 @@
 </city>
 <city>
 <!-- A city in Rhineland-Palatinate in Germany -->
- <_name>Zweibrücken</_name>
+ <name>Zweibrücken</name>
 <coordinates>49.250000 7.366667</coordinates>
 <location>
 <name>Zweibrücken, Rheinland-Pfalz</name>
@@ -14991,11 +14991,11 @@
 </state>
 <state>
 <!-- A state/province/territory in Germany -->
- <_name>Saarland</_name>
+ <name>Saarland</name>
 <fips-code>GM09</fips-code>
 <city>
 <!-- A city in Saarland in Germany -->
- <_name>Ensheim</_name>
+ <name>Ensheim</name>
 <coordinates>49.200000 7.100000</coordinates>
 <location>
 <name>Saarbruecken / Ensheim</name>
@@ -15009,11 +15009,11 @@
 use that unless you know that it has a different name in
 your language.
 -->
- <_name>Saxony</_name>
+ <name>Saxony</name>
 <fips-code>GM13</fips-code>
 <city>
 <!-- A city in Saxony in Germany -->
- <_name>Dresden</_name>
+  <name>Dresden</name>
 <coordinates>51.050000 13.750000</coordinates>
 <location>
 <name>Dresden-Klotzsche</name>
@@ -15023,7 +15023,7 @@
 </city>
 <city>
 <!-- A city in Saxony in Germany -->
- <_name>Leipzig</_name>
+ <name>Leipzig</name>
 <coordinates>51.300000 12.333333</coordinates>
 <location>
 <name>Leipzig-Schkeuditz</name>
@@ -15037,11 +15037,11 @@
 Please use that unless you know that it has a different
 name in your language.
 -->
- <_name>Saxony-Anhalt</_name>
+ <name>Saxony-Anhalt</name>
 <fips-code>GM14</fips-code>
 <city>
 <!-- A city in Saxony-Anhalt in Germany -->
- <_name>Holzdorf</_name>
+ <name>Holzdorf</name>
 <coordinates>51.766667 13.133333</coordinates>
 <location>
 <name>Holzdorf</name>
@@ -15052,11 +15052,11 @@
 </state>
 <state>
 <!-- A state in Germany. The Danish name is "Slesvig-Holsten". -->
- <_name>Schleswig-Holstein</_name>
+ <name>Schleswig-Holstein</name>
 <fips-code>GM10</fips-code>
 <city>
 <!-- A city in Schleswig-Holstein in Germany -->
- <_name>Hohn</_name>
+ <name>Hohn</name>
 <coordinates>54.300000 9.500000</coordinates>
 <location>
 <name>Hohn</name>
@@ -15066,7 +15066,7 @@
 </city>
 <city>
 <!-- A city in Schleswig-Holstein in Germany -->
- <_name>Kiel</_name>
+ <name>Kiel</name>
 <coordinates>54.333333 10.133333</coordinates>
 <location>
 <name>Holtenau Airport</name>
@@ -15076,7 +15076,7 @@
 </city>
 <city>
 <!-- A city in Schleswig-Holstein in Germany -->
- <_name>Schleswig</_name>
+ <name>Schleswig</name>
 <coordinates>54.516667 9.550000</coordinates>
 <location>
 <name>Schleswig-Jagel</name>
@@ -15086,7 +15086,7 @@
 </city>
 <city>
 <!-- A city in Schleswig-Holstein in Germany -->
- <_name>Ulstrupfeld</_name>
+ <name>Ulstrupfeld</name>
 <coordinates>54.833333 9.533333</coordinates>
 <location>
 <name>Gluecksburg / Meierwik</name>
@@ -15096,7 +15096,7 @@
 </city>
 <city>
 <!-- A city in Schleswig-Holstein in Germany -->
- <_name>Vorrade</_name>
+ <name>Vorrade</name>
 <coordinates>53.816667 10.683333</coordinates>
 <location>
 <name>Luebeck-Blankensee</name>
@@ -15106,7 +15106,7 @@
 </city>
 <city>
 <!-- A city in Schleswig-Holstein in Germany -->
- <_name>Westerland</_name>
+ <name>Westerland</name>
 <coordinates>54.900000 8.300000</coordinates>
 <location>
 <name>Westerland / Sylt</name>
@@ -15120,11 +15120,11 @@
 use that unless you know that it has a different name in
 your language.
 -->
- <_name>Thuringia</_name>
+ <name>Thuringia</name>
 <fips-code>GM15</fips-code>
 <city>
 <!-- A city in Thuringia in Germany -->
- <_name>Altenburg</_name>
+ <name>Altenburg</name>
 <coordinates>50.983333 12.450000</coordinates>
 <location>
 <name>Altenburg Nobitz</name>
@@ -15134,7 +15134,7 @@
 </city>
 <city>
 <!-- A city in Thuringia in Germany -->
- <_name>Bindersleben</_name>
+ <name>Bindersleben</name>
 <coordinates>50.966667 10.950000</coordinates>
 <location>
 <name>Bindersleben</name>
@@ -15148,7 +15148,7 @@
 <!-- GI - Gibraltar, a British overseas territory on the southern
 tip of Spain.
 -->
- <_name msgctxt="Country">Gibraltar</_name>
+ <name msgctxt="Country">Gibraltar</name>
 <iso-code>GI</iso-code>
 <fips-code>GI</fips-code>
 <timezones>
@@ -15157,7 +15157,7 @@
 <tz-hint>Europe/Gibraltar</tz-hint>
 <city>
 <!-- The capital of Gibraltar -->
- <_name msgctxt="City in Gibraltar">Gibraltar</_name>
+ <name msgctxt="City in Gibraltar">Gibraltar</name>
 <coordinates>36.133333 -5.350000</coordinates>
  <location>
 <name>Gibraltar</name>
@@ -15168,7 +15168,7 @@
 </country>
 <country>
 <!-- GR - Greece -->
- <_name>Greece</_name>
+ <name>Greece</name>
 <!-- Could not find information about the following stations,
 which may be in Greece:
 LGSY 
@@ -15181,7 +15181,7 @@
 <tz-hint>Europe/Athens</tz-hint>
 <city>
 <!-- A city in Greece -->
- <_name>Alexandroúpolis</_name>
+ <name>Alexandroúpolis</name>
 <coordinates>40.847500 25.874444</coordinates>
 <location>
 <name>Alexandroúpolis Airport</name>
@@ -15191,7 +15191,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Andravída</_name>
+ <name>Andravída</name>
 <coordinates>37.900000 21.266667</coordinates>
 <location>
 <name>Andravída Airport</name>
@@ -15201,7 +15201,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Argostólion</_name>
+ <name>Argostólion</name>
 <coordinates>38.173056 20.481944</coordinates>
 <location>
 <name>Kefalhnia Airport</name>
@@ -15214,7 +15214,7 @@
 "Athens" is the traditional English name.
 The local name in Greek is "Athína / Αθήνα".
 -->
- <_name msgctxt="City in Greece">Athens</_name>
+ <name msgctxt="City in Greece">Athens</name>
 <coordinates>37.983333 23.733333</coordinates>
 <location>
 <name>Athens Eleftherios Venizelos International Airport</name>
@@ -15224,7 +15224,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Chrysoúpolis</_name>
+ <name>Chrysoúpolis</name>
 <coordinates>40.985556 24.693889</coordinates>
 <location>
 <name>Chrysoúpolis Airport</name>
@@ -15236,7 +15236,7 @@
 <!-- A city in Greece.
 The name is also written "Χίος".
 -->
- <_name>Chíos</_name>
+ <name>Chíos</name>
 <coordinates>38.367778 26.135833</coordinates>
 <location>
 <name>Chíos Airport</name>
@@ -15246,7 +15246,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Elefsís</_name>
+ <name>Elefsís</name>
 <coordinates>38.033333 23.533333</coordinates>
 <location>
 <name>Elefsís Airport</name>
@@ -15256,7 +15256,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Irákleion</_name>
+ <name>Irákleion</name>
 <coordinates>35.325000 25.130556</coordinates>
 <location>
 <name>Irákleion Airport</name>
@@ -15268,7 +15268,7 @@
 <!-- A city in Greece.
 The name is also written "Καλαμάτα".
 -->
- <_name>Kalamáta</_name>
+ <name>Kalamáta</name>
 <coordinates>37.038889 22.114167</coordinates>
 <location>
 <name>Kalamáta Airport</name>
@@ -15278,7 +15278,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Karpásion</_name>
+ <name>Karpásion</name>
 <coordinates>39.933333 25.233333</coordinates>
 <location>
 <name>Limnos Airport</name>
@@ -15288,7 +15288,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Katomérion</_name>
+ <name>Katomérion</name>
 <coordinates>38.650000 20.783333</coordinates>
 <location>
 <name>Aktion Airport</name>
@@ -15298,7 +15298,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Kos</_name>
+ <name>Kos</name>
 <coordinates>36.893333 27.288889</coordinates>
 <location>
 <name>Kos Airport</name>
@@ -15308,7 +15308,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Kozáni</_name>
+ <name>Kozáni</name>
 <coordinates>40.301111 21.786389</coordinates>
 <location>
 <name>Kozáni Airport</name>
@@ -15318,7 +15318,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Kárpathos</_name>
+ <name>Kárpathos</name>
 <coordinates>35.500000 27.233333</coordinates>
 <location>
 <name>Kárpathos Airport</name>
@@ -15330,7 +15330,7 @@
 <!-- A city in Greece.
 The name is also written "Κέρκυρα".
 -->
- <_name>Kérkyra</_name>
+ <name>Kérkyra</name>
 <coordinates>39.620000 19.919722</coordinates>
 <location>
 <name>Kérkyra Airport</name>
@@ -15342,7 +15342,7 @@
 <!-- A city in Greece.
 The name is also written "Κύθηρα".
 -->
- <_name>Kýthira</_name>
+ <name>Kýthira</name>
 <coordinates>36.150000 22.992500</coordinates>
 <location>
 <name>Kýthira Airport</name>
@@ -15352,7 +15352,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Lárisa</_name>
+ <name>Lárisa</name>
 <coordinates>39.637222 22.420278</coordinates>
 <location>
 <name>Lárisa Airport</name>
@@ -15362,7 +15362,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Monólithos</_name>
+ <name>Monólithos</name>
 <coordinates>36.400000 25.483333</coordinates>
 <location>
 <name>Santorini Island</name>
@@ -15372,7 +15372,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Mytilíni</_name>
+ <name>Mytilíni</name>
 <coordinates>39.110000 26.554722</coordinates>
 <location>
 <name>Mytilíni Airport</name>
@@ -15384,7 +15384,7 @@
 <!-- A city in Greece.
 The name is also written "Μύκονος".
 -->
- <_name>Mýkonos</_name>
+ <name>Mýkonos</name>
 <coordinates>37.450000 25.333333</coordinates>
 <location>
 <name>Mikonos Island, Mikonos Airport</name>
@@ -15394,7 +15394,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Náxos</_name>
+ <name>Náxos</name>
 <coordinates>37.105556 25.376389</coordinates>
 <location>
 <name>Cyclades Islands, Náxos Airport</name>
@@ -15404,7 +15404,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Paradeísion</_name>
+ <name>Paradeísion</name>
 <coordinates>36.400000 28.083333</coordinates>
 <location>
 <name>Rhodes Airport</name>
@@ -15414,7 +15414,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Páros</_name>
+ <name>Páros</name>
 <coordinates>37.083333 25.150000</coordinates>
 <location>
 <name>Paros Community Airport</name>
@@ -15424,7 +15424,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Skíathos</_name>
+ <name>Skíathos</name>
 <coordinates>39.166667 23.483333</coordinates>
 <location>
 <name>Skiathos Island</name>
@@ -15434,7 +15434,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Soúda</_name>
+ <name>Soúda</name>
 <coordinates>35.484444 24.074444</coordinates>
 <location>
 <name>Soúda Airport</name>
@@ -15444,7 +15444,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Sámos</_name>
+ <name>Sámos</name>
 <coordinates>37.757222 26.976944</coordinates>
 <location>
 <name>Sámos Airport</name>
@@ -15454,7 +15454,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Tanágra</_name>
+ <name>Tanágra</name>
 <coordinates>38.316667 23.533333</coordinates>
 <location>
 <name>Tanágra Airport</name>
@@ -15464,7 +15464,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Thessaloníki</_name>
+ <name>Thessaloníki</name>
 <coordinates>40.640278 22.943889</coordinates>
 <location>
 <name>Thessaloníki Airport</name>
@@ -15474,7 +15474,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Zákynthos</_name>
+ <name>Zákynthos</name>
 <coordinates>37.791389 20.895278</coordinates>
 <location>
 <name>Zákynthos Airport</name>
@@ -15484,7 +15484,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Áno Síros</_name>
+ <name>Áno Síros</name>
 <coordinates>37.450000 24.933333</coordinates>
 <location>
 <name>Áno Síros Airport</name>
@@ -15494,7 +15494,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Áraxos</_name>
+ <name>Áraxos</name>
 <coordinates>38.166667 21.416667</coordinates>
 <location>
 <name>Áraxos Airport</name>
@@ -15504,7 +15504,7 @@
 </city>
 <city>
 <!-- A city in Greece -->
- <_name>Áyios Athanásios</_name>
+ <name>Áyios Athanásios</name>
 <coordinates>39.233333 22.766667</coordinates>
 <location>
 <name>Anchialos Airport</name>
@@ -15515,7 +15515,7 @@
 </country>
 <country>
 <!-- GG - The Bailiwick of Guernsey, a British Crown dependency -->
- <_name>Guernsey</_name>
+ <name>Guernsey</name>
 <!-- Could not find information about the following stations,
 which may be in Guernsey:
 EGHK EGXX 
@@ -15524,13 +15524,13 @@
 <fips-code>GK</fips-code>
 <timezones>
 <timezone id="Europe/Guernsey">
- <_name>GMT/BST</_name>
+ <name>GMT/BST</name>
 </timezone>
 </timezones>
 <tz-hint>Europe/Guernsey</tz-hint>
 <city>
 <!-- A city in Guernsey -->
- <_name>Hautnez</_name>
+ <name>Hautnez</name>
 <coordinates>49.433333 -2.600000</coordinates>
 <location>
 <name>Guernsey Airport</name>
@@ -15540,7 +15540,7 @@
 </city>
 <city>
 <!-- The capital of Guernsey -->
- <_name>Saint Peter Port</_name>
+ <name>Saint Peter Port</name>
 <coordinates>49.456111 -2.540833</coordinates>
 <location>
 <name>Guernsey Airport</name>
@@ -15551,7 +15551,7 @@
 </country>
 <country>
 <!-- HU - Hungary -->
- <_name>Hungary</_name>
+ <name>Hungary</name>
 <!-- Could not find information about the following stations,
 which may be in Hungary:
 LHPR 
@@ -15564,7 +15564,7 @@
 <tz-hint>Europe/Budapest</tz-hint>
 <city>
 <!-- The capital of Hungary -->
- <_name>Budapest</_name>
+ <name>Budapest</name>
 <coordinates>47.500000 19.083333</coordinates>
 <location>
 <name>Budapest-Ferihegy Airport</name>
@@ -15574,7 +15574,7 @@
 </city>
 <city>
 <!-- A city in Hungary -->
- <_name>Debrecen</_name>
+ <name>Debrecen</name>
 <coordinates>47.533333 21.633333</coordinates>
 <location>
 <name>Debrecen</name>
@@ -15584,7 +15584,7 @@
 </city>
 <city>
 <!-- A city in Hungary -->
- <_name>Kecskemét</_name>
+ <name>Kecskemét</name>
 <coordinates>46.900000 19.783333</coordinates>
 <location>
 <name>Kecskemét</name>
@@ -15594,7 +15594,7 @@
 </city>
 <city>
 <!-- A city in Hungary -->
- <_name>Pápa</_name>
+ <name>Pápa</name>
 <coordinates>47.333333 17.466667</coordinates>
 <location>
 <name>Pápa</name>
@@ -15604,7 +15604,7 @@
 </city>
 <city>
 <!-- A city in Hungary -->
- <_name>Pécs</_name>
+ <name>Pécs</name>
 <coordinates>46.083333 18.233333</coordinates>
 <location>
 <name>Pécs-Pogany Airport</name>
@@ -15614,7 +15614,7 @@
 </city>
 <city>
 <!-- A city in Hungary -->
- <_name>Szeged</_name>
+ <name>Szeged</name>
 <coordinates>46.250000 20.166667</coordinates>
 <location>
 <name>Szeged</name>
@@ -15624,7 +15624,7 @@
 </city>
 <city>
 <!-- A city in Hungary -->
- <_name>Szolnok</_name>
+ <name>Szolnok</name>
 <coordinates>47.183333 20.200000</coordinates>
 <location>
 <name>Szolnok</name>
@@ -15635,7 +15635,7 @@
 </country>
 <country>
 <!-- IS - Iceland -->
- <_name>Iceland</_name>
+ <name>Iceland</name>
 <iso-code>IS</iso-code>
 <fips-code>IC</fips-code>
 <timezones>
@@ -15644,7 +15644,7 @@
 <tz-hint>Atlantic/Reykjavik</tz-hint>
 <city>
 <!-- A city in Iceland -->
- <_name>Akureyri</_name>
+ <name>Akureyri</name>
 <coordinates>65.666667 -18.100000</coordinates>
 <location>
 <name>Akureyri</name>
@@ -15654,7 +15654,7 @@
 </city>
 <city>
 <!-- A city in Iceland -->
- <_name>Eiðar</_name>
+ <name>Eiðar</name>
 <coordinates>65.366667 -14.350000</coordinates>
 <location>
 <name>Egilsstadir</name>
@@ -15664,7 +15664,7 @@
 </city>
 <city>
 <!-- The capital of Iceland -->
- <_name>Reykjavík</_name>
+ <name>Reykjavík</name>
 <coordinates>64.150000 -21.950000</coordinates>
 <location>
 <name>Reykjavík</name>
@@ -15674,7 +15674,7 @@
 </city>
 <city>
 <!-- A city in Iceland -->
- <_name>Ytri-Njarðvík</_name>
+ <name>Ytri-Njarðvík</name>
 <coordinates>63.983333 -22.550000</coordinates>
 <location>
 <name>Keflavikurflugvollur</name>
@@ -15685,7 +15685,7 @@
 </country>
 <country>
 <!-- IE - Ireland -->
- <_name>Ireland</_name>
+ <name>Ireland</name>
 <iso-code>IE</iso-code>
 <fips-code>EI</fips-code>
 <timezones>
@@ -15693,7 +15693,7 @@
 <!-- The time zone in Ireland (GMT in the winter, and Irish
 Summer Time in the summer.)
 -->
- <_name>GMT/IST</_name>
+ <name>GMT/IST</name>
 </timezone>
 </timezones>
 <tz-hint>Europe/Dublin</tz-hint>
@@ -15701,7 +15701,7 @@
 <!-- A city in Ireland.
 The local name in Irish is "Corcaigh".
 -->
- <_name>Cork</_name>
+ <name>Cork</name>
 <coordinates>51.898611 -8.495833</coordinates>
 <location>
 <name>Cork Airport</name>
@@ -15713,7 +15713,7 @@
 <!-- The capital of Ireland.
 The local name in Irish is "Baile Átha Cliath".
 -->
- <_name msgctxt="City in Ireland">Dublin</_name>
+ <name msgctxt="City in Ireland">Dublin</name>
 <coordinates>53.333056 -6.248889</coordinates>
 <location>
 <name>Dublin Airport</name>
@@ -15725,7 +15725,7 @@
 <!-- A city in Ireland.
 The local name in Irish is "Dún Laoghaire".
 -->
- <_name>Dunleary</_name>
+ <name>Dunleary</name>
 <coordinates>53.292500 -6.128611</coordinates>
 <location>
 <name>Dublin Airport</name>
@@ -15735,7 +15735,7 @@
 </city>
 <city>
 <!-- A city in Ireland -->
- <_name>Glentavraun</_name>
+ <name>Glentavraun</name>
 <coordinates>53.883333 -8.800000</coordinates>
 <location>
 <name>Connaught</name>
@@ -15747,7 +15747,7 @@
 <!-- A city in Ireland.
 The local name in Irish is "Sionainn".
 -->
- <_name>Shannon</_name>
+ <name>Shannon</name>
 <coordinates>52.703889 -8.864167</coordinates>
 <location>
 <name>Shannon Airport</name>
@@ -15758,18 +15758,18 @@
 </country>
 <country>
 <!-- IM - Isle of Man, a British Crown dependency -->
- <_name>Isle of Man</_name>
+ <name>Isle of Man</name>
 <iso-code>IM</iso-code>
 <fips-code>IM</fips-code>
 <timezones>
 <timezone id="Europe/Isle_of_Man">
- <_name>GMT/BST</_name>
+ <name>GMT/BST</name>
 </timezone>
 </timezones>
 <tz-hint>Europe/Isle_of_Man</tz-hint>
 <city>
 <!-- The capital of the Isle of Man -->
- <_name msgctxt="City in Isle of Man">Douglas</_name>
+ <name msgctxt="City in Isle of Man">Douglas</name>
 <coordinates>54.150000 -4.483333</coordinates>
 <location>
 <name>Isle of Man, Ronaldsway Airport</name>
@@ -15780,7 +15780,7 @@
 </city>
 <city>
 <!-- A city in the Isle of Man -->
- <_name>Ronaldsway</_name>
+ <name>Ronaldsway</name>
 <coordinates>54.083333 -4.616667</coordinates>
 <location>
 <name>Isle of Man, Ronaldsway Airport</name>
@@ -15792,7 +15792,7 @@
 </country>
 <country>
 <!-- IT - Italy -->
- <_name>Italy</_name>
+ <name>Italy</name>
 <iso-code>IT</iso-code>
 <fips-code>IT</fips-code>
 <timezones>
@@ -15801,7 +15801,7 @@
 <tz-hint>Europe/Rome</tz-hint>
 <city>
 <!-- A city in Italy -->
- <_name>Albenga</_name>
+ <name>Albenga</name>
 <coordinates>44.050000 8.216667</coordinates>
 <location>
 <name>Albenga</name>
@@ -15811,7 +15811,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Alghero</_name>
+ <name>Alghero</name>
 <coordinates>40.558889 8.318056</coordinates>
 <location>
 <name>Alghero</name>
@@ -15821,7 +15821,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Aviano</_name>
+ <name>Aviano</name>
 <coordinates>46.070556 12.594722</coordinates>
 <location>
 <name>Aviano</name>
@@ -15836,7 +15836,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Bari</_name>
+ <name>Bari</name>
 <coordinates>41.133333 16.850000</coordinates>
 <location>
 <name>Palese Macchie Airport</name>
@@ -15846,7 +15846,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Bergamo</_name>
+ <name>Bergamo</name>
 <coordinates>45.683333 9.716667</coordinates>
 <location>
 <name>Orio Al Serio Airport</name>
@@ -15856,7 +15856,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Bologna</_name>
+ <name>Bologna</name>
 <coordinates>44.493850 11.342400</coordinates>
 <location>
 <name>Borgo Panigale Airport</name>
@@ -15866,7 +15866,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Bolzano</_name>
+ <name>Bolzano</name>
 <coordinates>46.516667 11.366667</coordinates>
 <location>
 <name>Bolzano</name>
@@ -15876,7 +15876,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Brescia</_name>
+ <name>Brescia</name>
 <coordinates>45.550000 10.250000</coordinates>
 <location>
 <name>Ghedi Airport</name>
@@ -15891,7 +15891,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Breuil-Cervinia</_name>
+ <name>Breuil-Cervinia</name>
 <coordinates>45.933333 7.633333</coordinates>
 <location>
 <name>Pian Rosa</name>
@@ -15901,7 +15901,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Brindisi</_name>
+ <name>Brindisi</name>
 <coordinates>40.633333 17.933333</coordinates>
 <location>
 <name>Brindisi</name>
@@ -15911,7 +15911,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Cagliari</_name>
+ <name>Cagliari</name>
 <coordinates>39.216667 9.116667</coordinates>
 <location>
 <name>Elmas Airport</name>
@@ -15921,7 +15921,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Capri</_name>
+ <name>Capri</name>
 <coordinates>40.550000 14.233333</coordinates>
 <location>
 <name>Capri</name>
@@ -15931,7 +15931,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Case Arfel</_name>
+ <name>Case Arfel</name>
 <coordinates>44.250000 7.783333</coordinates>
 <location>
 <name>Monte Malanotte</name>
@@ -15941,7 +15941,7 @@
 </city>
 <city>
  <!-- A city in Italy -->
- <_name>Catania</_name>
+ <name>Catania</name>
 <coordinates>37.500000 15.100000</coordinates>
 <location>
 <name>Fontanarossa Airport</name>
@@ -15956,7 +15956,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Cervia</_name>
+ <name>Cervia</name>
 <coordinates>44.261667 12.358889</coordinates>
 <location>
 <name>Cervia</name>
@@ -15966,7 +15966,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Crotone</_name>
+ <name>Crotone</name>
 <coordinates>39.083333 17.133333</coordinates>
 <location>
 <name>Crotone</name>
@@ -15976,7 +15976,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Cuneo</_name>
+ <name>Cuneo</name>
 <coordinates>44.383333 7.533333</coordinates>
 <location>
 <name>Levaldigi Airport</name>
@@ -15986,7 +15986,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Decimomannu</_name>
+ <name>Decimomannu</name>
 <coordinates>39.312500 8.969444</coordinates>
 <location>
 <name>Decimomannu</name>
@@ -15996,7 +15996,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Dobbiaco</_name>
+ <name>Dobbiaco</name>
 <coordinates>46.742500 12.231389</coordinates>
 <location>
 <name>Dobbiaco</name>
@@ -16006,7 +16006,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Ferrara</_name>
+ <name>Ferrara</name>
 <coordinates>44.833333 11.583333</coordinates>
 <location>
 <name>Ferrara</name>
@@ -16019,7 +16019,7 @@
 "Florence" is the traditional English name.
 The local name in Italian is "Firenze".
 -->
- <_name msgctxt="City in Italy">Florence</_name>
+ <name msgctxt="City in Italy">Florence</name>
 <coordinates>43.766667 11.250000</coordinates>
 <location>
 <name>Peretola Airport</name>
@@ -16029,7 +16029,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Forlì</_name>
+ <name>Forlì</name>
 <coordinates>44.223611 12.052778</coordinates>
 <location>
 <name>Forlì</name>
@@ -16039,7 +16039,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Frosinone</_name>
+ <name>Frosinone</name>
 <coordinates>41.633333 13.316667</coordinates>
 <location>
 <name>Frosinone</name>
@@ -16052,7 +16052,7 @@
 "Genoa" is the traditional English name.
 The local name in Italian is "Genova".
 -->
- <_name>Genoa</_name>
+ <name>Genoa</name>
 <coordinates>44.416667 8.950000</coordinates>
 <location>
 <name>Sestri Airport</name>
@@ -16062,7 +16062,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Ginosa Marina</_name>
+ <name>Ginosa Marina</name>
 <coordinates>40.433333 16.883333</coordinates>
 <location>
 <name>Ginosa Marina</name>
@@ -16072,7 +16072,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Gioia del Colle</_name>
+ <name>Gioia del Colle</name>
 <coordinates>40.800000 16.916667</coordinates>
 <location>
 <name>Gioia del Colle</name>
@@ -16082,7 +16082,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Grazzanise</_name>
+ <name>Grazzanise</name>
 <coordinates>41.083333 14.100000</coordinates>
 <location>
 <name>Grazzanise</name>
@@ -16092,7 +16092,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Grosseto</_name>
+ <name>Grosseto</name>
 <coordinates>42.766667 11.133333</coordinates>
 <location>
 <name>Grosseto</name>
@@ -16102,7 +16102,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Grottaglie</_name>
+ <name>Grottaglie</name>
 <coordinates>40.533333 17.433333</coordinates>
 <location>
 <name>Grottaglie</name>
@@ -16112,7 +16112,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Isola del Cantone</_name>
+ <name>Isola del Cantone</name>
 <coordinates>44.650000 8.950000</coordinates>
 <location>
 <name>Passo Dei Giovi</name>
@@ -16122,7 +16122,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Laigueglia</_name>
+ <name>Laigueglia</name>
 <coordinates>43.966667 8.150000</coordinates>
 <location>
 <name>Capo Mele</name>
@@ -16132,7 +16132,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Lampedusa</_name>
+ <name>Lampedusa</name>
 <coordinates>35.500000 12.600000</coordinates>
 <location>
 <name>Lampedusa</name>
@@ -16142,7 +16142,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Latina</_name>
+ <name>Latina</name>
 <coordinates>41.466667 12.866667</coordinates>
 <location>
 <name>Latina</name>
@@ -16152,7 +16152,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Lecce</_name>
+ <name>Lecce</name>
 <coordinates>40.383333 18.183333</coordinates>
 <location>
 <name>Lecce</name>
@@ -16162,7 +16162,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Messina</_name>
+ <name>Messina</name>
 <coordinates>38.183333 15.566667</coordinates>
 <location>
 <name>Messina</name>
@@ -16175,7 +16175,7 @@
 "Milan" is the traditional English name.
 The local name in Italian is "Milano".
 -->
- <_name>Milan</_name>
+ <name>Milan</name>
 <coordinates>45.466667 9.200000</coordinates>
 <location>
 <name>Linate Airport</name>
@@ -16190,7 +16190,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Ancona</_name>
+ <name>Ancona</name>
 <coordinates>43.616530 13.518780</coordinates>
 <location>
 <name>Falconara Airport</name>
@@ -16203,7 +16203,7 @@
 "Naples" is the traditional English name.
 The local name in Italian is "Napoli".
 -->
- <_name msgctxt="City in Italy">Naples</_name>
+ <name msgctxt="City in Italy">Naples</name>
 <coordinates>40.833333 14.250000</coordinates>
 <location>
 <name>Capodichino Airport</name>
@@ -16213,7 +16213,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Olbia</_name>
+ <name>Olbia</name>
 <coordinates>40.916667 9.516667</coordinates>
 <location>
 <name>Costa Smeralda Airport</name>
@@ -16223,7 +16223,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Palazzo</_name>
+ <name>Palazzo</name>
 <coordinates>42.716667 10.383333</coordinates>
 <location>
 <name>M. Calamita</name>
@@ -16233,7 +16233,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Palermo</_name>
+ <name>Palermo</name>
 <coordinates>38.116667 13.366667</coordinates>
 <location>
 <name>Punta Raisi Airport</name>
@@ -16243,7 +16243,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Paneveggio</_name>
+ <name>Paneveggio</name>
 <coordinates>46.300000 11.733333</coordinates>
 <location>
 <name>Passo Rolle</name>
@@ -16253,7 +16253,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Pantelleria</_name>
+ <name>Pantelleria</name>
 <coordinates>36.833333 11.950000</coordinates>
 <location>
 <name>Pantelleria</name>
@@ -16263,7 +16263,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Parma</_name>
+ <name>Parma</name>
 <coordinates>44.800000 10.333333</coordinates>
 <location>
 <name>Parma</name>
@@ -16273,7 +16273,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Perugia</_name>
+ <name>Perugia</name>
 <coordinates>43.133333 12.366667</coordinates>
 <location>
 <name>Perugia</name>
@@ -16283,7 +16283,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Pescara</_name>
+ <name>Pescara</name>
 <coordinates>42.466667 14.216667</coordinates>
 <location>
 <name>Pescara</name>
@@ -16293,7 +16293,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Piacenza</_name>
+ <name>Piacenza</name>
 <coordinates>45.016667 9.666667</coordinates>
 <location>
 <name>Piacenza</name>
@@ -16303,7 +16303,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Pisa</_name>
+ <name>Pisa</name>
 <coordinates>43.716667 10.383333</coordinates>
 <location>
 <name>S. Giusto Airport</name>
@@ -16313,7 +16313,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Pontecagnano</_name>
+ <name>Pontecagnano</name>
 <coordinates>40.633333 14.883333</coordinates>
 <location>
 <name>Pontecagnano Air Force Base</name>
@@ -16323,7 +16323,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Pratica di Mare</_name>
+ <name>Pratica di Mare</name>
 <coordinates>41.666667 12.483333</coordinates>
 <location>
 <name>Pratica di Mare</name>
@@ -16333,7 +16333,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Reggio di Calabria</_name>
+ <name>Reggio di Calabria</name>
 <coordinates>38.100000 15.650000</coordinates>
 <location>
 <name>Reggio di Calabria</name>
@@ -16343,7 +16343,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Resia</_name>
+ <name>Resia</name>
 <coordinates>46.833333 10.516667</coordinates>
 <location>
 <name>Resia Pass</name>
@@ -16353,7 +16353,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Rieti</_name>
+ <name>Rieti</name>
 <coordinates>42.400000 12.850000</coordinates>
 <location>
 <name>Rieti</name>
@@ -16363,7 +16363,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Rimini</_name>
+ <name>Rimini</name>
 <coordinates>44.063333 12.580833</coordinates>
 <location>
 <name>Rimini</name>
@@ -16376,7 +16376,7 @@
 "Rome" is the traditional English name.
 The local name in Italian is "Roma".
 -->
- <_name msgctxt="City in Italy">Rome</_name>
+ <name msgctxt="City in Italy">Rome</name>
 <coordinates>41.900000 12.483333</coordinates>
 <location>
 <name>Urbe Airport</name>
@@ -16396,7 +16396,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Ronchi dei Legionari</_name>
+ <name>Ronchi dei Legionari</name>
 <coordinates>45.823611 13.509722</coordinates>
 <location>
 <name>Ronchi dei Legionari</name>
@@ -16406,7 +16406,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Salignano</_name>
+ <name>Salignano</name>
 <coordinates>39.833333 18.350000</coordinates>
 <location>
 <name>S. Maria di Leuca</name>
@@ -16416,7 +16416,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>San Stèfano</_name>
+ <name>San Stèfano</name>
 <coordinates>39.107500 9.506111</coordinates>
 <location>
 <name>Capo Carbonara</name>
@@ -16426,7 +16426,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Sant'Eufemia Lamezia</_name>
+ <name>Sant'Eufemia Lamezia</name>
 <coordinates>38.916667 16.250000</coordinates>
 <location>
 <name>Lamezia Terme</name>
@@ -16436,7 +16436,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Sporminore</_name>
+ <name>Sporminore</name>
 <coordinates>46.166667 11.033333</coordinates>
 <location>
 <name>Paganella</name>
@@ -16446,7 +16446,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Tamaricciola</_name>
+ <name>Tamaricciola</name>
 <coordinates>41.416667 15.733333</coordinates>
 <location>
 <name>Amendola</name>
@@ -16456,7 +16456,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Tarvisio</_name>
+ <name>Tarvisio</name>
 <coordinates>46.510833 13.594167</coordinates>
 <location>
 <name>Tarvisio</name>
@@ -16466,7 +16466,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Trapani</_name>
+ <name>Trapani</name>
 <coordinates>38.016667 12.483333</coordinates>
 <location>
 <name>Birgi Airport</name>
@@ -16476,7 +16476,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Trevico</_name>
+ <name>Trevico</name>
 <coordinates>41.050000 15.216667</coordinates>
 <location>
 <name>Trevico</name>
@@ -16486,7 +16486,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Treviso</_name>
+ <name>Treviso</name>
 <coordinates>45.666667 12.245000</coordinates>
 <location>
 <name>S. Angelo Airport</name>
@@ -16501,7 +16501,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Trieste</_name>
+ <name>Trieste</name>
 <coordinates>45.648611 13.780000</coordinates>
 <location>
 <name>Trieste</name>
@@ -16514,7 +16514,7 @@
 "Turin" is the traditional English name.
 The local name is "Torino".
 -->
- <_name>Turin</_name>
+ <name>Turin</name>
 <coordinates>45.050000 7.666667</coordinates>
 <location>
 <name>Caselle Airport</name>
@@ -16527,7 +16527,7 @@
 "Venice" is the traditional English name.
 The local name in Italian is "Venezia".
 -->
- <_name>Venice</_name>
+ <name>Venice</name>
 <coordinates>45.438611 12.326667</coordinates>
 <location>
 <name>Tessera Airport</name>
@@ -16537,7 +16537,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Verona</_name>
+ <name>Verona</name>
 <coordinates>45.450000 11.000000</coordinates>
 <location>
 <name>Villafranca Airport</name>
@@ -16547,7 +16547,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Viterbo</_name>
+ <name>Viterbo</name>
 <coordinates>42.416667 12.100000</coordinates>
 <location>
 <name>Viterbo</name>
@@ -16557,7 +16557,7 @@
 </city>
 <city>
 <!-- A city in Italy -->
- <_name>Àrbatax</_name>
+ <name>Àrbatax</name>
 <coordinates>39.934444 9.705556</coordinates>
 <location>
 <name>Capo Bellavista</name>
@@ -16568,18 +16568,18 @@
 </country>
 <country>
 <!-- JE - The Bailiwick of Jersey, a British Crown dependency -->
- <_name>Jersey</_name>
+ <name>Jersey</name>
 <iso-code>JE</iso-code>
 <fips-code>JE</fips-code>
 <timezones>
 <timezone id="Europe/Jersey">
- <_name>GMT/BST</_name>
+ <name>GMT/BST</name>
 </timezone>
 </timezones>
 <tz-hint>Europe/Jersey</tz-hint>
 <city>
 <!-- A city in Jersey -->
- <_name>La Hougue</_name>
+ <name>La Hougue</name>
 <coordinates>49.216667 -2.216667</coordinates>
 <location>
 <name>Jersey Airport</name>
@@ -16589,7 +16589,7 @@
 </city>
 <city>
 <!-- The capital of Jersey -->
- <_name>Saint Helier</_name>
+ <name>Saint Helier</name>
 <coordinates>49.183333 -2.100000</coordinates>
 <location>
 <name>Jersey Airport</name>
@@ -16600,7 +16600,7 @@
 </country>
 <country>
 <!-- LV - Latvia -->
- <_name>Latvia</_name>
+ <name>Latvia</name>
 <!-- Could not find information about the following stations,
 which may be in Latvia:
 EVVA 
@@ -16613,7 +16613,7 @@
 <tz-hint>Europe/Riga</tz-hint>
 <city>
 <!-- A city in Latvia -->
- <_name>Liepāja</_name>
+ <name>Liepāja</name>
 <coordinates>56.516667 21.016667</coordinates>
 <location>
 <name>Liepāja International Airport</name>
@@ -16623,7 +16623,7 @@
 </city>
 <city>
 <!-- The capital of Latvia -->
- <_name>Rīga</_name>
+ <name>Rīga</name>
 <coordinates>56.950000 24.100000</coordinates>
 <location>
 <name>Rīga International Airport</name>
@@ -16634,7 +16634,7 @@
 </country>
 <country>
 <!-- LI - Liechtenstien -->
- <_name>Liechtenstein</_name>
+ <name>Liechtenstein</name>
 <!-- Could not find information about the following stations,
 which may be in Liechtenstein:
 LOXN 
@@ -16647,7 +16647,7 @@
 <tz-hint>Europe/Vaduz</tz-hint>
 <city>
 <!-- The capital of Liechtenstein -->
- <_name>Vaduz</_name>
+ <name>Vaduz</name>
 <coordinates>47.133333 9.516667</coordinates>
 <location>
 <name>Hohenems-Dornbirn</name>
@@ -16658,7 +16658,7 @@
 </country>
 <country>
 <!-- LT - Lithuania -->
- <_name>Lithuania</_name>
+ <name>Lithuania</name>
 <iso-code>LT</iso-code>
 <fips-code>LH</fips-code>
 <timezones>
@@ -16667,7 +16667,7 @@
 <tz-hint>Europe/Vilnius</tz-hint>
 <city>
 <!-- A city in Lithuania -->
- <_name>Kaunas</_name>
+ <name>Kaunas</name>
 <coordinates>54.900000 23.900000</coordinates>
 <location>
 <name>Kaunas</name>
@@ -16677,7 +16677,7 @@
 </city>
 <city>
 <!-- A city in Lithuania -->
- <_name>Palanga</_name>
+ <name>Palanga</name>
 <coordinates>55.917500 21.068611</coordinates>
 <location>
 <name>Palanga International Airport</name>
@@ -16687,7 +16687,7 @@
 </city>
 <city>
 <!-- The capital of Lithuania -->
- <_name>Vilnius</_name>
+ <name>Vilnius</name>
 <coordinates>54.683333 25.316667</coordinates>
 <location>
 <name>Vilnius</name>
@@ -16697,7 +16697,7 @@
 </city>
 <city>
 <!-- A city in Lithuania -->
- <_name>Šiauliai</_name>
+ <name>Šiauliai</name>
 <coordinates>55.933333 23.316667</coordinates>
 <location>
 <name>Siauliai International / Military Base</name>
@@ -16708,7 +16708,7 @@
 </country>
 <country>
 <!-- LU - Luxembourg -->
- <_name msgctxt="Country">Luxembourg</_name>
+ <name msgctxt="Country">Luxembourg</name>
 <iso-code>LU</iso-code>
 <fips-code>LU</fips-code>
 <timezones>
@@ -16717,7 +16717,7 @@
 <tz-hint>Europe/Luxembourg</tz-hint>
 <city>
 <!-- The capital of Luxembourg -->
- <_name msgctxt="City in Luxembourg">Luxembourg</_name>
+ <name msgctxt="City in Luxembourg">Luxembourg</name>
 <coordinates>49.611667 6.130000</coordinates>
 <location>
 <name>Luxembourg Airport</name>
@@ -16728,7 +16728,7 @@
 </country>
 <country>
 <!-- MK - The Former Yugoslav Republic of Macedonia -->
- <_name>Macedonia</_name>
+ <name>Macedonia</name>
 <iso-code>MK</iso-code>
 <fips-code>MK</fips-code>
 <timezones>
@@ -16737,7 +16737,7 @@
 <tz-hint>Europe/Skopje</tz-hint>
 <city>
 <!-- A city in Macedonia -->
- <_name>Ohrid</_name>
+ <name>Ohrid</name>
 <coordinates>41.117222 20.801944</coordinates>
 <location>
 <name>Ohrid</name>
@@ -16747,7 +16747,7 @@
 </city>
 <city>
 <!-- The capital of Macedonia -->
- <_name>Skopje</_name>
+ <name>Skopje</name>
 <coordinates>42.000000 21.433333</coordinates>
 <location>
 <name>Skopje-Petrovec</name>
@@ -16758,7 +16758,7 @@
 </country>
 <country>
 <!-- MT - Malta -->
- <_name msgctxt="Country">Malta</_name>
+ <name msgctxt="Country">Malta</name>
 <iso-code>MT</iso-code>
 <fips-code>MT</fips-code>
 <timezones>
@@ -16767,7 +16767,7 @@
 <tz-hint>Europe/Malta</tz-hint>
 <city>
 <!-- A city in Malta -->
- <_name>Luqa</_name>
+ <name>Luqa</name>
 <coordinates>35.858889 14.488611</coordinates>
 <location>
 <name>Luqa</name>
@@ -16777,7 +16777,7 @@
 </city>
 <city>
 <!-- The capital of Malta -->
- <_name>Valletta</_name>
+ <name>Valletta</name>
 <coordinates>35.899722 14.514722</coordinates>
 <location>
 <name>Luqa</name>
@@ -16788,7 +16788,7 @@
 </country>
 <country>
 <!-- MD - Moldova -->
- <_name>Moldova</_name>
+ <name>Moldova</name>
 <iso-code>MD</iso-code>
 <fips-code>MD</fips-code>
 <timezones>
@@ -16797,7 +16797,7 @@
 <tz-hint>Europe/Chisinau</tz-hint>
 <city>
 <!-- The capital of Moldova -->
- <_name>Chişinău</_name>
+ <name>Chişinău</name>
 <coordinates>47.005556 28.857500</coordinates>
 <location>
 <name>Chişinău International Airport</name>
@@ -16808,7 +16808,7 @@
 </country>
 <country>
 <!-- MC - Monaco -->
- <_name msgctxt="Country">Monaco</_name>
+ <name msgctxt="Country">Monaco</name>
 <!-- Could not find information about the following stations,
 which may be in Monaco:
 LFAQ LFDB LFJR LFLP LFMV LFRG 
@@ -16821,7 +16821,7 @@
 <tz-hint>Europe/Monaco</tz-hint>
 <city>
 <!-- The capital of Monaco -->
- <_name msgctxt="City in Monaco">Monaco</_name>
+ <name msgctxt="City in Monaco">Monaco</name>
 <coordinates>43.733333 7.416667</coordinates>
 <location>
 <name>Nice</name>
@@ -16832,7 +16832,7 @@
 </country>
 <country>
 <!-- ME - Montenegro -->
- <_name>Montenegro</_name>
+ <name>Montenegro</name>
 <!-- Could not find information about the following stations,
 which may be in Montenegro:
 LYBT LYKV LYUZ 
@@ -16845,7 +16845,7 @@
 <tz-hint>Europe/Podgorica</tz-hint>
 <city>
 <!-- A city in Montenegro -->
- <_name>Podgorica</_name>
+ <name>Podgorica</name>
 <coordinates>42.441111 19.263611</coordinates>
  <location>
 <name>Podgorica Titograd</name>
@@ -16855,7 +16855,7 @@
 </city>
 <city>
 <!-- A city in Montenegro -->
- <_name>Tivat</_name>
+ <name>Tivat</name>
 <coordinates>42.436389 18.696111</coordinates>
 <location>
 <name>Tivat</name>
@@ -16866,7 +16866,7 @@
 </country>
 <country>
 <!-- NL - Netherlands -->
- <_name>Netherlands</_name>
+ <name>Netherlands</name>
 <!-- Could not find information about the following stations,
 which may be in Netherlands:
 EHFZ EHJR EHSA EHSC 
@@ -16879,7 +16879,7 @@
 <tz-hint>Europe/Amsterdam</tz-hint>
 <city>
 <!-- The capital of the Netherlands -->
- <_name>Amsterdam</_name>
+ <name>Amsterdam</name>
 <coordinates>52.350000 4.916667</coordinates>
 <location>
 <name>Schiphol Airport</name>
@@ -16889,7 +16889,7 @@
 </city>
 <city>
 <!-- A city in the Netherlands -->
- <_name>De Kooy</_name>
+ <name>De Kooy</name>
 <coordinates>52.916667 4.800000</coordinates>
 <location>
 <name>De Kooy</name>
@@ -16899,7 +16899,7 @@
 </city>
 <city>
 <!-- A city in the Netherlands -->
- <_name>Deelen</_name>
+ <name>Deelen</name>
 <coordinates>52.066667 5.900000</coordinates>
 <location>
 <name>Deelen</name>
@@ -16909,7 +16909,7 @@
 </city>
 <city>
 <!-- A city in the Netherlands -->
- <_name>Eindhoven</_name>
+ <name>Eindhoven</name>
 <coordinates>51.450000 5.466667</coordinates>
 <location>
 <name>Eindhoven</name>
@@ -16919,7 +16919,7 @@
 </city>
 <city>
 <!-- A city in the Netherlands -->
- <_name>Gilze</_name>
+ <name>Gilze</name>
 <coordinates>51.550000 4.950000</coordinates>
 <location>
 <name>Gilze-Rijen</name>
@@ -16929,7 +16929,7 @@
 </city>
 <city>
 <!-- A city in the Netherlands -->
- <_name>Groningen</_name>
+ <name>Groningen</name>
 <coordinates>53.216667 6.550000</coordinates>
 <location>
 <name>Eelde Airport</name>
@@ -16939,7 +16939,7 @@
 </city>
 <city>
 <!-- A city in the Netherlands -->
- <_name>Leeuwarden</_name>
+ <name>Leeuwarden</name>
 <coordinates>53.200000 5.783333</coordinates>
 <location>
 <name>Leeuwarden</name>
@@ -16949,7 +16949,7 @@
 </city>
 <city>
 <!-- A city in the Netherlands -->
- <_name>Maastricht</_name>
+ <name>Maastricht</name>
 <coordinates>50.850000 5.683333</coordinates>
 <location>
 <name>Zuid Limburg Airport</name>
@@ -16959,7 +16959,7 @@
 </city>
 <city>
 <!-- A city in the Netherlands -->
- <_name>Oost-Vlieland</_name>
+ <name>Oost-Vlieland</name>
 <coordinates>53.283333 5.066667</coordinates>
 <location>
 <name>Vlieland</name>
@@ -16969,7 +16969,7 @@
 </city>
 <city>
 <!-- A city in the Netherlands -->
- <_name>Rotterdam</_name>
+ <name>Rotterdam</name>
 <coordinates>51.916667 4.500000</coordinates>
 <location>
 <name>Zestienhoven Airport</name>
@@ -16982,7 +16982,7 @@
 "The Hague" is the traditional English name.
 The local name in Dutch is "'s-Gravenhage".
 -->
- <_name>The Hague</_name>
+ <name>The Hague</name>
 <coordinates>52.083333 4.300000</coordinates>
 <location>
 <name>Valkenburg</name>
@@ -16992,7 +16992,7 @@
 </city>
 <city>
 <!-- A city in the Netherlands -->
- <_name>Valkenburg</_name>
+ <name>Valkenburg</name>
 <coordinates>52.183333 4.433333</coordinates>
 <location>
 <name>Valkenburg</name>
@@ -17002,7 +17002,7 @@
 </city>
 <city>
 <!-- A city in the Netherlands -->
- <_name>Volkel</_name>
+ <name>Volkel</name>
 <coordinates>51.650000 5.650000</coordinates>
 <location>
 <name>Volkel</name>
@@ -17012,7 +17012,7 @@
 </city>
 <city>
 <!-- A city in the Netherlands -->
- <_name>Woensdrecht</_name>
+ <name>Woensdrecht</name>
 <coordinates>51.433333 4.300000</coordinates>
 <location>
 <name>Woensdrecht</name>
@@ -17023,7 +17023,7 @@
 </country>
 <country>
 <!-- NO - Norway -->
- <_name>Norway</_name>
+ <name>Norway</name>
 <!-- Could not find cities for the following weather stations:
 ENDR - Draugen (64.355556 7.791667)
 ENHE - Heidrun (65.325000 2.326667)
@@ -17036,7 +17036,7 @@
 <tz-hint>Europe/Oslo</tz-hint>
 <city>
 <!-- A city in Norway -->
- <_name>Alta</_name>
+ <name>Alta</name>
 <coordinates>69.966667 23.241667</coordinates>
 <location>
 <name>Alta Airport</name>
@@ -17046,7 +17046,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Berlevåg</_name>
+ <name>Berlevåg</name>
 <coordinates>70.850000 29.100000</coordinates>
 <location>
 <name>Berlevåg</name>
@@ -17056,7 +17056,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Bodø</_name>
+ <name>Bodø</name>
 <coordinates>67.283333 14.383333</coordinates>
 <location>
 <name>Bodo Vi</name>
@@ -17066,7 +17066,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Bolle</_name>
+ <name>Bolle</name>
 <coordinates>68.158611 13.596389</coordinates>
 <location>
 <name>Leknes</name>
@@ -17076,7 +17076,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Boltåsen</_name>
+ <name>Boltåsen</name>
 <coordinates>68.533333 16.700000</coordinates>
 <location>
 <name>Evenes</name>
@@ -17086,7 +17086,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Brønnøysund</_name>
+ <name>Brønnøysund</name>
 <coordinates>65.466667 12.216667</coordinates>
 <location>
 <name>Brønnøysundsund Airport</name>
@@ -17096,7 +17096,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Båtsfjord</_name>
+ <name>Båtsfjord</name>
 <coordinates>70.632222 29.699722</coordinates>
 <location>
 <name>Båtsfjord</name>
@@ -17106,7 +17106,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Dalem</_name>
+ <name>Dalem</name>
 <coordinates>69.066667 18.516667</coordinates>
 <location>
 <name>Bardufoss</name>
@@ -17116,7 +17116,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Djupdalen</_name>
+ <name>Djupdalen</name>
 <coordinates>63.700000 9.583333</coordinates>
 <location>
 <name>Orland</name>
@@ -17126,7 +17126,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Eldskog</_name>
+ <name>Eldskog</name>
 <coordinates>70.050000 25.000000</coordinates>
 <location>
 <name>Banak</name>
@@ -17136,7 +17136,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Fagernes</_name>
+ <name>Fagernes</name>
 <coordinates>60.983333 9.250000</coordinates>
 <location>
 <name>Fagernes Leirin</name>
@@ -17146,7 +17146,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Fiskenes</_name>
+ <name>Fiskenes</name>
 <coordinates>69.263611 16.176667</coordinates>
 <location>
 <name>Andoya</name>
@@ -17156,7 +17156,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Flesland</_name>
+ <name>Flesland</name>
 <coordinates>60.293889 5.215278</coordinates>
 <location>
 <name>Bergen Airport</name>
@@ -17166,7 +17166,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Florø</_name>
+ <name>Florø</name>
 <coordinates>61.600000 5.000000</coordinates>
 <location>
 <name>Florø</name>
@@ -17176,7 +17176,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Førde</_name>
+ <name>Førde</name>
 <coordinates>61.450000 5.866667</coordinates>
 <location>
 <name>Førde Airport, Bringeland</name>
@@ -17186,7 +17186,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Gardermoen</_name>
+ <name>Gardermoen</name>
 <coordinates>60.216667 11.100000</coordinates>
 <location>
 <name>Oslo Airport</name>
@@ -17196,7 +17196,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Hammerfest</_name>
+ <name>Hammerfest</name>
 <coordinates>70.661667 23.688333</coordinates>
 <location>
 <name>Hammerfest</name>
@@ -17206,7 +17206,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Hasvik</_name>
+ <name>Hasvik</name>
 <coordinates>70.483333 22.150000</coordinates>
 <location>
 <name>Hasvik</name>
@@ -17216,7 +17216,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Haugesund</_name>
+ <name>Haugesund</name>
 <coordinates>59.411944 5.277500</coordinates>
 <location>
 <name>Haugesund Airport, Karmoy</name>
@@ -17226,7 +17226,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Holm</_name>
+ <name>Holm</name>
 <coordinates>61.150000 7.166667</coordinates>
 <location>
 <name>Sogndal Airport, Haukasen</name>
@@ -17236,7 +17236,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Honningsvåg</_name>
+ <name>Honningsvåg</name>
 <coordinates>70.983333 25.983333</coordinates>
 <location>
 <name>Honningsvåg Airport, Valan</name>
@@ -17246,7 +17246,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Kirkenes</_name>
+ <name>Kirkenes</name>
 <coordinates>69.725000 30.051667</coordinates>
 <location>
 <name>Kirkenes Airport</name>
@@ -17256,7 +17256,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Kjevik</_name>
+ <name>Kjevik</name>
 <coordinates>58.200000 8.100000</coordinates>
 <location>
 <name>Kristiansand Airport</name>
@@ -17266,7 +17266,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Kristiansund</_name>
+ <name>Kristiansund</name>
 <coordinates>63.116667 7.750000</coordinates>
 <location>
 <name>Kristiansund Airport, Kvernberget</name>
@@ -17276,7 +17276,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Tromsø</_name>
+ <name>Tromsø</name>
 <coordinates>69.666667 18.916667</coordinates>
 <location>
 <name>Langnes Airport</name>
@@ -17286,7 +17286,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Mehamn</_name>
+ <name>Mehamn</name>
 <coordinates>71.033333 27.850000</coordinates>
 <location>
 <name>Mehamn</name>
@@ -17296,7 +17296,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Molde</_name>
+ <name>Molde</name>
 <coordinates>62.733333 7.183333</coordinates>
 <location>
 <name>Molde Airport, Aro</name>
@@ -17306,7 +17306,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Mosjøen</_name>
+ <name>Mosjøen</name>
 <coordinates>65.833333 13.200000</coordinates>
 <location>
 <name>Mosjoen Kjaerstad</name>
@@ -17316,7 +17316,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Namsos</_name>
+ <name>Namsos</name>
 <coordinates>64.483333 11.500000</coordinates>
 <location>
 <name>Namsos Airport</name>
@@ -17326,7 +17326,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Narvik</_name>
+ <name>Narvik</name>
 <coordinates>68.435556 17.437222</coordinates>
 <location>
 <name>Narvik</name>
@@ -17336,7 +17336,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Notodden</_name>
+ <name>Notodden</name>
 <coordinates>59.566667 9.283333</coordinates>
 <location>
 <name>Notodden</name>
@@ -17346,7 +17346,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Oseberg</_name>
+ <name>Oseberg</name>
 <coordinates>59.316667 10.450000</coordinates>
 <location>
 <name>Oseberg</name>
@@ -17356,7 +17356,7 @@
 </city>
 <city>
 <!-- The capital of Norway -->
- <_name>Oslo</_name>
+ <name>Oslo</name>
 <coordinates>59.916667 10.750000</coordinates>
 <location>
 <name>Oslo Airport, Gardermoen</name>
@@ -17366,7 +17366,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Rygge</_name>
+ <name>Rygge</name>
 <coordinates>59.383333 10.716667</coordinates>
 <location>
 <name>Rygge</name>
@@ -17376,7 +17376,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Røros</_name>
+ <name>Røros</name>
 <coordinates>62.583333 11.400000</coordinates>
 <location>
 <name>Røros Airport</name>
@@ -17386,7 +17386,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Rørvik</_name>
+ <name>Rørvik</name>
 <coordinates>64.850000 11.233333</coordinates>
 <location>
 <name>Rørvik Airport, Ryum</name>
@@ -17396,7 +17396,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Røssvoll</_name>
+ <name>Røssvoll</name>
 <coordinates>66.366667 14.333333</coordinates>
 <location>
 <name>Mo I Rana Airport</name>
@@ -17406,7 +17406,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Røst</_name>
+ <name>Røst</name>
 <coordinates>67.516667 12.116667</coordinates>
 <location>
 <name>Rost Flyplass</name>
@@ -17416,7 +17416,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Sandane</_name>
+ <name>Sandane</name>
 <coordinates>61.766667 6.216667</coordinates>
 <location>
 <name>Sandane Airport, Anda</name>
@@ -17426,7 +17426,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Skagen</_name>
+ <name>Skagen</name>
 <coordinates>68.583333 15.050000</coordinates>
 <location>
 <name>Storkmarknes Airport</name>
@@ -17436,7 +17436,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Skien</_name>
+ <name>Skien</name>
 <coordinates>59.200000 9.600000</coordinates>
 <location>
 <name>Skien-Geiteryggen</name>
@@ -17446,7 +17446,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Sola</_name>
+ <name>Sola</name>
 <coordinates>58.883333 5.600000</coordinates>
 <location>
 <name>Stavanger Airport</name>
@@ -17456,7 +17456,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Stokka</_name>
+ <name>Stokka</name>
 <coordinates>65.766667 12.566667</coordinates>
 <location>
 <name>Sandnessjoen Airport</name>
@@ -17466,7 +17466,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Svartnes</_name>
+ <name>Svartnes</name>
 <coordinates>70.350000 31.033333</coordinates>
 <location>
 <name>Svartnes</name>
@@ -17476,7 +17476,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Svolvær</_name>
+ <name>Svolvær</name>
 <coordinates>68.233333 14.566667</coordinates>
 <location>
 <name>Svolvær Airport, Helle</name>
@@ -17486,7 +17486,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Sørkjosen</_name>
+ <name>Sørkjosen</name>
 <coordinates>69.800000 20.933333</coordinates>
 <location>
 <name>Sørkjosen</name>
@@ -17496,7 +17496,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Torp</_name>
+ <name>Torp</name>
 <coordinates>59.179722 10.242500</coordinates>
 <location>
 <name>Torp</name>
@@ -17506,7 +17506,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Trondheim</_name>
+ <name>Trondheim</name>
 <coordinates>63.416667 10.416667</coordinates>
 <location>
 <name>Trondheim Airport, Vaernes</name>
@@ -17516,7 +17516,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Vadsø</_name>
+ <name>Vadsø</name>
 <coordinates>70.073056 29.769722</coordinates>
 <location>
 <name>Vadsø</name>
@@ -17526,7 +17526,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Ålesund</_name>
+ <name>Ålesund</name>
 <coordinates>62.466667 6.150000</coordinates>
 <location>
 <name>Ålesund Airport, Vigra</name>
@@ -17536,7 +17536,7 @@
 </city>
 <city>
 <!-- A city in Norway -->
- <_name>Ørsta</_name>
+ <name>Ørsta</name>
 <coordinates>62.200000 6.150000</coordinates>
 <location>
 <name>Orsta-Volda Airport, Hovden</name>
@@ -17547,7 +17547,7 @@
 </country>
 <country>
 <!-- PL - Poland -->
- <_name>Poland</_name>
+ <name>Poland</name>
 <iso-code>PL</iso-code>
 <fips-code>PL</fips-code>
 <timezones>
@@ -17556,7 +17556,7 @@
 <tz-hint>Europe/Warsaw</tz-hint>
 <city>
 <!-- A city in Poland -->
- <_name>Bydgoszcz</_name>
+ <name>Bydgoszcz</name>
 <coordinates>53.123480 18.008438</coordinates>
 <location>
 <name>Bydgoszcz-Szwederowo</name>
@@ -17566,7 +17566,7 @@
 </city>
 <city>
 <!-- A city in Poland -->
- <_name>Gdańsk</_name>
+ <name>Gdańsk</name>
 <coordinates>54.350000 18.666667</coordinates>
 <location>
 <name>Gdańsk-Rębiechowo</name>
@@ -17576,7 +17576,7 @@
 </city>
 <city>
 <!-- A city in Poland -->
- <_name>Katowice</_name>
+ <name>Katowice</name>
 <coordinates>50.266667 19.016667</coordinates>
 <location>
 <name>Katowice-Pyrzowice</name>
@@ -17586,7 +17586,7 @@
 </city>
 <city>
 <!-- A city in Poland -->
- <_name>Kraków</_name>
+ <name>Kraków</name>
 <coordinates>50.083333 19.916667</coordinates>
 <location>
 <name>Kraków-Balice</name>
@@ -17596,7 +17596,7 @@
 </city>
 <city>
 <!-- A city in Poland -->
- <_name>Lublin</_name>
+ <name>Lublin</name>
 <coordinates>51.246452 22.568445</coordinates>
 <location>
 <name>Lublin-Świdnik</name>
@@ -17606,7 +17606,7 @@
 </city>
 <city>
 <!-- A city in Poland -->
- <_name>Łódź</_name>
+ <name>Łódź</name>
 <coordinates>51.750000 19.466667</coordinates>
 <location>
 <name>Łódź-Lublinek</name>
@@ -17616,7 +17616,7 @@
 </city>
 <city>
 <!-- A city in Poland -->
- <_name>Olsztyn</_name>
+ <name>Olsztyn</name>
 <coordinates>53.778422 20.480119</coordinates>
 <location>
 <name>Olsztyn-Szymany</name>
@@ -17626,7 +17626,7 @@
 </city>
 <city>
 <!-- A city in Poland -->
- <_name>Poznań</_name>
+ <name>Poznań</name>
 <coordinates>52.416667 16.966667</coordinates>
 <location>
 <name>Poznań-Ławica</name>
@@ -17636,7 +17636,7 @@
 </city>
 <city>
 <!-- A city in Poland -->
- <_name>Radom</_name>
+ <name>Radom</name>
 <coordinates>51.403611 21.156667</coordinates>
 <location>
 <name>Radom-Sadków</name>
@@ -17646,7 +17646,7 @@
 </city>
 <city>
 <!-- A city in Poland -->
- <_name>Rzeszów</_name>
+ <name>Rzeszów</name>
 <coordinates>50.050000 22.000000</coordinates>
 <location>
 <name>Rzeszów-Jasionka</name>
@@ -17656,7 +17656,7 @@
 </city>
 <city>
 <!-- A city in Poland -->
- <_name>Szczecin</_name>
+ <name>Szczecin</name>
 <coordinates>53.416667 14.583333</coordinates>
 <location>
 <name>Szczecin-Goleniów</name>
@@ -17669,7 +17669,7 @@
 "Warsaw" is the traditional English name.
 The local name in Polish is "Warszawa".
 -->
- <_name msgctxt="City in Poland">Warsaw</_name>
+ <name msgctxt="City in Poland">Warsaw</name>
 <coordinates>52.250000 21.000000</coordinates>
 <location>
 <name>Warszawa-Okęcie</name>
@@ -17679,7 +17679,7 @@
 </city>
 <city>
 <!-- A city in Poland -->
- <_name>Wrocław</_name>
+ <name>Wrocław</name>
 <coordinates>51.100000 17.033333</coordinates>
 <location>
 <name>Wrocław-Strachowice</name>
@@ -17689,7 +17689,7 @@
 </city>
 <city>
 <!-- A city in Poland -->
- <_name>Zielona Góra</_name>
+ <name>Zielona Góra</name>
 <coordinates>51.935621 15.506186</coordinates>
 <location>
 <name>Zielona Góra-Babimost</name>
@@ -17700,7 +17700,7 @@
 </country>
 <country>
 <!-- PT - Portugal -->
- <_name>Portugal</_name>
+ <name>Portugal</name>
 <iso-code>PT</iso-code>
 <fips-code>PO</fips-code>
 <timezones>
@@ -17709,26 +17709,26 @@
 is only used in places where "Portugal" is already
 understood from context.
 -->
- <_name>Azores</_name>
+ <name>Azores</name>
 </timezone>
 <timezone id="Atlantic/Madeira">
 <!-- This refers to the time zone for the Portuguese island
 of Madeira. The string is only used in places where
 "Portugal" is already understood from context.
 -->
- <_name>Madeira</_name>
+ <name>Madeira</name>
 </timezone>
 <timezone id="Europe/Lisbon">
 <!-- This refers to the time zone for mainland Portugal (as
 opposed to the time zone for the Azores).
 -->
- <_name>Mainland Portugal</_name>
+ <name>Mainland Portugal</name>
 </timezone>
 </timezones>
 <tz-hint>Europe/Lisbon</tz-hint>
 <city>
 <!-- A city in Portugal -->
- <_name>Beja</_name>
+ <name>Beja</name>
 <coordinates>38.016667 -7.866667</coordinates>
 <location>
 <name>Beja</name>
@@ -17738,7 +17738,7 @@
 </city>
 <city>
 <!-- A city in Portugal -->
- <_name>Castelo Branco</_name>
+ <name>Castelo Branco</name>
 <coordinates>38.516667 -28.733333</coordinates>
 <location>
 <name>Horta / Castelo Branco Acores</name>
@@ -17749,7 +17749,7 @@
 </city>
 <city>
 <!-- A city in Portugal -->
- <_name>Faro</_name>
+ <name>Faro</name>
 <coordinates>37.016667 -7.933333</coordinates>
 <location>
 <name>Faro Airport</name>
@@ -17759,7 +17759,7 @@
 </city>
 <city>
 <!-- A city in Portugal -->
- <_name>Flor da Rosa</_name>
+ <name>Flor da Rosa</name>
 <coordinates>36.966667 -25.150000</coordinates>
 <location>
 <name>Santa Maria Acores</name>
@@ -17770,7 +17770,7 @@
 </city>
 <city>
 <!-- A city in Portugal -->
- <_name>Lajes</_name>
+ <name>Lajes</name>
 <coordinates>38.766667 -27.100000</coordinates>
 <location>
 <name>Lajes Acores</name>
@@ -17784,7 +17784,7 @@
 "Lisbon" is the traditional English name.
 The local name in Portuguese is "Lisboa".
 -->
- <_name>Lisbon</_name>
+ <name>Lisbon</name>
 <coordinates>38.716667 -9.133333</coordinates>
 <location>
 <name>Lisbon / Portela</name>
@@ -17794,7 +17794,7 @@
 </city>
 <city>
 <!-- A city in Portugal -->
- <_name>Monte Real</_name>
+ <name>Monte Real</name>
 <coordinates>39.850000 -8.866667</coordinates>
 <location>
 <name>Monte Real Military Base</name>
@@ -17804,7 +17804,7 @@
 </city>
 <city>
 <!-- A city in Portugal -->
- <_name>Montijo</_name>
+ <name>Montijo</name>
 <coordinates>38.700000 -8.966667</coordinates>
 <location>
 <name>Montijo Military Base</name>
@@ -17814,7 +17814,7 @@
 </city>
 <city>
 <!-- A city in Portugal -->
- <_name>Ovar</_name>
+ <name>Ovar</name>
 <coordinates>40.866667 -8.633333</coordinates>
 <location>
 <name>Ovar Military Base</name>
@@ -17824,7 +17824,7 @@
 </city>
 <city>
 <!-- A city in Portugal -->
- <_name>Ponta Delgada</_name>
+ <name>Ponta Delgada</name>
 <coordinates>37.733333 -25.666667</coordinates>
 <location>
 <name>Ponta Delgada / Nordela Acores</name>
@@ -17835,7 +17835,7 @@
 </city>
 <city>
 <!-- A city in Portugal -->
- <_name>Porto</_name>
+ <name>Porto</name>
 <coordinates>41.150000 -8.616667</coordinates>
 <location>
 <name>Porto / Pedras Rubras</name>
@@ -17845,7 +17845,7 @@
 </city>
 <city>
 <!-- A city in Portugal -->
- <_name>Porto Santo</_name>
+ <name>Porto Santo</name>
 <coordinates>33.050000 -16.333333</coordinates>
 <location>
 <name>Porto Santo</name>
@@ -17857,7 +17857,7 @@
 <!-- A city in Portugal.
 One of several cities in Portugal called "Santa Cruz".
 -->
- <_name>Santa Cruz das Flores</_name>
+ <name>Santa Cruz das Flores</name>
 <coordinates>39.450000 -31.116667</coordinates>
 <location>
 <name>Flores Acores</name>
@@ -17868,7 +17868,7 @@
 </city>
 <city>
 <!-- A city in Portugal -->
- <_name>Sintra</_name>
+ <name>Sintra</name>
 <coordinates>38.800000 -9.383333</coordinates>
 <location>
 <name>Sintra Military Base</name>
@@ -17878,7 +17878,7 @@
 </city>
 <city>
 <!-- A city in Portugal -->
- <_name>Água de Pena</_name>
+ <name>Água de Pena</name>
 <coordinates>32.700000 -16.766667</coordinates>
 <location>
 <name>Madeira Airport</name>
@@ -17890,7 +17890,7 @@
 </country>
 <country>
 <!-- RO - Romania -->
- <_name>Romania</_name>
+ <name>Romania</name>
 <iso-code>RO</iso-code>
 <fips-code>RO</fips-code>
 <timezones>
@@ -17899,7 +17899,7 @@
 <tz-hint>Europe/Bucharest</tz-hint>
 <city>
 <!-- A city in Romania -->
- <_name>Arad</_name>
+ <name>Arad</name>
 <coordinates>46.183333 21.316667</coordinates>
 <location>
 <name>Arad</name>
@@ -17909,7 +17909,7 @@
 </city>
 <city>
 <!-- A city in Romania -->
- <_name>Bacău</_name>
+ <name>Bacău</name>
 <coordinates>46.566667 26.900000</coordinates>
 <location>
 <name>Bacău</name>
@@ -17919,7 +17919,7 @@
 </city>
 <city>
 <!-- A city in Romania -->
- <_name>Baia Mare</_name>
+ <name>Baia Mare</name>
 <coordinates>47.666667 23.583333</coordinates>
 <location>
 <name>Baia Mare</name>
@@ -17932,7 +17932,7 @@
 "Bucharest" is the traditional English name.
 The local name in Romanian is "Bucureşti".
 -->
- <_name>Bucharest</_name>
+ <name>Bucharest</name>
 <coordinates>44.433333 26.100000</coordinates>
 <location>
 <name>Bucharest / Imh</name>
@@ -17947,7 +17947,7 @@
 </city>
 <city>
 <!-- A city in Romania -->
- <_name>Cluj-Napoca</_name>
+ <name>Cluj-Napoca</name>
 <coordinates>46.766667 23.600000</coordinates>
 <location>
 <name>Cluj-Napoca</name>
@@ -17957,7 +17957,7 @@
 </city>
 <city>
 <!-- A city in Romania -->
- <_name>Craiova</_name>
+ <name>Craiova</name>
 <coordinates>44.316667 23.800000</coordinates>
 <location>
 <name>Craiova</name>
@@ -17967,7 +17967,7 @@
 </city>
 <city>
 <!-- A city in Romania -->
- <_name>Iaşi</_name>
+ <name>Iaşi</name>
 <coordinates>47.166667 27.600000</coordinates>
 <location>
 <name>Iaşi</name>
@@ -17977,7 +17977,7 @@
 </city>
 <city>
 <!-- A city in Romania -->
- <_name>Mihail Kogălniceanu</_name>
+ <name>Mihail Kogălniceanu</name>
 <coordinates>44.366667 28.450000</coordinates>
 <location>
 <name>Mihail Kogălniceanu</name>
@@ -17987,7 +17987,7 @@
 </city>
 <city>
 <!-- A city in Romania -->
- <_name>Oradea</_name>
+ <name>Oradea</name>
 <coordinates>47.066667 21.933333</coordinates>
 <location>
 <name>Oradea</name>
@@ -17997,7 +17997,7 @@
 </city>
 <city>
 <!-- A city in Romania -->
- <_name>Satu Mare</_name>
+ <name>Satu Mare</name>
 <coordinates>47.800000 22.883333</coordinates>
 <location>
 <name>Satu Mare</name>
@@ -18007,7 +18007,7 @@
 </city>
 <city>
 <!-- A city in Romania -->
- <_name>Sibiu</_name>
+ <name>Sibiu</name>
 <coordinates>45.800000 24.150000</coordinates>
 <location>
 <name>Sibiu</name>
@@ -18017,7 +18017,7 @@
 </city>
 <city>
 <!-- A city in Romania -->
- <_name>Suceava</_name>
+ <name>Suceava</name>
 <coordinates>47.633333 26.250000</coordinates>
 <location>
 <name>Suceava / Salcea</name>
@@ -18027,7 +18027,7 @@
 </city>
 <city>
 <!-- A city in Romania -->
- <_name>Timişoara</_name>
+ <name>Timişoara</name>
 <coordinates>45.749444 21.227222</coordinates>
 <location>
 <name>Timişoara</name>
@@ -18037,7 +18037,7 @@
 </city>
 <city>
 <!-- A city in Romania -->
- <_name>Tulcea</_name>
+ <name>Tulcea</name>
 <coordinates>45.166667 28.800000</coordinates>
 <location>
 <name>Tulcea</name>
@@ -18047,7 +18047,7 @@
 </city>
 <city>
 <!-- A city in Romania -->
- <_name>Târgu-Mureş</_name>
+ <name>Târgu-Mureş</name>
 <coordinates>46.550000 24.566667</coordinates>
 <location>
 <name>Târgu-Mureş</name>
@@ -18058,7 +18058,7 @@
 </country>
 <country>
 <!-- RU - Russian Federation -->
- <_name>Russia</_name>
+ <name>Russia</name>
 <!-- Could not find information about the following stations,
 which may be in Russia:
 UESO UHMP UHNN UHSH ULDD ULKK ULOO UMOO UNKL URKM URML USCM
@@ -18078,7 +18078,7 @@
 "Калининградское время". This string is only used in
 places where "Russia" is already clear from context.
 -->
- <_name>Kaliningrad Time</_name>
+ <name>Kaliningrad Time</name>
 </timezone>
 <timezone id="Europe/Moscow">
 <!-- A Russian time zone, used in most of the European part
@@ -18086,7 +18086,7 @@
 "Московское время". This string is only used in places
 where "Russia" is already clear from context.
 -->
- <_name>Moscow Time</_name>
+ <name>Moscow Time</name>
 <obsoletes>Europe/Volgograd</obsoletes>
 </timezone>
 <timezone id="Europe/Samara">
@@ -18096,7 +18096,7 @@
 used in places where "Russia" is already clear from
 context.
 -->
- <_name>Samara Time</_name>
+ <name>Samara Time</name>
 </timezone>
 <timezone id="Asia/Yekaterinburg">
 <!-- A Russian time zone, used along the Ural mountains,
@@ -18104,7 +18104,7 @@
 "Екатеринбургское время". This string is only used in
 places where "Russia" is already clear from context.
 -->
- <_name>Yekaterinburg Time</_name>
+ <name>Yekaterinburg Time</name>
 </timezone>
 <timezone id="Asia/Omsk">
 <!-- A Russian time zone, used in the Omsk oblast
@@ -18113,7 +18113,7 @@
 used in places where "Russia" is already clear from
 context.
 -->
- <_name>Omsk Time</_name>
+ <name>Omsk Time</name>
 </timezone>
 <timezone id="Asia/Novosibirsk">
 <!-- A Russian time zone, used in the Novosibirsk oblast.
@@ -18121,7 +18121,7 @@
 This string is only used in places
 where "Russia" is already clear from context.
 -->
- <_name>Novosibirsk Time</_name>
+ <name>Novosibirsk Time</name>
 </timezone>
 <timezone id="Asia/Krasnoyarsk">
 <!-- A Russian time zone, used in the Krasnoyarsk krai and
@@ -18129,7 +18129,7 @@
 "Красноярское время". This string is only used in places
 where "Russia" is already clear from context.
 -->
- <_name>Krasnoyarsk Time</_name>
+ <name>Krasnoyarsk Time</name>
 </timezone>
 <timezone id="Asia/Irkutsk">
 <!-- A Russian time zone, used in the Irkutsk oblast and
@@ -18137,7 +18137,7 @@
 name is "Иркутское время". This string is only used in
 places where "Russia" is already clear from context.
 -->
- <_name>Irkutsk Time</_name>
+ <name>Irkutsk Time</name>
 </timezone>
 <timezone id="Asia/Yakutsk">
 <!-- A Russian time zone, used in the city of Yakutsk and
@@ -18145,7 +18145,7 @@
 name is "Якутское время". This string is only used in
 places where "Russia" is already clear from context.
 -->
- <_name>Yakutsk Time</_name>
+ <name>Yakutsk Time</name>
 </timezone>
 <timezone id="Asia/Vladivostok">
 <!-- A Russian time zone, used in the city of Vladivostok and
@@ -18153,7 +18153,7 @@
 "Владивостокское время". This string is only used in
 places where "Russia" is already clear from context.
 -->
- <_name>Vladivostok Time</_name>
+ <name>Vladivostok Time</name>
 <obsoletes>Asia/Sakhalin</obsoletes>
 </timezone>
 <timezone id="Asia/Magadan">
@@ -18162,7 +18162,7 @@
 "Магаданское время". This string is only used in places
 where "Russia" is already clear from context.
 -->
- <_name>Magadan Time</_name>
+ <name>Magadan Time</name>
 </timezone>
 <timezone id="Asia/Kamchatka">
 <!-- A Russian time zone, used in the Kamchatka krai and
@@ -18170,7 +18170,7 @@
 is "Камчатское время". This string is only used in
 places where "Russia" is already clear from context.
 -->
- <_name>Kamchatka Time</_name>
+ <name>Kamchatka Time</name>
 <obsoletes>Asia/Anadyr</obsoletes>
 </timezone>
 </timezones>
@@ -18178,7 +18178,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Абакан".
 -->
- <_name>Abakan</_name>
+ <name>Abakan</name>
 <coordinates>53.715556 91.429167</coordinates>
 <location>
 <name>Abakan</name>
@@ -18191,7 +18191,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Адлер".
 -->
- <_name>Adler</_name>
+ <name>Adler</name>
 <coordinates>43.431111 39.923611</coordinates>
 <location>
 <name>Adler</name>
@@ -18204,7 +18204,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Анадырь".
 -->
- <_name>Anadyr'</_name>
+ <name>Anadyr'</name>
 <coordinates>64.750000 177.483333</coordinates>
 <location>
 <name>Anadyr'</name>
@@ -18217,7 +18217,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Анапа".
 -->
- <_name>Anapa</_name>
+ <name>Anapa</name>
 <coordinates>44.894444 37.321667</coordinates>
 <location>
 <name>Anapa / Vitiazevo</name>
@@ -18230,7 +18230,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Архангельск".
 -->
- <_name>Arkhangel'sk</_name>
+ <name>Arkhangel'sk</name>
 <coordinates>64.547222 40.548611</coordinates>
 <location>
 <name>Arhangel'sk</name>
@@ -18243,7 +18243,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Астрахань".
 -->
- <_name>Astrakhan'</_name>
+ <name>Astrakhan'</name>
 <coordinates>46.349444 48.049167</coordinates>
 <location>
 <name>Astrakhan'</name>
@@ -18256,7 +18256,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Барнаул".
 -->
- <_name>Barnaul</_name>
+ <name>Barnaul</name>
 <coordinates>53.360556 83.763611</coordinates>
 <location>
 <name>Barnaul</name>
@@ -18269,7 +18269,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Брацк".
 -->
- <_name>Bratsk</_name>
+ <name>Bratsk</name>
 <coordinates>56.350000 101.916667</coordinates>
 <location>
 <name>Bratsk / Irkutsk</name>
@@ -18282,7 +18282,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Брянск".
 -->
- <_name>Bryansk</_name>
+ <name>Bryansk</name>
 <coordinates>53.287500 34.380556</coordinates>
 <location>
 <name>Bryansk</name>
@@ -18295,7 +18295,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Челябинск".
 -->
- <_name>Chelyabinsk</_name>
+ <name>Chelyabinsk</name>
 <coordinates>55.154444 61.429722</coordinates>
 <location>
 <name>Chelyabinsk-Balandino</name>
@@ -18308,7 +18308,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Чита".
 -->
- <_name>Chita</_name>
+ <name>Chita</name>
 <coordinates>52.031712 113.500867</coordinates>
 <location>
 <name>Chita</name>
@@ -18321,7 +18321,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Чульман".
 -->
- <_name>Chul'man</_name>
+ <name>Chul'man</name>
 <coordinates>56.846944 124.906111</coordinates>
 <location>
 <name>Cul'man</name>
@@ -18334,7 +18334,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Энгельс".
 -->
- <_name>Engel's</_name>
+ <name>Engel's</name>
 <coordinates>51.483889 46.105278</coordinates>
 <location>
 <name>Saratov, Tsentralny Airport</name>
@@ -18347,7 +18347,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Иркуцк".
 -->
- <_name>Irkutsk</_name>
+ <name>Irkutsk</name>
 <coordinates>52.297778 104.296389</coordinates>
 <location>
 <name>Irkutsk</name>
@@ -18360,7 +18360,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Калининград".
 -->
- <_name>Kaliningrad</_name>
+ <name>Kaliningrad</name>
 <coordinates>54.710000 20.500000</coordinates>
 <location>
 <name>Khrabrovo Airport</name>
@@ -18373,7 +18373,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Казань".
 -->
- <_name>Kazan'</_name>
+ <name>Kazan'</name>
 <coordinates>55.750000 49.133333</coordinates>
 <location>
 <name>Kazan'</name>
@@ -18386,7 +18386,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Кемерово".
 -->
- <_name>Kemerovo</_name>
+ <name>Kemerovo</name>
 <coordinates>55.333333 86.083333</coordinates>
 <location>
 <name>Kemerovo</name>
@@ -18399,7 +18399,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Хабаровск".
 -->
- <_name>Khabarovsk</_name>
+ <name>Khabarovsk</name>
 <coordinates>48.480833 135.092778</coordinates>
 <location>
 <name>Habarovsk</name>
@@ -18412,7 +18412,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Ханты-Мансийск".
 -->
- <_name>Khanty-Mansiysk</_name>
+ <name>Khanty-Mansiysk</name>
 <coordinates>61.004167 69.001944</coordinates>
 <location>
 <name>Hanty-Mansijsk</name>
@@ -18424,7 +18424,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Краснодар".
 -->
- <_name>Krasnodar</_name>
+ <name>Krasnodar</name>
 <coordinates>45.032778 38.976944</coordinates>
 <location>
 <name>Krasnodar</name>
@@ -18437,7 +18437,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Красноярск".
 -->
- <_name>Krasnoyarsk</_name>
+ <name>Krasnoyarsk</name>
 <coordinates>56.016667 93.066667</coordinates>
 <location>
 <name>Krasnoyarsk</name>
@@ -18450,7 +18450,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Магадан".
 -->
- <_name>Magadan</_name>
+ <name>Magadan</name>
 <coordinates>59.566667 150.800000</coordinates>
 <location>
 <name>Magadan</name>
@@ -18463,7 +18463,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Минеральные Воды".
 -->
- <_name>Mineral'nyye Vody</_name>
+ <name>Mineral'nyye Vody</name>
 <coordinates>44.210278 43.135278</coordinates>
 <location>
 <name>Mineral'nye Vody</name>
@@ -18476,7 +18476,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Мирный".
 -->
- <_name>Mirnyy</_name>
+ <name>Mirnyy</name>
 <coordinates>62.535278 113.961111</coordinates>
 <location>
 <name>Mirny</name>
@@ -18490,7 +18490,7 @@
 "Moscow" is the traditional English name.
 The local name in Russian is "Moskva / Москва".
 -->
- <_name msgctxt="City in Russia">Moscow</_name>
+  <name msgctxt="City in Russia">Moscow</name>
 <coordinates>55.752222 37.615556</coordinates>
 <location>
 <name>Vnukovo Airport</name>
@@ -18521,7 +18521,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Мурманск".
 -->
- <_name>Murmansk</_name>
+ <name>Murmansk</name>
 <coordinates>68.971667 33.081944</coordinates>
 <location>
 <name>Murmansk</name>
@@ -18534,7 +18534,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Нальчик".
 -->
- <_name>Nal'chik</_name>
+ <name>Nal'chik</name>
 <coordinates>43.498056 43.618889</coordinates>
 <location>
 <name>Nal'chik</name>
@@ -18547,7 +18547,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Нижневартовск".
 -->
- <_name>Nizhnevartovsk</_name>
+ <name>Nizhnevartovsk</name>
 <coordinates>60.933333 76.566667</coordinates>
 <location>
 <name>Nizhnevartovsk</name>
@@ -18560,7 +18560,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Новокузнецк".
 -->
- <_name>Novokuznetsk</_name>
+ <name>Novokuznetsk</name>
 <coordinates>53.750000 87.100000</coordinates>
 <location>
 <name>Novokuznetsk</name>
@@ -18573,7 +18573,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Новосибирск".
 -->
- <_name>Novosibirsk</_name>
+ <name>Novosibirsk</name>
 <coordinates>55.041111 82.934444</coordinates>
 <location>
 <name>Novosibirsk</name>
@@ -18586,7 +18586,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Омск".
 -->
- <_name>Omsk</_name>
+ <name>Omsk</name>
 <coordinates>55.000000 73.400000</coordinates>
 <location>
 <name>Omsk</name>
@@ -18599,7 +18599,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Оренбург".
 -->
- <_name>Orenburg</_name>
+ <name>Orenburg</name>
  <coordinates>51.784722 55.098611</coordinates>
 <location>
 <name>Tsentralny Airport</name>
@@ -18612,7 +18612,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Пенза".
 -->
- <_name>Penza</_name>
+ <name>Penza</name>
 <coordinates>53.195833 45.000000</coordinates>
 <location>
 <name>Penza</name>
@@ -18625,7 +18625,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Пермь".
 -->
- <_name>Perm'</_name>
+ <name>Perm'</name>
 <coordinates>58.000000 56.250000</coordinates>
 <location>
 <name>Bolshoe Savino Airport</name>
@@ -18638,7 +18638,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Петропавловск-Камчатский".
 -->
- <_name>Petropavlovsk</_name>
+ <name>Petropavlovsk</name>
 <coordinates>53.016667 158.650000</coordinates>
 <location>
 <name>Petropavlovsk-Kamchatskij</name>
@@ -18651,7 +18651,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Ростов-на-Дону".
 -->
- <_name>Rostov</_name>
+ <name>Rostov</name>
 <coordinates>47.236389 39.713889</coordinates>
 <location>
 <name>Rostov</name>
@@ -18666,7 +18666,7 @@
 The local name in Russian is "Sankt-Peterburg /
 Санкт-Петербург".
 -->
- <_name>Saint Petersburg</_name>
+ <name>Saint Petersburg</name>
 <coordinates>59.894444 30.264167</coordinates>
 <location>
 <name>St. Peterburg</name>
@@ -18679,7 +18679,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Самара".
 -->
- <_name>Samara</_name>
+ <name>Samara</name>
 <coordinates>53.200000 50.150000</coordinates>
 <location>
 <name>Samara</name>
@@ -18690,7 +18690,7 @@
 </city>
 <city>
 <!-- A city in Russia -->
- <_name>Saratov</_name>
+ <name>Saratov</name>
 <coordinates>51.540556 46.008611</coordinates>
  <location>
 <name>Tsentralny Airport</name>
@@ -18703,7 +18703,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Ставрополь".
 -->
- <_name>Stavropol'</_name>
+ <name>Stavropol'</name>
 <coordinates>45.042778 41.973333</coordinates>
 <location>
 <name>Stavropol' / Mikhaylovsk</name>
@@ -18716,7 +18716,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Стригино".
 -->
- <_name>Strigino</_name>
+ <name>Strigino</name>
 <coordinates>56.202778 43.798611</coordinates>
 <location>
 <name>Nizhny Novgorod, Strigino Airport</name>
@@ -18729,7 +18729,7 @@
 <!-- A city in Russia.
 The local name in Russian is "Сургут".
 -->
- <_name>Surgut</_name>
+ <name>Surgut</name>
 <coordinates>61.250000 73.416667</coordinates>
 <location>
 <name>Surgut</name>
@@ -18740,7 +18740,7 @@
 </city>
 <city>
 <!-- A city in Russia -->
- <_name>Syktyvkar</_name>
+ <name>Syktyvkar</name>
 <coordinates>61.666667 50.812222</coordinates>
 <location>
 <name>Syktyvkar</name>
@@ -18751,7 +18751,7 @@
 </city>
 <city>
 <!-- A city in Russia -->
- <_name>Tiksi</_name>
+ <name>Tiksi</name>
 <coordinates>71.687222 128.869444</coordinates>
 <location>
 <name>Tiksi</name>
@@ -18762,7 +18762,7 @@
 </city>
 <city>
 <!-- A city in Russia -->
- <_name>Tyumen</_name>
+ <name>Tyumen</name>
 <coordinates>57.15 65.533333</coordinates>
 <location>
 <name>Tyumen</name>
@@ -18773,7 +18773,7 @@
 </city>
 <city>
 <!-- A city in Russia -->
- <_name>Udachnyy</_name>
+ <name>Udachnyy</name>
 <coordinates>66.416667 112.400000</coordinates>
 <location>
 <name>Polyarny</name>
@@ -18784,7 +18784,7 @@
 </city>
 <city>
 <!-- A city in Russia -->
- <_name>Ufa</_name>
+ <name>Ufa</name>
 <coordinates>54.775000 56.037500</coordinates>
 <location>
 <name>Ufa</name>
@@ -18795,7 +18795,7 @@
 </city>
 <city>
 <!-- A city in Russia -->
- <_name>Ul'yanovsk</_name>
+ <name>Ul'yanovsk</name>
 <coordinates>54.316944 48.366111</coordinates>
 <location>
 <name>Ul'yanovsk</name>
@@ -18805,7 +18805,7 @@
 </city>
 <city>
 <!-- A city in Russia -->
- <_name>Ulan-Ude</_name>
+ <name>Ulan-Ude</name>
 <coordinates>51.826053 107.609794</coordinates>
 <location>
 <name>Ulan-Ude</name>
@@ -18816,7 +18816,7 @@
 </city>
 <city>
 <!-- A city in Russia -->
- <_name>Velikiye Luki</_name>
+ <name>Velikiye Luki</name>
 <coordinates>56.340000 30.534722</coordinates>
 <location>
 <name>Velikiye Luki</name>
@@ -18827,7 +18827,7 @@
 </city>
 <city>
 <!-- A city in Russia -->
- <_name>Vladivostok</_name>
+ <name>Vladivostok</name>
 <coordinates>43.128056 131.901111</coordinates>
 <location>
 <name>Vladivostok</name>
@@ -18838,7 +18838,7 @@
 </city>
 <city>
 <!-- A city in Russia -->
- <_name>Volgograd</_name>
+ <name>Volgograd</name>
 <coordinates>48.804722 44.585833</coordinates>
 <location>
 <name>Volgograd</name>
@@ -18849,7 +18849,7 @@
 </city>
 <city>
 <!-- A city in Russia -->
- <_name>Voronezh</_name>
+ <name>Voronezh</name>
 <coordinates>51.669905 39.192267</coordinates>
 <location>
 <name>Voronez</name>
@@ -18860,7 +18860,7 @@
 </city>
 <city>
 <!-- A city in Russia -->
- <_name>Yakutsk</_name>
+ <name>Yakutsk</name>
 <coordinates>62.033889 129.733056</coordinates>
 <location>
 <name>Jakutsk</name>
@@ -18871,7 +18871,7 @@
 </city>
 <city>
 <!-- A city in Russia -->
- <_name>Yekaterinburg</_name>
+ <name>Yekaterinburg</name>
 <coordinates>56.857500 60.612500</coordinates>
 <location>
 <name>Yekaterinburg</name>
@@ -18882,7 +18882,7 @@
 </city>
 <city>
 <!-- A city in Russia -->
- <_name>Yuzhno-Sakhalinsk</_name>
+ <name>Yuzhno-Sakhalinsk</name>
 <coordinates>46.958116 142.733665</coordinates>
 <location>
 <name>Yuzhno-Sakhalinsk</name>
@@ -18894,7 +18894,7 @@
 </country>
 <country>
 <!-- SM - San Marino -->
- <_name msgctxt="Country">San Marino</_name>
+ <name msgctxt="Country">San Marino</name>
 <!-- Could not find information about the following stations,
 which may be in San Marino:
 LIBF LIMA 
@@ -18907,7 +18907,7 @@
 <tz-hint>Europe/San_Marino</tz-hint>
 <city>
 <!-- The capital of San Marino -->
- <_name msgctxt="City in San Marino">San Marino</_name>
+ <name msgctxt="City in San Marino">San Marino</name>
 <coordinates>43.933333 12.450000</coordinates>
 <location>
 <name>Rimini</name>
@@ -18918,7 +18918,7 @@
 </country>
 <country>
 <!-- RS - Serbia -->
- <_name>Serbia</_name>
+ <name>Serbia</name>
 <iso-code>RS</iso-code>
 <fips-code>RB</fips-code>
 <timezones>
@@ -18930,7 +18930,7 @@
 "Belgrade" is the traditional English name.
 The local name in Serbian is "Beograd".
 -->
- <_name>Belgrade</_name>
+ <name>Belgrade</name>
 <coordinates>44.818611 20.468056</coordinates>
 <location>
 <name>Belgrade / Surčin</name>
@@ -18940,7 +18940,7 @@
 </city>
 <city>
 <!-- A city in Serbia -->
- <_name>Niš</_name>
+ <name>Niš</name>
 <coordinates>43.324722 21.903333</coordinates>
 <location>
 <name>Niš</name>
@@ -18950,7 +18950,7 @@
 </city>
 <city>
  <!-- A city in Serbia -->
- <_name>Vršac</_name>
+ <name>Vršac</name>
 <coordinates>45.116667 21.303611</coordinates>
 <location>
 <name>Vršac</name>
@@ -18960,7 +18960,7 @@
 </city>
 <city>
 <!-- A city in Serbia -->
- <_name>Zemun</_name>
+ <name>Zemun</name>
 <coordinates>44.843056 20.401111</coordinates>
 <location>
 <name>Beograd / Surcin</name>
@@ -18971,7 +18971,7 @@
 </country>
 <country>
 <!-- SK - Slovakia -->
- <_name>Slovakia</_name>
+ <name>Slovakia</name>
 <iso-code>SK</iso-code>
 <fips-code>LO</fips-code>
 <timezones>
@@ -18980,7 +18980,7 @@
 <tz-hint>Europe/Bratislava</tz-hint>
 <city>
 <!-- The capital of Slovakia -->
- <_name>Bratislava</_name>
+ <name>Bratislava</name>
 <coordinates>48.150000 17.116667</coordinates>
 <location>
 <name>Bratislava Ivanka</name>
@@ -18990,7 +18990,7 @@
 </city>
 <city>
 <!-- A city in Slovakia -->
- <_name>Dolný Hričov</_name>
+ <name>Dolný Hričov</name>
 <coordinates>49.233333 18.633333</coordinates>
 <location>
 <name>Dolný Hričov</name>
@@ -19000,7 +19000,7 @@
 </city>
 <city>
 <!-- A city in Slovakia -->
- <_name>Kamenica nad Cirochou</_name>
+ <name>Kamenica nad Cirochou</name>
 <coordinates>48.933333 22.000000</coordinates>
 <location>
 <name>Kamenica nad Cirochou</name>
@@ -19010,7 +19010,7 @@
 </city>
 <city>
 <!-- A city in Slovakia -->
- <_name>Košice</_name>
+ <name>Košice</name>
 <coordinates>48.716667 21.250000</coordinates>
 <location>
 <name>Košice, Barca</name>
@@ -19020,7 +19020,7 @@
 </city>
 <city>
 <!-- A city in Slovakia -->
- <_name>Lučenec</_name>
+ <name>Lučenec</name>
 <coordinates>48.333333 19.666667</coordinates>
  <location>
 <name>Lučenec</name>
@@ -19030,7 +19030,7 @@
 </city>
 <city>
 <!-- A city in Slovakia -->
- <_name>Nitra</_name>
+ <name>Nitra</name>
 <coordinates>48.316667 18.083333</coordinates>
 <location>
 <name>Nitra</name>
@@ -19040,7 +19040,7 @@
 </city>
 <city>
 <!-- A city in Slovakia -->
- <_name>Piešťany</_name>
+ <name>Piešťany</name>
 <coordinates>48.600000 17.833333</coordinates>
 <location>
 <name>Piešťany</name>
@@ -19050,7 +19050,7 @@
 </city>
 <city>
 <!-- A city in Slovakia -->
- <_name>Poprad</_name>
+ <name>Poprad</name>
 <coordinates>49.050000 20.300000</coordinates>
 <location>
 <name>Poprad-Tatry Airport</name>
@@ -19060,7 +19060,7 @@
 </city>
 <city>
 <!-- A city in Slovakia -->
- <_name>Prievidza</_name>
+ <name>Prievidza</name>
 <coordinates>48.766667 18.633333</coordinates>
 <location>
 <name>Prievidza</name>
@@ -19070,7 +19070,7 @@
 </city>
 <city>
 <!-- A city in Slovakia -->
- <_name>Sliač</_name>
+ <name>Sliač</name>
 <coordinates>48.616667 19.183333</coordinates>
 <location>
 <name>Sliač</name>
@@ -19081,7 +19081,7 @@
 </country>
 <country>
 <!-- SI - Slovenia -->
- <_name>Slovenia</_name>
+ <name>Slovenia</name>
 <!-- Could not find information about the following stations,
 which may be in Slovenia:
 LJCE 
@@ -19094,7 +19094,7 @@
 <tz-hint>Europe/Ljubljana</tz-hint>
 <city>
 <!-- The capital of Slovenia -->
- <_name>Ljubljana</_name>
+ <name>Ljubljana</name>
 <coordinates>46.055278 14.514444</coordinates>
 <location>
 <name>Brnik Airport</name>
@@ -19104,7 +19104,7 @@
 </city>
 <city>
 <!-- A city in Slovenia -->
- <_name>Maribor</_name>
+ <name>Maribor</name>
 <coordinates>46.554722 15.646667</coordinates>
 <location>
 <name>Slivnica Airport</name>
@@ -19114,7 +19114,7 @@
 </city>
 <city>
 <!-- A city in Slovenia -->
- <_name>Portorož</_name>
+ <name>Portorož</name>
 <coordinates>45.516111 13.588333</coordinates>
 <location>
 <name>Portorož</name>
@@ -19125,7 +19125,7 @@
 </country>
 <country>
 <!-- ES - Spain -->
- <_name>Spain</_name>
+ <name>Spain</name>
 <!-- Could not find information about the following stations,
 which may be in Spain:
 LEBR 
@@ -19138,26 +19138,26 @@
 string is only used in places where "Spain" is already
 clear from context.
 -->
- <_name>Canary Islands</_name>
+ <name>Canary Islands</name>
 </timezone>
 <timezone id="Europe/Madrid">
 <!-- This refers to the time zone for mainland Spain (as
 opposed to the time zone for the Canary Islands).
 -->
- <_name>Mainland Spain</_name>
+ <name>Mainland Spain</name>
 </timezone>
 <timezone id="Africa/Ceuta">
 <!-- The time zone for the Spanish cities of Ceuta and
 Melilla, on the coast of Africa. The string is only used
 in places where "Spain" is already clear from context.
 -->
- <_name>Ceuta and Melilla</_name>
+ <name>Ceuta and Melilla</name>
 </timezone>
 </timezones>
 <tz-hint>Europe/Madrid</tz-hint>
 <city>
 <!-- A city in Spain -->
- <_name>A Coruña</_name>
+ <name>A Coruña</name>
 <coordinates>43.366667 -8.383333</coordinates>
 <location>
 <name>A Coruña Airport, Alvedro</name>
@@ -19167,7 +19167,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Agoncillo</_name>
+ <name>Agoncillo</name>
 <coordinates>42.450000 -2.283333</coordinates>
 <location>
 <name>Logrono Airport</name>
@@ -19177,7 +19177,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Alcantarilla</_name>
+ <name>Alcantarilla</name>
 <coordinates>37.966667 -1.216667</coordinates>
 <location>
 <name>Murcia Airport</name>
@@ -19187,7 +19187,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Alicante</_name>
+ <name>Alicante</name>
 <coordinates>38.350000 -0.483333</coordinates>
 <location>
 <name>Alicante Airport, El Altet</name>
@@ -19197,7 +19197,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Almería</_name>
+ <name>Almería</name>
 <coordinates>36.833333 -2.450000</coordinates>
 <location>
 <name>Almería Airport</name>
@@ -19207,7 +19207,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Armilla</_name>
+ <name>Armilla</name>
 <coordinates>37.150000 -3.616667</coordinates>
 <location>
 <name>Granada Airport</name>
@@ -19217,7 +19217,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Atogo</_name>
+ <name>Atogo</name>
 <coordinates>28.050000 -16.583333</coordinates>
 <location>
 <name>Tenerife Sur</name>
@@ -19228,7 +19228,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Avilés</_name>
+ <name>Avilés</name>
 <coordinates>43.556944 -5.924722</coordinates>
 <location>
 <name>Asturias Airport</name>
@@ -19238,7 +19238,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Barajas</_name>
+ <name>Barajas</name>
 <coordinates>40.483333 -3.583333</coordinates>
 <location>
 <name>Madrid Airport</name>
@@ -19248,7 +19248,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name msgctxt="City in Spain">Barcelona</_name>
+ <name msgctxt="City in Spain">Barcelona</name>
 <coordinates>41.383333 2.183333</coordinates>
 <location>
 <name>Barcelona Airport</name>
@@ -19258,7 +19258,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Bilbao</_name>
+ <name>Bilbao</name>
 <coordinates>43.250000 -2.966667</coordinates>
 <location>
 <name>Bilbao Airport, Sondica</name>
@@ -19268,7 +19268,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Colmenar Viejo</_name>
+ <name>Colmenar Viejo</name>
 <coordinates>40.666667 -3.766667</coordinates>
 <location>
 <name>Madri-Colmenar</name>
@@ -19278,7 +19278,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Corcovados</_name>
+ <name>Corcovados</name>
 <coordinates>28.616667 -17.750000</coordinates>
 <location>
 <name>La Palma Airport</name>
@@ -19289,7 +19289,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Cuatro Vientos</_name>
+ <name>Cuatro Vientos</name>
 <coordinates>40.383333 -3.783333</coordinates>
 <location>
 <name>Madrid Airport</name>
@@ -19299,7 +19299,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name msgctxt="City in Spain">Córdoba</_name>
+ <name msgctxt="City in Spain">Córdoba</name>
 <coordinates>37.883333 -4.766667</coordinates>
 <location>
 <name>Córdoba Airport</name>
@@ -19309,7 +19309,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>El Matorral</_name>
+ <name>El Matorral</name>
 <coordinates>28.433333 -13.866667</coordinates>
 <location>
 <name>Fuerteventura Airport</name>
@@ -19320,7 +19320,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Fuenterrabía</_name>
+ <name>Fuenterrabía</name>
 <coordinates>43.366667 -1.783333</coordinates>
 <location>
 <name>San Sebastian Airport</name>
@@ -19330,7 +19330,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Gando</_name>
+ <name>Gando</name>
 <coordinates>27.950000 -15.366667</coordinates>
 <location>
 <name>Gran Canaria - Canary Islands</name>
@@ -19341,7 +19341,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Gerona</_name>
+ <name>Gerona</name>
 <coordinates>41.983333 2.816667</coordinates>
 <location>
 <name>Gerona Airport, Costa Brava</name>
@@ -19351,7 +19351,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Getafe</_name>
+ <name>Getafe</name>
 <coordinates>40.300000 -3.716667</coordinates>
 <location>
 <name>Madrid Airport</name>
@@ -19361,7 +19361,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Granada</_name>
+ <name>Granada</name>
 <coordinates>37.183333 -3.600000</coordinates>
 <location>
 <name>Granada Airport</name>
@@ -19371,7 +19371,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Güime</_name>
+ <name>Güime</name>
 <coordinates>28.966667 -13.600000</coordinates>
 <location>
 <name>Lanzarote Airport</name>
@@ -19382,7 +19382,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Ibiza</_name>
+ <name>Ibiza</name>
 <coordinates>38.900000 1.433333</coordinates>
 <location>
 <name>Ibiza Airport, Es Codola</name>
@@ -19392,7 +19392,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Jerez</_name>
+ <name>Jerez</name>
 <coordinates>36.683333 -6.133333</coordinates>
 <location>
 <name>Jerez Airport</name>
@@ -19402,7 +19402,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name msgctxt="City in Spain">León</_name>
+ <name msgctxt="City in Spain">León</name>
 <coordinates>42.600000 -5.566667</coordinates>
 <location>
 <name>León Airport, Virgen del Camino</name>
@@ -19412,7 +19412,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Lleida</_name>
+ <name>Lleida</name>
 <coordinates>41.727778 0.535833</coordinates>
 <location>
 <name>Lleida–Alguaire Airport</name>
@@ -19422,7 +19422,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Los Baldíos</_name>
+ <name>Los Baldíos</name>
 <coordinates>28.466667 -16.316667</coordinates>
 <location>
 <name>Tenerife / Los Rodeos</name>
@@ -19433,7 +19433,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Los Llanos</_name>
+ <name>Los Llanos</name>
 <coordinates>38.916667 -1.850000</coordinates>
 <location>
 <name>Albacete Airport</name>
@@ -19443,7 +19443,7 @@
 </city>
 <city>
 <!-- The capital of Spain -->
- <_name>Madrid</_name>
+ <name>Madrid</name>
 <coordinates>40.400000 -3.683333</coordinates>
 <location>
 <name>Madrid Airport, Cuatro Vientos</name>
@@ -19453,7 +19453,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Mahón</_name>
+ <name>Mahón</name>
 <coordinates>39.883333 4.250000</coordinates>
 <location>
 <name>Menorca Airport</name>
@@ -19463,7 +19463,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Melilla</_name>
+ <name>Melilla</name>
 <coordinates>35.316667 -2.950000</coordinates>
 <location>
 <name>Melilla</name>
@@ -19473,7 +19473,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Morón</_name>
+ <name>Morón</name>
 <coordinates>37.133333 -5.450000</coordinates>
 <location>
 <name>Morón</name>
@@ -19483,7 +19483,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Málaga</_name>
+ <name>Málaga</name>
 <coordinates>36.716667 -4.416667</coordinates>
 <location>
 <name>Málaga Airport</name>
@@ -19493,7 +19493,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Noáin</_name>
+ <name>Noáin</name>
 <coordinates>42.750000 -1.633333</coordinates>
 <location>
 <name>Pamplona Airport</name>
@@ -19503,7 +19503,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Palma</_name>
+ <name>Palma</name>
 <coordinates>39.566667 2.650000</coordinates>
 <location>
 <name>Palma Airport, Son San Juan</name>
@@ -19513,7 +19513,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Reus</_name>
+ <name>Reus</name>
 <coordinates>41.150000 1.116667</coordinates>
 <location>
 <name>Reus Airport</name>
@@ -19523,7 +19523,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Rota</_name>
+ <name>Rota</name>
 <coordinates>36.616667 -6.350000</coordinates>
 <location>
 <name>Rota</name>
@@ -19533,7 +19533,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Sabadell</_name>
+ <name>Sabadell</name>
 <coordinates>41.550000 2.100000</coordinates>
 <location>
 <name>Sabadell</name>
@@ -19543,7 +19543,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Salamanca</_name>
+ <name>Salamanca</name>
 <coordinates>40.966667 -5.650000</coordinates>
 <location>
 <name>Salamanca Airport, Matacan</name>
@@ -19553,7 +19553,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>San Javier</_name>
+ <name>San Javier</name>
 <coordinates>37.800000 -0.850000</coordinates>
 <location>
  <name>Murcia Airport</name>
@@ -19563,7 +19563,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>San Pablo</_name>
+ <name>San Pablo</name>
 <coordinates>37.416667 -5.883333</coordinates>
 <location>
 <name>Sevilla Airport</name>
@@ -19573,7 +19573,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Santander</_name>
+ <name>Santander</name>
 <coordinates>43.464722 -3.804444</coordinates>
 <location>
 <name>Santander Airport, Parayas</name>
@@ -19583,7 +19583,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name msgctxt="City in Spain">Santiago</_name>
+ <name msgctxt="City in Spain">Santiago</name>
 <coordinates>42.883333 -8.550000</coordinates>
 <location>
 <name>Santiago Airport, Labacolla</name>
@@ -19593,7 +19593,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Talavera la Real</_name>
+ <name>Talavera la Real</name>
 <coordinates>38.883333 -6.766667</coordinates>
 <location>
 <name>Badajoz Airport</name>
@@ -19603,7 +19603,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Tamaduste</_name>
+ <name>Tamaduste</name>
 <coordinates>27.816667 -17.883333</coordinates>
 <location>
 <name>Hierro Airport</name>
@@ -19614,7 +19614,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Torrejón del Rey</_name>
+ <name>Torrejón del Rey</name>
 <coordinates>40.650000 -3.333333</coordinates>
 <location>
 <name>Madrid Airport</name>
@@ -19624,7 +19624,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name msgctxt="City in Spain">Valencia</_name>
+ <name msgctxt="City in Spain">Valencia</name>
 <coordinates>39.466667 -0.366667</coordinates>
 <location>
 <name>Valencia Airport</name>
@@ -19634,7 +19634,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Vigo</_name>
+ <name>Vigo</name>
 <coordinates>42.233333 -8.716667</coordinates>
 <location>
 <name>Vigo Airport, Peinador</name>
@@ -19644,7 +19644,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Villanubla</_name>
+ <name>Villanubla</name>
 <coordinates>41.700000 -4.833333</coordinates>
 <location>
 <name>Valladolid Airport</name>
@@ -19654,7 +19654,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Vitoria-Gasteiz</_name>
+ <name>Vitoria-Gasteiz</name>
 <coordinates>42.850000 -2.666667</coordinates>
 <location>
 <name>Vitoria-Gasteiz</name>
@@ -19664,7 +19664,7 @@
 </city>
 <city>
 <!-- A city in Spain -->
- <_name>Zaragoza</_name>
+ <name>Zaragoza</name>
 <coordinates>41.633333 -0.883333</coordinates>
 <location>
 <name>Zaragoza Airport</name>
@@ -19678,7 +19678,7 @@
 Arctic Ocean which is a part of Norway with unusual status
 internationally.
 -->
- <_name>Svalbard and Jan Mayen</_name>
+ <name>Svalbard and Jan Mayen</name>
 <!-- Could not find information about the following stations,
 which may be in Svalbard and Jan Mayen:
 ENDR ENEK ENGC ENHE ENSL 
@@ -19691,7 +19691,7 @@
 <tz-hint>Arctic/Longyearbyen</tz-hint>
 <city>
 <!-- The capital of Svalbard and Jan Mayen -->
- <_name>Longyearbyen</_name>
+ <name>Longyearbyen</name>
 <coordinates>78.216667 15.633333</coordinates>
 <location>
 <name>Svalbard Airport</name>
@@ -19702,7 +19702,7 @@
 </country>
 <country>
 <!-- SE - Sweden -->
- <_name>Sweden</_name>
+ <name>Sweden</name>
 <!-- Could not find information about the following stations,
 which may be in Sweden:
 ESGL ESNZ ESUD ESUT 
@@ -19715,7 +19715,7 @@
 <tz-hint>Europe/Stockholm</tz-hint>
 <city>
 <!-- A city in Sweden -->
- <_name>Borlänge</_name>
+ <name>Borlänge</name>
 <coordinates>60.483333 15.416667</coordinates>
 <location>
 <name>Borlänge</name>
@@ -19725,7 +19725,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Gällivare</_name>
+ <name>Gällivare</name>
 <coordinates>67.133333 20.700000</coordinates>
 <location>
 <name>Gällivare</name>
@@ -19735,7 +19735,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Göteborg</_name>
+ <name>Göteborg</name>
 <coordinates>57.716667 11.966667</coordinates>
 <location>
 <name>Göteborg-Save Airport</name>
@@ -19750,7 +19750,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Halmstad</_name>
+ <name>Halmstad</name>
 <coordinates>56.671389 12.855556</coordinates>
 <location>
 <name>Halmstad Swedish Air Force Base</name>
@@ -19760,7 +19760,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Jönköping</_name>
+ <name>Jönköping</name>
 <coordinates>57.783333 14.183333</coordinates>
 <location>
 <name>Jönköping Airport</name>
@@ -19770,7 +19770,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Kalmar</_name>
+ <name>Kalmar</name>
 <coordinates>56.666667 16.366667</coordinates>
 <location>
 <name>Kalmar</name>
@@ -19780,7 +19780,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Karlstad</_name>
+ <name>Karlstad</name>
 <coordinates>59.366667 13.500000</coordinates>
 <location>
 <name>Karlstad</name>
@@ -19790,7 +19790,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Kiruna</_name>
+ <name>Kiruna</name>
 <coordinates>67.850000 20.216667</coordinates>
 <location>
 <name>Kiruna Airport</name>
@@ -19800,7 +19800,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Kramfors</_name>
+ <name>Kramfors</name>
 <coordinates>62.933333 17.792500</coordinates>
 <location>
 <name>Kramfors Airport</name>
@@ -19810,7 +19810,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Kristianstad</_name>
+ <name>Kristianstad</name>
 <coordinates>56.033333 14.133333</coordinates>
 <location>
 <name>Kristianstad-Everod Airport</name>
@@ -19820,7 +19820,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Linköping</_name>
+ <name>Linköping</name>
 <coordinates>58.416667 15.616667</coordinates>
 <location>
 <name>Linköping-Saab Airport</name>
@@ -19830,7 +19830,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Ljungbyhed</_name>
+ <name>Ljungbyhed</name>
 <coordinates>56.066667 13.216667</coordinates>
 <location>
 <name>Ljungbyhed</name>
@@ -19840,7 +19840,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Luleå</_name>
+ <name>Luleå</name>
 <coordinates>65.583333 22.150000</coordinates>
 <location>
 <name>Luleå-Kallax Airport</name>
@@ -19850,7 +19850,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Lycksele</_name>
+ <name>Lycksele</name>
 <coordinates>64.600000 18.666667</coordinates>
 <location>
 <name>Lycksele</name>
@@ -19860,7 +19860,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Malmö</_name>
+ <name>Malmö</name>
 <coordinates>55.600000 13.000000</coordinates>
 <location>
 <name>Malmö-Sturup Airport</name>
@@ -19870,7 +19870,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Norrköping</_name>
+ <name>Norrköping</name>
 <coordinates>58.600000 16.183333</coordinates>
 <location>
 <name>Norrköping</name>
@@ -19880,7 +19880,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Nyköping</_name>
+ <name>Nyköping</name>
 <coordinates>58.750000 17.000000</coordinates>
 <location>
 <name>Stockholm, Stockholm-Skavsta Airport</name>
@@ -19890,7 +19890,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Ronneby</_name>
+ <name>Ronneby</name>
 <coordinates>56.200000 15.300000</coordinates>
 <location>
 <name>Ronneby</name>
@@ -19900,7 +19900,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Skellefteå</_name>
+ <name>Skellefteå</name>
 <coordinates>64.766667 20.950000</coordinates>
 <location>
 <name>Skellefteå Airport</name>
@@ -19910,7 +19910,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Skövde</_name>
+ <name>Skövde</name>
 <coordinates>58.400000 13.850000</coordinates>
 <location>
 <name>Skövde Airport</name>
@@ -19920,7 +19920,7 @@
 </city>
 <city>
 <!-- The capital of Sweden -->
- <_name>Stockholm</_name>
+ <name>Stockholm</name>
 <coordinates>59.333333 18.050000</coordinates>
 <location>
 <name>Stockholm-Bromma Airport</name>
@@ -19935,7 +19935,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Sundsvall</_name>
+ <name>Sundsvall</name>
 <coordinates>62.383333 17.300000</coordinates>
 <location>
 <name>Sundsvall-Harnosand Airport</name>
@@ -19945,7 +19945,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Söderhamn</_name>
+ <name>Söderhamn</name>
 <coordinates>61.300000 17.050000</coordinates>
 <location>
 <name>Söderhamn</name>
@@ -19955,7 +19955,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Umeå</_name>
+ <name>Umeå</name>
 <coordinates>63.833333 20.250000</coordinates>
 <location>
 <name>Umeå Airport</name>
@@ -19965,7 +19965,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Visby</_name>
+ <name>Visby</name>
 <coordinates>57.633333 18.300000</coordinates>
 <location>
 <name>Visby Airport</name>
@@ -19975,7 +19975,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Västerås</_name>
+ <name>Västerås</name>
 <coordinates>59.616667 16.550000</coordinates>
 <location>
 <name>Västerås-Hasslo Airport</name>
@@ -19985,7 +19985,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Växjö</_name>
+ <name>Växjö</name>
 <coordinates>56.883333 14.816667</coordinates>
 <location>
 <name>Växjö</name>
@@ -19995,7 +19995,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Ängelholm</_name>
+ <name>Ängelholm</name>
 <coordinates>56.250000 12.866667</coordinates>
 <location>
 <name>Ängelholm</name>
@@ -20005,7 +20005,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Örebro</_name>
+ <name>Örebro</name>
 <coordinates>59.283333 15.216667</coordinates>
 <location>
 <name>Orebro Private</name>
@@ -20015,7 +20015,7 @@
 </city>
 <city>
 <!-- A city in Sweden -->
- <_name>Örnsköldsvik</_name>
+ <name>Örnsköldsvik</name>
 <coordinates>63.300000 18.716667</coordinates>
 <location>
 <name>Örnsköldsvik Airport</name>
@@ -20026,7 +20026,7 @@
 </country>
 <country>
 <!-- CH - Switzerland -->
- <_name>Switzerland</_name>
+ <name>Switzerland</name>
 <iso-code>CH</iso-code>
 <fips-code>SZ</fips-code>
 <timezones>
@@ -20035,7 +20035,7 @@
 <tz-hint>Europe/Zurich</tz-hint>
 <city>
 <!-- The capital of Switzerland -->
- <_name>Bern</_name>
+ <name>Bern</name>
 <coordinates>46.916667 7.466667</coordinates>
 <location>
 <name>Bern-Belp Airport</name>
@@ -20045,7 +20045,7 @@
 </city>
 <city>
 <!-- A city in Switzerland -->
- <_name>Basel</_name>
+ <name>Basel</name>
 <coordinates>47.583333 7.516667</coordinates>
 <location>
 <name>Bale-Mulhouse</name>
@@ -20058,7 +20058,7 @@
 "Geneva" is the traditional English name.
 The local name is "Genève".
 -->
- <_name>Geneva</_name>
+ <name>Geneva</name>
 <coordinates>46.200000 6.166667</coordinates>
 <location>
 <name>Geneve-Cointrin</name>
@@ -20068,7 +20068,7 @@
 </city>
 <city>
 <!-- A city in Switzerland -->
- <_name>Grenchen</_name>
+ <name>Grenchen</name>
 <coordinates>47.183333 7.383333</coordinates>
 <location>
 <name>Grenchen</name>
@@ -20078,7 +20078,7 @@
 </city>
 <city>
 <!-- A city in Switzerland -->
- <_name>Lugano</_name>
+ <name>Lugano</name>
 <coordinates>46.000000 8.966667</coordinates>
 <location>
 <name>Lugano</name>
@@ -20088,7 +20088,7 @@
 </city>
 <city>
 <!-- A city in Switzerland -->
- <_name>Neuchâtel</_name>
+ <name>Neuchâtel</name>
 <coordinates>47.000000 6.966667</coordinates>
 <location>
 <name>Les Eplatures</name>
@@ -20098,7 +20098,7 @@
 </city>
 <city>
 <!-- A city in Switzerland -->
- <_name>Sankt Gallen</_name>
+ <name>Sankt Gallen</name>
 <coordinates>47.466667 9.400000</coordinates>
 <location>
 <name>Saint Gallen-Altenrhein</name>
@@ -20108,7 +20108,7 @@
 </city>
 <city>
 <!-- A city in Switzerland -->
-	<_name>St. Moritz</_name>
+	<name>St. Moritz</name>
 <coordinates>46.5 9.833333</coordinates>
 <location>
 <name>Samedan</name>
@@ -20118,7 +20118,7 @@
 </city>
 <city>
 <!-- A city in Switzerland -->
- <_name>Sion</_name>
+ <name>Sion</name>
 <coordinates>46.233333 7.350000</coordinates>
 <location>
 <name>Sion</name>
@@ -20128,7 +20128,7 @@
 </city>
 <city>
 <!-- A city in Switzerland -->
- <_name>Zürich</_name>
+ <name>Zürich</name>
 <coordinates>47.366667 8.550000</coordinates>
 <location>
 <name>Zurich-Kloten</name>
@@ -20139,7 +20139,7 @@
 </country>
 <country>
 <!-- TR - Turkey -->
- <_name>Turkey</_name>
+ <name>Turkey</name>
 <!-- Could not find weather stations for the following major
 cities:
 Batman, Kiziltepe
@@ -20152,7 +20152,7 @@
 <tz-hint>Europe/Istanbul</tz-hint>
 <city>
 <!-- A city in Turkey -->
- <_name>Adana</_name>
+ <name>Adana</name>
 <coordinates>37.001667 35.328889</coordinates>
 <location>
 <name>Adana-Sakirpasa Airport</name>
@@ -20167,7 +20167,7 @@
 </city>
 <city>
 <!-- The capital of Turkey -->
- <_name>Ankara</_name>
+ <name>Ankara</name>
 <coordinates>40.116667 32.983333</coordinates>
 <location>
 <name>Ankara-Guvercin Lik Airport</name>
@@ -20187,7 +20187,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Antalya</_name>
+ <name>Antalya</name>
 <coordinates>36.912500 30.689722</coordinates>
 <location>
 <name>Antalya</name>
@@ -20197,7 +20197,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Balikesir</_name>
+ <name>Balikesir</name>
 <coordinates>39.649167 27.886111</coordinates>
 <location>
 <name>Balikesir</name>
@@ -20207,7 +20207,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Bandirma</_name>
+ <name>Bandirma</name>
 <coordinates>40.352222 27.976667</coordinates>
 <location>
 <name>Bandirma</name>
@@ -20217,7 +20217,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Bodrum</_name>
+ <name>Bodrum</name>
 <coordinates>37.038333 27.429167</coordinates>
 <location>
 <name>Bodrum Milas Airport</name>
@@ -20227,7 +20227,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Burdur</_name>
+ <name>Burdur</name>
 <coordinates>37.720278 30.290833</coordinates>
 <location>
 <name>Suleyman Demirel</name>
@@ -20237,7 +20237,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Bursa</_name>
+ <name>Bursa</name>
 <coordinates>40.191667 29.061111</coordinates>
 <location>
 <name>Bursa-Yenisehir, Mil-Civ Airport</name>
@@ -20247,7 +20247,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Corlu</_name>
+ <name>Corlu</name>
 <coordinates>41.159167 27.800000</coordinates>
 <location>
 <name>Corlu</name>
@@ -20257,7 +20257,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Dalaman</_name>
+ <name>Dalaman</name>
 <coordinates>36.765000 28.804167</coordinates>
 <location>
 <name>Dalaman</name>
@@ -20267,7 +20267,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Diyarbakir</_name>
+ <name>Diyarbakir</name>
 <coordinates>37.915833 40.218889</coordinates>
 <location>
 <name>Diyarbakir</name>
@@ -20277,7 +20277,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Erzurum</_name>
+ <name>Erzurum</name>
 <coordinates>39.908611 41.276944</coordinates>
 <location>
 <name>Erzurum</name>
@@ -20287,7 +20287,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Eskisehir</_name>
+ <name>Eskisehir</name>
 <coordinates>39.776667 30.520556</coordinates>
 <location>
 <name>Eskisehir</name>
@@ -20297,7 +20297,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Gaziantep</_name>
+ <name>Gaziantep</name>
 <coordinates>37.059444 37.382500</coordinates>
 <location>
 <name>Gaziantep</name>
@@ -20307,7 +20307,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Istanbul</_name>
+ <name>Istanbul</name>
 <coordinates>41.018611 28.964722</coordinates>
 <location>
 <name>Istanbul-Ataturk Airport</name>
@@ -20322,7 +20322,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Izmir</_name>
+ <name>Izmir</name>
 <coordinates>38.410375 27.142010</coordinates>
 <location>
 <name>Izmir-Cigli Airport</name>
@@ -20337,7 +20337,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Kars</_name>
+ <name>Kars</name>
 <coordinates>40.608056 43.097500</coordinates>
 <location>
 <name>Kars</name>
@@ -20347,7 +20347,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Kayseri</_name>
+ <name>Kayseri</name>
 <coordinates>38.732222 35.485278</coordinates>
 <location>
 <name>Kayseri-Erkilet Airport</name>
@@ -20357,7 +20357,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Kislakoy</_name>
+ <name>Kislakoy</name>
 <coordinates>40.099082 32.602115</coordinates>
 <location>
 <name>Murted Air Force Base</name>
@@ -20367,7 +20367,7 @@
 </city>
  <city>
 <!-- A city in Turkey -->
- <_name>Konya</_name>
+ <name>Konya</name>
 <coordinates>37.865556 32.482500</coordinates>
 <location>
 <name>Konya</name>
@@ -20377,7 +20377,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Malatya</_name>
+ <name>Malatya</name>
 <coordinates>38.353333 38.311944</coordinates>
 <location>
 <name>Malatya-Erhac Airport</name>
@@ -20387,7 +20387,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Merzifon</_name>
+ <name>Merzifon</name>
 <coordinates>40.873333 35.463056</coordinates>
 <location>
 <name>Merzifon</name>
@@ -20397,7 +20397,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Nevsehir</_name>
+ <name>Nevsehir</name>
 <coordinates>38.625000 34.712222</coordinates>
 <location>
 <name>Nevsehir</name>
@@ -20407,7 +20407,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Samsun</_name>
+ <name>Samsun</name>
 <coordinates>41.286667 36.330000</coordinates>
 <location>
 <name>Samsun-Carsamba Airport</name>
@@ -20417,7 +20417,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Tepetarla</_name>
+ <name>Tepetarla</name>
 <coordinates>40.750000 30.066667</coordinates>
 <location>
 <name>Topel Air Force Base</name>
@@ -20427,7 +20427,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Trabzon</_name>
+ <name>Trabzon</name>
 <coordinates>41.005000 39.726944</coordinates>
 <location>
 <name>Trabzon</name>
@@ -20437,7 +20437,7 @@
 </city>
 <city>
 <!-- A city in Turkey -->
- <_name>Van</_name>
+ <name>Van</name>
 <coordinates>38.494167 43.380000</coordinates>
 <location>
 <name>Van</name>
@@ -20448,7 +20448,7 @@
 </country>
 <country>
 <!-- UA - Ukraine -->
- <_name>Ukraine</_name>
+ <name>Ukraine</name>
 <!-- Could not find information about the following stations,
 which may be in Ukraine:
 UKCM UKCW 
@@ -20465,7 +20465,7 @@
 <tz-hint>Europe/Kiev</tz-hint>
 <city>
 <!-- A city in Ukraine -->
- <_name>Boryspil'</_name>
+ <name>Boryspil'</name>
 <coordinates>50.350000 30.950000</coordinates>
 <location>
 <name>Boryspil'</name>
@@ -20475,7 +20475,7 @@
 </city>
 <city>
 <!-- A city in Ukraine -->
- <_name>Chagor</_name>
+ <name>Chagor</name>
 <coordinates>48.250000 25.983333</coordinates>
 <location>
 <name>Chernovsty</name>
@@ -20485,7 +20485,7 @@
 </city>
 <city>
 <!-- A city in Ukraine -->
- <_name>Dnipropetrovs'k</_name>
+ <name>Dnipropetrovs'k</name>
 <coordinates>48.450000 34.983333</coordinates>
 <location>
 <name>Dnipropetrovs'k</name>
@@ -20495,7 +20495,7 @@
 </city>
 <city>
 <!-- A city in Ukraine -->
- <_name>Donets'k</_name>
+ <name>Donets'k</name>
 <coordinates>48.000000 37.800000</coordinates>
 <location>
 <name>Donets'k</name>
@@ -20505,7 +20505,7 @@
 </city>
 <city>
 <!-- A city in Ukraine -->
- <_name>Hostomel'</_name>
+ <name>Hostomel'</name>
 <coordinates>50.583333 30.266667</coordinates>
 <location>
 <name>Hostomel'</name>
@@ -20515,7 +20515,7 @@
 </city>
 <city>
 <!-- A city in Ukraine -->
- <_name>Ivano-Frankivs'k</_name>
+ <name>Ivano-Frankivs'k</name>
 <coordinates>48.917222 24.707222</coordinates>
 <location>
 <name>Ivano-Frankivs'k</name>
@@ -20525,7 +20525,7 @@
 </city>
 <city>
 <!-- A city in Ukraine -->
- <_name>Kharkiv</_name>
+ <name>Kharkiv</name>
 <coordinates>50.000000 36.250000</coordinates>
 <location>
 <name>Kharkiv</name>
@@ -20538,7 +20538,7 @@
 "Kiev" is the traditional English name.
 The local name in Ukrainian is "Kyyiv".
 -->
- <_name>Kiev</_name>
+ <name>Kiev</name>
 <coordinates>50.433333 30.516667</coordinates>
 <location>
 <name>Kyiv</name>
@@ -20548,7 +20548,7 @@
 </city>
 <city>
 <!-- A city in Ukraine -->
- <_name>Kryvyy Rih</_name>
+ <name>Kryvyy Rih</name>
 <coordinates>47.916667 33.350000</coordinates>
 <location>
 <name>Kryvyy Rih / Dnipropetrovs'k</name>
@@ -20558,7 +20558,7 @@
 </city>
 <city>
 <!-- A city in Ukraine -->
- <_name>L'viv</_name>
+ <name>L'viv</name>
 <coordinates>49.833333 24.000000</coordinates>
 <location>
 <name>L'viv</name>
@@ -20568,7 +20568,7 @@
 </city>
 <city>
 <!-- A city in Ukraine -->
- <_name>Mokroye</_name>
+ <name>Mokroye</name>
 <coordinates>47.816667 35.250000</coordinates>
 <location>
 <name>Zaporizhzhia / Mokroye</name>
@@ -20578,7 +20578,7 @@
 </city>
 <city>
 <!-- A city in Ukraine -->
- <_name>Mykolayiv</_name>
+ <name>Mykolayiv</name>
 <coordinates>46.966667 32.000000</coordinates>
 <location>
 <name>Mykolaiv</name>
@@ -20588,7 +20588,7 @@
 </city>
 <city>
 <!-- A city in Ukraine -->
- <_name>Odesa</_name>
+ <name>Odesa</name>
 <coordinates>46.466667 30.733333</coordinates>
 <location>
 <name>Odesa</name>
@@ -20598,7 +20598,7 @@
 </city>
 <city>
 <!-- A city in Ukraine -->
- <_name>Rivne</_name>
+ <name>Rivne</name>
 <coordinates>50.616667 26.250000</coordinates>
 <location>
 <name>Rivne</name>
@@ -20608,7 +20608,7 @@
 </city>
 <city>
 <!-- A city in Ukraine -->
- <_name>Simferopol'</_name>
+ <name>Simferopol'</name>
 <coordinates>44.950000 34.100000</coordinates>
 <location>
 <name>Simferopol'</name>
@@ -20618,7 +20618,7 @@
 </city>
 <city>
 <!-- A city in Ukraine -->
- <_name>Telichka</_name>
+ <name>Telichka</name>
 <coordinates>50.400000 30.566667</coordinates>
 <location>
 <name>Kyiv</name>
@@ -20628,7 +20628,7 @@
 </city>
 <city>
 <!-- A city in Ukraine -->
- <_name>Uzhhorod</_name>
+ <name>Uzhhorod</name>
 <coordinates>48.616667 22.300000</coordinates>
 <location>
 <name>Uzhhorod</name>
@@ -20639,7 +20639,7 @@
 </country>
 <country>
 <!-- GB - United Kingdom -->
- <_name>United Kingdom</_name>
+ <name>United Kingdom</name>
 <iso-code>GB</iso-code>
 <fips-code>UK</fips-code>
 <timezones>
@@ -20647,13 +20647,13 @@
 <!-- The time zone in the UK (GMT in the winter, and British
 Summer Time in the summer.)
 -->
- <_name>GMT/BST</_name>
+ <name>GMT/BST</name>
 </timezone>
 </timezones>
 <tz-hint>Europe/London</tz-hint>
 <state>
 <!-- A state/province/territory in United Kingdom -->
- <_name>East and South East England</_name>
+ <name>East and South East England</name>
 <fips-code>UKA5|UKC3|UKE4|UKF8|UKI1|UKI5|UKI9|UKK3|UKM5|UKN5|UKO3</fips-code>
 <fips-code>UKB3|UKB6|UKB9|UKE2|UKF2|UKG2|UKG5|UKI3|UKI6|UKK2|UKK6|UKK7|UKM1|UKM4|UKP4|UKP6|UKP9|UKQ2</fips-code>
 <fips-code>UKA1|UKA2|UKA6|UKB5|UKB8|UKC4|UKC8|UKD9|UKE3|UKE7|UKE8|UKF1|UKF3|UKF4|UKF6|UKF9|UKG1|UKG3|UKG4|UKG7|UKH1|UKH6|UKH9|UKI4|UKI8|UKK8|UKL1|UKM8|UKN8|UKO5|UKO9|UKP1|UKP5</fips-code>
@@ -20661,7 +20661,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name msgctxt="City in East and South East England, United Kingdom">Benson</_name>
+ <name msgctxt="City in East and South East England, United Kingdom">Benson</name>
 <coordinates>51.633333 -1.116667</coordinates>
 <location>
  <name>Benson</name>
@@ -20674,7 +20674,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name>Biggin Hill</_name>
+ <name>Biggin Hill</name>
 <coordinates>51.283333 0.033333</coordinates>
 <location>
 <name>Biggin Hill</name>
@@ -20687,7 +20687,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name>Brize Norton</_name>
+ <name>Brize Norton</name>
 <coordinates>51.766667 -1.566667</coordinates>
 <location>
 <name>Brize Norton</name>
@@ -20700,7 +20700,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name msgctxt="City in East and South East England, United Kingdom">Cambridge</_name>
+ <name msgctxt="City in East and South East England, United Kingdom">Cambridge</name>
 <coordinates>52.200000 0.116667</coordinates>
 <location>
 <name>Cambridge</name>
@@ -20713,7 +20713,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name>Farnborough</_name>
+ <name>Farnborough</name>
 <coordinates>51.266667 -0.733333</coordinates>
 <location>
 <name>Farnborough</name>
@@ -20725,7 +20725,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name>Lakenheath</_name>
+ <name>Lakenheath</name>
 <coordinates>52.433333 0.566667</coordinates>
 <location>
 <name>Lakenheath Royal Air Force Base</name>
@@ -20735,7 +20735,7 @@
 </city>
 <city>
 <!-- The capital of the United Kingdom -->
- <_name msgctxt="City in East and South East England, United Kingdom">London</_name>
+ <name msgctxt="City in East and South East England, United Kingdom">London</name>
 <coordinates>51.500000 -0.116667</coordinates>
 <location>
 <name>Heathrow Airport</name>
@@ -20760,7 +20760,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name>Luton</_name>
+ <name>Luton</name>
 <coordinates>51.883333 -0.416667</coordinates>
 <location>
 <name>Luton Airport</name>
@@ -20773,7 +20773,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name>Lydd</_name>
+ <name>Lydd</name>
 <coordinates>50.950000 0.916667</coordinates>
 <location>
 <name>Lydd Airport</name>
@@ -20785,7 +20785,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name>Manston</_name>
+ <name>Manston</name>
 <coordinates>51.350000 1.366667</coordinates>
 <location>
 <name>Manston, South East</name>
@@ -20797,7 +20797,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name>Marham</_name>
+ <name>Marham</name>
 <coordinates>52.650000 0.550000</coordinates>
 <location>
 <name>Marham</name>
@@ -20809,7 +20809,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name>Mildenhall</_name>
+ <name>Mildenhall</name>
 <coordinates>52.350000 0.516667</coordinates>
 <location>
 <name>Mildenhall Royal Air Force Base</name>
@@ -20821,7 +20821,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name>Northolt</_name>
+ <name>Northolt</name>
 <coordinates>51.533333 -0.366667</coordinates>
 <location>
 <name>Northolt</name>
@@ -20833,7 +20833,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name>Norwich</_name>
+ <name>Norwich</name>
 <coordinates>52.633333 1.300000</coordinates>
 <location>
 <name>Norwich Weather Centre</name>
@@ -20846,7 +20846,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name>Odiham</_name>
+ <name>Odiham</name>
 <coordinates>51.250000 -0.933333</coordinates>
 <location>
 <name>Odiham</name>
@@ -20858,7 +20858,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name>Shoreham-by-Sea</_name>
+ <name>Shoreham-by-Sea</name>
 <coordinates>50.833333 -0.233333</coordinates>
 <location>
 <name>Shoreham-by-Sea Airport</name>
@@ -20871,7 +20871,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name>Southampton</_name>
+ <name>Southampton</name>
 <coordinates>50.900000 -1.400000</coordinates>
 <location>
 <name>Southampton / Weather Centre</name>
@@ -20884,7 +20884,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name msgctxt="City in East and South East England, United Kingdom">Southend</_name>
+ <name msgctxt="City in East and South East England, United Kingdom">Southend</name>
 <coordinates>51.533333 0.700000</coordinates>
 <location>
 <name>Southend</name>
@@ -20897,7 +20897,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name>Stansted Mountfitchet</_name>
+ <name>Stansted Mountfitchet</name>
 <coordinates>51.900000 0.200000</coordinates>
 <location>
 <name>Stansted Mountfitchet Airport</name>
@@ -20910,7 +20910,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name>Wainfleet</_name>
+ <name>Wainfleet</name>
 <coordinates>53.100000 0.250000</coordinates>
 <location>
 <name>Wainfleet</name>
@@ -20922,7 +20922,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name>Wattisham</_name>
+ <name>Wattisham</name>
 <coordinates>52.116667 0.950000</coordinates>
 <location>
 <name>Wattisham</name>
@@ -20935,7 +20935,7 @@
 <!-- A city in East and South East England in the United
 Kingdom
 -->
- <_name>Wittering</_name>
+ <name>Wittering</name>
 <coordinates>52.600000 -0.450000</coordinates>
 <location>
 <name>Wittering</name>
@@ -20946,7 +20946,7 @@
 </state>
 <city>
 <!-- A city in the United Kingdom -->
- <_name>Fairford</_name>
+ <name>Fairford</name>
 <coordinates>51.700000 -1.783333</coordinates>
 <location>
 <name>Fairford Royal Air Force Base</name>
@@ -20956,12 +20956,12 @@
 </city>
 <state>
 <!-- A state/province/territory in United Kingdom -->
- <_name>Midlands</_name>
+ <name>Midlands</name>
 <fips-code>UKD2|UKD3|UKH4|UKH5|UKH7|UKJ1|UKJ8|UKJ9|UKL4</fips-code>
 <fips-code>UKA7|UKC7|UKD7|UKF7|UKL6|UKL7|UKM2|UKM9|UKN4|UKO2|UKO8|UKP3|UKQ3|UKQ4</fips-code>
 <city>
 <!-- A city in Midlands in the United Kingdom -->
- <_name msgctxt="City in Midlands, United Kingdom">Birmingham</_name>
+ <name msgctxt="City in Midlands, United Kingdom">Birmingham</name>
 <coordinates>52.466667 -1.916667</coordinates>
 <location>
 <name>Birmingham Airport</name>
@@ -20972,7 +20972,7 @@
 </city>
 <city>
 <!-- A city in Midlands in the United Kingdom -->
- <_name>Castle Donington</_name>
+ <name>Castle Donington</name>
 <coordinates>52.833333 -1.333333</coordinates>
 <location>
 <name>East Midlands</name>
@@ -20983,7 +20983,7 @@
 </city>
 <city>
 <!-- A city in Midlands in the United Kingdom -->
- <_name>Cottesmore</_name>
+ <name>Cottesmore</name>
 <coordinates>52.700000 -0.650000</coordinates>
 <location>
 <name>Cottesmore</name>
@@ -20993,7 +20993,7 @@
 </city>
 <city>
 <!-- A city in Midlands in the United Kingdom -->
- <_name>Coventry</_name>
+ <name>Coventry</name>
 <coordinates>52.416667 -1.550000</coordinates>
 <location>
 <name>Coventry Airport</name>
@@ -21003,7 +21003,7 @@
 </city>
 <city>
 <!-- A city in Midlands in the United Kingdom -->
- <_name>Cranfield</_name>
+ <name>Cranfield</name>
 <coordinates>52.066667 -0.600000</coordinates>
 <location>
 <name>Cranfield</name>
@@ -21015,11 +21015,11 @@
 </state>
 <state>
 <!-- A state/province/territory in United Kingdom -->
- <_name>North East England</_name>
+ <name>North East England</name>
 <fips-code>UKD1|UKD8|UKE5|UKF5|UKI7|UKJ5|UKJ6|UKK9|UKM7|UKN3|UKN6</fips-code>
 <city>
 <!-- A city in North East England in the United Kingdom -->
- <_name>Coningsby</_name>
+ <name>Coningsby</name>
 <coordinates>53.116667 -0.166667</coordinates>
 <location>
 <name>Coningsby Royal Air Force Base</name>
@@ -21029,7 +21029,7 @@
 </city>
 <city>
 <!-- A city in North East England in the United Kingdom -->
- <_name>Cranwell</_name>
+ <name>Cranwell</name>
 <coordinates>53.033333 -0.466667</coordinates>
 <location>
 <name>Cranwell</name>
@@ -21039,7 +21039,7 @@
 </city>
 <city>
 <!-- A city in North East England in the United Kingdom -->
- <_name>Dishforth</_name>
+ <name>Dishforth</name>
 <coordinates>54.150000 -1.416667</coordinates>
 <location>
 <name>Disforth</name>
@@ -21049,7 +21049,7 @@
 </city>
 <city>
 <!-- A city in North East England in the United Kingdom -->
- <_name msgctxt="City in North East England, United Kingdom">Newcastle</_name>
+ <name msgctxt="City in North East England, United Kingdom">Newcastle</name>
 <coordinates>54.988056 -1.619444</coordinates>
 <location>
 <name>Newcastle</name>
@@ -21060,7 +21060,7 @@
 </city>
 <city>
 <!-- A city in North East England in the United Kingdom -->
- <_name msgctxt="City in North East England, United Kingdom">Stockton</_name>
+ <name msgctxt="City in North East England, United Kingdom">Stockton</name>
 <coordinates>54.583333 -1.416667</coordinates>
 <location>
 <name>Tees-Side</name>
@@ -21070,7 +21070,7 @@
 </city>
 <city>
 <!-- A city in North East England in the United Kingdom -->
- <_name>Topcliffe</_name>
+ <name>Topcliffe</name>
 <coordinates>54.183333 -1.383333</coordinates>
 <location>
 <name>Topcliffe Royal Air Force Base</name>
@@ -21080,7 +21080,7 @@
 </city>
 <city>
 <!-- A city in North East England in the United Kingdom -->
- <_name>Waddington</_name>
+ <name>Waddington</name>
 <coordinates>53.166667 -0.533333</coordinates>
 <location>
 <name>Waddington</name>
@@ -21091,12 +21091,12 @@
 </state>
 <state>
 <!-- A state/province/territory in United Kingdom -->
- <_name>North West England</_name>
+ <name>North West England</name>
 <fips-code>UKA8|UKA9|UKB1|UKC1|UKC5|UKC9|UKE9|UKG9|UKH2|UKH8|UKI2|UKK1|UKL2|UKL5|UKL8|UKN1|UKN2|UKO1|UKO6|UKP2|UKP7|UKQ1</fips-code>
 <fips-code>UKA3|UKB4|UKC2|UKD5|UKE1|UKG6|UKG8|UKH3|UKJ2|UKJ3|UKJ7|UKL3|UKL9|UKO7|UKQ5</fips-code>
 <city>
 <!-- A city in North West England in the United Kingdom -->
- <_name>Blackpool</_name>
+ <name>Blackpool</name>
 <coordinates>53.816667 -3.050000</coordinates>
 <location>
 <name>Blackpool Airport</name>
@@ -21107,7 +21107,7 @@
 </city>
 <city>
 <!-- A city in North West England in the United Kingdom -->
- <_name>Carlisle</_name>
+ <name>Carlisle</name>
 <coordinates>54.883333 -2.933333</coordinates>
 <location>
 <name>Carlisle</name>
@@ -21124,7 +21124,7 @@
 </city>
 <city>
 <!-- A city in North West England in the United Kingdom -->
- <_name>Church Fenton</_name>
+ <name>Church Fenton</name>
 <coordinates>53.816667 -1.216667</coordinates>
 <location>
 <name>Church Fenton</name>
@@ -21134,7 +21134,7 @@
 </city>
 <city>
 <!-- A city in North West England in the United Kingdom -->
- <_name>Kirmington</_name>
+ <name>Kirmington</name>
 <coordinates>53.583333 -0.333333</coordinates>
 <location>
 <name>Humberside</name>
@@ -21144,7 +21144,7 @@
 </city>
 <city>
 <!-- A city in North West England in the United Kingdom -->
- <_name>Leeds</_name>
+ <name>Leeds</name>
 <coordinates>53.800000 -1.583333</coordinates>
 <location>
 <name>Leeds And Bradford</name>
@@ -21155,7 +21155,7 @@
 </city>
 <city>
 <!-- A city in North West England in the United Kingdom -->
- <_name>Leeming Bar</_name>
+ <name>Leeming Bar</name>
 <coordinates>54.300000 -1.550000</coordinates>
 <location>
 <name>Leeming</name>
@@ -21165,7 +21165,7 @@
 </city>
 <city>
 <!-- A city in North West England in the United Kingdom -->
- <_name>Linton upon Ouse</_name>
+ <name>Linton upon Ouse</name>
 <coordinates>54.033333 -1.250000</coordinates>
 <location>
 <name>Linton upon Ouse</name>
@@ -21175,7 +21175,7 @@
 </city>
 <city>
 <!-- A city in North West England in the United Kingdom -->
- <_name msgctxt="City in North West England, United Kingdom">Liverpool</_name>
+ <name msgctxt="City in North West England, United Kingdom">Liverpool</name>
 <coordinates>53.416667 -3.000000</coordinates>
 <location>
 <name>Liverpool Airport</name>
@@ -21186,7 +21186,7 @@
 </city>
 <city>
 <!-- A city in North West England in the United Kingdom -->
- <_name msgctxt="City in North West England, United Kingdom">Manchester</_name>
+ <name msgctxt="City in North West England, United Kingdom">Manchester</name>
 <coordinates>53.500000 -2.216667</coordinates>
 <location>
 <name>Manchester Airport</name>
@@ -21197,7 +21197,7 @@
 </city>
 <city>
 <!-- A city in North West England in the United Kingdom -->
- <_name>Shawbury</_name>
+ <name>Shawbury</name>
 <coordinates>52.783333 -2.650000</coordinates>
 <location>
 <name>Shawbury</name>
@@ -21209,11 +21209,11 @@
 </state>
 <state>
 <!-- A state/province/territory in United Kingdom -->
- <_name>Northern Ireland</_name>
+ <name>Northern Ireland</name>
 <fips-code>UKQ6|UKQ7|UKQ8|UKQ9|UKR1|UKR2|UKR3|UKR4|UKR5|UKR6|UKR7|UKR8|UKR9|UKS1|UKS2|UKS3|UKS4|UKS5|UKS6|UKS7|UKS8|UKS9|UKT1|UKT2|UKT3|UKT4</fips-code>
 <city>
 <!-- A city in Northern Ireland in the United Kingdom -->
- <_name>Belfast</_name>
+ <name>Belfast</name>
 <coordinates>54.583333 -5.933333</coordinates>
 <location>
 <name>Belfast / Harbour</name>
@@ -21230,7 +21230,7 @@
 </city>
 <city>
 <!-- A city in Northern Ireland in the United Kingdom -->
- <_name>Eglinton</_name>
+ <name>Eglinton</name>
 <coordinates>55.016667 -7.183333</coordinates>
 <location>
 <name>Eglinton / Londonderry</name>
@@ -21242,11 +21242,11 @@
 </state>
 <state>
 <!-- A state/province/territory in United Kingdom -->
- <_name>Scotland</_name>
+ <name>Scotland</name>
 <fips-code>UKT5|UKT6|UKT7|UKT8|UKT9|UKU1|UKU2|UKU3|UKU4|UKU5|UKU6|UKU7|UKU8|UKU9|UKV1|UKV2|UKV3|UKV4|UKV5|UKV6|UKV7|UKV8|UKV9|UKW1|UKW2|UKW3|UKW4|UKW5|UKW6|UKW7|UKW8|UKW9</fips-code>
 <city>
 <!-- A city in Scotland in the United Kingdom -->
- <_name msgctxt="City in Scotland, United Kingdom">Aberdeen</_name>
+ <name msgctxt="City in Scotland, United Kingdom">Aberdeen</name>
 <coordinates>57.133333 -2.100000</coordinates>
 <location>
 <name>Aberdeen / Dyce</name>
@@ -21257,7 +21257,7 @@
 </city>
 <city>
 <!-- A city in Scotland in the United Kingdom -->
- <_name>Campbeltown</_name>
+ <name>Campbeltown</name>
 <coordinates>55.433333 -5.633333</coordinates>
 <location>
 <name>Campbeltown</name>
@@ -21267,7 +21267,7 @@
 </city>
 <city>
 <!-- A city in Scotland in the United Kingdom -->
- <_name>Dundee</_name>
+ <name>Dundee</name>
 <coordinates>56.500000 -2.966667</coordinates>
 <location>
 <name>Dundee / Riverside</name>
@@ -21278,7 +21278,7 @@
 </city>
 <city>
 <!-- A city in Scotland in the United Kingdom -->
- <_name>Edinburgh</_name>
+ <name>Edinburgh</name>
 <coordinates>55.950000 -3.200000</coordinates>
 <location>
 <name>Edinburgh Airport</name>
@@ -21289,7 +21289,7 @@
 </city>
 <city>
 <!-- A city in Scotland in the United Kingdom -->
- <_name msgctxt="City in Scotland, United Kingdom">Glasgow</_name>
+ <name msgctxt="City in Scotland, United Kingdom">Glasgow</name>
 <coordinates>55.833333 -4.250000</coordinates>
 <location>
 <name>Glasgow Airport</name>
@@ -21300,7 +21300,7 @@
 </city>
 <city>
 <!-- A city in Scotland in the United Kingdom -->
- <_name>Gramisdale</_name>
+ <name>Gramisdale</name>
 <coordinates>57.483333 -7.333333</coordinates>
 <location>
 <name>Benbecula</name>
@@ -21310,7 +21310,7 @@
 </city>
 <city>
 <!-- A city in Scotland in the United Kingdom -->
- <_name>Inverness</_name>
+ <name>Inverness</name>
 <coordinates>57.466667 -4.233333</coordinates>
 <location>
 <name>Inverness / Dalcross</name>
@@ -21321,7 +21321,7 @@
 </city>
 <city>
 <!-- A city in Scotland in the United Kingdom -->
- <_name>Kilmoluag</_name>
+ <name>Kilmoluag</name>
 <coordinates>56.500000 -6.916667</coordinates>
 <location>
 <name>Tiree</name>
@@ -21332,7 +21332,7 @@
 </city>
 <city>
 <!-- A city in Scotland in the United Kingdom -->
- <_name>Kinloss</_name>
+ <name>Kinloss</name>
 <coordinates>57.616667 -3.566667</coordinates>
 <location>
 <name>Kinloss</name>
@@ -21343,7 +21343,7 @@
 </city>
 <city>
 <!-- A city in Scotland in the United Kingdom -->
- <_name>Kintra</_name>
+ <name>Kintra</name>
 <coordinates>55.650000 -6.250000</coordinates>
 <location>
 <name>Islay</name>
@@ -21353,7 +21353,7 @@
 </city>
 <city>
 <!-- A city in Scotland in the United Kingdom -->
- <_name>Kirkwall</_name>
+ <name>Kirkwall</name>
 <coordinates>58.966667 -2.950000</coordinates>
 <location>
 <name>Kirkwall Airport</name>
@@ -21364,7 +21364,7 @@
 </city>
 <city>
 <!-- A city in Scotland in the United Kingdom -->
- <_name>Leuchars</_name>
+ <name>Leuchars</name>
 <coordinates>56.383333 -2.883333</coordinates>
 <location>
 <name>Leuchars</name>
@@ -21374,7 +21374,7 @@
 </city>
 <city>
 <!-- A city in Scotland in the United Kingdom -->
- <_name>Lossiemouth</_name>
+ <name>Lossiemouth</name>
 <coordinates>57.700000 -3.283333</coordinates>
 <location>
 <name>Lossiemouth</name>
@@ -21385,7 +21385,7 @@
 </city>
 <city>
 <!-- A city in Scotland in the United Kingdom -->
- <_name>Mossbank</_name>
+ <name>Mossbank</name>
 <coordinates>60.450000 -1.200000</coordinates>
 <location>
 <name>Scatsa / Shetland Island</name>
@@ -21396,7 +21396,7 @@
 </city>
 <city>
 <!-- A city in Scotland in the United Kingdom -->
- <_name>Prestwick</_name>
+ <name>Prestwick</name>
 <coordinates>55.483333 -4.616667</coordinates>
 <location>
 <name>Prestwick Airport</name>
@@ -21406,7 +21406,7 @@
 </city>
 <city>
 <!-- A city in Scotland in the United Kingdom -->
- <_name>Stornoway</_name>
+ <name>Stornoway</name>
 <coordinates>58.216667 -6.366667</coordinates>
 <location>
 <name>Stornoway</name>
@@ -21417,7 +21417,7 @@
 </city>
 <city>
 <!-- A city in Scotland in the United Kingdom -->
- <_name>Sumburgh</_name>
+ <name>Sumburgh</name>
 <coordinates>59.866667 -1.283333</coordinates>
 <location>
 <name>Sumburgh Cape</name>
@@ -21427,7 +21427,7 @@
 </city>
 <city>
 <!-- A city in Scotland in the United Kingdom -->
- <_name>Wick</_name>
+ <name>Wick</name>
 <coordinates>58.433333 -3.083333</coordinates>
 <location>
 <name>Wick</name>
@@ -21438,13 +21438,13 @@
 </state>
 <state>
 <!-- A state/province/territory in United Kingdom -->
- <_name>South and South West England</_name>
+ <name>South and South West England</name>
 <fips-code>UKA4|UKB2|UKB7|UKC6|UKD4|UKD6|UKE6|UKJ4|UKK4|UKK5|UKM3|UKM6|UKN9|UKO4|UKP8</fips-code>
 <city>
 <!-- A city in South and South West England in the United
 Kingdom
 -->
- <_name>Boscombe</_name>
+ <name>Boscombe</name>
 <coordinates>51.150000 -1.716667</coordinates>
 <location>
 <name>Boscombe Down</name>
@@ -21457,7 +21457,7 @@
 <!-- A city in South and South West England in the United
 Kingdom
 -->
- <_name>Bournemouth</_name>
+ <name>Bournemouth</name>
 <coordinates>50.716667 -1.883333</coordinates>
 <location>
 <name>Bournemouth Airport</name>
@@ -21470,7 +21470,7 @@
 <!-- A city in South and South West England in the United
 Kingdom
 -->
- <_name>Bristol</_name>
+ <name>Bristol</name>
 <coordinates>51.450000 -2.583333</coordinates>
 <location>
 <name>Bristol / Lulsgate</name>
@@ -21483,7 +21483,7 @@
 <!-- A city in South and South West England in the United
 Kingdom
 -->
- <_name>Butes</_name>
+ <name>Butes</name>
 <coordinates>49.717500 -2.202500</coordinates>
 <location>
 <name>Alderney / Channel Island</name>
@@ -21495,7 +21495,7 @@
 <!-- A city in South and South West England in the United
 Kingdom
 -->
- <_name>Exeter</_name>
+ <name>Exeter</name>
 <coordinates>50.700000 -3.533333</coordinates>
 <location>
 <name>Exeter Airport</name>
@@ -21508,7 +21508,7 @@
 <!-- A city in South and South West England in the United
 Kingdom
 -->
- <_name>Filton</_name>
+ <name>Filton</name>
 <coordinates>51.508611 -2.574722</coordinates>
 <location>
 <name>Filton Private</name>
@@ -21520,7 +21520,7 @@
 <!-- A city in South and South West England in the United
 Kingdom
 -->
- <_name>Helston</_name>
+ <name>Helston</name>
 <coordinates>50.099722 -5.272222</coordinates>
 <location>
 <name>Culdrose</name>
@@ -21532,7 +21532,7 @@
 <!-- A city in South and South West England in the United
 Kingdom
 -->
- <_name>Hugh Town</_name>
+ <name>Hugh Town</name>
 <coordinates>49.916667 -6.316667</coordinates>
 <location>
 <name>Scilly, Saint Mary's</name>
@@ -21545,7 +21545,7 @@
 <!-- A city in South and South West England in the United
 Kingdom
 -->
- <_name>Lyneham</_name>
+ <name>Lyneham</name>
 <coordinates>51.516667 -1.966667</coordinates>
 <location>
 <name>Lyneham</name>
@@ -21557,7 +21557,7 @@
 <!-- A city in South and South West England in the United
 Kingdom
 -->
- <_name>Middle Wallop</_name>
+ <name>Middle Wallop</name>
 <coordinates>51.133333 -1.583333</coordinates>
 <location>
 <name>Middle Wallop</name>
@@ -21569,7 +21569,7 @@
 <!-- A city in South and South West England in the United
 Kingdom
 -->
- <_name msgctxt="City in South and South West England, United Kingdom">Plymouth</_name>
+ <name msgctxt="City in South and South West England, United Kingdom">Plymouth</name>
 <coordinates>50.396389 -4.138611</coordinates>
 <location>
 <name>Plymouth / Roborough</name>
@@ -21582,7 +21582,7 @@
 <!-- A city in South and South West England in the United
 Kingdom
 -->
- <_name>Staverton</_name>
+ <name>Staverton</name>
 <coordinates>51.916667 -2.166667</coordinates>
 <location>
 <name>Staverton Private</name>
@@ -21594,7 +21594,7 @@
 <!-- A city in South and South West England in the United
 Kingdom
 -->
- <_name>Yeovilton</_name>
+ <name>Yeovilton</name>
 <coordinates>51.004167 -2.650278</coordinates>
 <location>
 <name>Yeovilton</name>
@@ -21606,13 +21606,13 @@
 </state>
 <state>
 <!-- A state/province/territory in United Kingdom -->
- <_name>Wales</_name>
+ <name>Wales</name>
 <fips-code>UKX1|UKX2|UKX3|UKX4|UKX5|UKX6|UKX7|UKX8|UKX9|UKY1|UKY2|UKY3|UKY4|UKY5|UKY6|UKY7|UKY8|UKY9|UKZ1|UKZ2|UKZ3|UKZ4</fips-code>
 <city>
 <!-- A city in Wales in the United Kingdom.
 The local name in Welsh is "Caerdydd".
 -->
-  <_name msgctxt="City in Wales, United Kingdom">Cardiff</_name>
+ <name msgctxt="City in Wales, United Kingdom">Cardiff</name>
 <coordinates>51.500000 -3.200000</coordinates>
 <location>
 <name>Cardiff-Wales Airport</name>
@@ -21623,7 +21623,7 @@
 </city>
 <city>
 <!-- A city in Wales in the United Kingdom -->
- <_name>Hawarden</_name>
+ <name>Hawarden</name>
 <coordinates>53.183333 -3.033333</coordinates>
 <location>
 <name>Hawarden</name>
@@ -21633,7 +21633,7 @@
 </city>
 <city>
 <!-- A city in Wales in the United Kingdom -->
- <_name>Pembrey</_name>
+ <name>Pembrey</name>
 <coordinates>51.689167 -4.277222</coordinates>
 <location>
 <name>Pembrey Sands</name>
@@ -21644,7 +21644,7 @@
 </city>
 <city>
 <!-- A city in Wales in the United Kingdom -->
- <_name>Saint Athan</_name>
+ <name>Saint Athan</name>
 <coordinates>51.402778 -3.413889</coordinates>
 <location>
 <name>St Athan Royal Air Force Base</name>
@@ -21655,7 +21655,7 @@
 </city>
 <city>
 <!-- A city in Wales in the United Kingdom -->
- <_name>Valley</_name>
+ <name>Valley</name>
 <coordinates>53.283333 -4.566667</coordinates>
 <location>
 <name>Valley</name>
@@ -21668,7 +21668,7 @@
 </country>
 <country>
 <!-- VA - Holy See (Vatican City State) -->
- <_name>Vatican City</_name>
+ <name>Vatican City</name>
 <iso-code>VA</iso-code>
 <fips-code>VT</fips-code>
 <timezones>
@@ -21678,7 +21678,7 @@
 </country>
 <country>
 <!-- AX - Åland Islands, an autonomous province of Finland -->
- <_name>Åland Islands</_name>
+ <name>Åland Islands</name>
 <iso-code>AX</iso-code>
 <fips-code>FI01</fips-code>
 <pref-lang>swe</pref-lang>
@@ -21690,7 +21690,7 @@
 <!-- A city in the Åland Islands.
 The local name in Finnish is "Maarianhamina".
 -->
- <_name>Mariehamn</_name>
+ <name>Mariehamn</name>
 <coordinates>60.100000 19.950000</coordinates>
 <location>
 <name>Mariehamn / Aland Island</name>
@@ -21701,10 +21701,10 @@
 </country>
 </region>
 <region>
- <_name>Middle East</_name>
+ <name>Middle East</name>
 <country>
 <!-- BH - Bahrain -->
- <_name>Bahrain</_name>
+ <name>Bahrain</name>
 <iso-code>BH</iso-code>
 <fips-code>BA</fips-code>
 <timezones>
@@ -21715,7 +21715,7 @@
 <!-- A city in Bahrain.
 The name is also written "الحد".
 -->
- <_name>Al Hadd</_name>
+ <name>Al Hadd</name>
 <coordinates>26.245556 50.654167</coordinates>
 <location>
 <name>Bahrain International Airport</name>
@@ -21728,7 +21728,7 @@
 "Manama" is the traditional English name.
 The local name in Arabic is "Al Manamah / المنامة".
 -->
- <_name>Manama</_name>
+ <name>Manama</name>
 <coordinates>26.236111 50.583056</coordinates>
 <location>
 <name>Bahrain International Airport</name>
@@ -21739,7 +21739,7 @@
 </country>
 <country>
 <!-- IR - Islamic Republic of Iran -->
- <_name>Iran</_name>
+ <name>Iran</name>
 <!-- Could not find information about the following stations,
 which may be in Iran:
 OIBP OICJ OIGK OIHM OIIE OIKO OIMD OINB OINK OINZ OITU 
@@ -21754,7 +21754,7 @@
 <!-- A city in Iran.
 The name is also written "آبادان".
 -->
- <_name>Abadan</_name>
+ <name>Abadan</name>
 <coordinates>30.339200 48.304300</coordinates>
 <location>
 <name>Abadan</name>
@@ -21764,7 +21764,7 @@
 </city>
 <city>
 <!-- A city in Iran -->
- <_name>Abadeh</_name>
+ <name>Abadeh</name>
 <coordinates>31.160833 52.650556</coordinates>
 <location>
 <name>Abadeh</name>
@@ -21774,7 +21774,7 @@
 </city>
 <city>
 <!-- A city in Iran -->
- <_name>Abū Mūsā</_name>
+ <name>Abū Mūsā</name>
 <coordinates>25.914444 54.995278</coordinates>
 <location>
 <name>Abumusa Island, Abumusa Airport</name>
@@ -21791,7 +21791,7 @@
 <!-- A city in Iran.
 The name is also written "آغاجاری".
 -->
- <_name>Aghajari</_name>
+ <name>Aghajari</name>
 <coordinates>30.700600 49.831500</coordinates>
 <location>
 <name>Aghajari</name>
@@ -21803,7 +21803,7 @@
 <!-- A city in Iran.
 The name is also written "اهواز".
 -->
- <_name>Ahvaz</_name>
+ <name>Ahvaz</name>
 <coordinates>31.320300 48.669300</coordinates>
 <location>
 <name>Ahvaz</name>
@@ -21815,7 +21815,7 @@
 <!-- A city in Iran.
 The name is also written "اردبيل".
 -->
- <_name>Ardabil</_name>
+ <name>Ardabil</name>
 <coordinates>38.249800 48.293300</coordinates>
 <location>
 <name>Ardabil</name>
@@ -21827,7 +21827,7 @@
 <!-- A city in Iran.
 The name is also written "بندر عباس".
 -->
- <_name>Bandar 'Abbas</_name>
+ <name>Bandar 'Abbas</name>
 <coordinates>27.186500 56.280800</coordinates>
 <location>
 <name>Bandar 'Abbas</name>
@@ -21839,7 +21839,7 @@
 <!-- A city in Iran.
 The name is also written "بندر بوشهر".
 -->
- <_name>Bandar-e Bushehr</_name>
+ <name>Bandar-e Bushehr</name>
 <coordinates>28.968400 50.838500</coordinates>
 <location>
 <name>Bandar-e Bushehr Airport</name>
@@ -21851,7 +21851,7 @@
 <!-- A city in Iran.
 The name is also written "بندر لنگه".
 -->
- <_name>Bandar-e Lengeh</_name>
+ <name>Bandar-e Lengeh</name>
 <coordinates>26.556111 54.880833</coordinates>
 <location>
 <name>Bandar Lengeh</name>
@@ -21863,7 +21863,7 @@
 <!-- A city in Iran.
 The name is also written "بندر ماهشهر".
 -->
- <_name>Bandar-e Mahshahr</_name>
+ <name>Bandar-e Mahshahr</name>
 <coordinates>30.558800 49.198100</coordinates>
 <location>
 <name>Mahshahr Airport</name>
@@ -21873,7 +21873,7 @@
 </city>
 <city>
 <!-- A city in Iran -->
- <_name>Birjand</_name>
+ <name>Birjand</name>
 <coordinates>32.873889 59.214444</coordinates>
 <location>
 <name>Birjand</name>
@@ -21885,7 +21885,7 @@
 <!-- A city in Iran.
 The name is also written "چاه بهار".
 -->
- <_name>Chah Bahar</_name>
+ <name>Chah Bahar</name>
 <coordinates>25.291900 60.643000</coordinates>
 <location>
 <name>Chah Bahar</name>
@@ -21897,7 +21897,7 @@
 <!-- A city in Iran.
 The name is also written "ديرستان".
 -->
- <_name>Dayrestan</_name>
+ <name>Dayrestan</name>
 <coordinates>26.746300 55.934900</coordinates>
 <location>
 <name>Gheshm Island, Dayrestan Airport</name>
@@ -21909,7 +21909,7 @@
 <!-- A city in Iran.
 The name is also written "دو گنبدان".
 -->
- <_name>Do Gonbadan</_name>
+ <name>Do Gonbadan</name>
 <coordinates>30.358600 50.798100</coordinates>
 <location>
 <name>Gach Saran du Gunbadan</name>
@@ -21919,7 +21919,7 @@
 </city>
 <city>
 <!-- A city in Iran -->
- <_name>Esfahan</_name>
+ <name>Esfahan</name>
 <coordinates>32.659722 51.671389</coordinates>
 <location>
 <name>Esfahan</name>
@@ -21931,7 +21931,7 @@
 <!-- A city in Iran.
 The name is also written "فسا".
 -->
- <_name>Fasa</_name>
+ <name>Fasa</name>
 <coordinates>28.938300 53.648200</coordinates>
 <location>
 <name>Fasa</name>
@@ -21943,7 +21943,7 @@
 <!-- A city in Iran.
 The name is also written "گرگان".
 -->
- <_name>Gorgan</_name>
+ <name>Gorgan</name>
 <coordinates>36.839444 54.436111</coordinates>
 <location>
 <name>Gorgan</name>
@@ -21955,7 +21955,7 @@
 <!-- A city in Iran.
 The name is also written "گوشه شاهزاده قاسم".
 -->
- <_name>Gusheh Shahzadeh Qasem</_name>
+ <name>Gusheh Shahzadeh Qasem</name>
 <coordinates>30.700000 51.550000</coordinates>
 <location>
 <name>Yasouj, National Airport</name>
@@ -21967,7 +21967,7 @@
 <!-- A city in Iran.
 The name is also written "همدان".
 -->
- <_name>Hamadan</_name>
+ <name>Hamadan</name>
 <coordinates>34.796111 48.515833</coordinates>
 <location>
 <name>Hamadan</name>
@@ -21979,7 +21979,7 @@
 <!-- A city in Iran.
 The name is also written "يلام".
 -->
- <_name>Ilam</_name>
+ <name>Ilam</name>
 <coordinates>33.637400 46.422700</coordinates>
 <location>
 <name>Ilam</name>
@@ -21989,7 +21989,7 @@
 </city>
 <city>
 <!-- A city in Iran -->
- <_name>Iranshahr</_name>
+ <name>Iranshahr</name>
 <coordinates>27.203889 60.691944</coordinates>
 <location>
 <name>Iranshahr</name>
@@ -22001,7 +22001,7 @@
 <!-- A city in Iran.
 The name is also written "كرج".
 -->
- <_name>Karaj</_name>
+ <name>Karaj</name>
 <coordinates>35.835500 51.010300</coordinates>
 <location>
 <name>Payam Airport</name>
@@ -22011,7 +22011,7 @@
 </city>
 <city>
 <!-- A city in Iran -->
- <_name>Kashan</_name>
+ <name>Kashan</name>
 <coordinates>33.983611 51.447500</coordinates>
 <location>
 <name>Kashan</name>
@@ -22021,7 +22021,7 @@
 </city>
 <city>
 <!-- A city in Iran -->
- <_name>Kerman</_name>
+ <name>Kerman</name>
 <coordinates>30.293889 57.084167</coordinates>
 <location>
 <name>Kerman</name>
@@ -22031,7 +22031,7 @@
 </city>
 <city>
 <!-- A city in Iran -->
- <_name>Kermanshah</_name>
+ <name>Kermanshah</name>
 <coordinates>34.314167 47.065000</coordinates>
 <location>
 <name>Kermanshah</name>
@@ -22043,7 +22043,7 @@
 <!-- A city in Iran.
 The name is also written "خرم آباد".
 -->
- <_name>Khorramabad</_name>
+ <name>Khorramabad</name>
 <coordinates>33.487778 48.355833</coordinates>
 <location>
 <name>Khorramabad</name>
@@ -22055,7 +22055,7 @@
 <!-- A city in Iran.
 The name is also written "كيش".
 -->
- <_name>Kish</_name>
+ <name>Kish</name>
 <coordinates>26.557778 54.019444</coordinates>
 <location>
 <name>Kish Island, Kish Airport</name>
@@ -22065,7 +22065,7 @@
 </city>
 <city>
 <!-- A city in Iran -->
- <_name>Lar</_name>
+ <name>Lar</name>
 <coordinates>27.684167 54.343611</coordinates>
 <location>
 <name>Lar</name>
@@ -22077,7 +22077,7 @@
 <!-- A city in Iran.
 The name is also written "مشهد".
 -->
- <_name>Mashhad</_name>
+ <name>Mashhad</name>
 <coordinates>36.297000 59.606200</coordinates>
 <location>
 <name>Mashhad</name>
@@ -22089,7 +22089,7 @@
 <!-- A city in Iran.
 The name is also written "مسجد سلیمان".
 -->
- <_name>Masjed Soleyman</_name>
+ <name>Masjed Soleyman</name>
 <coordinates>31.936400 49.303900</coordinates>
 <location>
 <name>Masjed Soleyman</name>
@@ -22101,7 +22101,7 @@
 <!-- A city in Iran.
 The name is also written "نو شهر".
 -->
- <_name>Now Shahr</_name>
+ <name>Now Shahr</name>
 <coordinates>36.645278 51.495833</coordinates>
 <location>
 <name>Now Shahr</name>
@@ -22113,7 +22113,7 @@
 <!-- A city in Iran.
 The name is also written "ارومیه".
 -->
- <_name>Orumiyeh</_name>
+ <name>Orumiyeh</name>
 <coordinates>37.555300 45.072400</coordinates>
 <location>
 <name>Orumiyeh</name>
@@ -22125,7 +22125,7 @@
 <!-- A city in Iran.
 The name is also written "قزوین".
 -->
- <_name>Qazvin</_name>
+ <name>Qazvin</name>
 <coordinates>36.268200 50.000000</coordinates>
 <location>
 <name>Ghazvin</name>
@@ -22135,7 +22135,7 @@
 </city>
 <city>
 <!-- A city in Iran -->
- <_name>Rasht</_name>
+ <name>Rasht</name>
 <coordinates>37.279444 49.585833</coordinates>
 <location>
 <name>Rasht</name>
@@ -22145,7 +22145,7 @@
 </city>
 <city>
 <!-- A city in Iran -->
- <_name>Sabzevar</_name>
+ <name>Sabzevar</name>
 <coordinates>36.214444 57.679722</coordinates>
 <location>
 <name>Sabzevar</name>
@@ -22157,7 +22157,7 @@
 <!-- A city in Iran.
 The name is also written "سخت سر".
 -->
- <_name>Sakht Sar</_name>
+ <name>Sakht Sar</name>
 <coordinates>36.900278 50.682500</coordinates>
 <location>
 <name>Sakht Sar</name>
@@ -22167,7 +22167,7 @@
 </city>
 <city>
 <!-- A city in Iran -->
- <_name>Sanandaj</_name>
+ <name>Sanandaj</name>
 <coordinates>35.318100 47.000100</coordinates>
 <location>
 <name>Sanandaj</name>
@@ -22177,7 +22177,7 @@
 </city>
 <city>
 <!-- A city in Iran -->
- <_name>Sarakhs</_name>
+ <name>Sarakhs</name>
 <coordinates>36.534722 61.161111</coordinates>
 <location>
 <name>Sarakhs</name>
@@ -22189,7 +22189,7 @@
 <!-- A city in Iran.
 The name is also written "سمنان".
 -->
- <_name>Semnan</_name>
+ <name>Semnan</name>
 <coordinates>35.575278 53.394167</coordinates>
 <location>
 <name>Semnan</name>
@@ -22201,7 +22201,7 @@
 <!-- A city in Iran.
 The name is also written "شهر بالا".
 -->
- <_name>Shahr-e Bala</_name>
+ <name>Shahr-e Bala</name>
 <coordinates>26.674444 57.780556</coordinates>
 <location>
 <name>Jask</name>
@@ -22213,7 +22213,7 @@
 <!-- A city in Iran.
 The name is also written "شهر كرد".
 -->
- <_name>Shahr-e Kord</_name>
+ <name>Shahr-e Kord</name>
 <coordinates>32.325556 50.864444</coordinates>
 <location>
 <name>Shahr-e Kord</name>
@@ -22225,7 +22225,7 @@
 <!-- A city in Iran.
 The name is also written "شیراز".
 -->
- <_name>Shiraz</_name>
+ <name>Shiraz</name>
 <coordinates>29.603600 52.538800</coordinates>
 <location>
 <name>Shiraz</name>
@@ -22235,7 +22235,7 @@
 </city>
 <city>
 <!-- A city in Iran -->
- <_name>Tabas</_name>
+ <name>Tabas</name>
 <coordinates>33.588333 56.922500</coordinates>
 <location>
 <name>Tabas</name>
@@ -22247,7 +22247,7 @@
 <!-- A city in Iran.
 The name is also written "تبريز".
 -->
- <_name>Tabriz</_name>
+ <name>Tabriz</name>
 <coordinates>38.080000 46.291900</coordinates>
 <location>
 <name>Tabriz</name>
@@ -22259,7 +22259,7 @@
 <!-- The capital of Iran.
 The name is also written "تهران".
 -->
- <_name>Tehran</_name>
+ <name>Tehran</name>
 <coordinates>35.705000 51.421600</coordinates>
 <location>
 <name>Tehran-Mehrabad</name>
@@ -22271,7 +22271,7 @@
 <!-- A city in Iran.
 The name is also written "يزد".
 -->
- <_name>Yazd</_name>
+ <name>Yazd</name>
 <coordinates>31.897222 54.367500</coordinates>
 <location>
 <name>Yazd</name>
@@ -22283,7 +22283,7 @@
 <!-- A city in Iran.
 The name is also written "زابل".
 -->
- <_name>Zabol</_name>
+ <name>Zabol</name>
 <coordinates>31.028700 61.501200</coordinates>
 <location>
 <name>Zabol</name>
@@ -22295,7 +22295,7 @@
 <!-- A city in Iran.
 The name is also written "زاهدان (کي)".
 -->
- <_name>Zahedan-e (Yek)</_name>
+ <name>Zahedan-e (Yek)</name>
 <coordinates>29.496300 60.862900</coordinates>
 <location>
 <name>Zahedan-e (Yek)</name>
@@ -22306,7 +22306,7 @@
 </country>
 <country>
 <!-- IQ - Iraq -->
- <_name>Iraq</_name>
+ <name>Iraq</name>
 <!-- Could not find weather stations for the following major
 cities:
 Baghdad
@@ -22320,7 +22320,7 @@
 </country>
 <country>
 <!-- IL - Israel -->
- <_name>Israel</_name>
+ <name>Israel</name>
 <iso-code>IL</iso-code>
 <fips-code>IS</fips-code>
 <timezones>
@@ -22329,7 +22329,7 @@
 <tz-hint>Asia/Jerusalem</tz-hint>
 <city>
 <!-- A city in Israel -->
- <_name>Elat</_name>
+ <name>Elat</name>
 <coordinates>29.561111 34.951667</coordinates>
 <location>
 <name>Elat</name>
@@ -22339,7 +22339,7 @@
 </city>
 <city>
 <!-- A city in Israel -->
- <_name>Mahanayim</_name>
+ <name>Mahanayim</name>
 <coordinates>32.983333 35.566667</coordinates>
 <location>
 <name>Galilee / Pina</name>
@@ -22349,7 +22349,7 @@
 </city>
 <city>
 <!-- A city in Israel -->
- <_name>Mahane Yisra'el</_name>
+ <name>Mahane Yisra'el</name>
 <coordinates>32.000000 34.916667</coordinates>
 <location>
 <name>Ben-Gurion International Airport</name>
@@ -22359,7 +22359,7 @@
 </city>
 <city>
 <!-- A city in Israel -->
- <_name>Ramot Remez</_name>
+ <name>Ramot Remez</name>
 <coordinates>32.781667 35.016667</coordinates>
 <location>
 <name>Sde-Haifa Haifa</name>
@@ -22369,7 +22369,7 @@
 </city>
 <city>
 <!-- A city in Israel -->
- <_name>Shizzafon</_name>
+ <name>Shizzafon</name>
 <coordinates>30.041667 35.027778</coordinates>
 <location>
 <name>Ovda</name>
@@ -22379,7 +22379,7 @@
 </city>
 <city>
 <!-- A city in Israel -->
- <_name>Tel Aviv</_name>
+ <name>Tel Aviv</name>
 <coordinates>32.066667 34.766667</coordinates>
 <location>
 <name>Sde-Dov Airport</name>
@@ -22390,7 +22390,7 @@
 </country>
 <country>
 <!-- JO - Jordan -->
- <_name msgctxt="Country">Jordan</_name>
+ <name msgctxt="Country">Jordan</name>
 <iso-code>JO</iso-code>
 <fips-code>JO</fips-code>
 <timezones>
@@ -22399,7 +22399,7 @@
 <tz-hint>Asia/Amman</tz-hint>
 <city>
 <!-- A city in Jordan -->
- <_name>Al 'Aqabah</_name>
+ <name>Al 'Aqabah</name>
 <coordinates>29.526667 35.007778</coordinates>
 <location>
 &