libgweather r519 - in trunk: . data



Author: danw
Date: Tue Nov 25 20:39:18 2008
New Revision: 519
URL: http://svn.gnome.org/viewvc/libgweather?rev=519&view=rev

Log:
	* configure.in (IT_PROG_INTLTOOL): require 0.40.3, for msgctxt
	support

	* data/update-locations.py: find duplicate names, and add msgctxt
	attributes to the XML so that, eg, translators can differentiate
	"Athens, Georgia, USA" from the capital of Greece and the former
	Soviet republic. #529057
	(State.__init__, City.print_xml, get_city): trim down the text of
	the comments. In particular, we don't need to prepend
	"Translators: ..." to them, because *all* of the comments in
	Locations.xml.in are for translators.

	* data/Locations.xml.in: regen

	* data/Makefile.am (rebuild-locations): fix this rule to delete
	the right file on error


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/data/Locations.xml.in
   trunk/data/Makefile.am
   trunk/data/update-locations.py

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Nov 25 20:39:18 2008
@@ -24,7 +24,7 @@
 
 AM_MAINTAINER_MODE
 
-IT_PROG_INTLTOOL([0.40.0])
+IT_PROG_INTLTOOL([0.40.3])
 PKG_PROG_PKG_CONFIG([0.19])
 
 AC_PROG_CC

Modified: trunk/data/Locations.xml.in
==============================================================================
--- trunk/data/Locations.xml.in	(original)
+++ trunk/data/Locations.xml.in	Tue Nov 25 20:39:18 2008
@@ -17,7 +17,7 @@
       </timezones>
       <tz-hint>Africa/Algiers</tz-hint>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Adrar</_name>
         <coordinates>27.900000 -0.283333</coordinates>
         <location>
@@ -27,7 +27,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Algeria.
+        <!-- The capital of Algeria.
              "Algiers" is the traditional English name.
              The local name in French is "Alger".
           -->
@@ -40,7 +40,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Annaba</_name>
         <coordinates>36.900000 7.766667</coordinates>
         <location>
@@ -50,7 +50,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Batna</_name>
         <coordinates>35.555278 6.178611</coordinates>
         <location>
@@ -60,7 +60,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Bechar</_name>
         <coordinates>31.616667 -2.216667</coordinates>
         <location>
@@ -70,7 +70,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Bejaia</_name>
         <coordinates>36.750000 5.083333</coordinates>
         <location>
@@ -80,7 +80,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Berriane</_name>
         <coordinates>32.833333 3.766667</coordinates>
         <location>
@@ -90,7 +90,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Biskra</_name>
         <coordinates>34.850000 5.733333</coordinates>
         <location>
@@ -100,7 +100,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Bou Saada</_name>
         <coordinates>35.214167 4.182500</coordinates>
         <location>
@@ -110,7 +110,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Chlef</_name>
         <coordinates>36.164722 1.334722</coordinates>
         <location>
@@ -120,7 +120,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Constantine</_name>
         <coordinates>36.365000 6.614722</coordinates>
         <location>
@@ -130,7 +130,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Dar el Beida</_name>
         <coordinates>36.713333 3.212500</coordinates>
         <location>
@@ -140,7 +140,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Djanet</_name>
         <coordinates>24.552500 9.482222</coordinates>
         <location>
@@ -150,7 +150,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>El Golea</_name>
         <coordinates>30.566667 2.883333</coordinates>
         <location>
@@ -160,7 +160,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Ghardaia</_name>
         <coordinates>32.483333 3.666667</coordinates>
         <location>
@@ -170,7 +170,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Hassi Messaoud</_name>
         <coordinates>31.701944 6.054444</coordinates>
         <location>
@@ -180,7 +180,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>I-n-Amenas</_name>
         <coordinates>28.050000 9.550000</coordinates>
         <location>
@@ -190,7 +190,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>I-n-Salah</_name>
         <coordinates>27.216667 2.466667</coordinates>
         <location>
@@ -200,7 +200,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Illizi</_name>
         <coordinates>26.483333 8.466667</coordinates>
         <location>
@@ -210,7 +210,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Jijel</_name>
         <coordinates>36.800000 5.766667</coordinates>
         <location>
@@ -220,7 +220,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Laghouat</_name>
         <coordinates>33.800000 2.883333</coordinates>
         <location>
@@ -230,7 +230,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Mascara</_name>
         <coordinates>35.394444 0.139722</coordinates>
         <location>
@@ -240,7 +240,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Oran</_name>
         <coordinates>35.691111 -0.641667</coordinates>
         <location>
@@ -255,7 +255,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Ouargla</_name>
         <coordinates>31.957500 5.327778</coordinates>
         <location>
@@ -265,7 +265,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Setif</_name>
         <coordinates>36.191389 5.409444</coordinates>
         <location>
@@ -275,7 +275,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Sidi Amrane</_name>
         <coordinates>33.500000 6.016667</coordinates>
         <location>
@@ -285,7 +285,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Sidi Bel Abbes</_name>
         <coordinates>35.193889 -0.641389</coordinates>
         <location>
@@ -295,7 +295,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Tamanrasset</_name>
         <coordinates>22.785000 5.522778</coordinates>
         <location>
@@ -305,7 +305,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Tebessa</_name>
         <coordinates>35.404167 8.124167</coordinates>
         <location>
@@ -315,7 +315,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Tiaret</_name>
         <coordinates>35.375833 1.313056</coordinates>
         <location>
@@ -325,7 +325,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Timimoun</_name>
         <coordinates>29.250000 0.250000</coordinates>
         <location>
@@ -335,7 +335,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Tindouf</_name>
         <coordinates>27.651944 -8.214444</coordinates>
         <location>
@@ -345,7 +345,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Tlemcen</_name>
         <coordinates>34.878333 -1.315000</coordinates>
         <location>
@@ -355,7 +355,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Algeria -->
+        <!-- A city in Algeria -->
         <_name>Touggourt</_name>
         <coordinates>33.100000 6.066667</coordinates>
         <location>
@@ -375,7 +375,7 @@
       </timezones>
       <tz-hint>Africa/Luanda</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Angola -->
+        <!-- The capital of Angola -->
         <_name>Luanda</_name>
         <coordinates>-8.838333 13.234444</coordinates>
         <location>
@@ -395,7 +395,7 @@
       </timezones>
       <tz-hint>Africa/Porto-Novo</tz-hint>
       <city>
-        <!-- Translators: this is a city in Benin -->
+        <!-- A city in Benin -->
         <_name>Cotonou</_name>
         <coordinates>6.350000 2.433333</coordinates>
         <location>
@@ -405,7 +405,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Benin -->
+        <!-- The capital of Benin -->
         <_name>Porto-Novo</_name>
         <coordinates>6.483333 2.616667</coordinates>
         <location>
@@ -425,7 +425,7 @@
       </timezones>
       <tz-hint>Africa/Gaborone</tz-hint>
       <city>
-        <!-- Translators: this is a city in Botswana -->
+        <!-- A city in Botswana -->
         <_name>Francistown</_name>
         <coordinates>-21.166667 27.516667</coordinates>
         <location>
@@ -435,7 +435,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Botswana -->
+        <!-- The capital of Botswana -->
         <_name>Gaborone</_name>
         <coordinates>-24.646389 25.911944</coordinates>
         <location>
@@ -445,7 +445,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Botswana -->
+        <!-- A city in Botswana -->
         <_name>Ghanzi</_name>
         <coordinates>-21.566667 21.783333</coordinates>
         <location>
@@ -455,7 +455,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Botswana -->
+        <!-- A city in Botswana -->
         <_name>Kasane</_name>
         <coordinates>-17.816667 25.150000</coordinates>
         <location>
@@ -465,7 +465,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Botswana -->
+        <!-- A city in Botswana -->
         <_name>Letlhakane</_name>
         <coordinates>-21.416667 25.583333</coordinates>
         <location>
@@ -475,7 +475,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Botswana -->
+        <!-- A city in Botswana -->
         <_name>Lokerane</_name>
         <coordinates>-24.883333 24.666667</coordinates>
         <location>
@@ -485,7 +485,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Botswana -->
+        <!-- A city in Botswana -->
         <_name>Maun</_name>
         <coordinates>-19.983333 23.416667</coordinates>
         <location>
@@ -495,7 +495,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Botswana -->
+        <!-- A city in Botswana -->
         <_name>Mochudi</_name>
         <coordinates>-24.416667 26.150000</coordinates>
         <location>
@@ -505,7 +505,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Botswana -->
+        <!-- A city in Botswana -->
         <_name>Selebi-Phikwe</_name>
         <coordinates>-21.966111 27.917222</coordinates>
         <location>
@@ -515,7 +515,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Botswana -->
+        <!-- A city in Botswana -->
         <_name>Tshabong</_name>
         <coordinates>-26.050000 22.450000</coordinates>
         <location>
@@ -535,7 +535,7 @@
       </timezones>
       <tz-hint>Africa/Ouagadougou</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Burkina Faso -->
+        <!-- The capital of Burkina Faso -->
         <_name>Ouagadougou</_name>
         <coordinates>12.370278 -1.524722</coordinates>
         <location>
@@ -555,7 +555,7 @@
       </timezones>
       <tz-hint>Africa/Bujumbura</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Burundi -->
+        <!-- The capital of Burundi -->
         <_name>Bujumbura</_name>
         <coordinates>-3.376111 29.360000</coordinates>
         <location>
@@ -579,7 +579,7 @@
       </timezones>
       <tz-hint>Africa/Douala</tz-hint>
       <city>
-        <!-- Translators: this is a city in Cameroon -->
+        <!-- A city in Cameroon -->
         <_name>Douala</_name>
         <coordinates>4.050278 9.700000</coordinates>
         <location>
@@ -589,7 +589,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Cameroon -->
+        <!-- A city in Cameroon -->
         <_name>Garoua</_name>
         <coordinates>9.300000 13.400000</coordinates>
         <location>
@@ -599,7 +599,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Cameroon -->
+        <!-- A city in Cameroon -->
         <_name>Ngaoundere</_name>
         <coordinates>7.316667 13.583333</coordinates>
         <location>
@@ -609,7 +609,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Cameroon -->
+        <!-- The capital of Cameroon -->
         <_name>Yaounde</_name>
         <coordinates>3.866667 11.516667</coordinates>
         <location>
@@ -637,7 +637,7 @@
       </timezones>
       <tz-hint>Atlantic/Cape_Verde</tz-hint>
       <city>
-        <!-- Translators: this is a city in Cape Verde -->
+        <!-- A city in Cape Verde -->
         <_name>PreguiÃa</_name>
         <coordinates>16.750000 -22.950000</coordinates>
         <location>
@@ -657,8 +657,7 @@
       </timezones>
       <tz-hint>Africa/Bangui</tz-hint>
       <city>
-        <!-- Translators: this is a city in the Central African Republic
-          -->
+        <!-- A city in the Central African Republic -->
         <_name>Bangassou</_name>
         <coordinates>4.733333 22.816667</coordinates>
         <location>
@@ -668,9 +667,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of the Central African
-             Republic
-          -->
+        <!-- The capital of the Central African Republic -->
         <_name>Bangui</_name>
         <coordinates>4.366667 18.583333</coordinates>
         <location>
@@ -680,8 +677,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Central African Republic
-          -->
+        <!-- A city in the Central African Republic -->
         <_name>Berberati</_name>
         <coordinates>4.266667 15.783333</coordinates>
         <location>
@@ -701,7 +697,7 @@
       </timezones>
       <tz-hint>Africa/Ndjamena</tz-hint>
       <city>
-        <!-- Translators: this is a city in Chad -->
+        <!-- A city in Chad -->
         <_name>Moundou</_name>
         <coordinates>8.566667 16.083333</coordinates>
         <location>
@@ -711,7 +707,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Chad -->
+        <!-- The capital of Chad -->
         <_name>N'Djamena</_name>
         <coordinates>12.108502 15.048173</coordinates>
         <location>
@@ -721,7 +717,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Chad -->
+        <!-- A city in Chad -->
         <_name>Sarh</_name>
         <coordinates>9.150000 18.383333</coordinates>
         <location>
@@ -741,7 +737,7 @@
       </timezones>
       <tz-hint>Indian/Comoro</tz-hint>
       <city>
-        <!-- Translators: this is a city in Comoros -->
+        <!-- A city in Comoros -->
         <_name>MbalÃni</_name>
         <coordinates>-11.550000 43.274167</coordinates>
         <location>
@@ -751,7 +747,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Comoros -->
+        <!-- The capital of Comoros -->
         <_name>Moroni</_name>
         <coordinates>-11.704167 43.240278</coordinates>
         <location>
@@ -768,28 +764,26 @@
       <fips-code>CG</fips-code>
       <timezones>
         <timezone id="Africa/Kinshasa">
-          <!-- Translators: This is the time zone used in the western
-               half of the Democratic Republic of the Congo. The string
-               is only used in places where "Democratic Republic of the
-               Congo" is already clear from context. FIXME: is there an
-               official name for this zone?
+          <!-- The time zone used in the western half of the Democratic
+               Republic of the Congo. The string is only used in places
+               where "Democratic Republic of the Congo" is already
+               clear from context. FIXME: is there an official name for
+               this zone?
             -->
           <_name>Western Congo</_name>
         </timezone>
         <timezone id="Africa/Lubumbashi">
-          <!-- Translators: This is the time zone used in the eastern
-               half of the Democratic Republic of the Congo. The string
-               is only used in places where "Democratic Republic of the
-               Congo" is already clear from context. FIXME: is there an
-               official name for this zone?
+          <!-- The time zone used in the eastern half of the Democratic
+               Republic of the Congo. The string is only used in places
+               where "Democratic Republic of the Congo" is already
+               clear from context. FIXME: is there an official name for
+               this zone?
             -->
           <_name>Eastern Congo</_name>
         </timezone>
       </timezones>
       <city>
-        <!-- Translators: this is the capital of the Democratic
-             Republic of the Congo
-          -->
+        <!-- The capital of the Democratic Republic of the Congo -->
         <_name>Kinshasa</_name>
         <coordinates>-4.329722 15.315000</coordinates>
         <location>
@@ -814,9 +808,7 @@
       </timezones>
       <tz-hint>Africa/Brazzaville</tz-hint>
       <city>
-        <!-- Translators: this is the capital of the Republic of the
-             Congo
-          -->
+        <!-- The capital of the Republic of the Congo -->
         <_name>Brazzaville</_name>
         <coordinates>-4.259167 15.284722</coordinates>
         <location>
@@ -826,7 +818,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Republic of the Congo -->
+        <!-- A city in the Republic of the Congo -->
         <_name>Pointe-Noire</_name>
         <coordinates>-4.794722 11.846111</coordinates>
         <location>
@@ -850,7 +842,7 @@
       </timezones>
       <tz-hint>Africa/Abidjan</tz-hint>
       <city>
-        <!-- Translators: this is a city in CÃte d'Ivoire -->
+        <!-- A city in CÃte d'Ivoire -->
         <_name>Abidjan</_name>
         <coordinates>5.341111 -4.028056</coordinates>
         <location>
@@ -862,7 +854,7 @@
     </country>
     <country>
       <!-- DJ - Djibouti -->
-      <_name>Djibouti</_name>
+      <_name msgctxt="Country">Djibouti</_name>
       <iso-code>DJ</iso-code>
       <fips-code>DJ</fips-code>
       <timezones>
@@ -870,7 +862,7 @@
       </timezones>
       <tz-hint>Africa/Djibouti</tz-hint>
       <city>
-        <!-- Translators: this is a city in Djibouti -->
+        <!-- A city in Djibouti -->
         <_name>Ambouli</_name>
         <coordinates>11.569444 43.136667</coordinates>
         <location>
@@ -880,8 +872,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Djibouti -->
-        <_name>Djibouti</_name>
+        <!-- The capital of Djibouti -->
+        <_name msgctxt="City in Djibouti">Djibouti</_name>
         <coordinates>11.595000 43.148056</coordinates>
         <location>
           <name>Djibouti / Ambouli</name>
@@ -904,7 +896,7 @@
       </timezones>
       <tz-hint>Africa/Cairo</tz-hint>
       <city>
-        <!-- Translators: this is a city in Egypt -->
+        <!-- A city in Egypt -->
         <_name>Al 'Arish</_name>
         <coordinates>31.126111 33.801944</coordinates>
         <location>
@@ -914,7 +906,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Egypt -->
+        <!-- A city in Egypt -->
         <_name>Al Ghardaqah</_name>
         <coordinates>27.238889 33.836111</coordinates>
         <location>
@@ -924,7 +916,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Egypt -->
+        <!-- A city in Egypt -->
         <_name>Al Qabuti</_name>
         <coordinates>31.237778 32.281389</coordinates>
         <location>
@@ -934,11 +926,11 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Egypt.
+        <!-- A city in Egypt.
              "Alexandria" is the traditional English name.
              The local name in Arabic is "Al Iskandariyah".
           -->
-        <_name>Alexandria</_name>
+        <_name msgctxt="City in Egypt">Alexandria</_name>
         <coordinates>31.198056 29.919167</coordinates>
         <location>
           <name>Nouzha Airport</name>
@@ -952,7 +944,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Egypt -->
+        <!-- A city in Egypt -->
         <_name>Aswan</_name>
         <coordinates>24.087500 32.898889</coordinates>
         <location>
@@ -962,7 +954,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Egypt -->
+        <!-- A city in Egypt -->
         <_name>Asyut</_name>
         <coordinates>27.182778 31.182778</coordinates>
         <location>
@@ -972,11 +964,11 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Egypt.
+        <!-- The capital of Egypt.
              "Cairo" is the traditional English name.
              The local name in Arabic is "Al Qahirah".
           -->
-        <_name>Cairo</_name>
+        <_name msgctxt="City in Egypt">Cairo</_name>
         <coordinates>30.050000 31.250000</coordinates>
         <location>
           <name>Cairo Airport</name>
@@ -985,7 +977,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Egypt.
+        <!-- A city in Egypt.
              "Luxor" is the traditional English name.
              The local name in Arabic is "Al Uqsur".
           -->
@@ -998,7 +990,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Egypt -->
+        <!-- A city in Egypt -->
         <_name>Marsa Matruh</_name>
         <coordinates>31.350000 27.233333</coordinates>
         <location>
@@ -1008,7 +1000,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Egypt -->
+        <!-- A city in Egypt -->
         <_name>Sharm ash Shaykh</_name>
         <coordinates>27.863611 34.288056</coordinates>
         <location>
@@ -1018,7 +1010,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Egypt -->
+        <!-- A city in Egypt -->
         <_name>Taba</_name>
         <coordinates>29.491944 34.891389</coordinates>
         <location>
@@ -1042,7 +1034,7 @@
       </timezones>
       <tz-hint>Africa/Malabo</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Equatorial Guinea -->
+        <!-- The capital of Equatorial Guinea -->
         <_name>Malabo</_name>
         <coordinates>3.750000 8.783333</coordinates>
         <location>
@@ -1104,7 +1096,7 @@
       </timezones>
       <tz-hint>Africa/Libreville</tz-hint>
       <city>
-        <!-- Translators: this is a city in Gabon -->
+        <!-- A city in Gabon -->
         <_name>Franceville</_name>
         <coordinates>-1.633333 13.583333</coordinates>
         <location>
@@ -1114,7 +1106,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Gabon -->
+        <!-- The capital of Gabon -->
         <_name>Libreville</_name>
         <coordinates>0.383333 9.450000</coordinates>
         <location>
@@ -1124,7 +1116,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Gabon -->
+        <!-- A city in Gabon -->
         <_name>Port-Gentil</_name>
         <coordinates>-0.716667 8.783333</coordinates>
         <location>
@@ -1144,7 +1136,7 @@
       </timezones>
       <tz-hint>Africa/Banjul</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Gambia -->
+        <!-- The capital of Gambia -->
         <_name>Banjul</_name>
         <coordinates>13.453056 -16.577500</coordinates>
         <location>
@@ -1154,7 +1146,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Gambia -->
+        <!-- A city in Gambia -->
         <_name>Old Yundum</_name>
         <coordinates>13.362500 -16.686111</coordinates>
         <location>
@@ -1174,7 +1166,7 @@
       </timezones>
       <tz-hint>Africa/Accra</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Ghana -->
+        <!-- The capital of Ghana -->
         <_name>Accra</_name>
         <coordinates>5.550000 -0.216667</coordinates>
         <location>
@@ -1194,7 +1186,7 @@
       </timezones>
       <tz-hint>Africa/Conakry</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Guinea -->
+        <!-- The capital of Guinea -->
         <_name>Conakry</_name>
         <coordinates>9.509167 -13.712222</coordinates>
         <location>
@@ -1228,7 +1220,7 @@
       </timezones>
       <tz-hint>Africa/Nairobi</tz-hint>
       <city>
-        <!-- Translators: this is a city in Kenya -->
+        <!-- A city in Kenya -->
         <_name>Eldoret</_name>
         <coordinates>0.516667 35.283333</coordinates>
         <location>
@@ -1238,7 +1230,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Kenya -->
+        <!-- A city in Kenya -->
         <_name>Kisumu</_name>
         <coordinates>-0.100000 34.750000</coordinates>
         <location>
@@ -1248,7 +1240,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Kenya -->
+        <!-- A city in Kenya -->
         <_name>Mombasa</_name>
         <coordinates>-4.050000 39.666667</coordinates>
         <location>
@@ -1258,7 +1250,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Kenya -->
+        <!-- The capital of Kenya -->
         <_name>Nairobi</_name>
         <coordinates>-1.283333 36.816667</coordinates>
         <location>
@@ -1284,7 +1276,7 @@
     </country>
     <country>
       <!-- LR - Liberia -->
-      <_name>Liberia</_name>
+      <_name msgctxt="Country">Liberia</_name>
       <!-- Could not find weather stations for the following major
            cities:
            Monrovia
@@ -1306,7 +1298,7 @@
       </timezones>
       <tz-hint>Africa/Tripoli</tz-hint>
       <city>
-        <!-- Translators: this is a city in Libya -->
+        <!-- A city in Libya -->
         <_name>Baninah</_name>
         <coordinates>32.083333 20.266667</coordinates>
         <location>
@@ -1316,7 +1308,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Libya -->
+        <!-- A city in Libya -->
         <_name>Sabha</_name>
         <coordinates>27.033333 14.433333</coordinates>
         <location>
@@ -1326,7 +1318,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Libya.
+        <!-- The capital of Libya.
              "Tripoli" is the traditional English name.
              The local name in Arabic is "Tarabulus / ØØØØÙØ".
           -->
@@ -1349,7 +1341,7 @@
       </timezones>
       <tz-hint>Indian/Antananarivo</tz-hint>
       <city>
-        <!-- Translators: this is a city in Madagascar -->
+        <!-- A city in Madagascar -->
         <_name>Ankarena</_name>
         <coordinates>-17.083333 49.816667</coordinates>
         <location>
@@ -1359,7 +1351,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Madagascar -->
+        <!-- The capital of Madagascar -->
         <_name>Antananarivo</_name>
         <coordinates>-18.916667 47.516667</coordinates>
         <location>
@@ -1369,7 +1361,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Madagascar -->
+        <!-- A city in Madagascar -->
         <_name>Antsiranana</_name>
         <coordinates>-12.266667 49.283333</coordinates>
         <location>
@@ -1379,7 +1371,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Madagascar -->
+        <!-- A city in Madagascar -->
         <_name>Fasenina-Ampasy</_name>
         <coordinates>-13.300000 48.316667</coordinates>
         <location>
@@ -1389,7 +1381,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Madagascar -->
+        <!-- A city in Madagascar -->
         <_name>Mahajanga</_name>
         <coordinates>-15.716667 46.316667</coordinates>
         <location>
@@ -1399,7 +1391,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Madagascar -->
+        <!-- A city in Madagascar -->
         <_name>Toamasina</_name>
         <coordinates>-18.166667 49.383333</coordinates>
         <location>
@@ -1409,7 +1401,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Madagascar -->
+        <!-- A city in Madagascar -->
         <_name>Tolanaro</_name>
         <coordinates>-25.033333 47.000000</coordinates>
         <location>
@@ -1457,7 +1449,7 @@
       </timezones>
       <tz-hint>Africa/Nouakchott</tz-hint>
       <city>
-        <!-- Translators: this is a city in Mauritania -->
+        <!-- A city in Mauritania -->
         <_name>Nouadhibou</_name>
         <coordinates>20.902500 -17.042222</coordinates>
         <location>
@@ -1467,7 +1459,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Mauritania -->
+        <!-- The capital of Mauritania -->
         <_name>Nouakchott</_name>
         <coordinates>18.119444 -16.040556</coordinates>
         <location>
@@ -1487,7 +1479,7 @@
       </timezones>
       <tz-hint>Indian/Mauritius</tz-hint>
       <city>
-        <!-- Translators: this is a city in Mauritius -->
+        <!-- A city in Mauritius -->
         <_name>Plaisance</_name>
         <coordinates>-20.418333 57.671389</coordinates>
         <location>
@@ -1497,7 +1489,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Mauritius -->
+        <!-- The capital of Mauritius -->
         <_name>Port Louis</_name>
         <coordinates>-20.161944 57.498889</coordinates>
         <location>
@@ -1507,7 +1499,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Mauritius -->
+        <!-- A city in Mauritius -->
         <_name>Port Mathurin</_name>
         <coordinates>-19.683333 63.416667</coordinates>
         <location>
@@ -1527,7 +1519,7 @@
       </timezones>
       <tz-hint>Indian/Mayotte</tz-hint>
       <city>
-        <!-- Translators: this is a city in Mayotte -->
+        <!-- A city in Mayotte -->
         <_name>Dzaoudzi</_name>
         <coordinates>-12.779444 45.253611</coordinates>
         <location>
@@ -1537,7 +1529,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Mayotte -->
+        <!-- The capital of Mayotte -->
         <_name>Mamoudzou</_name>
         <coordinates>-12.779444 45.227222</coordinates>
         <location>
@@ -1560,7 +1552,7 @@
       </timezones>
       <tz-hint>Africa/Casablanca</tz-hint>
       <city>
-        <!-- Translators: this is a city in Morocco -->
+        <!-- A city in Morocco -->
         <_name>Agadir</_name>
         <coordinates>30.400000 -9.600000</coordinates>
         <location>
@@ -1570,7 +1562,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Morocco -->
+        <!-- A city in Morocco -->
         <_name>Al Hoceima</_name>
         <coordinates>35.240000 -3.930000</coordinates>
         <location>
@@ -1580,7 +1572,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Morocco -->
+        <!-- A city in Morocco -->
         <_name>Casablanca</_name>
         <coordinates>33.590000 -7.610000</coordinates>
         <location>
@@ -1590,7 +1582,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Morocco -->
+        <!-- A city in Morocco -->
         <_name>Fes</_name>
         <coordinates>34.050000 -4.980000</coordinates>
         <location>
@@ -1600,7 +1592,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Morocco -->
+        <!-- A city in Morocco -->
         <_name>Marrakech</_name>
         <coordinates>31.630000 -8.000000</coordinates>
         <location>
@@ -1610,7 +1602,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Morocco -->
+        <!-- A city in Morocco -->
         <_name>Meknes</_name>
         <coordinates>33.900000 -5.550000</coordinates>
         <location>
@@ -1620,7 +1612,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Morocco -->
+        <!-- A city in Morocco -->
         <_name>Nador</_name>
         <coordinates>35.170000 -2.930000</coordinates>
         <location>
@@ -1630,7 +1622,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Morocco -->
+        <!-- A city in Morocco -->
         <_name>Nouaseur</_name>
         <coordinates>33.380000 -7.610000</coordinates>
         <location>
@@ -1640,7 +1632,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Morocco -->
+        <!-- A city in Morocco -->
         <_name>Ouarzazat</_name>
         <coordinates>30.920000 -6.910000</coordinates>
         <location>
@@ -1650,7 +1642,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Morocco -->
+        <!-- A city in Morocco -->
         <_name>Oujda</_name>
         <coordinates>34.680000 -1.910000</coordinates>
         <location>
@@ -1660,7 +1652,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Morocco -->
+        <!-- The capital of Morocco -->
         <_name>Rabat</_name>
         <coordinates>34.020000 -6.830000</coordinates>
         <location>
@@ -1670,7 +1662,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Morocco.
+        <!-- A city in Morocco.
              "Tangier" is the traditional English name.
              The local name is "Tanger".
           -->
@@ -1683,7 +1675,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Morocco -->
+        <!-- A city in Morocco -->
         <_name>Tetouan</_name>
         <coordinates>35.570000 -5.370000</coordinates>
         <location>
@@ -1703,7 +1695,7 @@
       </timezones>
       <tz-hint>Africa/Maputo</tz-hint>
       <city>
-        <!-- Translators: this is a city in Mozambique -->
+        <!-- A city in Mozambique -->
         <_name>Beira</_name>
         <coordinates>-19.843611 34.838889</coordinates>
         <location>
@@ -1713,7 +1705,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Mozambique -->
+        <!-- A city in Mozambique -->
         <_name>Chimoio</_name>
         <coordinates>-19.116389 33.483333</coordinates>
         <location>
@@ -1723,7 +1715,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Mozambique -->
+        <!-- A city in Mozambique -->
         <_name>Inhambane</_name>
         <coordinates>-23.865000 35.383333</coordinates>
         <location>
@@ -1733,7 +1725,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Mozambique -->
+        <!-- A city in Mozambique -->
         <_name>Lichinga</_name>
         <coordinates>-13.312778 35.240556</coordinates>
         <location>
@@ -1743,7 +1735,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Mozambique -->
+        <!-- The capital of Mozambique -->
         <_name>Maputo</_name>
         <coordinates>-25.965278 32.589167</coordinates>
         <location>
@@ -1753,7 +1745,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Mozambique -->
+        <!-- A city in Mozambique -->
         <_name>Nampula</_name>
         <coordinates>-15.119722 39.264722</coordinates>
         <location>
@@ -1763,7 +1755,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Mozambique -->
+        <!-- A city in Mozambique -->
         <_name>Pemba</_name>
         <coordinates>-12.960833 40.507778</coordinates>
         <location>
@@ -1773,7 +1765,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Mozambique -->
+        <!-- A city in Mozambique -->
         <_name>Quelimane</_name>
         <coordinates>-17.878611 36.888333</coordinates>
         <location>
@@ -1783,7 +1775,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Mozambique -->
+        <!-- A city in Mozambique -->
         <_name>Tete</_name>
         <coordinates>-16.156389 33.586667</coordinates>
         <location>
@@ -1807,7 +1799,7 @@
       </timezones>
       <tz-hint>Africa/Windhoek</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Namibia -->
+        <!-- The capital of Namibia -->
         <_name>Windhoek</_name>
         <coordinates>-22.570000 17.083611</coordinates>
         <location>
@@ -1827,7 +1819,7 @@
       </timezones>
       <tz-hint>Africa/Niamey</tz-hint>
       <city>
-        <!-- Translators: this is a city in Niger -->
+        <!-- A city in Niger -->
         <_name>Agadez</_name>
         <coordinates>16.973333 7.991111</coordinates>
         <location>
@@ -1837,7 +1829,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Niger -->
+        <!-- The capital of Niger -->
         <_name>Niamey</_name>
         <coordinates>13.516667 2.116667</coordinates>
         <location>
@@ -1847,7 +1839,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Niger -->
+        <!-- A city in Niger -->
         <_name>Zinder</_name>
         <coordinates>13.804869 8.988371</coordinates>
         <location>
@@ -1875,7 +1867,7 @@
       </timezones>
       <tz-hint>Africa/Lagos</tz-hint>
       <city>
-        <!-- Translators: this is a city in Nigeria -->
+        <!-- A city in Nigeria -->
         <_name>Ibadan</_name>
         <coordinates>7.387778 3.896389</coordinates>
         <location>
@@ -1885,7 +1877,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Nigeria -->
+        <!-- A city in Nigeria -->
         <_name>Ikeja</_name>
         <coordinates>6.596667 3.343056</coordinates>
         <location>
@@ -1895,7 +1887,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Nigeria -->
+        <!-- A city in Nigeria -->
         <_name>Ilorin</_name>
         <coordinates>8.500000 4.550000</coordinates>
         <location>
@@ -1905,7 +1897,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Nigeria -->
+        <!-- A city in Nigeria -->
         <_name>Kaduna</_name>
         <coordinates>10.523056 7.440278</coordinates>
         <location>
@@ -1915,7 +1907,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Nigeria -->
+        <!-- A city in Nigeria -->
         <_name>Kano</_name>
         <coordinates>11.996389 8.516667</coordinates>
         <location>
@@ -1925,7 +1917,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Nigeria -->
+        <!-- A city in Nigeria -->
         <_name>Lagos</_name>
         <coordinates>6.453056 3.395833</coordinates>
         <location>
@@ -1935,7 +1927,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Nigeria -->
+        <!-- A city in Nigeria -->
         <_name>Port Harcourt</_name>
         <coordinates>4.789167 6.998611</coordinates>
         <location>
@@ -1971,7 +1963,7 @@
       </timezones>
       <tz-hint>Indian/Reunion</tz-hint>
       <city>
-        <!-- Translators: this is a city in RÃunion -->
+        <!-- A city in RÃunion -->
         <_name>Gillot</_name>
         <coordinates>-20.883333 55.516667</coordinates>
         <location>
@@ -1981,7 +1973,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of RÃunion -->
+        <!-- The capital of RÃunion -->
         <_name>Saint-Denis</_name>
         <coordinates>-20.866667 55.466667</coordinates>
         <location>
@@ -1991,8 +1983,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in RÃunion -->
-        <_name>Saint-Pierre</_name>
+        <!-- A city in RÃunion -->
+        <_name msgctxt="City in RÃunion">Saint-Pierre</_name>
         <coordinates>-21.316667 55.483333</coordinates>
         <location>
           <name>Saint-Pierre</name>
@@ -2028,7 +2020,7 @@
       </timezones>
       <tz-hint>Africa/Dakar</tz-hint>
       <city>
-        <!-- Translators: this is a city in Senegal -->
+        <!-- A city in Senegal -->
         <_name>Boukot Ouolof</_name>
         <coordinates>12.416389 -16.750556</coordinates>
         <location>
@@ -2038,7 +2030,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Senegal -->
+        <!-- The capital of Senegal -->
         <_name>Dakar</_name>
         <coordinates>14.736667 -17.633889</coordinates>
         <location>
@@ -2048,7 +2040,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Senegal -->
+        <!-- A city in Senegal -->
         <_name>Saint-Louis</_name>
         <coordinates>16.032222 -16.616667</coordinates>
         <location>
@@ -2058,7 +2050,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Senegal -->
+        <!-- A city in Senegal -->
         <_name>Tambacounda</_name>
         <coordinates>13.753889 -13.758611</coordinates>
         <location>
@@ -2068,7 +2060,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Senegal -->
+        <!-- A city in Senegal -->
         <_name>Ziguinchor</_name>
         <coordinates>12.583333 -16.271944</coordinates>
         <location>
@@ -2088,7 +2080,7 @@
       </timezones>
       <tz-hint>Indian/Mahe</tz-hint>
       <city>
-        <!-- Translators: this is a city in the Seychelles -->
+        <!-- A city in the Seychelles -->
         <_name>Cascade</_name>
         <coordinates>-4.666667 55.500000</coordinates>
         <location>
@@ -2098,8 +2090,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of the Seychelles -->
-        <_name>Victoria</_name>
+        <!-- The capital of the Seychelles -->
+        <_name msgctxt="City in Seychelles">Victoria</_name>
         <coordinates>-4.616667 55.450000</coordinates>
         <location>
           <name>Seychelles International Airport</name>
@@ -2118,7 +2110,7 @@
       </timezones>
       <tz-hint>Africa/Freetown</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Sierra Leone -->
+        <!-- The capital of Sierra Leone -->
         <_name>Freetown</_name>
         <coordinates>8.490000 -13.234167</coordinates>
         <location>
@@ -2128,7 +2120,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sierra Leone -->
+        <!-- A city in Sierra Leone -->
         <_name>Lungi</_name>
         <coordinates>8.640833 -13.221944</coordinates>
         <location>
@@ -2166,7 +2158,7 @@
       </timezones>
       <tz-hint>Africa/Johannesburg</tz-hint>
       <city>
-        <!-- Translators: this is a city in South Africa -->
+        <!-- A city in South Africa -->
         <_name>Bloemfontein</_name>
         <coordinates>-29.133333 26.200000</coordinates>
         <location>
@@ -2176,7 +2168,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in South Africa -->
+        <!-- A city in South Africa -->
         <_name>Cape Town</_name>
         <coordinates>-33.916667 18.416667</coordinates>
         <location>
@@ -2186,7 +2178,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in South Africa -->
+        <!-- A city in South Africa -->
         <_name>Durban</_name>
         <coordinates>-29.850000 31.016667</coordinates>
         <location>
@@ -2196,7 +2188,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in South Africa -->
+        <!-- A city in South Africa -->
         <_name>Johannesburg</_name>
         <coordinates>-26.200000 28.083333</coordinates>
         <location>
@@ -2211,7 +2203,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in South Africa -->
+        <!-- A city in South Africa -->
         <_name>Klerksdorp</_name>
         <coordinates>-26.866667 26.666667</coordinates>
         <location>
@@ -2221,7 +2213,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in South Africa -->
+        <!-- A city in South Africa -->
         <_name>Port Elizabeth</_name>
         <coordinates>-33.966667 25.583333</coordinates>
         <location>
@@ -2231,7 +2223,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in South Africa -->
+        <!-- A city in South Africa -->
         <_name>Potchefstroom</_name>
         <coordinates>-26.716667 27.100000</coordinates>
         <location>
@@ -2241,7 +2233,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of South Africa -->
+        <!-- The capital of South Africa -->
         <_name>Pretoria</_name>
         <coordinates>-25.706944 28.229444</coordinates>
         <location>
@@ -2251,7 +2243,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in South Africa -->
+        <!-- A city in South Africa -->
         <_name>Rustenburg</_name>
         <coordinates>-25.666667 27.250000</coordinates>
         <location>
@@ -2261,7 +2253,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in South Africa -->
+        <!-- A city in South Africa -->
         <_name>Springs</_name>
         <coordinates>-26.250000 28.400000</coordinates>
         <location>
@@ -2271,7 +2263,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in South Africa -->
+        <!-- A city in South Africa -->
         <_name>Standerton</_name>
         <coordinates>-26.950000 29.250000</coordinates>
         <location>
@@ -2281,7 +2273,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in South Africa -->
+        <!-- A city in South Africa -->
         <_name>Upington</_name>
         <coordinates>-28.450000 21.250000</coordinates>
         <location>
@@ -2291,7 +2283,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in South Africa -->
+        <!-- A city in South Africa -->
         <_name>Vereeniging</_name>
         <coordinates>-26.666667 27.933333</coordinates>
         <location>
@@ -2311,7 +2303,7 @@
       </timezones>
       <tz-hint>Africa/Khartoum</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Sudan.
+        <!-- The capital of Sudan.
              "Khartoum" is the traditional English name.
              The local name in Arabic is "Al Khartum".
           -->
@@ -2338,7 +2330,7 @@
       </timezones>
       <tz-hint>Africa/Mbabane</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Swaziland -->
+        <!-- The capital of Swaziland -->
         <_name>Lobamba</_name>
         <coordinates>-26.466667 31.200000</coordinates>
         <location>
@@ -2348,7 +2340,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Swaziland -->
+        <!-- A city in Swaziland -->
         <_name>Manzini</_name>
         <coordinates>-26.483333 31.366667</coordinates>
         <location>
@@ -2358,7 +2350,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Swaziland -->
+        <!-- The capital of Swaziland -->
         <_name>Mbabane</_name>
         <coordinates>-26.316667 31.133333</coordinates>
         <location>
@@ -2382,7 +2374,7 @@
       </timezones>
       <tz-hint>Africa/Dar_es_Salaam</tz-hint>
       <city>
-        <!-- Translators: this is a city in Tanzania -->
+        <!-- A city in Tanzania -->
         <_name>Arusha</_name>
         <coordinates>-3.366667 36.683333</coordinates>
         <location>
@@ -2392,7 +2384,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tanzania -->
+        <!-- A city in Tanzania -->
         <_name>Bukoba</_name>
         <coordinates>-1.331667 31.812222</coordinates>
         <location>
@@ -2402,7 +2394,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Tanzania -->
+        <!-- The capital of Tanzania -->
         <_name>Dar es Salaam</_name>
         <coordinates>-6.800000 39.283333</coordinates>
         <location>
@@ -2412,7 +2404,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tanzania -->
+        <!-- A city in Tanzania -->
         <_name>Dodoma</_name>
         <coordinates>-6.183333 35.750000</coordinates>
         <location>
@@ -2422,7 +2414,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tanzania -->
+        <!-- A city in Tanzania -->
         <_name>Iringa</_name>
         <coordinates>-7.766667 35.700000</coordinates>
         <location>
@@ -2432,7 +2424,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tanzania -->
+        <!-- A city in Tanzania -->
         <_name>Kigoma</_name>
         <coordinates>-4.876944 29.626667</coordinates>
         <location>
@@ -2442,7 +2434,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tanzania -->
+        <!-- A city in Tanzania -->
         <_name>Kisauni</_name>
         <coordinates>-6.216667 39.216667</coordinates>
         <location>
@@ -2452,7 +2444,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tanzania -->
+        <!-- A city in Tanzania -->
         <_name>Mbeya</_name>
         <coordinates>-8.900000 33.450000</coordinates>
         <location>
@@ -2462,7 +2454,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tanzania -->
+        <!-- A city in Tanzania -->
         <_name>Morogoro</_name>
         <coordinates>-6.816667 37.666667</coordinates>
         <location>
@@ -2472,7 +2464,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tanzania -->
+        <!-- A city in Tanzania -->
         <_name>Moshi</_name>
         <coordinates>-3.350000 37.333333</coordinates>
         <location>
@@ -2482,7 +2474,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tanzania -->
+        <!-- A city in Tanzania -->
         <_name>Mtwara</_name>
         <coordinates>-10.266667 40.183333</coordinates>
         <location>
@@ -2492,7 +2484,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tanzania -->
+        <!-- A city in Tanzania -->
         <_name>Musoma</_name>
         <coordinates>-1.500000 33.800000</coordinates>
         <location>
@@ -2502,7 +2494,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tanzania -->
+        <!-- A city in Tanzania -->
         <_name>Mwanza</_name>
         <coordinates>-2.516667 32.900000</coordinates>
         <location>
@@ -2512,7 +2504,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tanzania -->
+        <!-- A city in Tanzania -->
         <_name>Songea</_name>
         <coordinates>-10.683333 35.650000</coordinates>
         <location>
@@ -2522,7 +2514,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tanzania -->
+        <!-- A city in Tanzania -->
         <_name>Tabora</_name>
         <coordinates>-5.016667 32.800000</coordinates>
         <location>
@@ -2532,7 +2524,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tanzania -->
+        <!-- A city in Tanzania -->
         <_name>Zanzibar</_name>
         <coordinates>-6.166667 39.183333</coordinates>
         <location>
@@ -2552,7 +2544,7 @@
       </timezones>
       <tz-hint>Africa/Lome</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Togo -->
+        <!-- The capital of Togo -->
         <_name>Lome</_name>
         <coordinates>6.131944 1.222778</coordinates>
         <location>
@@ -2562,7 +2554,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Togo -->
+        <!-- A city in Togo -->
         <_name>Niamtougou</_name>
         <coordinates>9.768056 1.105278</coordinates>
         <location>
@@ -2582,7 +2574,7 @@
       </timezones>
       <tz-hint>Africa/Tunis</tz-hint>
       <city>
-        <!-- Translators: this is a city in Tunisia -->
+        <!-- A city in Tunisia -->
         <_name>Bizerte</_name>
         <coordinates>37.274444 9.873889</coordinates>
         <location>
@@ -2592,7 +2584,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tunisia -->
+        <!-- A city in Tunisia -->
         <_name>El Borma</_name>
         <coordinates>31.666667 9.133333</coordinates>
         <location>
@@ -2602,7 +2594,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tunisia -->
+        <!-- A city in Tunisia -->
         <_name>Gabes</_name>
         <coordinates>33.883333 10.116667</coordinates>
         <location>
@@ -2612,7 +2604,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tunisia -->
+        <!-- A city in Tunisia -->
         <_name>Gafsa</_name>
         <coordinates>34.425000 8.784167</coordinates>
         <location>
@@ -2622,7 +2614,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tunisia -->
+        <!-- A city in Tunisia -->
         <_name>Houmt Souk</_name>
         <coordinates>33.874722 10.859167</coordinates>
         <location>
@@ -2632,7 +2624,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tunisia -->
+        <!-- A city in Tunisia -->
         <_name>Jendouba</_name>
         <coordinates>36.501111 8.779444</coordinates>
         <location>
@@ -2642,7 +2634,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tunisia -->
+        <!-- A city in Tunisia -->
         <_name>Kairouan</_name>
         <coordinates>35.674444 10.101667</coordinates>
         <location>
@@ -2652,7 +2644,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tunisia -->
+        <!-- A city in Tunisia -->
         <_name>Monastir</_name>
         <coordinates>35.783333 10.833333</coordinates>
         <location>
@@ -2662,7 +2654,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tunisia -->
+        <!-- A city in Tunisia -->
         <_name>Qulaybiyah</_name>
         <coordinates>36.850000 11.100000</coordinates>
         <location>
@@ -2672,7 +2664,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tunisia -->
+        <!-- A city in Tunisia -->
         <_name>Remada</_name>
         <coordinates>32.316667 10.400000</coordinates>
         <location>
@@ -2682,7 +2674,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tunisia -->
+        <!-- A city in Tunisia -->
         <_name>Sfax</_name>
         <coordinates>34.740556 10.760278</coordinates>
         <location>
@@ -2692,7 +2684,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tunisia -->
+        <!-- A city in Tunisia -->
         <_name>Tabarka</_name>
         <coordinates>36.954444 8.758056</coordinates>
         <location>
@@ -2702,7 +2694,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Tunisia -->
+        <!-- A city in Tunisia -->
         <_name>Tozeur</_name>
         <coordinates>33.920556 8.133333</coordinates>
         <location>
@@ -2712,7 +2704,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Tunisia -->
+        <!-- The capital of Tunisia -->
         <_name>Tunis</_name>
         <coordinates>36.802778 10.179722</coordinates>
         <location>
@@ -2732,7 +2724,7 @@
       </timezones>
       <tz-hint>Africa/Kampala</tz-hint>
       <city>
-        <!-- Translators: this is a city in Uganda -->
+        <!-- A city in Uganda -->
         <_name>Arua</_name>
         <coordinates>3.019167 30.930833</coordinates>
         <location>
@@ -2742,7 +2734,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Uganda -->
+        <!-- A city in Uganda -->
         <_name>Entebbe</_name>
         <coordinates>0.064444 32.446944</coordinates>
         <location>
@@ -2752,7 +2744,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Uganda -->
+        <!-- A city in Uganda -->
         <_name>Kabale</_name>
         <coordinates>-1.326111 30.003889</coordinates>
         <location>
@@ -2762,7 +2754,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Uganda -->
+        <!-- The capital of Uganda -->
         <_name>Kampala</_name>
         <coordinates>0.315556 32.565556</coordinates>
         <location>
@@ -2792,7 +2784,7 @@
       </timezones>
       <tz-hint>Africa/Lusaka</tz-hint>
       <city>
-        <!-- Translators: this is a city in Zambia -->
+        <!-- A city in Zambia -->
         <_name>Chinganze</_name>
         <coordinates>-13.266667 31.916667</coordinates>
         <location>
@@ -2802,7 +2794,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Zambia -->
+        <!-- A city in Zambia -->
         <_name>Livingstone</_name>
         <coordinates>-17.850000 25.866667</coordinates>
         <location>
@@ -2812,7 +2804,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Zambia -->
+        <!-- The capital of Zambia -->
         <_name>Lusaka</_name>
         <coordinates>-15.416667 28.283333</coordinates>
         <location>
@@ -2822,7 +2814,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Zambia -->
+        <!-- A city in Zambia -->
         <_name>Ndola</_name>
         <coordinates>-12.966667 28.633333</coordinates>
         <location>
@@ -2842,7 +2834,7 @@
       </timezones>
       <tz-hint>Africa/Harare</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Zimbabwe -->
+        <!-- The capital of Zimbabwe -->
         <_name>Harare</_name>
         <coordinates>-17.817778 31.044722</coordinates>
         <location>
@@ -2854,84 +2846,82 @@
     </country>
   </region>
   <region>
-    <_name>Antarctica</_name>
+    <_name msgctxt="Region">Antarctica</_name>
     <country>
       <!-- AQ - Antarctica -->
-      <_name>Antarctica</_name>
+      <_name msgctxt="Country">Antarctica</_name>
       <iso-code>AQ</iso-code>
       <fips-code>AY</fips-code>
       <timezones>
         <timezone id="Antarctica/Palmer">
-          <!-- Translators: This is an American research station in
-               Antarctica, which keeps the same time as mainland Chile.
-               The string is only used in places where "Antarctica" is
-               already clear from context.
+          <!-- An American research station in Antarctica, which keeps
+               the same time as mainland Chile. The string is only used
+               in places where "Antarctica" is already clear from
+               context.
             -->
           <_name>Palmer Station (Chile Time)</_name>
         </timezone>
         <timezone id="Antarctica/Rothera">
-          <!-- Translators: This is a British research station in
-               Antarctica. The string is only used in places where
-               "Antarctica" is already clear from context.
+          <!-- 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>
         </timezone>
         <timezone id="Antarctica/Syowa">
-          <!-- Translators: This is a Japanese research station in
-               Antarctica. The string is only used in places where
-               "Antarctica" is already clear from context.
+          <!-- A Japanese research station in Antarctica. The string is
+               only used in places where "Antarctica" is already clear
+               from context.
             -->
           <_name>Showa Station</_name>
         </timezone>
         <timezone id="Antarctica/Mawson">
-          <!-- Translators: This is an Australian research station in
-               Antarctica. The string is only used in places where
-               "Antarctica" is already clear from context.
+          <!-- An Australian research station in Antarctica. The string
+               is only used in places where "Antarctica" is already
+               clear from context.
             -->
           <_name>Mawson Station</_name>
         </timezone>
         <timezone id="Antarctica/Vostok">
-          <!-- Translators: This is a Russian research station in
-               Antarctica. The string is only used in places where
-               "Antarctica" is already clear from context.
+          <!-- A Russian research station in Antarctica. The string is
+               only used in places where "Antarctica" is already clear
+               from context.
             -->
           <_name>Vostok Station</_name>
         </timezone>
         <timezone id="Antarctica/Davis">
-          <!-- Translators: This is an Australian research station in
-               Antarctica. The string is only used in places where
-               "Antarctica" is already clear from context.
+          <!-- An Australian research station in Antarctica. The string
+               is only used in places where "Antarctica" is already
+               clear from context.
             -->
           <_name>Davis Station</_name>
         </timezone>
         <timezone id="Antarctica/Casey">
-          <!-- Translators: This is an Australian research station in
-               Antarctica, which keeps the same time as Western
-               Australia. The string is only used in places where
-               "Antarctica" is already clear from context.
+          <!-- An Australian research station in Antarctica, which
+               keeps the same time as Western Australia. The string is
+               only used in places where "Antarctica" is already clear
+               from context.
             -->
           <_name>Casey Station (Western Australia Time)</_name>
         </timezone>
         <timezone id="Antarctica/DumontDUrville">
-          <!-- Translators: This is a French research station in
-               Antarctica. The string is only used in places where
-               "Antarctica" is already clear from context.
+          <!-- 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>
         </timezone>
         <timezone id="Antarctica/McMurdo">
-          <!-- Translators: This is 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.
+          <!-- 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>
         </timezone>
         <timezone id="Antarctica/South_Pole">
-          <!-- Translators: This is 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.
+          <!-- 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>
         </timezone>
@@ -2951,7 +2941,7 @@
       </timezones>
       <tz-hint>Asia/Kabul</tz-hint>
       <city>
-        <!-- Translators: this is a city in Afghanistan -->
+        <!-- A city in Afghanistan -->
         <_name>Herat</_name>
         <coordinates>34.346944 62.198333</coordinates>
         <location>
@@ -2961,7 +2951,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Afghanistan.
+        <!-- The capital of Afghanistan.
              "Kabul" is the traditional English name.
              The local name in Persian is "Kabol".
           -->
@@ -2988,7 +2978,7 @@
       </timezones>
       <tz-hint>Asia/Yerevan</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Armenia -->
+        <!-- The capital of Armenia -->
         <_name>Yerevan</_name>
         <coordinates>40.181111 44.513611</coordinates>
         <location>
@@ -3012,7 +3002,7 @@
       </timezones>
       <tz-hint>Asia/Baku</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Azerbaijan.
+        <!-- The capital of Azerbaijan.
              "Baku" is the traditional English name.
              The local name is "Baki".
           -->
@@ -3025,7 +3015,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Azerbaijan -->
+        <!-- A city in Azerbaijan -->
         <_name>Ganca</_name>
         <coordinates>40.682778 46.360556</coordinates>
         <location>
@@ -3049,7 +3039,7 @@
       </timezones>
       <tz-hint>Asia/Dhaka</tz-hint>
       <city>
-        <!-- Translators: this is a city in Bangladesh.
+        <!-- A city in Bangladesh.
              The local name in Bengali is "ààààààààà".
           -->
         <_name>Chittagong</_name>
@@ -3061,7 +3051,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Bangladesh.
+        <!-- The capital of Bangladesh.
              The local name in Bengali is "àààà".
           -->
         <_name>Dhaka</_name>
@@ -3073,7 +3063,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bangladesh -->
+        <!-- A city in Bangladesh -->
         <_name>Solpur</_name>
         <coordinates>23.850000 90.400000</coordinates>
         <location>
@@ -3107,7 +3097,7 @@
       </timezones>
       <tz-hint>Asia/Brunei</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Brunei -->
+        <!-- The capital of Brunei -->
         <_name>Bandar Seri Begawan</_name>
         <coordinates>4.883333 114.933333</coordinates>
         <location>
@@ -3127,7 +3117,7 @@
       </timezones>
       <tz-hint>Asia/Phnom_Penh</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Cambodia.
+        <!-- The capital of Cambodia.
              "Phnom Penh" is the traditional English name.
              The local name in Khmer is "Phnum Penh".
           -->
@@ -3140,7 +3130,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Cambodia -->
+        <!-- A city in Cambodia -->
         <_name>Pouthichentong</_name>
         <coordinates>11.566667 104.850000</coordinates>
         <location>
@@ -3150,7 +3140,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Cambodia -->
+        <!-- A city in Cambodia -->
         <_name>Siemreab</_name>
         <coordinates>13.366667 103.850000</coordinates>
         <location>
@@ -3181,11 +3171,11 @@
       </timezones>
       <tz-hint>Asia/Shanghai</tz-hint>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Anhui</_name>
         <fips-code>CH01</fips-code>
         <city>
-          <!-- Translators: this is a city in Anhui in China.
+          <!-- A city in Anhui in China.
                The name is also written "åè".
             -->
           <_name>Hefei</_name>
@@ -3198,12 +3188,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
-        <_name>Beijing</_name>
+        <!-- A state/province/territory in China -->
+        <_name msgctxt="State in China">Beijing</_name>
         <fips-code>CH22</fips-code>
         <city>
-          <!-- Translators: this is the capital of China -->
-          <_name>Beijing</_name>
+          <!-- The capital of China -->
+          <_name msgctxt="City in Beijing, China">Beijing</_name>
           <coordinates>39.928889 116.388333</coordinates>
           <location>
             <name>Beijing</name>
@@ -3213,14 +3203,14 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
-        <_name>Chongqing</_name>
+        <!-- A state/province/territory in China -->
+        <_name msgctxt="State in China">Chongqing</_name>
         <fips-code>CH33</fips-code>
         <city>
-          <!-- Translators: this is a city in Chongqing in China.
+          <!-- A city in Chongqing in China.
                The name is also written "éå".
             -->
-          <_name>Chongqing</_name>
+          <_name msgctxt="City in Chongqing, China">Chongqing</_name>
           <coordinates>29.562778 106.552778</coordinates>
           <location>
             <name>Chongqing</name>
@@ -3230,11 +3220,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Fujian</_name>
         <fips-code>CH07</fips-code>
         <city>
-          <!-- Translators: this is a city in Fujian in China.
+          <!-- A city in Fujian in China.
                The name is also written "çå".
             -->
           <_name>Fuzhou</_name>
@@ -3246,7 +3236,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Fujian in China.
+          <!-- A city in Fujian in China.
                The name is also written "åé".
             -->
           <_name>Xiamen</_name>
@@ -3259,11 +3249,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Gansu</_name>
         <fips-code>CH15</fips-code>
         <city>
-          <!-- Translators: this is a city in Gansu in China.
+          <!-- A city in Gansu in China.
                The name is also written "åå".
             -->
           <_name>Lanzhou</_name>
@@ -3276,11 +3266,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Guangdong</_name>
         <fips-code>CH30</fips-code>
         <city>
-          <!-- Translators: this is a city in Guangdong in China.
+          <!-- A city in Guangdong in China.
                The name is also written "åå".
             -->
           <_name>Guangzhou</_name>
@@ -3292,7 +3282,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Guangdong in China -->
+          <!-- A city in Guangdong in China -->
           <_name>Shantou</_name>
           <coordinates>23.368140 116.714790</coordinates>
           <location>
@@ -3302,7 +3292,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Guangdong in China -->
+          <!-- A city in Guangdong in China -->
           <_name>Shenzhen</_name>
           <coordinates>22.533333 114.133333</coordinates>
           <location>
@@ -3313,11 +3303,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Guangxi</_name>
         <fips-code>CH16</fips-code>
         <city>
-          <!-- Translators: this is a city in Guangxi in China -->
+          <!-- A city in Guangxi in China -->
           <_name>Guilin</_name>
           <coordinates>25.281944 110.286389</coordinates>
           <location>
@@ -3327,7 +3317,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Guangxi in China.
+          <!-- A city in Guangxi in China.
                The name is also written "åå".
             -->
           <_name>Nanning</_name>
@@ -3340,16 +3330,16 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Guizhou</_name>
         <fips-code>CH18</fips-code>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Hainan</_name>
         <fips-code>CH31</fips-code>
         <city>
-          <!-- Translators: this is a city in Hainan in China -->
+          <!-- A city in Hainan in China -->
           <_name>Sanya</_name>
           <coordinates>18.243056 109.505000</coordinates>
           <location>
@@ -3360,11 +3350,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Heilongjiang</_name>
         <fips-code>CH08</fips-code>
         <city>
-          <!-- Translators: this is a city in Heilongjiang in China.
+          <!-- A city in Heilongjiang in China.
                The name is also written "ååæ".
             -->
           <_name>Harbin</_name>
@@ -3377,11 +3367,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Henan</_name>
         <fips-code>CH09</fips-code>
         <city>
-          <!-- Translators: this is a city in Henan in China.
+          <!-- A city in Henan in China.
                The name is also written "éå".
             -->
           <_name>Zhengzhou</_name>
@@ -3394,11 +3384,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Hubei</_name>
         <fips-code>CH12</fips-code>
         <city>
-          <!-- Translators: this is a city in Hubei in China.
+          <!-- A city in Hubei in China.
                The name is also written "ææ".
             -->
           <_name>Wuhan</_name>
@@ -3411,11 +3401,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Hunan</_name>
         <fips-code>CH11</fips-code>
         <city>
-          <!-- Translators: this is a city in Hunan in China.
+          <!-- A city in Hunan in China.
                The name is also written "éæ".
             -->
           <_name>Changsha</_name>
@@ -3428,11 +3418,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Inner Mongolia</_name>
         <fips-code>CH20</fips-code>
         <city>
-          <!-- Translators: this is a city in Inner Mongolia in China.
+          <!-- A city in Inner Mongolia in China.
                The name is also written "ååæç".
             -->
           <_name>Hohhot</_name>
@@ -3445,11 +3435,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Jiangsu</_name>
         <fips-code>CH04</fips-code>
         <city>
-          <!-- Translators: this is a city in Jiangsu in China.
+          <!-- A city in Jiangsu in China.
                The name is also written "åä".
             -->
           <_name>Nanjing</_name>
@@ -3462,11 +3452,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Jilin</_name>
         <fips-code>CH05</fips-code>
         <city>
-          <!-- Translators: this is a city in Jilin in China.
+          <!-- A city in Jilin in China.
                The name is also written "éæ".
             -->
           <_name>Changchun</_name>
@@ -3479,11 +3469,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Liaoning</_name>
         <fips-code>CH19</fips-code>
         <city>
-          <!-- Translators: this is a city in Liaoning in China -->
+          <!-- A city in Liaoning in China -->
           <_name>Dalian</_name>
           <coordinates>38.912222 121.602222</coordinates>
           <location>
@@ -3493,7 +3483,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Liaoning in China.
+          <!-- A city in Liaoning in China.
                The name is also written "æé".
             -->
           <_name>Shenyang</_name>
@@ -3506,11 +3496,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Shaanxi</_name>
         <fips-code>CH26</fips-code>
         <city>
-          <!-- Translators: this is a city in Shaanxi in China.
+          <!-- A city in Shaanxi in China.
                The name is also written "èå".
             -->
           <_name>Xi'an</_name>
@@ -3523,11 +3513,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Shandong</_name>
         <fips-code>CH25</fips-code>
         <city>
-          <!-- Translators: this is a city in Shandong in China -->
+          <!-- A city in Shandong in China -->
           <_name>Qingdao</_name>
           <coordinates>36.098611 120.371944</coordinates>
           <location>
@@ -3538,14 +3528,14 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
-        <_name>Shanghai</_name>
+        <!-- A state/province/territory in China -->
+        <_name msgctxt="State in China">Shanghai</_name>
         <fips-code>CH23</fips-code>
         <city>
-          <!-- Translators: this is a city in Shanghai in China.
+          <!-- A city in Shanghai in China.
                The name is also written "äæ".
             -->
-          <_name>Shanghai</_name>
+          <_name msgctxt="City in Shanghai, China">Shanghai</_name>
           <coordinates>31.222222 121.458056</coordinates>
           <location>
             <name>Hongqiao Airport</name>
@@ -3560,11 +3550,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Shanxi</_name>
         <fips-code>CH24</fips-code>
         <city>
-          <!-- Translators: this is a city in Shanxi in China.
+          <!-- A city in Shanxi in China.
                The name is also written "åå".
             -->
           <_name>Taiyuan</_name>
@@ -3577,11 +3567,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Sichuan</_name>
         <fips-code>CH32</fips-code>
         <city>
-          <!-- Translators: this is a city in Sichuan in China.
+          <!-- A city in Sichuan in China.
                The name is also written "æé".
             -->
           <_name>Chengdu</_name>
@@ -3594,14 +3584,14 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
-        <_name>Tianjin</_name>
+        <!-- A state/province/territory in China -->
+        <_name msgctxt="State in China">Tianjin</_name>
         <fips-code>CH28</fips-code>
         <city>
-          <!-- Translators: this is a city in Tianjin in China.
+          <!-- A city in Tianjin in China.
                The name is also written "åæ".
             -->
-          <_name>Tianjin</_name>
+          <_name msgctxt="City in Tianjin, China">Tianjin</_name>
           <coordinates>39.142222 117.176667</coordinates>
           <location>
             <name>Zhangguizhu Airport</name>
@@ -3611,11 +3601,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Xinjiang</_name>
         <fips-code>CH13</fips-code>
         <city>
-          <!-- Translators: this is a city in Xinjiang in China -->
+          <!-- A city in Xinjiang in China -->
           <_name>Kashi</_name>
           <coordinates>39.454722 75.979722</coordinates>
           <location>
@@ -3625,7 +3615,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Xinjiang in China.
+          <!-- A city in Xinjiang in China.
                The name is also written "äéæé".
             -->
           <_name>Urumqi</_name>
@@ -3638,11 +3628,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Yunnan</_name>
         <fips-code>CH29</fips-code>
         <city>
-          <!-- Translators: this is a city in Yunnan in China.
+          <!-- A city in Yunnan in China.
                The name is also written "ææ".
             -->
           <_name>Kunming</_name>
@@ -3655,11 +3645,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in China -->
+        <!-- A state/province/territory in China -->
         <_name>Zhejiang</_name>
         <fips-code>CH02</fips-code>
         <city>
-          <!-- Translators: this is a city in Zhejiang in China.
+          <!-- A city in Zhejiang in China.
                The name is also written "æå".
             -->
           <_name>Hangzhou</_name>
@@ -3674,7 +3664,7 @@
     </country>
     <country>
       <!-- GE - Georgia (the country, not the US state) -->
-      <_name>Georgia</_name>
+      <_name msgctxt="Country">Georgia</_name>
       <!-- Could not find weather stations for the following major
            cities:
            Tbilisi
@@ -3698,7 +3688,7 @@
       </timezones>
       <tz-hint>Asia/Hong_Kong</tz-hint>
       <city>
-        <!-- Translators: this is a city in Hong Kong -->
+        <!-- A city in Hong Kong -->
         <_name>Kowloon</_name>
         <coordinates>22.316667 114.183333</coordinates>
         <location>
@@ -3731,7 +3721,7 @@
       </timezones>
       <tz-hint>Asia/Kolkata</tz-hint>
       <city>
-        <!-- Translators: this is a city in India -->
+        <!-- A city in India -->
         <_name>Ahmadabad</_name>
         <coordinates>23.033333 72.616667</coordinates>
         <location>
@@ -3741,7 +3731,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in India -->
+        <!-- A city in India -->
         <_name>Amritsar</_name>
         <coordinates>31.633056 74.865556</coordinates>
         <location>
@@ -3751,7 +3741,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in India.
+        <!-- A city in India.
              "Benares" is the traditional English name.
              The local name is "Varanasi".
              The local name in Hindi is "ààààààà".
@@ -3765,7 +3755,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in India.
+        <!-- A city in India.
              "Bombay" is the traditional English name.
              The local name in Marathi is "Mumbai /  ààààà".
           -->
@@ -3778,7 +3768,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in India.
+        <!-- A city in India.
              "Calcutta" is the traditional English name.
              The local name in Bengali is "Kolkata /  àààààà".
           -->
@@ -3791,7 +3781,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in India -->
+        <!-- A city in India -->
         <_name>Dam Dam</_name>
         <coordinates>22.622222 88.416944</coordinates>
         <location>
@@ -3801,7 +3791,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in India -->
+        <!-- A city in India -->
         <_name>Hyderabad</_name>
         <coordinates>17.375278 78.474444</coordinates>
         <location>
@@ -3811,7 +3801,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in India -->
+        <!-- A city in India -->
         <_name>Jaipur</_name>
         <coordinates>26.916667 75.816667</coordinates>
         <location>
@@ -3821,7 +3811,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in India.
+        <!-- A city in India.
              The local name in Hindi is "àààà".
           -->
         <_name>Lucknow</_name>
@@ -3833,7 +3823,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in India.
+        <!-- A city in India.
              "Madras" is the traditional English name.
              The local name in Tamil is "Chennai / àààààà".
           -->
@@ -3846,7 +3836,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in India -->
+        <!-- A city in India -->
         <_name>Nagpur</_name>
         <coordinates>21.150000 79.100000</coordinates>
         <location>
@@ -3856,7 +3846,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of India.
+        <!-- The capital of India.
              The local name in Urdu is "ÙØÛ ØÙÛâ".
              The local name in Panjabi is "àààà ààààà".
              The local name in Hindi is "àà àààààà".
@@ -3870,7 +3860,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in India -->
+        <!-- A city in India -->
         <_name>Palam</_name>
         <coordinates>28.566667 77.100000</coordinates>
         <location>
@@ -3880,7 +3870,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in India -->
+        <!-- A city in India -->
         <_name>Patna</_name>
         <coordinates>25.600000 85.116667</coordinates>
         <location>
@@ -3890,7 +3880,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in India -->
+        <!-- A city in India -->
         <_name>Sanganer</_name>
         <coordinates>26.816667 75.783333</coordinates>
         <location>
@@ -3900,8 +3890,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in India -->
-        <_name>Santa Cruz</_name>
+        <!-- A city in India -->
+        <_name msgctxt="City in India">Santa Cruz</_name>
         <coordinates>19.083333 72.833333</coordinates>
         <location>
           <name>Bombay / Santa Cruz</name>
@@ -3910,7 +3900,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in India.
+        <!-- A city in India.
              The local name in Malayalam is "ààààààààààààà".
           -->
         <_name>Thiruvananthapuram</_name>
@@ -3922,7 +3912,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in India.
+        <!-- A city in India.
              The local name in Tamil is "ààààààààààààààààà".
           -->
         <_name>Tiruchchirappalli</_name>
@@ -3948,7 +3938,7 @@
       </timezones>
       <tz-hint>Asia/Tokyo</tz-hint>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Akita</_name>
         <coordinates>39.716667 140.066667</coordinates>
         <location>
@@ -3958,7 +3948,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Ami</_name>
         <coordinates>36.033333 140.200000</coordinates>
         <location>
@@ -3968,7 +3958,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Aomori</_name>
         <coordinates>40.821111 140.751111</coordinates>
         <location>
@@ -3978,7 +3968,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Asahikawa</_name>
         <coordinates>43.767778 142.370278</coordinates>
         <location>
@@ -3988,7 +3978,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Ashiya</_name>
         <coordinates>33.883333 130.666667</coordinates>
         <location>
@@ -3998,7 +3988,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Chitose</_name>
         <coordinates>42.819444 141.652222</coordinates>
         <location>
@@ -4013,7 +4003,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Chofu</_name>
         <coordinates>35.655556 139.552222</coordinates>
         <location>
@@ -4023,7 +4013,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Fuji</_name>
         <coordinates>35.166667 138.683333</coordinates>
         <location>
@@ -4033,7 +4023,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Fukue</_name>
         <coordinates>32.688056 128.841944</coordinates>
         <location>
@@ -4043,7 +4033,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Fukuoka</_name>
         <coordinates>33.583333 130.400000</coordinates>
         <location>
@@ -4053,7 +4043,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Futemma</_name>
         <coordinates>26.287222 127.773056</coordinates>
         <location>
@@ -4063,7 +4053,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Gifu</_name>
         <coordinates>35.416667 136.750000</coordinates>
         <location>
@@ -4073,7 +4063,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Hakodate</_name>
         <coordinates>41.775833 140.736667</coordinates>
         <location>
@@ -4083,7 +4073,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Hamamatsu</_name>
         <coordinates>34.700000 137.733333</coordinates>
         <location>
@@ -4093,7 +4083,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Hamanaka</_name>
         <coordinates>38.816667 139.783333</coordinates>
         <location>
@@ -4103,7 +4093,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Hanamaki</_name>
         <coordinates>39.383333 141.116667</coordinates>
         <location>
@@ -4113,7 +4103,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Hiroshima</_name>
         <coordinates>34.400000 132.450000</coordinates>
         <location>
@@ -4128,7 +4118,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Hofu</_name>
         <coordinates>34.050000 131.566667</coordinates>
         <location>
@@ -4138,7 +4128,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Ishigaki</_name>
         <coordinates>24.333333 124.150000</coordinates>
         <location>
@@ -4148,7 +4138,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Iwakuni</_name>
         <coordinates>34.150000 132.183333</coordinates>
         <location>
@@ -4158,7 +4148,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Izumo</_name>
         <coordinates>35.366667 132.766667</coordinates>
         <location>
@@ -4168,7 +4158,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Janado</_name>
         <coordinates>26.333333 126.800000</coordinates>
         <location>
@@ -4178,7 +4168,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Kadena</_name>
         <coordinates>26.366667 127.750000</coordinates>
         <location>
@@ -4188,7 +4178,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Kagoshima</_name>
         <coordinates>31.600000 130.550000</coordinates>
         <location>
@@ -4198,7 +4188,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Kanayama</_name>
         <coordinates>33.683333 135.350000</coordinates>
         <location>
@@ -4208,7 +4198,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Kanoya</_name>
         <coordinates>31.383333 130.850000</coordinates>
         <location>
@@ -4218,7 +4208,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Kashoji</_name>
         <coordinates>34.400000 135.283333</coordinates>
         <location>
@@ -4228,7 +4218,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Kitakyushu</_name>
         <coordinates>33.833333 130.833333</coordinates>
         <location>
@@ -4238,7 +4228,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Kochi</_name>
         <coordinates>33.550000 133.550000</coordinates>
         <location>
@@ -4248,7 +4238,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Komatsu</_name>
         <coordinates>36.400000 136.450000</coordinates>
         <location>
@@ -4258,7 +4248,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Komatsushima</_name>
         <coordinates>34.000000 134.583333</coordinates>
         <location>
@@ -4268,7 +4258,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Kumamoto</_name>
         <coordinates>32.800000 130.716667</coordinates>
         <location>
@@ -4278,7 +4268,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Kunigami</_name>
         <coordinates>27.416667 128.683333</coordinates>
         <location>
@@ -4288,7 +4278,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Kushiro</_name>
         <coordinates>42.975000 144.374722</coordinates>
         <location>
@@ -4298,7 +4288,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Matsubara</_name>
         <coordinates>24.783333 125.266667</coordinates>
         <location>
@@ -4308,7 +4298,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Matsumoto</_name>
         <coordinates>36.233333 137.966667</coordinates>
         <location>
@@ -4318,7 +4308,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Matsushima</_name>
         <coordinates>38.366667 141.071667</coordinates>
         <location>
@@ -4328,7 +4318,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Matsuyama</_name>
         <coordinates>33.836389 132.753056</coordinates>
         <location>
@@ -4338,7 +4328,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Memambetsu</_name>
         <coordinates>43.907222 144.173889</coordinates>
         <location>
@@ -4348,7 +4338,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Mihonoseki</_name>
         <coordinates>35.566667 133.316667</coordinates>
         <location>
@@ -4358,7 +4348,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Minami</_name>
         <coordinates>24.783333 141.316667</coordinates>
         <location>
@@ -4368,7 +4358,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Misawa</_name>
         <coordinates>40.683611 141.359722</coordinates>
         <location>
@@ -4378,7 +4368,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Mito</_name>
         <coordinates>36.366667 140.466667</coordinates>
         <location>
@@ -4388,7 +4378,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Miyazaki</_name>
         <coordinates>31.900000 131.433333</coordinates>
         <location>
@@ -4398,7 +4388,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Mombetsu</_name>
         <coordinates>44.352500 143.352500</coordinates>
         <location>
@@ -4408,7 +4398,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Nagasaki</_name>
         <coordinates>32.755000 129.868333</coordinates>
         <location>
@@ -4418,7 +4408,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Nagoya</_name>
         <coordinates>35.166667 136.916667</coordinates>
         <location>
@@ -4428,7 +4418,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Naha</_name>
         <coordinates>26.207222 127.673333</coordinates>
         <location>
@@ -4438,7 +4428,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Naka-shibetsu</_name>
         <coordinates>43.550000 144.983333</coordinates>
         <location>
@@ -4448,7 +4438,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Niigata</_name>
         <coordinates>37.916667 139.050000</coordinates>
         <location>
@@ -4458,7 +4448,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Obihiro</_name>
         <coordinates>42.917222 143.204444</coordinates>
         <location>
@@ -4473,7 +4463,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Odaira</_name>
         <coordinates>30.550000 130.966667</coordinates>
         <location>
@@ -4483,7 +4473,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Odaka</_name>
         <coordinates>37.200000 140.416667</coordinates>
         <location>
@@ -4493,7 +4483,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Odate</_name>
         <coordinates>40.268611 140.568333</coordinates>
         <location>
@@ -4503,7 +4493,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Ofunakoshi</_name>
         <coordinates>34.273333 129.354722</coordinates>
         <location>
@@ -4513,7 +4503,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Ogimachiya</_name>
         <coordinates>35.833333 139.400000</coordinates>
         <location>
@@ -4523,7 +4513,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Oita</_name>
         <coordinates>33.237222 131.604444</coordinates>
         <location>
@@ -4533,7 +4523,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Okata</_name>
         <coordinates>34.783333 139.383333</coordinates>
         <location>
@@ -4543,7 +4533,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Okayama</_name>
         <coordinates>34.650000 133.916667</coordinates>
         <location>
@@ -4553,7 +4543,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Okazato</_name>
         <coordinates>33.100000 139.783333</coordinates>
         <location>
@@ -4563,7 +4553,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Osaka</_name>
         <coordinates>34.666667 135.500000</coordinates>
         <location>
@@ -4573,7 +4563,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Ozuki</_name>
         <coordinates>34.066667 131.033333</coordinates>
         <location>
@@ -4583,7 +4573,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Saga</_name>
         <coordinates>33.250000 130.300000</coordinates>
         <location>
@@ -4593,7 +4583,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Sanrizuka</_name>
         <coordinates>35.750000 140.383333</coordinates>
         <location>
@@ -4603,7 +4593,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Sawada</_name>
         <coordinates>24.833333 125.166667</coordinates>
         <location>
@@ -4613,7 +4603,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Sendai</_name>
         <coordinates>38.254722 140.884722</coordinates>
         <location>
@@ -4628,7 +4618,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Shiroi</_name>
         <coordinates>35.800000 140.066667</coordinates>
         <location>
@@ -4638,7 +4628,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Takamatsu</_name>
         <coordinates>34.333333 134.050000</coordinates>
         <location>
@@ -4648,7 +4638,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Takatsu</_name>
         <coordinates>34.683333 131.783333</coordinates>
         <location>
@@ -4658,7 +4648,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Tateyama</_name>
         <coordinates>34.983333 139.866667</coordinates>
         <location>
@@ -4668,7 +4658,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Japan -->
+        <!-- The capital of Japan -->
         <_name>Tokyo</_name>
         <coordinates>35.685000 139.751389</coordinates>
         <location>
@@ -4683,7 +4673,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Tottori</_name>
         <coordinates>35.500000 134.233333</coordinates>
         <location>
@@ -4693,7 +4683,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Toyama</_name>
         <coordinates>36.683333 137.216667</coordinates>
         <location>
@@ -4703,7 +4693,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Toyooka</_name>
         <coordinates>35.533333 134.833333</coordinates>
         <location>
@@ -4713,7 +4703,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Tsuiki</_name>
         <coordinates>33.666667 131.050000</coordinates>
         <location>
@@ -4723,7 +4713,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Ushuku</_name>
         <coordinates>28.450000 129.716667</coordinates>
         <location>
@@ -4733,7 +4723,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Wakkanai</_name>
         <coordinates>45.409444 141.673889</coordinates>
         <location>
@@ -4743,7 +4733,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Yamagata</_name>
         <coordinates>38.252778 140.337500</coordinates>
         <location>
@@ -4753,7 +4743,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Yamaguchi</_name>
         <coordinates>34.166667 131.483333</coordinates>
         <location>
@@ -4763,7 +4753,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Yao</_name>
         <coordinates>34.616667 135.600000</coordinates>
         <location>
@@ -4773,7 +4763,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Yokota</_name>
         <coordinates>35.750000 139.383333</coordinates>
         <location>
@@ -4783,7 +4773,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Japan -->
+        <!-- A city in Japan -->
         <_name>Yoshinaga</_name>
         <coordinates>34.800000 138.300000</coordinates>
         <location>
@@ -4801,17 +4791,15 @@
       <pref-lang>kaz</pref-lang>
       <timezones>
         <timezone id="Asia/Almaty">
-          <!-- Translators: This is the time zone used in the eastern
-               half of Kazakhstan. FIXME: is there an official name for
-               this zone?
+          <!-- The time zone used in the eastern half of Kazakhstan.
+               FIXME: is there an official name for this zone?
             -->
           <_name>Eastern Kazakhstan</_name>
           <obsoletes>Asia/Qyzylorda</obsoletes>
         </timezone>
         <timezone id="Asia/Aqtobe">
-          <!-- Translators: This is the time zone used in the western
-               half of Kazakhstan. FIXME: is there an official name for
-               this zone?
+          <!-- The time zone used in the western half of Kazakhstan.
+               FIXME: is there an official name for this zone?
             -->
           <_name>Western Kazakhstan</_name>
           <obsoletes>Asia/Aqtau</obsoletes>
@@ -4820,7 +4808,7 @@
       </timezones>
       <tz-hint>Asia/Almaty</tz-hint>
       <city>
-        <!-- Translators: this is a city in Kazakhstan -->
+        <!-- A city in Kazakhstan -->
         <_name>Almaty</_name>
         <coordinates>43.250000 76.950000</coordinates>
         <location>
@@ -4830,7 +4818,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Kazakhstan.
+        <!-- A city in Kazakhstan.
              The local name in Russian is "Aktau".
           -->
         <_name>Aqtau</_name>
@@ -4843,7 +4831,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Kazakhstan.
+        <!-- A city in Kazakhstan.
              The local name in Russian is "Aktobe".
           -->
         <_name>AqtÃbe</_name>
@@ -4856,7 +4844,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Kazakhstan -->
+        <!-- The capital of Kazakhstan -->
         <_name>Astana</_name>
         <coordinates>51.181111 71.427778</coordinates>
         <location>
@@ -4867,7 +4855,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Kazakhstan.
+        <!-- A city in Kazakhstan.
              The local name in Russian is "Ural'sk".
           -->
         <_name>Oral</_name>
@@ -4880,7 +4868,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Kazakhstan.
+        <!-- A city in Kazakhstan.
              The local name in Russian is "Karaganda".
           -->
         <_name>Qaraghandy</_name>
@@ -4892,7 +4880,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Kazakhstan.
+        <!-- A city in Kazakhstan.
              The local name in Russian is "Kostanay".
           -->
         <_name>Qostanay</_name>
@@ -4905,7 +4893,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Kazakhstan.
+        <!-- A city in Kazakhstan.
              The local name in Russian is "Kyzylorda".
           -->
         <_name>Qyzylorda</_name>
@@ -4918,7 +4906,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Kazakhstan -->
+        <!-- A city in Kazakhstan -->
         <_name>Shymkent</_name>
         <coordinates>42.300000 69.600000</coordinates>
         <location>
@@ -4943,7 +4931,7 @@
       </timezones>
       <tz-hint>Asia/Bishkek</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Kyrgyzstan -->
+        <!-- The capital of Kyrgyzstan -->
         <_name>Bishkek</_name>
         <coordinates>42.873056 74.600278</coordinates>
         <location>
@@ -4967,7 +4955,7 @@
       </timezones>
       <tz-hint>Asia/Vientiane</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Laos.
+        <!-- The capital of Laos.
              "Vientiane" is the traditional English name.
              The local name in Lao is "Viangchan".
           -->
@@ -4994,7 +4982,7 @@
       </timezones>
       <tz-hint>Asia/Macau</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Macau.
+        <!-- The capital of Macau.
              The name is also written "æé".
              The local name is "Macau".
           -->
@@ -5007,7 +4995,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Macau.
+        <!-- A city in Macau.
              The local name in Chinese is "Dangzai / æä".
           -->
         <_name>Taipa</_name>
@@ -5035,7 +5023,7 @@
       </timezones>
       <tz-hint>Asia/Kuala_Lumpur</tz-hint>
       <city>
-        <!-- Translators: this is a city in Malaysia -->
+        <!-- A city in Malaysia -->
         <_name>Bintulu</_name>
         <coordinates>3.166667 113.033333</coordinates>
         <location>
@@ -5045,8 +5033,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Malaysia -->
-        <_name>George Town</_name>
+        <!-- A city in Malaysia -->
+        <_name msgctxt="City in Malaysia">George Town</_name>
         <coordinates>5.416667 100.333333</coordinates>
         <location>
           <name>Bayan Lepas Airport</name>
@@ -5055,7 +5043,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Malaysia -->
+        <!-- A city in Malaysia -->
         <_name>Johor Bahru</_name>
         <coordinates>1.466667 103.750000</coordinates>
         <location>
@@ -5065,7 +5053,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Malaysia -->
+        <!-- A city in Malaysia -->
         <_name>Klang</_name>
         <coordinates>3.033333 101.450000</coordinates>
         <location>
@@ -5075,7 +5063,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Malaysia -->
+        <!-- A city in Malaysia -->
         <_name>Kota Baharu</_name>
         <coordinates>6.133333 102.250000</coordinates>
         <location>
@@ -5085,7 +5073,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Malaysia -->
+        <!-- A city in Malaysia -->
         <_name>Kota Kinabalu</_name>
         <coordinates>5.983333 116.066667</coordinates>
         <location>
@@ -5095,7 +5083,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Malaysia -->
+        <!-- A city in Malaysia -->
         <_name>Kuah</_name>
         <coordinates>6.316667 99.850000</coordinates>
         <location>
@@ -5105,7 +5093,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Malaysia -->
+        <!-- The capital of Malaysia -->
         <_name>Kuala Lumpur</_name>
         <coordinates>3.166667 101.700000</coordinates>
         <location>
@@ -5115,7 +5103,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Malaysia -->
+        <!-- A city in Malaysia -->
         <_name>Kuantan</_name>
         <coordinates>3.800000 103.333333</coordinates>
         <location>
@@ -5125,7 +5113,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Malaysia -->
+        <!-- A city in Malaysia -->
         <_name>Kuching</_name>
         <coordinates>1.550000 110.333333</coordinates>
         <location>
@@ -5135,7 +5123,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Malaysia -->
+        <!-- A city in Malaysia -->
         <_name>Kudat</_name>
         <coordinates>6.879722 116.849167</coordinates>
         <location>
@@ -5145,7 +5133,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Malaysia -->
+        <!-- A city in Malaysia -->
         <_name>Melaka</_name>
         <coordinates>2.196944 102.248056</coordinates>
         <location>
@@ -5155,7 +5143,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Malaysia -->
+        <!-- A city in Malaysia -->
         <_name>Miri</_name>
         <coordinates>4.383333 113.983333</coordinates>
         <location>
@@ -5165,7 +5153,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Malaysia -->
+        <!-- A city in Malaysia -->
         <_name>Sandakan</_name>
         <coordinates>5.833333 118.116667</coordinates>
         <location>
@@ -5175,7 +5163,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Malaysia -->
+        <!-- A city in Malaysia -->
         <_name>Sepang</_name>
         <coordinates>2.700000 101.750000</coordinates>
         <location>
@@ -5185,7 +5173,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Malaysia -->
+        <!-- A city in Malaysia -->
         <_name>Sibu</_name>
         <coordinates>2.300000 111.816667</coordinates>
         <location>
@@ -5195,7 +5183,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Malaysia -->
+        <!-- A city in Malaysia -->
         <_name>Sitiawan</_name>
         <coordinates>4.216667 100.700000</coordinates>
         <location>
@@ -5205,7 +5193,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Malaysia -->
+        <!-- A city in Malaysia -->
         <_name>Tawau</_name>
         <coordinates>4.250000 117.900000</coordinates>
         <location>
@@ -5215,8 +5203,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Malaysia -->
-        <_name>Victoria</_name>
+        <!-- A city in Malaysia -->
+        <_name msgctxt="City in Malaysia">Victoria</_name>
         <coordinates>5.276667 115.241667</coordinates>
         <location>
           <name>Victoria</name>
@@ -5235,7 +5223,7 @@
       </timezones>
       <tz-hint>Indian/Maldives</tz-hint>
       <city>
-        <!-- Translators: this is the capital of the Maldives.
+        <!-- The capital of the Maldives.
              "Male" is the traditional English name.
              The local name in Dhivehi is "Maale".
           -->
@@ -5255,30 +5243,27 @@
       <fips-code>MG</fips-code>
       <timezones>
         <timezone id="Asia/Choibalsan">
-          <!-- Translators: This is the time zone used in the eastern
-               part of Mongolia. FIXME: Is there an official name for
-               this zone?
+          <!-- The time zone used in the eastern part of Mongolia.
+               FIXME: Is there an official name for this zone?
             -->
           <_name>Eastern Mongolia</_name>
         </timezone>
         <timezone id="Asia/Hovd">
-          <!-- Translators: This is the time zone used in the western
-               part of Mongolia. FIXME: Is there an official name for
-               this zone?
+          <!-- The time zone used in the western part of Mongolia.
+               FIXME: Is there an official name for this zone?
             -->
           <_name>Western Mongolia</_name>
         </timezone>
         <timezone id="Asia/Ulaanbaatar">
-          <!-- Translators: This is the time zone used in the central
-               part of Mongolia. FIXME: Is there an official name for
-               this zone?
+          <!-- The time zone used in the central part of Mongolia.
+               FIXME: Is there an official name for this zone?
             -->
           <_name>Central Mongolia</_name>
         </timezone>
       </timezones>
       <tz-hint>Asia/Ulaanbaatar</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Mongolia.
+        <!-- The capital of Mongolia.
              The name is also written "ÐÐÐÐÐÐÐÐÑÐÑ".
           -->
         <_name>Ulaanbaatar</_name>
@@ -5307,7 +5292,7 @@
       </timezones>
       <tz-hint>Asia/Rangoon</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Myanmar.
+        <!-- The capital of Myanmar.
              "Rangoon" is the traditional English name.
              The local name in Burmese is "Yangon".
           -->
@@ -5330,7 +5315,7 @@
       </timezones>
       <tz-hint>Asia/Katmandu</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Nepal.
+        <!-- The capital of Nepal.
              The local name in Nepali is "àààààààà".
           -->
         <_name>Kathmandu</_name>
@@ -5368,7 +5353,7 @@
       </timezones>
       <tz-hint>Asia/Karachi</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Pakistan -->
+        <!-- The capital of Pakistan -->
         <_name>Islamabad</_name>
         <coordinates>33.700000 73.166667</coordinates>
         <location>
@@ -5378,7 +5363,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Pakistan -->
+        <!-- A city in Pakistan -->
         <_name>Karachi</_name>
         <coordinates>24.866667 67.050000</coordinates>
         <location>
@@ -5388,7 +5373,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Pakistan -->
+        <!-- A city in Pakistan -->
         <_name>Lahore</_name>
         <coordinates>31.549722 74.343611</coordinates>
         <location>
@@ -5398,7 +5383,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Pakistan -->
+        <!-- A city in Pakistan -->
         <_name>Nawabshah</_name>
         <coordinates>26.250000 68.416667</coordinates>
         <location>
@@ -5418,7 +5403,7 @@
       </timezones>
       <tz-hint>Asia/Manila</tz-hint>
       <city>
-        <!-- Translators: this is a city in the Philippines -->
+        <!-- A city in the Philippines -->
         <_name>Angeles</_name>
         <coordinates>15.135833 120.591111</coordinates>
         <location>
@@ -5428,7 +5413,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Philippines -->
+        <!-- A city in the Philippines -->
         <_name>Davao</_name>
         <coordinates>7.073056 125.612778</coordinates>
         <location>
@@ -5438,7 +5423,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Philippines -->
+        <!-- A city in the Philippines -->
         <_name>Laoag</_name>
         <coordinates>18.198889 120.593611</coordinates>
         <location>
@@ -5448,7 +5433,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of the Philippines -->
+        <!-- The capital of the Philippines -->
         <_name>Manila</_name>
         <coordinates>14.604167 120.982222</coordinates>
         <location>
@@ -5458,7 +5443,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Philippines -->
+        <!-- A city in the Philippines -->
         <_name>Masbate</_name>
         <coordinates>12.366667 123.616667</coordinates>
         <location>
@@ -5468,7 +5453,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Philippines -->
+        <!-- A city in the Philippines -->
         <_name>Pildira</_name>
         <coordinates>14.516667 121.000000</coordinates>
         <location>
@@ -5478,7 +5463,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Philippines -->
+        <!-- A city in the Philippines -->
         <_name>Subic</_name>
         <coordinates>14.879722 120.233333</coordinates>
         <location>
@@ -5488,7 +5473,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Philippines -->
+        <!-- A city in the Philippines -->
         <_name>Zamboanga City</_name>
         <coordinates>6.910255 122.071715</coordinates>
         <location>
@@ -5500,7 +5485,7 @@
     </country>
     <country>
       <!-- SG - Singapore -->
-      <_name>Singapore</_name>
+      <_name msgctxt="Country">Singapore</_name>
       <!-- Could not find information about the following stations,
            which may be in Singapore:
            WSSL 
@@ -5512,8 +5497,8 @@
       </timezones>
       <tz-hint>Asia/Singapore</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Singapore -->
-        <_name>Singapore</_name>
+        <!-- The capital of Singapore -->
+        <_name msgctxt="City in Singapore">Singapore</_name>
         <coordinates>1.293056 103.855833</coordinates>
         <location>
           <name>Paya Lebar Airport</name>
@@ -5541,7 +5526,7 @@
       </timezones>
       <tz-hint>Asia/Seoul</tz-hint>
       <city>
-        <!-- Translators: this is a city in South Korea -->
+        <!-- A city in South Korea -->
         <_name>Ch'ongju</_name>
         <coordinates>36.637222 127.489722</coordinates>
         <location>
@@ -5551,7 +5536,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in South Korea -->
+        <!-- A city in South Korea -->
         <_name>Cheju</_name>
         <coordinates>33.509722 126.521944</coordinates>
         <location>
@@ -5561,7 +5546,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in South Korea -->
+        <!-- A city in South Korea -->
         <_name>Inch'on</_name>
         <coordinates>37.453611 126.731667</coordinates>
         <location>
@@ -5571,7 +5556,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in South Korea -->
+        <!-- A city in South Korea -->
         <_name>Kunsan</_name>
         <coordinates>35.978611 126.711389</coordinates>
         <location>
@@ -5581,7 +5566,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in South Korea.
+        <!-- A city in South Korea.
              The name is also written "ìì".
           -->
         <_name>Osan</_name>
@@ -5593,7 +5578,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in South Korea -->
+        <!-- A city in South Korea -->
         <_name>P'ohang</_name>
         <coordinates>36.032222 129.365000</coordinates>
         <location>
@@ -5603,7 +5588,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in South Korea -->
+        <!-- A city in South Korea -->
         <_name>P'yongt'aek</_name>
         <coordinates>36.994722 127.088889</coordinates>
         <location>
@@ -5613,7 +5598,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in South Korea -->
+        <!-- A city in South Korea -->
         <_name>Pusan</_name>
         <coordinates>35.102778 129.040278</coordinates>
         <location>
@@ -5623,7 +5608,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in South Korea -->
+        <!-- A city in South Korea -->
         <_name>Sach'on</_name>
         <coordinates>35.084167 128.088611</coordinates>
         <location>
@@ -5633,7 +5618,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of South Korea.
+        <!-- The capital of South Korea.
              "Seoul" is the traditional English name.
              The local name in Korean is "Soul".
           -->
@@ -5646,7 +5631,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in South Korea -->
+        <!-- A city in South Korea -->
         <_name>Taegu</_name>
         <coordinates>35.870278 128.591111</coordinates>
         <location>
@@ -5666,7 +5651,7 @@
       </timezones>
       <tz-hint>Asia/Colombo</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Sri Lanka -->
+        <!-- The capital of Sri Lanka -->
         <_name>Colombo</_name>
         <coordinates>6.931944 79.847778</coordinates>
         <location>
@@ -5676,7 +5661,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sri Lanka -->
+        <!-- A city in Sri Lanka -->
         <_name>Katunayaka</_name>
         <coordinates>7.164722 79.873056</coordinates>
         <location>
@@ -5686,7 +5671,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Sri Lanka -->
+        <!-- The capital of Sri Lanka -->
         <_name>Sri Jayewardenepura Kotte</_name>
         <coordinates>6.902778 79.908333</coordinates>
         <location>
@@ -5708,7 +5693,7 @@
       </timezones>
       <tz-hint>Asia/Taipei</tz-hint>
       <city>
-        <!-- Translators: this is a city in Taiwan.
+        <!-- A city in Taiwan.
              The name is also written "ééå".
           -->
         <_name>Kao-hsiung-shih</_name>
@@ -5720,7 +5705,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Taiwan.
+        <!-- A city in Taiwan.
              The name is also written "åé".
           -->
         <_name>Pu-ting</_name>
@@ -5732,7 +5717,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Taiwan.
+        <!-- A city in Taiwan.
              The name is also written "æå".
           -->
         <_name>Sung-shan</_name>
@@ -5744,7 +5729,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Taiwan.
+        <!-- The capital of Taiwan.
              The name is also written "èåå".
           -->
         <_name>T'ai-pei Shih</_name>
@@ -5766,7 +5751,7 @@
       </timezones>
       <tz-hint>Asia/Dushanbe</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Tajikistan -->
+        <!-- The capital of Tajikistan -->
         <_name>Dushanbe</_name>
         <coordinates>38.560000 68.773889</coordinates>
         <location>
@@ -5790,7 +5775,7 @@
       </timezones>
       <tz-hint>Asia/Bangkok</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Thailand.
+        <!-- The capital of Thailand.
              "Bangkok" is the traditional English name.
              The local name in Thai is "Krung Thep / àààààààà".
           -->
@@ -5803,7 +5788,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Thailand -->
+        <!-- A city in Thailand -->
         <_name>Chiang Mai</_name>
         <coordinates>18.790278 98.981667</coordinates>
         <location>
@@ -5813,7 +5798,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Thailand -->
+        <!-- A city in Thailand -->
         <_name>Chon Buri</_name>
         <coordinates>13.366667 100.983333</coordinates>
         <location>
@@ -5823,7 +5808,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Thailand -->
+        <!-- A city in Thailand -->
         <_name>Hat Yai</_name>
         <coordinates>7.016667 100.466667</coordinates>
         <location>
@@ -5833,7 +5818,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Thailand -->
+        <!-- A city in Thailand -->
         <_name>Hua Hin</_name>
         <coordinates>12.566667 99.966667</coordinates>
         <location>
@@ -5843,7 +5828,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Thailand -->
+        <!-- A city in Thailand -->
         <_name>Khon Kaen</_name>
         <coordinates>16.433333 102.833333</coordinates>
         <location>
@@ -5853,7 +5838,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Thailand -->
+        <!-- A city in Thailand -->
         <_name>Lampang</_name>
         <coordinates>18.298333 99.507222</coordinates>
         <location>
@@ -5863,7 +5848,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Thailand -->
+        <!-- A city in Thailand -->
         <_name>Mae Hong Son</_name>
         <coordinates>19.266667 97.933333</coordinates>
         <location>
@@ -5873,7 +5858,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Thailand -->
+        <!-- A city in Thailand -->
         <_name>Nan</_name>
         <coordinates>18.783333 100.783333</coordinates>
         <location>
@@ -5883,7 +5868,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Thailand -->
+        <!-- A city in Thailand -->
         <_name>Phrae</_name>
         <coordinates>18.150000 100.133333</coordinates>
         <location>
@@ -5893,7 +5878,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Thailand -->
+        <!-- A city in Thailand -->
         <_name>Phuket</_name>
         <coordinates>7.883333 98.400000</coordinates>
         <location>
@@ -5903,7 +5888,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Thailand -->
+        <!-- A city in Thailand -->
         <_name>Ranong</_name>
         <coordinates>9.966667 98.633333</coordinates>
         <location>
@@ -5913,7 +5898,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Thailand -->
+        <!-- A city in Thailand -->
         <_name>Rayong</_name>
         <coordinates>12.666667 101.283333</coordinates>
         <location>
@@ -5923,7 +5908,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Thailand -->
+        <!-- A city in Thailand -->
         <_name>Surat Thani</_name>
         <coordinates>9.133333 99.316667</coordinates>
         <location>
@@ -5933,7 +5918,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Thailand -->
+        <!-- A city in Thailand -->
         <_name>Trang</_name>
         <coordinates>7.550000 99.600000</coordinates>
         <location>
@@ -5943,7 +5928,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Thailand -->
+        <!-- A city in Thailand -->
         <_name>Ubon Ratchathani</_name>
         <coordinates>15.233056 104.863056</coordinates>
         <location>
@@ -5953,7 +5938,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Thailand -->
+        <!-- A city in Thailand -->
         <_name>Udon Thani</_name>
         <coordinates>17.407500 102.793056</coordinates>
         <location>
@@ -5973,7 +5958,7 @@
       </timezones>
       <tz-hint>Asia/Ashgabat</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Turkmenistan.
+        <!-- The capital of Turkmenistan.
              "Ashgabat" is the traditional English name.
              The local name in Turkmen is "Asgabat".
           -->
@@ -6002,7 +5987,7 @@
       </timezones>
       <tz-hint>Asia/Tashkent</tz-hint>
       <city>
-        <!-- Translators: this is a city in Uzbekistan -->
+        <!-- A city in Uzbekistan -->
         <_name>Nukus</_name>
         <coordinates>42.453056 59.610278</coordinates>
         <location>
@@ -6012,7 +5997,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Uzbekistan -->
+        <!-- A city in Uzbekistan -->
         <_name>Samarqand</_name>
         <coordinates>39.654167 66.959722</coordinates>
         <location>
@@ -6022,7 +6007,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Uzbekistan.
+        <!-- The capital of Uzbekistan.
              "Tashkent" is the traditional English name.
              The local name is "Toshkent".
           -->
@@ -6035,7 +6020,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Uzbekistan -->
+        <!-- A city in Uzbekistan -->
         <_name>Termiz</_name>
         <coordinates>37.224167 67.278333</coordinates>
         <location>
@@ -6045,7 +6030,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Uzbekistan -->
+        <!-- A city in Uzbekistan -->
         <_name>Urganch</_name>
         <coordinates>41.550000 60.633333</coordinates>
         <location>
@@ -6068,7 +6053,7 @@
       </timezones>
       <tz-hint>Asia/Ho_Chi_Minh</tz-hint>
       <city>
-        <!-- Translators: this is a city in Viet Nam -->
+        <!-- A city in Viet Nam -->
         <_name>Da Nang</_name>
         <coordinates>16.067778 108.220833</coordinates>
         <location>
@@ -6078,7 +6063,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Viet Nam.
+        <!-- The capital of Viet Nam.
              "Hanoi" is the traditional English name.
              The local name in Vietnamese is "Ha Noi".
           -->
@@ -6091,7 +6076,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Viet Nam.
+        <!-- A city in Viet Nam.
              "Ho Chi Minh City" is the traditional English name.
              The local name in Vietnamese is "Thanh Pho Ho Chi Minh".
           -->
@@ -6107,7 +6092,7 @@
   </region>
   <region>
     <!-- FIXME: rename this to Atlantic Ocean -->
-    <_name>Atlantic</_name>
+    <_name msgctxt="Region">Atlantic</_name>
     <country>
       <!-- AI - Anguilla, a British territory in the Caribbean -->
       <_name>Anguilla</_name>
@@ -6118,7 +6103,7 @@
       </timezones>
       <tz-hint>America/Anguilla</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Anguilla -->
+        <!-- The capital of Anguilla -->
         <_name>The Valley</_name>
         <coordinates>18.216667 -63.050000</coordinates>
         <location>
@@ -6138,7 +6123,7 @@
       </timezones>
       <tz-hint>America/Antigua</tz-hint>
       <city>
-        <!-- Translators: this is a city in Antigua and Barbuda -->
+        <!-- A city in Antigua and Barbuda -->
         <_name>Fitches Creek</_name>
         <coordinates>17.116667 -61.783333</coordinates>
         <location>
@@ -6148,8 +6133,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Antigua and Barbuda -->
-        <_name>Saint John's</_name>
+        <!-- The capital of Antigua and Barbuda -->
+        <_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>
@@ -6168,7 +6153,7 @@
       </timezones>
       <tz-hint>America/Barbados</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Barbados -->
+        <!-- The capital of Barbados -->
         <_name>Bridgetown</_name>
         <coordinates>13.100000 -59.616667</coordinates>
         <location>
@@ -6178,7 +6163,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Barbados -->
+        <!-- A city in Barbados -->
         <_name>Paragon</_name>
         <coordinates>13.066667 -59.483333</coordinates>
         <location>
@@ -6200,8 +6185,8 @@
       </timezones>
       <tz-hint>Atlantic/Bermuda</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Bermuda -->
-        <_name>Hamilton</_name>
+        <!-- The capital of Bermuda -->
+        <_name msgctxt="City in Bermuda">Hamilton</_name>
         <coordinates>32.294167 -64.783889</coordinates>
         <location>
           <name>Bermuda</name>
@@ -6210,8 +6195,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bermuda -->
-        <_name>Saint George</_name>
+        <!-- A city in Bermuda -->
+        <_name msgctxt="City in Bermuda">Saint George</_name>
         <coordinates>32.381667 -64.678056</coordinates>
         <location>
           <name>Bermuda</name>
@@ -6232,7 +6217,7 @@
       </timezones>
       <tz-hint>America/Dominica</tz-hint>
       <city>
-        <!-- Translators: this is a city in Dominica -->
+        <!-- A city in Dominica -->
         <_name>Marigot</_name>
         <coordinates>15.533333 -61.300000</coordinates>
         <location>
@@ -6242,8 +6227,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Dominica -->
-        <_name>Roseau</_name>
+        <!-- The capital of Dominica -->
+        <_name msgctxt="City in Dominica">Roseau</_name>
         <coordinates>15.300000 -61.400000</coordinates>
         <location>
           <name>Canefield Airport</name>
@@ -6252,7 +6237,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Dominica -->
+        <!-- A city in Dominica -->
         <_name>Saint Joseph</_name>
         <coordinates>15.400000 -61.433333</coordinates>
         <location>
@@ -6276,35 +6261,35 @@
       <pref-lang>dan</pref-lang>
       <timezones>
         <timezone id="America/Danmarkshavn">
-          <!-- Translators: This is the timezone around Danmarkshavn
-               station in Greenland. The string is only used in places
-               where "Greenland" is already clear from context.
+          <!-- The timezone around Danmarkshavn station in Greenland.
+               The string is only used in places where "Greenland" is
+               already clear from context.
             -->
           <_name>Danmarkshavn</_name>
         </timezone>
         <timezone id="America/Godthab">
-          <!-- Translators: This is the primary timezone for Greenland,
-               although sources seem to point towards calling the area
-               "Western Greenland" rathern than just "Greenland".
+          <!-- The primary timezone for Greenland, although sources
+               seem to point towards calling the area "Western
+               Greenland" rathern than just "Greenland".
             -->
           <_name>Western Greenland</_name>
         </timezone>
         <timezone id="America/Scoresbysund">
-          <!-- Translators: This is the timezone around Scoresbysund /
-               Ittoqqortoormiit on the east coast of Greenland.
+          <!-- The timezone around Scoresbysund / Ittoqqortoormiit on
+               the east coast of Greenland.
             -->
           <_name>Eastern Greenland</_name>
         </timezone>
         <timezone id="America/Thule">
-          <!-- Translators: This is the timezone at the Thule US Air
-               Force Base on the west coast of Greenland.
+          <!-- The timezone at the Thule US Air Force Base on the west
+               coast of Greenland.
             -->
           <_name>Thule AFB</_name>
         </timezone>
       </timezones>
       <tz-hint>America/Godthab</tz-hint>
       <city>
-        <!-- Translators: this is a city in Greenland.
+        <!-- A city in Greenland.
              The local name in Kalaallisut is "Uummannaq".
           -->
         <_name>Dundas</_name>
@@ -6317,7 +6302,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Greenland.
+        <!-- The capital of Greenland.
              The local name in Kalaallisut is "Nuuk".
           -->
         <_name>GodthÃb</_name>
@@ -6329,7 +6314,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greenland -->
+        <!-- A city in Greenland -->
         <_name>Ittorisseq</_name>
         <coordinates>70.450000 -22.450000</coordinates>
         <location>
@@ -6339,7 +6324,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greenland.
+        <!-- A city in Greenland.
              The local name in Kalaallisut is "Ilulissat".
           -->
         <_name>Jakobshavn</_name>
@@ -6351,7 +6336,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greenland -->
+        <!-- A city in Greenland -->
         <_name>Kulusuk</_name>
         <coordinates>65.566667 -37.183333</coordinates>
         <location>
@@ -6361,7 +6346,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greenland -->
+        <!-- A city in Greenland -->
         <_name>Narsarsuaq</_name>
         <coordinates>61.166667 -45.416667</coordinates>
         <location>
@@ -6371,7 +6356,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greenland -->
+        <!-- A city in Greenland -->
         <_name>SÃndre StrÃmfjord</_name>
         <coordinates>67.000000 -50.700000</coordinates>
         <location>
@@ -6395,7 +6380,7 @@
       </timezones>
       <tz-hint>America/Puerto_Rico</tz-hint>
       <city>
-        <!-- Translators: this is a city in Puerto Rico -->
+        <!-- A city in Puerto Rico -->
         <_name>Carolina</_name>
         <coordinates>18.380782 -65.957387</coordinates>
         <location>
@@ -6406,7 +6391,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Puerto Rico -->
+        <!-- A city in Puerto Rico -->
         <_name>Ponce</_name>
         <coordinates>18.011077 -66.614062</coordinates>
         <location>
@@ -6417,7 +6402,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Puerto Rico -->
+        <!-- A city in Puerto Rico -->
         <_name>Rafael Hernandez</_name>
         <coordinates>18.471333 -67.079069</coordinates>
         <location>
@@ -6428,7 +6413,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Puerto Rico -->
+        <!-- A city in Puerto Rico -->
         <_name>San Juan</_name>
         <coordinates>18.466334 -66.105722</coordinates>
         <location>
@@ -6465,8 +6450,8 @@
       </timezones>
       <tz-hint>Atlantic/St_Helena</tz-hint>
       <city>
-        <!-- Translators: this is a city in Saint Helena -->
-        <_name>Georgetown</_name>
+        <!-- A city in Saint Helena -->
+        <_name msgctxt="City in Saint Helena">Georgetown</_name>
         <coordinates>-7.933333 -14.416667</coordinates>
         <location>
           <name>Wide Awake Field Ascension Island</name>
@@ -6485,7 +6470,7 @@
       </timezones>
       <tz-hint>America/St_Kitts</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Saint Kitts and Nevis -->
+        <!-- The capital of Saint Kitts and Nevis -->
         <_name>Basseterre</_name>
         <coordinates>17.300000 -62.716667</coordinates>
         <location>
@@ -6495,7 +6480,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saint Kitts and Nevis -->
+        <!-- A city in Saint Kitts and Nevis -->
         <_name>Charlestown</_name>
         <coordinates>17.133333 -62.616667</coordinates>
         <location>
@@ -6505,7 +6490,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saint Kitts and Nevis -->
+        <!-- A city in Saint Kitts and Nevis -->
         <_name>Golden Rock</_name>
         <coordinates>17.316667 -62.716667</coordinates>
         <location>
@@ -6515,8 +6500,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saint Kitts and Nevis -->
-        <_name>Newcastle</_name>
+        <!-- A city in Saint Kitts and Nevis -->
+        <_name msgctxt="City in Saint Kitts and Nevis">Newcastle</_name>
         <coordinates>17.200000 -62.583333</coordinates>
         <location>
           <name>Charlestown / Newcastle</name>
@@ -6539,9 +6524,7 @@
       </timezones>
       <tz-hint>America/St_Thomas</tz-hint>
       <city>
-        <!-- Translators: this is a city in the United States Virgin
-             Islands
-          -->
+        <!-- A city in the United States Virgin Islands -->
         <_name>Charlotte Amalie</_name>
         <coordinates>18.341900 -64.930701</coordinates>
         <location>
@@ -6551,9 +6534,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the United States Virgin
-             Islands
-          -->
+        <!-- A city in the United States Virgin Islands -->
         <_name>Christiansted</_name>
         <coordinates>17.746640 -64.703198</coordinates>
         <location>
@@ -6579,7 +6560,7 @@
       </timezones>
       <tz-hint>Pacific/Pago_Pago</tz-hint>
       <city>
-        <!-- Translators: this is a city in American Samoa -->
+        <!-- A city in American Samoa -->
         <_name>Pago Pago</_name>
         <coordinates>-14.278056 -170.702500</coordinates>
         <location>
@@ -6600,105 +6581,97 @@
       <fips-code>AS</fips-code>
       <timezones>
         <timezone id="Australia/Perth">
-          <!-- Translators: This is the time zone used in Western
-               Australia. The string is only used in places where
-               "Australia" is already clear from context.
+          <!-- The time zone used in Western Australia. The string is
+               only used in places where "Australia" is already clear
+               from context.
             -->
           <_name>Western Time</_name>
         </timezone>
         <timezone id="Australia/Eucla">
-          <!-- Translators: This is the commonly-used name for an
-               unofficial time zone used in part of southwestern
-               Australia. The string is only used in places where
-               "Australia" is already clear from context.
+          <!-- The commonly-used name for an unofficial time zone used
+               in part of southwestern Australia. The string is only
+               used in places where "Australia" is already clear from
+               context.
             -->
           <_name>Central Western Time</_name>
         </timezone>
         <timezone id="Australia/Adelaide">
-          <!-- Translators: This is the time zone used in Central
-               Australia. This string is specifically for the time zone
-               as implemented in the state of South Australia, and is
-               only used in places where "Australia" is already clear
-               from context.
+          <!-- The time zone used in Central Australia. This string is
+               specifically for the time zone as implemented in the
+               state of South Australia, and is only used in places
+               where "Australia" is already clear from context.
             -->
           <_name>Central Time (South Australia)</_name>
         </timezone>
         <timezone id="Australia/Broken_Hill">
-          <!-- Translators: This is the time zone used in Central
-               Australia. This string is specifically for the time zone
-               as implemented in Yancowinna county in the state of New
-               South Wales (NSW), which uses Central Time even though
-               the rest of the state uses Eastern Time. This string is
-               only used in places where "Australia" is already clear
-               from context.
+          <!-- The time zone used in Central Australia. This string is
+               specifically for the time zone as implemented in
+               Yancowinna county in the state of New South Wales (NSW),
+               which uses Central Time even though the rest of the
+               state uses Eastern Time. This string is only used in
+               places where "Australia" is already clear from context.
             -->
           <_name>Central Time (Yancowinna, NSW)</_name>
         </timezone>
         <timezone id="Australia/Darwin">
-          <!-- Translators: This is the time zone used in Central
-               Australia. This string is specifically for the time zone
-               as implemented in the Northern Territory, which does not
-               use Summer Time. This string is only used in places
-               where "Australia" is already clear from context.
+          <!-- The time zone used in Central Australia. This string is
+               specifically for the time zone as implemented in the
+               Northern Territory, which does not use Summer Time. This
+               string is only used in places where "Australia" is
+               already clear from context.
             -->
           <_name>Central Time (Northern Territory)</_name>
         </timezone>
         <timezone id="Australia/Hobart">
-          <!-- Translators: This is the time zone used in Eastern
-               Australia. This string is specifically for the time zone
-               as implemented in the state of Tasmania, and is only
-               used in places where "Australia" is already clear from
-               context.
+          <!-- The time zone used in Eastern Australia. This string is
+               specifically for the time zone as implemented in the
+               state of Tasmania, and is only used in places where
+               "Australia" is already clear from context.
             -->
           <_name>Eastern Time (Tasmania)</_name>
           <obsoletes>Australia/Currie</obsoletes>
         </timezone>
         <timezone id="Australia/Melbourne">
-          <!-- Translators: This is the time zone used in Eastern
-               Australia. This string is specifically for the time zone
-               as implemented in the state of Victoria, and is only
-               used in places where "Australia" is already clear from
-               context.
+          <!-- The time zone used in Eastern Australia. This string is
+               specifically for the time zone as implemented in the
+               state of Victoria, and is only used in places where
+               "Australia" is already clear from context.
             -->
           <_name>Eastern Time (Victoria)</_name>
         </timezone>
         <timezone id="Australia/Sydney">
-          <!-- Translators: This is the time zone used in Eastern
-               Australia. This string is specifically for the time zone
-               as implemented in the state of New South Wales, and is
-               only used in places where "Australia" is already clear
-               from context.
+          <!-- The time zone used in Eastern Australia. This string is
+               specifically for the time zone as implemented in the
+               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>
         </timezone>
         <timezone id="Australia/Brisbane">
-          <!-- Translators: This is the time zone used in Eastern
-               Australia. This string is specifically for the time zone
-               as implemented in the state of Queensland, which does
-               not use Summer Time. This string is only used in places
-               where "Australia" is already clear from context.
+          <!-- The time zone used in Eastern Australia. This string is
+               specifically for the time zone as implemented in the
+               state of Queensland, which does not use Summer Time.
+               This string is only used in places where "Australia" is
+               already clear from context.
             -->
           <_name>Eastern Time (Queensland)</_name>
           <obsoletes>Australia/Lindeman</obsoletes>
         </timezone>
         <timezone id="Australia/Lord_Howe">
-          <!-- Translators: This is the time zone used on Lord Howe
-               Island, off the east coast of Australia. This string is
-               only used in places where "Australia" is already clear
-               from context.
+          <!-- The time zone used on Lord Howe Island, off the east
+               coast of Australia. This string is only used in places
+               where "Australia" is already clear from context.
             -->
           <_name>Lord Howe Island</_name>
         </timezone>
       </timezones>
       <state>
-        <!-- Translators: this is a state/province/territory in
-             Australia
-          -->
+        <!-- A state/province/territory in Australia -->
         <_name>Australian Capital Territory</_name>
         <fips-code>AS01</fips-code>
         <tz-hint>Australia/Melbourne</tz-hint>
         <city>
-          <!-- Translators: this is the capital of Australia -->
+          <!-- The capital of Australia -->
           <_name>Canberra</_name>
           <coordinates>-35.283333 149.216667</coordinates>
           <location>
@@ -6710,16 +6683,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in
-             Australia
-          -->
+        <!-- A state/province/territory in Australia -->
         <_name>New South Wales</_name>
         <fips-code>AS02</fips-code>
         <tz-hint>Australia/Sydney</tz-hint>
         <city>
-          <!-- Translators: this is a city in New South Wales in
-               Australia
-            -->
+          <!-- A city in New South Wales in Australia -->
           <_name>Dubbo</_name>
           <coordinates>-32.250000 148.616667</coordinates>
           <location>
@@ -6729,9 +6698,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New South Wales in
-               Australia
-            -->
+          <!-- A city in New South Wales in Australia -->
           <_name>Forest Hill</_name>
           <coordinates>-35.150000 147.466667</coordinates>
           <location>
@@ -6741,10 +6708,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New South Wales in
-               Australia
-            -->
-          <_name>Richmond</_name>
+          <!-- A city in New South Wales in Australia -->
+          <_name msgctxt="City in New South Wales, Australia">Richmond</_name>
           <coordinates>-33.600000 150.766667</coordinates>
           <location>
             <name>Richmond Air Force Base</name>
@@ -6753,10 +6718,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New South Wales in
-               Australia
-            -->
-          <_name>Sydney</_name>
+          <!-- A city in New South Wales in Australia -->
+          <_name msgctxt="City in New South Wales, Australia">Sydney</_name>
           <coordinates>-33.883333 151.216667</coordinates>
           <location>
             <name>Sydney Airport</name>
@@ -6766,9 +6729,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New South Wales in
-               Australia
-            -->
+          <!-- A city in New South Wales in Australia -->
           <_name>Tamworth</_name>
           <coordinates>-31.100000 150.933333</coordinates>
           <location>
@@ -6779,16 +6740,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in
-             Australia
-          -->
+        <!-- A state/province/territory in Australia -->
         <_name>Northern Territory</_name>
         <fips-code>AS03</fips-code>
         <tz-hint>Australia/Darwin</tz-hint>
         <city>
-          <!-- Translators: this is a city in Northern Territory in
-               Australia
-            -->
+          <!-- A city in Northern Territory in Australia -->
           <_name>Alice Springs</_name>
           <coordinates>-23.700000 133.883333</coordinates>
           <location>
@@ -6799,9 +6756,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Northern Territory in
-               Australia
-            -->
+          <!-- A city in Northern Territory in Australia -->
           <_name>Darwin</_name>
           <coordinates>-12.466667 130.833333</coordinates>
           <location>
@@ -6812,9 +6767,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Northern Territory in
-               Australia
-            -->
+          <!-- A city in Northern Territory in Australia -->
           <_name>Katherine</_name>
           <coordinates>-14.466667 132.266667</coordinates>
           <location>
@@ -6825,14 +6778,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in
-             Australia
-          -->
+        <!-- A state/province/territory in Australia -->
         <_name>Queensland</_name>
         <fips-code>AS04</fips-code>
         <tz-hint>Australia/Brisbane</tz-hint>
         <city>
-          <!-- Translators: this is a city in Queensland in Australia -->
+          <!-- A city in Queensland in Australia -->
           <_name>Brisbane</_name>
           <coordinates>-27.500000 153.016667</coordinates>
           <location>
@@ -6843,7 +6794,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Queensland in Australia -->
+          <!-- A city in Queensland in Australia -->
           <_name>Cairns</_name>
           <coordinates>-16.916667 145.766667</coordinates>
           <location>
@@ -6853,7 +6804,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Queensland in Australia -->
+          <!-- A city in Queensland in Australia -->
           <_name>Coolangatta</_name>
           <coordinates>-28.166667 153.533333</coordinates>
           <location>
@@ -6863,7 +6814,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Queensland in Australia -->
+          <!-- A city in Queensland in Australia -->
           <_name>Mount Isa</_name>
           <coordinates>-20.733333 139.500000</coordinates>
           <location>
@@ -6873,7 +6824,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Queensland in Australia -->
+          <!-- A city in Queensland in Australia -->
           <_name>Rockhampton</_name>
           <coordinates>-23.383333 150.500000</coordinates>
           <location>
@@ -6883,7 +6834,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Queensland in Australia -->
+          <!-- A city in Queensland in Australia -->
           <_name>Townsville</_name>
           <coordinates>-19.250000 146.800000</coordinates>
           <location>
@@ -6894,16 +6845,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in
-             Australia
-          -->
+        <!-- A state/province/territory in Australia -->
         <_name>South Australia</_name>
         <fips-code>AS05</fips-code>
         <tz-hint>Australia/Adelaide</tz-hint>
         <city>
-          <!-- Translators: this is a city in South Australia in
-               Australia
-            -->
+          <!-- A city in South Australia in Australia -->
           <_name>Adelaide</_name>
           <coordinates>-34.933333 138.600000</coordinates>
           <location>
@@ -6914,9 +6861,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Australia in
-               Australia
-            -->
+          <!-- A city in South Australia in Australia -->
           <_name>Woomera</_name>
           <coordinates>-31.150000 136.800000</coordinates>
           <location>
@@ -6927,15 +6872,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in
-             Australia
-          -->
+        <!-- A state/province/territory in Australia -->
         <_name>Tasmania</_name>
         <fips-code>AS06</fips-code>
         <tz-hint>Australia/Hobart</tz-hint>
         <city>
-          <!-- Translators: this is a city in Tasmania in Australia -->
-          <_name>Hobart</_name>
+          <!-- A city in Tasmania in Australia -->
+          <_name msgctxt="City in Tasmania, Australia">Hobart</_name>
           <coordinates>-42.916667 147.333333</coordinates>
           <location>
             <name>Hobart Airport</name>
@@ -6945,7 +6888,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Tasmania in Australia -->
+          <!-- A city in Tasmania in Australia -->
           <_name>Launceston</_name>
           <coordinates>-41.450000 147.166667</coordinates>
           <location>
@@ -6956,14 +6899,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in
-             Australia
-          -->
-        <_name>Victoria</_name>
+        <!-- A state/province/territory in Australia -->
+        <_name msgctxt="State in Australia">Victoria</_name>
         <fips-code>AS07</fips-code>
         <tz-hint>Australia/Melbourne</tz-hint>
         <city>
-          <!-- Translators: this is a city in Victoria in Australia -->
+          <!-- A city in Victoria in Australia -->
           <_name>Lara</_name>
           <coordinates>-38.016667 144.400000</coordinates>
           <location>
@@ -6973,8 +6914,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Victoria in Australia -->
-          <_name>Melbourne</_name>
+          <!-- A city in Victoria in Australia -->
+          <_name msgctxt="City in Victoria, Australia">Melbourne</_name>
           <coordinates>-37.816667 144.966667</coordinates>
           <location>
             <name>Melbourne Airport</name>
@@ -6985,16 +6926,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in
-             Australia
-          -->
+        <!-- A state/province/territory in Australia -->
         <_name>Western Australia</_name>
         <fips-code>AS08</fips-code>
         <tz-hint>Australia/Perth</tz-hint>
         <city>
-          <!-- Translators: this is a city in Western Australia in
-               Australia
-            -->
+          <!-- A city in Western Australia in Australia -->
           <_name>Broome</_name>
           <coordinates>-17.966667 122.233333</coordinates>
           <location>
@@ -7004,9 +6941,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Western Australia in
-               Australia
-            -->
+          <!-- A city in Western Australia in Australia -->
           <_name>Bullsbrook</_name>
           <coordinates>-31.666667 116.000000</coordinates>
           <location>
@@ -7016,9 +6951,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Western Australia in
-               Australia
-            -->
+          <!-- A city in Western Australia in Australia -->
           <_name>Kalgoorlie</_name>
           <coordinates>-30.750000 121.466667</coordinates>
           <location>
@@ -7028,9 +6961,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Western Australia in
-               Australia
-            -->
+          <!-- A city in Western Australia in Australia -->
           <_name>Kununurra</_name>
           <coordinates>-15.766667 128.733333</coordinates>
           <location>
@@ -7040,9 +6971,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Western Australia in
-               Australia
-            -->
+          <!-- A city in Western Australia in Australia -->
           <_name>Learmonth</_name>
           <coordinates>-22.250000 114.083333</coordinates>
           <location>
@@ -7052,9 +6981,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Western Australia in
-               Australia
-            -->
+          <!-- A city in Western Australia in Australia -->
           <_name>Perth</_name>
           <coordinates>-31.933333 115.833333</coordinates>
           <location>
@@ -7065,9 +6992,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Western Australia in
-               Australia
-            -->
+          <!-- A city in Western Australia in Australia -->
           <_name>Shellborough</_name>
           <coordinates>-20.016667 119.366667</coordinates>
           <location>
@@ -7110,7 +7035,7 @@
       </timezones>
       <tz-hint>Indian/Christmas</tz-hint>
       <city>
-        <!-- Translators: this is a city in Christmas Island -->
+        <!-- A city in Christmas Island -->
         <_name>Drumsite</_name>
         <coordinates>-10.433333 105.683333</coordinates>
         <location>
@@ -7120,7 +7045,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Christmas Island -->
+        <!-- The capital of Christmas Island -->
         <_name>Flying Fish Cove</_name>
         <coordinates>-10.416667 105.716667</coordinates>
         <location>
@@ -7143,7 +7068,7 @@
       </timezones>
       <tz-hint>Indian/Cocos</tz-hint>
       <city>
-        <!-- Translators: this is a city in the Cocos (Keeling) Islands -->
+        <!-- A city in the Cocos (Keeling) Islands -->
         <_name>Bantam Village</_name>
         <coordinates>-12.116667 96.883333</coordinates>
         <location>
@@ -7164,7 +7089,7 @@
       </timezones>
       <tz-hint>Pacific/Rarotonga</tz-hint>
       <city>
-        <!-- Translators: this is the capital of the Cook Islands -->
+        <!-- The capital of the Cook Islands -->
         <_name>Avarua</_name>
         <coordinates>-21.207778 -159.775000</coordinates>
         <location>
@@ -7184,7 +7109,7 @@
       </timezones>
       <tz-hint>Pacific/Fiji</tz-hint>
       <city>
-        <!-- Translators: this is a city in Fiji -->
+        <!-- A city in Fiji -->
         <_name>Nausori</_name>
         <coordinates>-18.033333 178.533333</coordinates>
         <location>
@@ -7194,7 +7119,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Fiji -->
+        <!-- The capital of Fiji -->
         <_name>Suva</_name>
         <coordinates>-18.133333 178.416667</coordinates>
         <location>
@@ -7213,33 +7138,31 @@
       <fips-code>FP</fips-code>
       <timezones>
         <timezone id="Pacific/Tahiti">
-          <!-- Translators: This refers to the time zone in the Society
-               Islands of French Polynesia (including in particular the
-               island of Tahiti). This string is only used in places
-               where "French Polynesia" is already clear from context.
+          <!-- This refers to the time zone in the Society Islands of
+               French Polynesia (including in particular the island of
+               Tahiti). This string is only used in places where
+               "French Polynesia" is already clear from context.
             -->
           <_name>Tahiti / Society Islands</_name>
         </timezone>
         <timezone id="Pacific/Marquesas">
-          <!-- Translators: 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.
+          <!-- 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>
         </timezone>
         <timezone id="Pacific/Gambier">
-          <!-- Translators: 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.
+          <!-- 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>
         </timezone>
       </timezones>
       <tz-hint>Pacific/Tahiti</tz-hint>
       <city>
-        <!-- Translators: this is the capital of French Polynesia -->
+        <!-- The capital of French Polynesia -->
         <_name>Papeete</_name>
         <coordinates>-17.533333 -149.566667</coordinates>
         <location>
@@ -7265,7 +7188,7 @@
       </timezones>
       <tz-hint>Pacific/Guam</tz-hint>
       <city>
-        <!-- Translators: this is a city in Guam -->
+        <!-- A city in Guam -->
         <_name>Asatdas</_name>
         <coordinates>13.516944 144.863611</coordinates>
         <location>
@@ -7275,7 +7198,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Guam -->
+        <!-- A city in Guam -->
         <_name>HagÃtÃa</_name>
         <coordinates>13.474167 144.747778</coordinates>
         <location>
@@ -7296,31 +7219,28 @@
       <fips-code>ID</fips-code>
       <timezones>
         <timezone id="Asia/Jakarta">
-          <!-- Translators: this is the timezone on the western islands
-               of Indonesia. The name in Indonesian is "Waktu Indonesia
-               Bagian Barat".
+          <!-- The timezone on the western islands of Indonesia. The
+               name in Indonesian is "Waktu Indonesia Bagian Barat".
             -->
           <_name>Western Indonesia Time</_name>
           <obsoletes>Asia/Pontianak</obsoletes>
         </timezone>
         <timezone id="Asia/Makassar">
-          <!-- Translators: this is the timezone on the central islands
-               of Indonesia. The name in Indonesian is "Waktu Indonesia
-               Bagian Tengah".
+          <!-- The timezone on the central islands of Indonesia. The
+               name in Indonesian is "Waktu Indonesia Bagian Tengah".
             -->
           <_name>Central Indonesia Time</_name>
         </timezone>
         <timezone id="Asia/Jayapura">
-          <!-- Translators: this is the timezone on the eastern islands
-               of Indonesia. The name in Indonesian is "Waktu Indonesia
-               Bagian Timur".
+          <!-- The timezone on the eastern islands of Indonesia. The
+               name in Indonesian is "Waktu Indonesia Bagian Timur".
             -->
           <_name>Eastern Indonesia Time</_name>
         </timezone>
       </timezones>
       <tz-hint>Asia/Jakarta</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Indonesia -->
+        <!-- The capital of Indonesia -->
         <_name>Jakarta</_name>
         <coordinates>-6.174444 106.829444</coordinates>
         <location>
@@ -7330,7 +7250,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Indonesia -->
+        <!-- A city in Indonesia -->
         <_name>Makassar</_name>
         <coordinates>-5.140000 119.422100</coordinates>
         <location>
@@ -7341,7 +7261,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Indonesia -->
+        <!-- A city in Indonesia -->
         <_name>Manado</_name>
         <coordinates>1.487000 124.845500</coordinates>
         <location>
@@ -7351,7 +7271,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Indonesia -->
+        <!-- A city in Indonesia -->
         <_name>Medan</_name>
         <coordinates>3.583333 98.666667</coordinates>
         <location>
@@ -7361,7 +7281,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Indonesia -->
+        <!-- A city in Indonesia -->
         <_name>Palembang</_name>
         <coordinates>-2.916667 104.750000</coordinates>
         <location>
@@ -7371,7 +7291,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Indonesia -->
+        <!-- A city in Indonesia -->
         <_name>Pekanbaru</_name>
         <coordinates>0.533333 101.450000</coordinates>
         <location>
@@ -7392,34 +7312,31 @@
       <fips-code>KR</fips-code>
       <timezones>
         <timezone id="Pacific/Tarawa">
-          <!-- Translators: This is the time zone in the Gilbert
-               Islands, one of the three main island groups of
-               Kiribati. This string is only used in places where
-               "Kiribati" is already clear from context.
+          <!-- The time zone in the Gilbert 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>Gilbert Islands</_name>
         </timezone>
         <timezone id="Pacific/Enderbury">
-          <!-- Translators: This is 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.
+          <!-- 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>
         </timezone>
         <timezone id="Pacific/Kiritimati">
-          <!-- Translators: This is 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.
+          <!-- 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>
         </timezone>
       </timezones>
       <tz-hint>Pacific/Tarawa</tz-hint>
       <city>
-        <!-- Translators: this is a city in Kiribati -->
-        <_name>London</_name>
+        <!-- A city in Kiribati -->
+        <_name msgctxt="City in Kiribati">London</_name>
         <coordinates>1.983333 -157.466667</coordinates>
         <location>
           <name>Christmas, Cassidy Airport</name>
@@ -7445,7 +7362,7 @@
       </timezones>
       <tz-hint>Pacific/Majuro</tz-hint>
       <city>
-        <!-- Translators: this is the capital of the Marshall Islands -->
+        <!-- The capital of the Marshall Islands -->
         <_name>Majuro</_name>
         <coordinates>7.100000 171.383333</coordinates>
         <location>
@@ -7472,27 +7389,25 @@
       <fips-code>US64</fips-code>
       <timezones>
         <timezone id="Pacific/Ponape">
-          <!-- Translators: This is one of two time zones in the
-               Federated States of Micronesia, including the islands of
-               Pohnpei and Kosrae. The string is only used in places
-               where "Micronesia" is already clear from context.
+          <!-- One of two time zones in the Federated States of
+               Micronesia, including the islands of Pohnpei and Kosrae.
+               The string is only used in places where "Micronesia" is
+               already clear from context.
             -->
           <_name>Pohnpei / Kosrae</_name>
           <obsoletes>Pacific/Kosrae</obsoletes>
         </timezone>
         <timezone id="Pacific/Truk">
-          <!-- Translators: This is one of two time zones in the
-               Federated States of Micronesia, including the islands of
-               Yap and Chuuk. The string is only used in places where
-               "Micronesia" is already clear from context.
+          <!-- One of two time zones in the Federated States of
+               Micronesia, including the islands of Yap and Chuuk. The
+               string is only used in places where "Micronesia" is
+               already clear from context.
             -->
           <_name>Yap / Chuuk</_name>
         </timezone>
       </timezones>
       <city>
-        <!-- Translators: this is the capital of the Federated States
-             of Micronesia
-          -->
+        <!-- The capital of the Federated States of Micronesia -->
         <_name>Palikir</_name>
         <coordinates>6.916667 158.150000</coordinates>
         <location>
@@ -7525,7 +7440,7 @@
       </timezones>
       <tz-hint>Pacific/Noumea</tz-hint>
       <city>
-        <!-- Translators: this is a city in New Caledonia -->
+        <!-- A city in New Caledonia -->
         <_name>Karenga</_name>
         <coordinates>-22.016667 166.233333</coordinates>
         <location>
@@ -7535,7 +7450,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of New Caledonia -->
+        <!-- The capital of New Caledonia -->
         <_name>NoumÃa</_name>
         <coordinates>-22.266667 166.450000</coordinates>
         <location>
@@ -7552,25 +7467,25 @@
       <fips-code>NZ</fips-code>
       <timezones>
         <timezone id="Pacific/Auckland">
-          <!-- Translators: This refers to the "mainland" of New
-               Zealand (ie, North Island and South Island), to
-               distinguish it from the Chatham Islands. The string is
-               only used in places where "New Zealand" is already clear
-               from context. FIXME: is there a better name for this?
-               "Mainland" seems odd in reference to an island nation...
+          <!-- This refers to the "mainland" of New Zealand (ie, North
+               Island and South Island), to distinguish it from the
+               Chatham Islands. The string is only used in places where
+               "New Zealand" is already clear from context. FIXME: is
+               there a better name for this? "Mainland" seems odd in
+               reference to an island nation...
             -->
           <_name>Mainland New Zealand</_name>
         </timezone>
         <timezone id="Pacific/Chatham">
-          <!-- Translators: This refers to the time zone in the Chatham
-               Islands of New Zealand.
+          <!-- This refers to the time zone in the Chatham Islands of
+               New Zealand.
             -->
           <_name>Chatham Islands</_name>
         </timezone>
       </timezones>
       <tz-hint>Pacific/Auckland</tz-hint>
       <city>
-        <!-- Translators: this is a city in New Zealand -->
+        <!-- A city in New Zealand -->
         <_name>Auckland</_name>
         <coordinates>-36.866667 174.766667</coordinates>
         <location>
@@ -7580,7 +7495,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in New Zealand -->
+        <!-- A city in New Zealand -->
         <_name>Christchurch</_name>
         <coordinates>-43.533333 172.633333</coordinates>
         <location>
@@ -7590,7 +7505,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of New Zealand -->
+        <!-- The capital of New Zealand -->
         <_name>Wellington</_name>
         <coordinates>-41.300000 174.783333</coordinates>
         <location>
@@ -7610,7 +7525,7 @@
       </timezones>
       <tz-hint>Pacific/Niue</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Niue -->
+        <!-- The capital of Niue -->
         <_name>Alofi</_name>
         <coordinates>-19.016667 -169.916667</coordinates>
         <location>
@@ -7630,8 +7545,8 @@
       </timezones>
       <tz-hint>Pacific/Norfolk</tz-hint>
       <city>
-        <!-- Translators: this is a city in Norfolk Island -->
-        <_name>Kingston</_name>
+        <!-- A city in Norfolk Island -->
+        <_name msgctxt="City in Norfolk Island">Kingston</_name>
         <coordinates>-29.050000 167.950000</coordinates>
         <location>
           <name>Norfolk Island Airport</name>
@@ -7653,8 +7568,7 @@
       </timezones>
       <tz-hint>Pacific/Saipan</tz-hint>
       <city>
-        <!-- Translators: this is a city in the Northern Mariana Islands
-          -->
+        <!-- A city in the Northern Mariana Islands -->
         <_name>Chalan Kanoa</_name>
         <coordinates>15.145556 145.699167</coordinates>
         <location>
@@ -7679,7 +7593,7 @@
       </timezones>
       <tz-hint>Pacific/Palau</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Palau -->
+        <!-- The capital of Palau -->
         <_name>Koror</_name>
         <coordinates>7.333333 134.483333</coordinates>
         <location>
@@ -7694,7 +7608,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Palau -->
+        <!-- The capital of Palau -->
         <_name>Melekeok</_name>
         <coordinates>7.493333 134.634167</coordinates>
         <location>
@@ -7718,7 +7632,7 @@
       </timezones>
       <tz-hint>Pacific/Port_Moresby</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Papua New Guinea -->
+        <!-- The capital of Papua New Guinea -->
         <_name>Port Moresby</_name>
         <coordinates>-9.464722 147.192500</coordinates>
         <location>
@@ -7728,7 +7642,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Papua New Guinea -->
+        <!-- A city in Papua New Guinea -->
         <_name>Wewak</_name>
         <coordinates>-3.550000 143.633333</coordinates>
         <location>
@@ -7764,7 +7678,7 @@
       </timezones>
       <tz-hint>Pacific/Apia</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Samoa -->
+        <!-- The capital of Samoa -->
         <_name>Apia</_name>
         <coordinates>-13.833333 -171.733333</coordinates>
         <location>
@@ -7774,7 +7688,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Samoa -->
+        <!-- A city in Samoa -->
         <_name>Faleolo</_name>
         <coordinates>-13.816667 -171.983333</coordinates>
         <location>
@@ -7794,7 +7708,7 @@
       </timezones>
       <tz-hint>Pacific/Guadalcanal</tz-hint>
       <city>
-        <!-- Translators: this is the capital of the Solomon Islands -->
+        <!-- The capital of the Solomon Islands -->
         <_name>Honiara</_name>
         <coordinates>-9.433333 159.950000</coordinates>
         <location>
@@ -7834,7 +7748,7 @@
       </timezones>
       <tz-hint>Pacific/Tongatapu</tz-hint>
       <city>
-        <!-- Translators: this is a city in Tonga -->
+        <!-- A city in Tonga -->
         <_name>Fua'amotu</_name>
         <coordinates>-21.250000 -175.133333</coordinates>
         <location>
@@ -7844,7 +7758,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Tonga -->
+        <!-- The capital of Tonga -->
         <_name>Nuku'alofa</_name>
         <coordinates>-21.133333 -175.200000</coordinates>
         <location>
@@ -7864,7 +7778,7 @@
       </timezones>
       <tz-hint>Pacific/Funafuti</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Tuvalu -->
+        <!-- The capital of Tuvalu -->
         <_name>Funafuti</_name>
         <coordinates>-8.516667 179.216667</coordinates>
         <location>
@@ -7884,37 +7798,35 @@
       <fips-code>US74</fips-code>
       <timezones>
         <timezone id="Pacific/Johnston">
-          <!-- Translators: This is the time zone for the Johnston
-               Atoll in the United States Minor Outlying Islands, which
-               keeps the same time as the US state of Hawaii. The
-               string is only used in places where "US Minor Outlying
-               Islands" is already clear from context.
+          <!-- The time zone for the Johnston Atoll in the United
+               States Minor Outlying Islands, which keeps the same time
+               as the US state of Hawaii. The string is only used in
+               places where "US Minor Outlying Islands" is already
+               clear from context.
             -->
           <_name>Johnston Atoll (Hawaii Time)</_name>
         </timezone>
         <timezone id="Pacific/Midway">
-          <!-- Translators: This is the time zone for the Midway Atoll
-               in the United States Minor Outlying Islands, which uses
-               the same time as American Samoa (which is in fact also
-               the same time zone as (non-American) Samoa). The string
-               is only used in places where "US Minor Outlying Islands"
-               is already clear from context.
+          <!-- The time zone for the Midway Atoll in the United States
+               Minor Outlying Islands, which uses the same time as
+               American Samoa (which is in fact also the same time zone
+               as (non-American) Samoa). The string is only used in
+               places where "US Minor Outlying Islands" is already
+               clear from context.
             -->
           <_name>Midway Atoll (Samoa Time)</_name>
         </timezone>
         <timezone id="Pacific/Wake">
-          <!-- Translators: This is the time zone for Wake Island in
-               the United States Minor Outlying Islands. The string is
-               only used in places where "US Minor Outlying Islands" is
-               already clear from context.
+          <!-- The time zone for Wake Island in the United States Minor
+               Outlying Islands. The string is only used in places
+               where "US Minor Outlying Islands" is already clear from
+               context.
             -->
           <_name>Wake Island</_name>
         </timezone>
       </timezones>
       <city>
-        <!-- Translators: this is a city in the United States Minor
-             Outlying Islands
-          -->
+        <!-- A city in the United States Minor Outlying Islands -->
         <_name>Wake Island, Wake Island Army Airfield Airport</_name>
         <coordinates>19.283333 166.650000</coordinates>
         <location>
@@ -7950,7 +7862,7 @@
       </timezones>
       <tz-hint>Pacific/Wallis</tz-hint>
       <city>
-        <!-- Translators: this is a city in Wallis and Futuna -->
+        <!-- A city in Wallis and Futuna -->
         <_name>Mata'utu</_name>
         <coordinates>-13.283333 -176.133333</coordinates>
         <location>
@@ -7984,7 +7896,7 @@
       </timezones>
       <tz-hint>America/Argentina/Buenos_Aires</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Argentina -->
+        <!-- The capital of Argentina -->
         <_name>Buenos Aires</_name>
         <coordinates>-34.587500 -58.672500</coordinates>
         <location>
@@ -7994,7 +7906,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
+        <!-- A city in Argentina -->
         <_name>Comodoro Rivadavia</_name>
         <coordinates>-45.866667 -67.500000</coordinates>
         <location>
@@ -8004,7 +7916,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
+        <!-- A city in Argentina -->
         <_name>Corrientes</_name>
         <coordinates>-27.466667 -58.833333</coordinates>
         <location>
@@ -8014,8 +7926,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
-        <_name>CÃrdoba</_name>
+        <!-- A city in Argentina -->
+        <_name msgctxt="City in Argentina">CÃrdoba</_name>
         <coordinates>-31.400000 -64.183333</coordinates>
         <location>
           <name>CÃrdoba Airport</name>
@@ -8024,7 +7936,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
+        <!-- A city in Argentina -->
         <_name>El Palomar</_name>
         <coordinates>-34.541667 -58.615278</coordinates>
         <location>
@@ -8034,7 +7946,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
+        <!-- A city in Argentina -->
         <_name>Ezeiza</_name>
         <coordinates>-34.838056 -58.517222</coordinates>
         <location>
@@ -8044,7 +7956,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
+        <!-- A city in Argentina -->
         <_name>Formosa</_name>
         <coordinates>-26.183333 -58.183333</coordinates>
         <location>
@@ -8054,7 +7966,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
+        <!-- A city in Argentina -->
         <_name>Mar del Plata</_name>
         <coordinates>-38.000000 -57.550000</coordinates>
         <location>
@@ -8064,7 +7976,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
+        <!-- A city in Argentina -->
         <_name>Mendoza</_name>
         <coordinates>-32.883333 -68.816667</coordinates>
         <location>
@@ -8074,7 +7986,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
+        <!-- A city in Argentina -->
         <_name>NeuquÃn</_name>
         <coordinates>-38.950000 -68.066667</coordinates>
         <location>
@@ -8084,7 +7996,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
+        <!-- A city in Argentina -->
         <_name>Posadas</_name>
         <coordinates>-27.383333 -55.883333</coordinates>
         <location>
@@ -8094,7 +8006,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
+        <!-- A city in Argentina -->
         <_name>Puerto IguazÃ</_name>
         <coordinates>-25.566667 -54.566667</coordinates>
         <location>
@@ -8104,7 +8016,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
+        <!-- A city in Argentina -->
         <_name>Reconquista</_name>
         <coordinates>-29.150000 -59.650000</coordinates>
         <location>
@@ -8114,7 +8026,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
+        <!-- A city in Argentina -->
         <_name>Resistencia</_name>
         <coordinates>-27.450000 -58.983333</coordinates>
         <location>
@@ -8124,7 +8036,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
+        <!-- A city in Argentina -->
         <_name>Rosario</_name>
         <coordinates>-32.951111 -60.666389</coordinates>
         <location>
@@ -8134,7 +8046,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
+        <!-- A city in Argentina -->
         <_name>RÃo Gallegos</_name>
         <coordinates>-51.633333 -69.216667</coordinates>
         <location>
@@ -8144,7 +8056,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
+        <!-- A city in Argentina -->
         <_name>RÃo Grande</_name>
         <coordinates>-53.783333 -67.700000</coordinates>
         <location>
@@ -8154,7 +8066,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
+        <!-- A city in Argentina -->
         <_name>Salta</_name>
         <coordinates>-24.783333 -65.416667</coordinates>
         <location>
@@ -8164,7 +8076,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
+        <!-- A city in Argentina -->
         <_name>San Carlos de Bariloche</_name>
         <coordinates>-41.150000 -71.300000</coordinates>
         <location>
@@ -8174,8 +8086,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
-        <_name>San Fernando</_name>
+        <!-- A city in Argentina -->
+        <_name msgctxt="City in Argentina">San Fernando</_name>
         <coordinates>-34.444167 -58.577500</coordinates>
         <location>
           <name>San Fernando</name>
@@ -8184,7 +8096,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
+        <!-- A city in Argentina -->
         <_name>San Miguel de TucumÃn</_name>
         <coordinates>-26.816667 -65.216667</coordinates>
         <location>
@@ -8194,7 +8106,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
+        <!-- A city in Argentina -->
         <_name>San Salvador de Jujuy</_name>
         <coordinates>-24.183333 -65.300000</coordinates>
         <location>
@@ -8204,7 +8116,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Argentina -->
+        <!-- A city in Argentina -->
         <_name>Ushuaia</_name>
         <coordinates>-54.800000 -68.300000</coordinates>
         <location>
@@ -8226,7 +8138,7 @@
       </timezones>
       <tz-hint>America/Aruba</tz-hint>
       <city>
-        <!-- Translators: this is a city in Aruba -->
+        <!-- A city in Aruba -->
         <_name>Camacuri</_name>
         <coordinates>12.500000 -70.016667</coordinates>
         <location>
@@ -8236,7 +8148,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Aruba -->
+        <!-- The capital of Aruba -->
         <_name>Oranjestad</_name>
         <coordinates>12.516667 -70.033333</coordinates>
         <location>
@@ -8256,8 +8168,8 @@
       </timezones>
       <tz-hint>America/Nassau</tz-hint>
       <city>
-        <!-- Translators: this is a city in the Bahamas -->
-        <_name>Freeport</_name>
+        <!-- A city in the Bahamas -->
+        <_name msgctxt="City in Bahamas">Freeport</_name>
         <coordinates>26.533333 -78.700000</coordinates>
         <location>
           <name>Freeport, Grand Bahama</name>
@@ -8266,8 +8178,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Bahamas -->
-        <_name>Georgetown</_name>
+        <!-- A city in the Bahamas -->
+        <_name msgctxt="City in Bahamas">Georgetown</_name>
         <coordinates>23.500000 -75.766667</coordinates>
         <location>
           <name>Georgetown, Exuma</name>
@@ -8276,7 +8188,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of the Bahamas -->
+        <!-- The capital of the Bahamas -->
         <_name>Nassau</_name>
         <coordinates>25.083333 -77.350000</coordinates>
         <location>
@@ -8300,7 +8212,7 @@
       </timezones>
       <tz-hint>America/Belize</tz-hint>
       <city>
-        <!-- Translators: this is a city in Belize -->
+        <!-- A city in Belize -->
         <_name>Belize City</_name>
         <coordinates>17.483333 -88.183333</coordinates>
         <location>
@@ -8320,7 +8232,7 @@
       </timezones>
       <tz-hint>America/La_Paz</tz-hint>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
+        <!-- A city in Bolivia -->
         <_name>Camiri</_name>
         <coordinates>-20.050000 -63.516667</coordinates>
         <location>
@@ -8330,7 +8242,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
+        <!-- A city in Bolivia -->
         <_name>Cobija</_name>
         <coordinates>-11.033333 -68.733333</coordinates>
         <location>
@@ -8340,7 +8252,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
+        <!-- A city in Bolivia -->
         <_name>Cochabamba</_name>
         <coordinates>-17.383333 -66.150000</coordinates>
         <location>
@@ -8350,8 +8262,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
-        <_name>ConcepciÃn</_name>
+        <!-- A city in Bolivia -->
+        <_name msgctxt="City in Bolivia">ConcepciÃn</_name>
         <coordinates>-16.133333 -62.033333</coordinates>
         <location>
           <name>ConcepciÃn</name>
@@ -8360,8 +8272,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Bolivia -->
-        <_name>La Paz</_name>
+        <!-- The capital of Bolivia -->
+        <_name msgctxt="City in Bolivia">La Paz</_name>
         <coordinates>-16.500000 -68.150000</coordinates>
         <location>
           <name>Alto Airport</name>
@@ -8370,7 +8282,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
+        <!-- A city in Bolivia -->
         <_name>Magdalena</_name>
         <coordinates>-13.233333 -64.200000</coordinates>
         <location>
@@ -8380,7 +8292,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
+        <!-- A city in Bolivia -->
         <_name>Oruro</_name>
         <coordinates>-17.983333 -67.150000</coordinates>
         <location>
@@ -8390,7 +8302,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
+        <!-- A city in Bolivia -->
         <_name>PotosÃ</_name>
         <coordinates>-19.583611 -65.753056</coordinates>
         <location>
@@ -8400,7 +8312,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
+        <!-- A city in Bolivia -->
         <_name>Puerto SuÃrez</_name>
         <coordinates>-18.950000 -57.800000</coordinates>
         <location>
@@ -8410,7 +8322,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
+        <!-- A city in Bolivia -->
         <_name>Reyes</_name>
         <coordinates>-14.316667 -67.383333</coordinates>
         <location>
@@ -8420,7 +8332,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
+        <!-- A city in Bolivia -->
         <_name>Riberalta</_name>
         <coordinates>-10.983333 -66.100000</coordinates>
         <location>
@@ -8430,7 +8342,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
+        <!-- A city in Bolivia -->
         <_name>RoborÃ</_name>
         <coordinates>-18.333333 -59.750000</coordinates>
         <location>
@@ -8440,7 +8352,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
+        <!-- A city in Bolivia -->
         <_name>Rurrenabaque</_name>
         <coordinates>-14.466667 -67.566667</coordinates>
         <location>
@@ -8450,7 +8362,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
+        <!-- A city in Bolivia -->
         <_name>San Borja</_name>
         <coordinates>-14.816667 -66.850000</coordinates>
         <location>
@@ -8460,7 +8372,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
+        <!-- A city in Bolivia -->
         <_name>San Ignacio de Velasco</_name>
         <coordinates>-16.366667 -60.950000</coordinates>
         <location>
@@ -8470,7 +8382,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
+        <!-- A city in Bolivia -->
         <_name>San JoaquÃn</_name>
         <coordinates>-13.066667 -64.816667</coordinates>
         <location>
@@ -8480,8 +8392,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia.
-             This is one of several cities in Bolivia called "San JosÃ".
+        <!-- A city in Bolivia.
+             One of several cities in Bolivia called "San JosÃ".
           -->
         <_name>San Josà de Chiquitos</_name>
         <coordinates>-17.850000 -60.750000</coordinates>
@@ -8492,7 +8404,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
+        <!-- A city in Bolivia -->
         <_name>Santa Ana de Yacuma</_name>
         <coordinates>-13.750000 -65.433333</coordinates>
         <location>
@@ -8502,8 +8414,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
-        <_name>Santa Cruz</_name>
+        <!-- A city in Bolivia -->
+        <_name msgctxt="City in Bolivia">Santa Cruz</_name>
         <coordinates>-17.800000 -63.166667</coordinates>
         <location>
           <name>El Trompillo Airport</name>
@@ -8512,7 +8424,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Bolivia -->
+        <!-- The capital of Bolivia -->
         <_name>Sucre</_name>
         <coordinates>-19.043056 -65.259167</coordinates>
         <location>
@@ -8522,7 +8434,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
+        <!-- A city in Bolivia -->
         <_name>Tarija</_name>
         <coordinates>-21.516667 -64.750000</coordinates>
         <location>
@@ -8532,8 +8444,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
-        <_name>Trinidad</_name>
+        <!-- A city in Bolivia -->
+        <_name msgctxt="City in Bolivia">Trinidad</_name>
         <coordinates>-14.833333 -64.900000</coordinates>
         <location>
           <name>Trinidad</name>
@@ -8542,7 +8454,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
+        <!-- A city in Bolivia -->
         <_name>Villamontes</_name>
         <coordinates>-21.250000 -63.500000</coordinates>
         <location>
@@ -8552,7 +8464,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
+        <!-- A city in Bolivia -->
         <_name>Viro Viro</_name>
         <coordinates>-17.650000 -63.133333</coordinates>
         <location>
@@ -8562,7 +8474,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bolivia -->
+        <!-- A city in Bolivia -->
         <_name>Yacuiba</_name>
         <coordinates>-22.033333 -63.683333</coordinates>
         <location>
@@ -8586,157 +8498,151 @@
       <fips-code>BR</fips-code>
       <timezones>
         <timezone id="America/Araguaina">
-          <!-- Translators: This represents the time zone in the
-               Brazilian state of Tocantins. See the comment on
-               "BrasÃlia Time" for more details. This string is only
-               used in places where "Brazil" is already clear from
-               context.
+          <!-- This represents the time zone in the Brazilian state of
+               Tocantins. See the comment on "BrasÃlia Time" for more
+               details. This string is only used in places where
+               "Brazil" is already clear from context.
             -->
           <_name>Tocantins</_name>
         </timezone>
         <timezone id="America/Bahia">
-          <!-- Translators: This represents the time zone in the
-               Brazilian state of Bahia. See the comment on "BrasÃlia
-               Time" for more details. This string is only used in
-               places where "Brazil" is already clear from context.
+          <!-- This represents the time zone in the Brazilian state of
+               Bahia. See the comment on "BrasÃlia Time" for more
+               details. This string is only used in places where
+               "Brazil" is already clear from context.
             -->
-          <_name>Bahia</_name>
+          <_name msgctxt="Timezone">Bahia</_name>
         </timezone>
         <timezone id="America/Belem">
-          <!-- Translators: This represents the time zone in the
-               Brazilian state of Amapà and the eastern part of ParÃ.
-               See the comment on "BrasÃlia Time" for more details.
-               This string is only used in places where "Brazil" is
-               already clear from context.
+          <!-- This represents the time zone in the Brazilian state of
+               Amapà and the eastern part of ParÃ. See the comment on
+               "BrasÃlia Time" for more details. This string is only
+               used in places where "Brazil" is already clear from
+               context.
             -->
           <_name>Amapà / East ParÃ</_name>
         </timezone>
         <timezone id="America/Boa_Vista">
-          <!-- Translators: This represents the time zone in the
-               Brazilian state of Roraima. See the comment on "BrasÃlia
-               Time" for more details. This string is only used in
-               places where "Brazil" is already clear from context.
+          <!-- This represents the time zone in the Brazilian state of
+               Roraima. See the comment on "BrasÃlia Time" for more
+               details. This string is only used in places where
+               "Brazil" is already clear from context.
             -->
-          <_name>Roraima</_name>
+          <_name msgctxt="Timezone">Roraima</_name>
         </timezone>
         <timezone id="America/Campo_Grande">
-          <!-- Translators: This represents the time zone in the
-               Brazilian state of Mato Grosso do Sul. See the comment
-               on "BrasÃlia Time" for more details. This string is only
-               used in places where "Brazil" is already clear from
-               context.
+          <!-- This represents the time zone in the Brazilian state of
+               Mato Grosso do Sul. See the comment on "BrasÃlia Time"
+               for more details. This string is only used in places
+               where "Brazil" is already clear from context.
             -->
-          <_name>Mato Grosso do Sul</_name>
+          <_name msgctxt="Timezone">Mato Grosso do Sul</_name>
         </timezone>
         <timezone id="America/Cuiaba">
-          <!-- Translators: This represents the time zone in the
-               Brazilian state of Mato Grosso. See the comment on
-               "BrasÃlia Time" for more details. This string is only
-               used in places where "Brazil" is already clear from
-               context.
+          <!-- This represents the time zone in the Brazilian state of
+               Mato Grosso. See the comment on "BrasÃlia Time" for more
+               details. This string is only used in places where
+               "Brazil" is already clear from context.
             -->
-          <_name>Mato Grosso</_name>
+          <_name msgctxt="Timezone">Mato Grosso</_name>
         </timezone>
         <timezone id="America/Eirunepe">
-          <!-- Translators: This represents the time zone in the
-               western part of the Brazilian state of Amazonas. See the
-               comment on "BrasÃlia Time" for more details. This string
-               is only used in places where "Brazil" is already clear
-               from context.
+          <!-- This represents the time zone in the western part of the
+               Brazilian state of Amazonas. See the comment on
+               "BrasÃlia Time" for more details. This string is only
+               used in places where "Brazil" is already clear from
+               context.
             -->
           <_name>West Amazonas</_name>
         </timezone>
         <timezone id="America/Fortaleza">
-          <!-- Translators: This represents the time zone in the
-               Brazilian states of CearÃ, MaranhÃo, ParaÃba, PiauÃ, and
-               Rio Grande do Norte. See the comment on "BrasÃlia Time"
-               for more details. This string is only used in places
-               where "Brazil" is already clear from context.
+          <!-- This represents the time zone in the Brazilian states of
+               CearÃ, MaranhÃo, ParaÃba, PiauÃ, and Rio Grande do
+               Norte. See the comment on "BrasÃlia Time" for more
+               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>
         </timezone>
         <timezone id="America/Maceio">
-          <!-- Translators: This represents the time zone in the
-               Brazilian states of Alagoas and Sergipe. See the comment
-               on "BrasÃlia Time" for more details. This string is only
-               used in places where "Brazil" is already clear from
-               context.
+          <!-- This represents the time zone in the Brazilian states of
+               Alagoas and Sergipe. See the comment on "BrasÃlia Time"
+               for more details. This string is only used in places
+               where "Brazil" is already clear from context.
             -->
           <_name>Alagoas, Sergipe</_name>
         </timezone>
         <timezone id="America/Manaus">
-          <!-- Translators: This represents the time zone in the
-               eastern part of the Brazilian state of Amazonas. See the
-               comment on "BrasÃlia Time" for more details. This string
-               is only used in places where "Brazil" is already clear
-               from context.
+          <!-- This represents the time zone in the eastern part of the
+               Brazilian state of Amazonas. See the comment on
+               "BrasÃlia Time" for more details. This string is only
+               used in places where "Brazil" is already clear from
+               context.
             -->
           <_name>East Amazonas</_name>
         </timezone>
         <timezone id="America/Noronha">
-          <!-- Translators: This represents the time zone on the
-               Brazilian island of Fernando de Noronha. See the comment
-               on "BrasÃlia Time" for more details. This string is only
-               used in places where "Brazil" is already clear from
-               context.
+          <!-- This represents the time zone on the Brazilian island of
+               Fernando de Noronha. See the comment on "BrasÃlia Time"
+               for more details. This string is only used in places
+               where "Brazil" is already clear from context.
             -->
           <_name>Fernando de Noronha</_name>
         </timezone>
         <timezone id="America/Porto_Velho">
-          <!-- Translators: This represents the time zone in the
-               Brazilian state of RondÃnia and the western part of
-               ParÃ. See the comment on "BrasÃlia Time" for more
-               details. This string is only used in places where
-               "Brazil" is already clear from context.
+          <!-- This represents the time zone in the Brazilian state of
+               RondÃnia and the western part of ParÃ. See the comment
+               on "BrasÃlia Time" for more details. This string is only
+               used in places where "Brazil" is already clear from
+               context.
             -->
           <_name>West ParÃ, RondÃnia</_name>
         </timezone>
         <timezone id="America/Recife">
-          <!-- Translators: This represents the time zone in the
-               Brazilian state of Pernambuco. See the comment on
-               "BrasÃlia Time" for more details. This string is only
-               used in places where "Brazil" is already clear from
-               context.
+          <!-- This represents the time zone in the Brazilian state of
+               Pernambuco. See the comment on "BrasÃlia Time" for more
+               details. This string is only used in places where
+               "Brazil" is already clear from context.
             -->
-          <_name>Pernambuco</_name>
+          <_name msgctxt="Timezone">Pernambuco</_name>
         </timezone>
         <timezone id="America/Rio_Branco">
-          <!-- Translators: This represents the time zone in the
-               Brazilian state of Acre. See the comment on "BrasÃlia
-               Time" for more details. This string is only used in
-               places where "Brazil" is already clear from context.
+          <!-- This represents the time zone in the Brazilian state of
+               Acre. See the comment on "BrasÃlia Time" for more
+               details. This string is only used in places where
+               "Brazil" is already clear from context.
             -->
-          <_name>Acre</_name>
+          <_name msgctxt="Timezone">Acre</_name>
         </timezone>
         <timezone id="America/Sao_Paulo">
-          <!-- Translators: This represents the official "base" time
-               zone in Brazil, covering the capital city of BrasÃlia,
-               and those states that choose to follow it. Each
-               Brazilian state decides on its own each year whether or
-               not to observe Daylight Saving Time. The tzdata database
-               breaks the states up into groups of states that
-               generally make the same decision in a given year. Thus,
-               in any given year, several of the time zones will appear
-               to be redundant, but exactly which ones seem redundant
-               may differ from year to year, and there's no good way to
-               identify the zones other than by listing states. 
-               Anyway, "BrasÃlia Time" is the most common timezone,
-               being used by about a third of the states in Brazil
-               (Distrito Federal, EspÃrito Santo, GoiÃs, Minas Gerais,
-               ParanÃ, Rio de Janeiro, Rio Grande do Sul, Santa
-               Catarina, and SÃo Paulo). This string is only used in
-               places where "Brazil" is already clear from context.
+          <!-- This represents the official "base" time zone in Brazil,
+               covering the capital city of BrasÃlia, and those states
+               that choose to follow it. Each Brazilian state decides
+               on its own each year whether or not to observe Daylight
+               Saving Time. The tzdata database breaks the states up
+               into groups of states that generally make the same
+               decision in a given year. Thus, in any given year,
+               several of the time zones will appear to be redundant,
+               but exactly which ones seem redundant may differ from
+               year to year, and there's no good way to identify the
+               zones other than by listing states.  Anyway, "BrasÃlia
+               Time" is the most common timezone, being used by about a
+               third of the states in Brazil (Distrito Federal,
+               EspÃrito Santo, GoiÃs, Minas Gerais, ParanÃ, Rio de
+               Janeiro, Rio Grande do Sul, Santa Catarina, and SÃo
+               Paulo). This string is only used in places where
+               "Brazil" is already clear from context.
             -->
           <_name>BrasÃlia Time</_name>
         </timezone>
       </timezones>
       <tz-hint>America/Sao_Paulo</tz-hint>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
-        <_name>Acre</_name>
+        <!-- A state/province/territory in Brazil -->
+        <_name msgctxt="State in Brazil">Acre</_name>
         <fips-code>BR01</fips-code>
         <city>
-          <!-- Translators: this is a city in Acre in Brazil -->
+          <!-- A city in Acre in Brazil -->
           <_name>Cruzeiro do Sul</_name>
           <coordinates>-7.633333 -72.600000</coordinates>
           <location>
@@ -8747,7 +8653,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Acre in Brazil -->
+          <!-- A city in Acre in Brazil -->
           <_name>Rio Branco</_name>
           <coordinates>-9.966667 -67.800000</coordinates>
           <location>
@@ -8758,7 +8664,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Acre in Brazil -->
+          <!-- A city in Acre in Brazil -->
           <_name>TarauacÃ</_name>
           <coordinates>-8.166667 -70.766667</coordinates>
           <location>
@@ -8769,11 +8675,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
+        <!-- A state/province/territory in Brazil -->
         <_name>Alagoas</_name>
         <fips-code>BR02</fips-code>
         <city>
-          <!-- Translators: this is a city in Alagoas in Brazil -->
+          <!-- A city in Alagoas in Brazil -->
           <_name>MaceiÃ</_name>
           <coordinates>-9.666667 -35.716667</coordinates>
           <location>
@@ -8785,11 +8691,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
+        <!-- A state/province/territory in Brazil -->
         <_name>AmapÃ</_name>
         <fips-code>BR03</fips-code>
         <city>
-          <!-- Translators: this is a city in Amapà in Brazil -->
+          <!-- A city in Amapà in Brazil -->
           <_name>Oiapoque</_name>
           <coordinates>3.833333 -51.833333</coordinates>
           <location>
@@ -8800,11 +8706,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
+        <!-- A state/province/territory in Brazil -->
         <_name>Amazonas</_name>
         <fips-code>BR04</fips-code>
         <city>
-          <!-- Translators: this is a city in Amazonas in Brazil -->
+          <!-- A city in Amazonas in Brazil -->
           <_name>Manaus</_name>
           <coordinates>-3.113333 -60.025278</coordinates>
           <location>
@@ -8820,7 +8726,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Amazonas in Brazil -->
+          <!-- A city in Amazonas in Brazil -->
           <_name>ManicorÃ</_name>
           <coordinates>-5.812222 -61.297500</coordinates>
           <location>
@@ -8830,7 +8736,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Amazonas in Brazil -->
+          <!-- A city in Amazonas in Brazil -->
           <_name>SÃo FÃlix</_name>
           <coordinates>-3.750000 -69.483333</coordinates>
           <location>
@@ -8841,7 +8747,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Amazonas in Brazil -->
+          <!-- A city in Amazonas in Brazil -->
           <_name>SÃo Gabriel</_name>
           <coordinates>-0.133333 -67.083333</coordinates>
           <location>
@@ -8851,7 +8757,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Amazonas in Brazil -->
+          <!-- A city in Amazonas in Brazil -->
           <_name>TefÃ</_name>
           <coordinates>-3.366667 -64.700000</coordinates>
           <location>
@@ -8863,11 +8769,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
-        <_name>Bahia</_name>
+        <!-- A state/province/territory in Brazil -->
+        <_name msgctxt="State in Brazil">Bahia</_name>
         <fips-code>BR05</fips-code>
         <city>
-          <!-- Translators: this is a city in Bahia in Brazil -->
+          <!-- A city in Bahia in Brazil -->
           <_name>Bom Jesus da Lapa</_name>
           <coordinates>-13.250000 -43.416667</coordinates>
           <location>
@@ -8877,7 +8783,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Bahia in Brazil -->
+          <!-- A city in Bahia in Brazil -->
           <_name>IlhÃus</_name>
           <coordinates>-14.816667 -39.033333</coordinates>
           <location>
@@ -8887,7 +8793,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Bahia in Brazil -->
+          <!-- A city in Bahia in Brazil -->
           <_name>Paulo Afonso</_name>
           <coordinates>-9.350000 -38.233333</coordinates>
           <location>
@@ -8897,7 +8803,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Bahia in Brazil -->
+          <!-- A city in Bahia in Brazil -->
           <_name>PÃrto Seguro</_name>
           <coordinates>-16.433333 -39.083333</coordinates>
           <location>
@@ -8907,7 +8813,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Bahia in Brazil -->
+          <!-- A city in Bahia in Brazil -->
           <_name>Salvador</_name>
           <coordinates>-12.983333 -38.516667</coordinates>
           <location>
@@ -8918,7 +8824,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Bahia in Brazil -->
+          <!-- A city in Bahia in Brazil -->
           <_name>VitÃria da Conquista</_name>
           <coordinates>-14.850000 -40.850000</coordinates>
           <location>
@@ -8929,11 +8835,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
+        <!-- A state/province/territory in Brazil -->
         <_name>CearÃ</_name>
         <fips-code>BR06</fips-code>
         <city>
-          <!-- Translators: this is a city in Cearà in Brazil -->
+          <!-- A city in Cearà in Brazil -->
           <_name>Fortaleza</_name>
           <coordinates>-3.716667 -38.500000</coordinates>
           <location>
@@ -8945,11 +8851,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
-        <_name>Distrito Federal</_name>
+        <!-- A state/province/territory in Brazil -->
+        <_name msgctxt="State in Brazil">Distrito Federal</_name>
         <fips-code>BR07</fips-code>
         <city>
-          <!-- Translators: this is the capital of Brazil -->
+          <!-- The capital of Brazil -->
           <_name>BrasÃlia</_name>
           <coordinates>-15.783333 -47.916667</coordinates>
           <location>
@@ -8961,11 +8867,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
+        <!-- A state/province/territory in Brazil -->
         <_name>EspÃrito Santo</_name>
         <fips-code>BR08</fips-code>
         <city>
-          <!-- Translators: this is a city in EspÃrito Santo in Brazil -->
+          <!-- A city in EspÃrito Santo in Brazil -->
           <_name>VitÃria</_name>
           <coordinates>-20.316667 -40.350000</coordinates>
           <location>
@@ -8977,11 +8883,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
+        <!-- A state/province/territory in Brazil -->
         <_name>GoiÃs</_name>
         <fips-code>BR29</fips-code>
         <city>
-          <!-- Translators: this is a city in GoiÃs in Brazil -->
+          <!-- A city in GoiÃs in Brazil -->
           <_name>AnÃpolis</_name>
           <coordinates>-16.333333 -48.966667</coordinates>
           <location>
@@ -8991,7 +8897,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in GoiÃs in Brazil -->
+          <!-- A city in GoiÃs in Brazil -->
           <_name>GoiÃnia</_name>
           <coordinates>-16.666667 -49.266667</coordinates>
           <location>
@@ -9003,11 +8909,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
+        <!-- A state/province/territory in Brazil -->
         <_name>MaranhÃo</_name>
         <fips-code>BR13</fips-code>
         <city>
-          <!-- Translators: this is a city in MaranhÃo in Brazil -->
+          <!-- A city in MaranhÃo in Brazil -->
           <_name>Imperatriz</_name>
           <coordinates>-5.533333 -47.483333</coordinates>
           <location>
@@ -9017,7 +8923,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in MaranhÃo in Brazil -->
+          <!-- A city in MaranhÃo in Brazil -->
           <_name>SÃo LuÃs</_name>
           <coordinates>-2.516667 -44.266667</coordinates>
           <location>
@@ -9029,11 +8935,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
-        <_name>Mato Grosso</_name>
+        <!-- A state/province/territory in Brazil -->
+        <_name msgctxt="State in Brazil">Mato Grosso</_name>
         <fips-code>BR14</fips-code>
         <city>
-          <!-- Translators: this is a city in Mato Grosso in Brazil -->
+          <!-- A city in Mato Grosso in Brazil -->
           <_name>Alta Floresta</_name>
           <coordinates>-9.900000 -55.900000</coordinates>
           <location>
@@ -9043,7 +8949,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mato Grosso in Brazil -->
+          <!-- A city in Mato Grosso in Brazil -->
           <_name>Barra do GarÃas</_name>
           <coordinates>-15.883333 -52.250000</coordinates>
           <location>
@@ -9053,7 +8959,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mato Grosso in Brazil -->
+          <!-- A city in Mato Grosso in Brazil -->
           <_name>CuiabÃ</_name>
           <coordinates>-15.583333 -56.083333</coordinates>
           <location>
@@ -9065,13 +8971,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
-        <_name>Mato Grosso do Sul</_name>
+        <!-- A state/province/territory in Brazil -->
+        <_name msgctxt="State in Brazil">Mato Grosso do Sul</_name>
         <fips-code>BR11</fips-code>
         <city>
-          <!-- Translators: this is a city in Mato Grosso do Sul in
-               Brazil
-            -->
+          <!-- A city in Mato Grosso do Sul in Brazil -->
           <_name>Campo Grande</_name>
           <coordinates>-20.450000 -54.616667</coordinates>
           <location>
@@ -9082,9 +8986,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mato Grosso do Sul in
-               Brazil
-            -->
+          <!-- A city in Mato Grosso do Sul in Brazil -->
           <_name>CorumbÃ</_name>
           <coordinates>-19.016667 -57.650000</coordinates>
           <location>
@@ -9095,9 +8997,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mato Grosso do Sul in
-               Brazil
-            -->
+          <!-- A city in Mato Grosso do Sul in Brazil -->
           <_name>Ponta PorÃ</_name>
           <coordinates>-22.533333 -55.716667</coordinates>
           <location>
@@ -9109,11 +9009,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
+        <!-- A state/province/territory in Brazil -->
         <_name>Minas Gerais</_name>
         <fips-code>BR15</fips-code>
         <city>
-          <!-- Translators: this is a city in Minas Gerais in Brazil -->
+          <!-- A city in Minas Gerais in Brazil -->
           <_name>Barbacena</_name>
           <coordinates>-21.233333 -43.766667</coordinates>
           <location>
@@ -9123,7 +9023,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minas Gerais in Brazil -->
+          <!-- A city in Minas Gerais in Brazil -->
           <_name>Belo Horizonte</_name>
           <coordinates>-19.916667 -43.933333</coordinates>
           <location>
@@ -9139,7 +9039,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minas Gerais in Brazil -->
+          <!-- A city in Minas Gerais in Brazil -->
           <_name>Juiz de Fora</_name>
           <coordinates>-21.751667 -43.352778</coordinates>
           <location>
@@ -9149,7 +9049,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minas Gerais in Brazil -->
+          <!-- A city in Minas Gerais in Brazil -->
           <_name>Montes Claros</_name>
           <coordinates>-16.716667 -43.866667</coordinates>
           <location>
@@ -9159,7 +9059,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minas Gerais in Brazil -->
+          <!-- A city in Minas Gerais in Brazil -->
           <_name>PoÃos de Caldas</_name>
           <coordinates>-21.800000 -46.566667</coordinates>
           <location>
@@ -9169,7 +9069,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minas Gerais in Brazil -->
+          <!-- A city in Minas Gerais in Brazil -->
           <_name>Uberaba</_name>
           <coordinates>-19.750000 -47.916667</coordinates>
           <location>
@@ -9179,7 +9079,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minas Gerais in Brazil -->
+          <!-- A city in Minas Gerais in Brazil -->
           <_name>UberlÃndia</_name>
           <coordinates>-18.916667 -48.300000</coordinates>
           <location>
@@ -9190,11 +9090,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
+        <!-- A state/province/territory in Brazil -->
         <_name>ParanÃ</_name>
         <fips-code>BR18</fips-code>
         <city>
-          <!-- Translators: this is a city in Paranà in Brazil -->
+          <!-- A city in Paranà in Brazil -->
           <_name>Curitiba</_name>
           <coordinates>-25.416667 -49.250000</coordinates>
           <location>
@@ -9210,7 +9110,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Paranà in Brazil -->
+          <!-- A city in Paranà in Brazil -->
           <_name>Foz do IguaÃu</_name>
           <coordinates>-25.550000 -54.583333</coordinates>
           <location>
@@ -9221,7 +9121,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Paranà in Brazil -->
+          <!-- A city in Paranà in Brazil -->
           <_name>Londrina</_name>
           <coordinates>-23.300000 -51.150000</coordinates>
           <location>
@@ -9232,7 +9132,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Paranà in Brazil -->
+          <!-- A city in Paranà in Brazil -->
           <_name>MaringÃ</_name>
           <coordinates>-23.416667 -51.916667</coordinates>
           <location>
@@ -9243,11 +9143,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
+        <!-- A state/province/territory in Brazil -->
         <_name>ParaÃba</_name>
         <fips-code>BR17</fips-code>
         <city>
-          <!-- Translators: this is a city in ParaÃba in Brazil -->
+          <!-- A city in ParaÃba in Brazil -->
           <_name>Campina Grande</_name>
           <coordinates>-7.216667 -35.883333</coordinates>
           <location>
@@ -9257,7 +9157,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in ParaÃba in Brazil -->
+          <!-- A city in ParaÃba in Brazil -->
           <_name>JoÃo Pessoa</_name>
           <coordinates>-7.116667 -34.866667</coordinates>
           <location>
@@ -9269,11 +9169,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
+        <!-- A state/province/territory in Brazil -->
         <_name>ParÃ</_name>
         <fips-code>BR16</fips-code>
         <city>
-          <!-- Translators: this is a city in Parà in Brazil -->
+          <!-- A city in Parà in Brazil -->
           <_name>Altamira</_name>
           <coordinates>-3.200000 -52.200000</coordinates>
           <location>
@@ -9283,7 +9183,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Parà in Brazil -->
+          <!-- A city in Parà in Brazil -->
           <_name>BelÃm</_name>
           <coordinates>-1.450000 -48.483333</coordinates>
           <location>
@@ -9294,7 +9194,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Parà in Brazil -->
+          <!-- A city in Parà in Brazil -->
           <_name>Cachimbo</_name>
           <coordinates>-8.950000 -54.900000</coordinates>
           <location>
@@ -9304,7 +9204,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Parà in Brazil -->
+          <!-- A city in Parà in Brazil -->
           <_name>ConceiÃÃo do Araguaia</_name>
           <coordinates>-8.241111 -49.296111</coordinates>
           <location>
@@ -9314,7 +9214,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Parà in Brazil -->
+          <!-- A city in Parà in Brazil -->
           <_name>Itaituba</_name>
           <coordinates>-4.216667 -56.016667</coordinates>
           <location>
@@ -9324,7 +9224,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Parà in Brazil -->
+          <!-- A city in Parà in Brazil -->
           <_name>Jacareacanga</_name>
           <coordinates>-6.266667 -57.650000</coordinates>
           <location>
@@ -9334,7 +9234,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Parà in Brazil -->
+          <!-- A city in Parà in Brazil -->
           <_name>MarabÃ</_name>
           <coordinates>-5.350000 -49.116667</coordinates>
           <location>
@@ -9345,7 +9245,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Parà in Brazil -->
+          <!-- A city in Parà in Brazil -->
           <_name>Piri Grande</_name>
           <coordinates>0.066667 -50.000000</coordinates>
           <location>
@@ -9356,7 +9256,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Parà in Brazil -->
+          <!-- A city in Parà in Brazil -->
           <_name>SantarÃm</_name>
           <coordinates>-2.433333 -54.700000</coordinates>
           <location>
@@ -9367,7 +9267,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Parà in Brazil -->
+          <!-- A city in Parà in Brazil -->
           <_name>TucuruÃ</_name>
           <coordinates>-3.700000 -49.700000</coordinates>
           <location>
@@ -9378,11 +9278,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
-        <_name>Pernambuco</_name>
+        <!-- A state/province/territory in Brazil -->
+        <_name msgctxt="State in Brazil">Pernambuco</_name>
         <fips-code>BR30</fips-code>
         <city>
-          <!-- Translators: this is a city in Pernambuco in Brazil -->
+          <!-- A city in Pernambuco in Brazil -->
           <_name>Petrolina</_name>
           <coordinates>-9.400000 -40.500000</coordinates>
           <location>
@@ -9392,7 +9292,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pernambuco in Brazil -->
+          <!-- A city in Pernambuco in Brazil -->
           <_name>Recife</_name>
           <coordinates>-8.050000 -34.900000</coordinates>
           <location>
@@ -9403,7 +9303,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pernambuco in Brazil -->
+          <!-- A city in Pernambuco in Brazil -->
           <_name>Vila dos RemÃdios</_name>
           <coordinates>-3.850000 -32.400000</coordinates>
           <location>
@@ -9415,11 +9315,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
+        <!-- A state/province/territory in Brazil -->
         <_name>PiauÃ</_name>
         <fips-code>BR20</fips-code>
         <city>
-          <!-- Translators: this is a city in Piauà in Brazil -->
+          <!-- A city in Piauà in Brazil -->
           <_name>ParnaÃba</_name>
           <coordinates>-2.909167 -41.774722</coordinates>
           <location>
@@ -9429,7 +9329,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Piauà in Brazil -->
+          <!-- A city in Piauà in Brazil -->
           <_name>Teresina</_name>
           <coordinates>-5.083333 -42.816667</coordinates>
           <location>
@@ -9441,13 +9341,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
+        <!-- A state/province/territory in Brazil -->
         <_name>Rio Grande do Norte</_name>
         <fips-code>BR22</fips-code>
         <city>
-          <!-- Translators: this is a city in Rio Grande do Norte in
-               Brazil
-            -->
+          <!-- A city in Rio Grande do Norte in Brazil -->
           <_name>MossorÃ</_name>
           <coordinates>-5.191389 -37.344722</coordinates>
           <location>
@@ -9457,10 +9355,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Rio Grande do Norte in
-               Brazil
-            -->
-          <_name>Natal</_name>
+          <!-- A city in Rio Grande do Norte in Brazil -->
+          <_name msgctxt="City in Rio Grande do Norte, Brazil">Natal</_name>
           <coordinates>-5.783333 -35.216667</coordinates>
           <location>
             <name>Natal Airport</name>
@@ -9471,13 +9367,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
+        <!-- A state/province/territory in Brazil -->
         <_name>Rio Grande do Sul</_name>
         <fips-code>BR23</fips-code>
         <city>
-          <!-- Translators: this is a city in Rio Grande do Sul in
-               Brazil
-            -->
+          <!-- A city in Rio Grande do Sul in Brazil -->
           <_name>Pelotas</_name>
           <coordinates>-31.766667 -52.333333</coordinates>
           <location>
@@ -9488,9 +9382,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Rio Grande do Sul in
-               Brazil
-            -->
+          <!-- A city in Rio Grande do Sul in Brazil -->
           <_name>Porto Alegre</_name>
           <coordinates>-30.033333 -51.200000</coordinates>
           <location>
@@ -9506,10 +9398,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Rio Grande do Sul in
-               Brazil
-            -->
-          <_name>Santa Maria</_name>
+          <!-- A city in Rio Grande do Sul in Brazil -->
+          <_name msgctxt="City in Rio Grande do Sul, Brazil">Santa Maria</_name>
           <coordinates>-29.683333 -53.800000</coordinates>
           <location>
             <name>Santa Maria Airport</name>
@@ -9518,9 +9408,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Rio Grande do Sul in
-               Brazil
-            -->
+          <!-- A city in Rio Grande do Sul in Brazil -->
           <_name>Uruguaiana</_name>
           <coordinates>-29.750000 -57.083333</coordinates>
           <location>
@@ -9532,11 +9420,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
-        <_name>Rio de Janeiro</_name>
+        <!-- A state/province/territory in Brazil -->
+        <_name msgctxt="State in Brazil">Rio de Janeiro</_name>
         <fips-code>BR21</fips-code>
         <city>
-          <!-- Translators: this is a city in Rio de Janeiro in Brazil -->
+          <!-- A city in Rio de Janeiro in Brazil -->
           <_name>Campos</_name>
           <coordinates>-21.750000 -41.300000</coordinates>
           <location>
@@ -9546,8 +9434,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Rio de Janeiro in Brazil -->
-          <_name>Rio de Janeiro</_name>
+          <!-- A city in Rio de Janeiro in Brazil -->
+          <_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>
@@ -9578,7 +9466,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Rio de Janeiro in Brazil -->
+          <!-- A city in Rio de Janeiro in Brazil -->
           <_name>SÃo Pedro da Aldeia</_name>
           <coordinates>-22.850000 -42.100000</coordinates>
           <location>
@@ -9589,11 +9477,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
+        <!-- A state/province/territory in Brazil -->
         <_name>RondÃnia</_name>
         <fips-code>BR24</fips-code>
         <city>
-          <!-- Translators: this is a city in RondÃnia in Brazil -->
+          <!-- A city in RondÃnia in Brazil -->
           <_name>PÃrto Velho</_name>
           <coordinates>-8.766667 -63.900000</coordinates>
           <location>
@@ -9604,7 +9492,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in RondÃnia in Brazil -->
+          <!-- A city in RondÃnia in Brazil -->
           <_name>Vilhena</_name>
           <coordinates>-12.716667 -60.116667</coordinates>
           <location>
@@ -9616,11 +9504,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
-        <_name>Roraima</_name>
+        <!-- A state/province/territory in Brazil -->
+        <_name msgctxt="State in Brazil">Roraima</_name>
         <fips-code>BR25</fips-code>
         <city>
-          <!-- Translators: this is a city in Roraima in Brazil -->
+          <!-- A city in Roraima in Brazil -->
           <_name>Boa Vista</_name>
           <coordinates>2.816667 -60.666667</coordinates>
           <location>
@@ -9632,11 +9520,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
+        <!-- A state/province/territory in Brazil -->
         <_name>Santa Catarina</_name>
         <fips-code>BR26</fips-code>
         <city>
-          <!-- Translators: this is a city in Santa Catarina in Brazil -->
+          <!-- A city in Santa Catarina in Brazil -->
           <_name>FlorianÃpolis</_name>
           <coordinates>-27.583333 -48.566667</coordinates>
           <location>
@@ -9648,11 +9536,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
+        <!-- A state/province/territory in Brazil -->
         <_name>Sergipe</_name>
         <fips-code>BR28</fips-code>
         <city>
-          <!-- Translators: this is a city in Sergipe in Brazil -->
+          <!-- A city in Sergipe in Brazil -->
           <_name>Aracaju</_name>
           <coordinates>-10.916667 -37.066667</coordinates>
           <location>
@@ -9664,11 +9552,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
-        <_name>SÃo Paulo</_name>
+        <!-- A state/province/territory in Brazil -->
+        <_name msgctxt="State in Brazil">SÃo Paulo</_name>
         <fips-code>BR27</fips-code>
         <city>
-          <!-- Translators: this is a city in SÃo Paulo in Brazil -->
+          <!-- A city in SÃo Paulo in Brazil -->
           <_name>Bauru</_name>
           <coordinates>-22.316667 -49.066667</coordinates>
           <location>
@@ -9678,7 +9566,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in SÃo Paulo in Brazil -->
+          <!-- A city in SÃo Paulo in Brazil -->
           <_name>Campinas</_name>
           <coordinates>-22.900000 -47.083333</coordinates>
           <location>
@@ -9689,7 +9577,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in SÃo Paulo in Brazil -->
+          <!-- A city in SÃo Paulo in Brazil -->
           <_name>GuaratinguetÃ</_name>
           <coordinates>-22.816667 -45.216667</coordinates>
           <location>
@@ -9699,7 +9587,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in SÃo Paulo in Brazil -->
+          <!-- A city in SÃo Paulo in Brazil -->
           <_name>Guarulhos</_name>
           <coordinates>-23.466667 -46.533333</coordinates>
           <location>
@@ -9710,7 +9598,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in SÃo Paulo in Brazil -->
+          <!-- A city in SÃo Paulo in Brazil -->
           <_name>Palmeiras</_name>
           <coordinates>-21.133333 -47.750000</coordinates>
           <location>
@@ -9721,7 +9609,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in SÃo Paulo in Brazil -->
+          <!-- A city in SÃo Paulo in Brazil -->
           <_name>PiraÃununga</_name>
           <coordinates>-21.983333 -47.416667</coordinates>
           <location>
@@ -9731,7 +9619,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in SÃo Paulo in Brazil -->
+          <!-- A city in SÃo Paulo in Brazil -->
           <_name>Presidente Prudente</_name>
           <coordinates>-22.116667 -51.366667</coordinates>
           <location>
@@ -9741,7 +9629,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in SÃo Paulo in Brazil -->
+          <!-- A city in SÃo Paulo in Brazil -->
           <_name>Santos</_name>
           <coordinates>-23.950000 -46.333333</coordinates>
           <location>
@@ -9751,7 +9639,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in SÃo Paulo in Brazil -->
+          <!-- A city in SÃo Paulo in Brazil -->
           <_name>SÃo Josà dos Campos</_name>
           <coordinates>-23.183333 -45.883333</coordinates>
           <location>
@@ -9762,8 +9650,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in SÃo Paulo in Brazil -->
-          <_name>SÃo Paulo</_name>
+          <!-- A city in SÃo Paulo in Brazil -->
+          <_name msgctxt="City in SÃo Paulo, Brazil">SÃo Paulo</_name>
           <coordinates>-23.533333 -46.616667</coordinates>
           <location>
             <name>Marte Airport</name>
@@ -9779,7 +9667,7 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Brazil -->
+        <!-- A state/province/territory in Brazil -->
         <_name>Tocantis</_name>
         <fips-code>BR31</fips-code>
       </state>
@@ -9796,9 +9684,7 @@
       </timezones>
       <tz-hint>America/Tortola</tz-hint>
       <city>
-        <!-- Translators: this is the capital of the British Virgin
-             Islands
-          -->
+        <!-- The capital of the British Virgin Islands -->
         <_name>Road Town</_name>
         <coordinates>18.416667 -64.616667</coordinates>
         <location>
@@ -9808,7 +9694,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the British Virgin Islands -->
+        <!-- A city in the British Virgin Islands -->
         <_name>The Mill</_name>
         <coordinates>18.450000 -64.533333</coordinates>
         <location>
@@ -9828,8 +9714,8 @@
       </timezones>
       <tz-hint>America/Cayman</tz-hint>
       <city>
-        <!-- Translators: this is the capital of the Cayman Islands -->
-        <_name>George Town</_name>
+        <!-- The capital of the Cayman Islands -->
+        <_name msgctxt="City in Cayman Islands">George Town</_name>
         <coordinates>19.300000 -81.383333</coordinates>
         <location>
           <name>Owen Roberts Airport, Grand Cayman</name>
@@ -9838,7 +9724,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Cayman Islands -->
+        <!-- A city in the Cayman Islands -->
         <_name>Knob Hill</_name>
         <coordinates>19.683333 -79.883333</coordinates>
         <location>
@@ -9848,7 +9734,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Cayman Islands -->
+        <!-- A city in the Cayman Islands -->
         <_name>Red Bay Estate</_name>
         <coordinates>19.283333 -81.350000</coordinates>
         <location>
@@ -9869,18 +9755,22 @@
       <fips-code>CI</fips-code>
       <timezones>
         <timezone id="America/Santiago">
-          <!-- Translators: This refers to the time zone for mainland
-               Chile (as opposed to the time zone for Easter Island).
+          <!-- This refers to the time zone for mainland Chile (as
+               opposed to the time zone for Easter Island).
             -->
           <_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>
         </timezone>
       </timezones>
       <tz-hint>America/Santiago</tz-hint>
       <city>
-        <!-- Translators: this is a city in Chile -->
+        <!-- A city in Chile -->
         <_name>Antofagasta</_name>
         <coordinates>-23.650000 -70.400000</coordinates>
         <location>
@@ -9890,7 +9780,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Chile -->
+        <!-- A city in Chile -->
         <_name>Arica</_name>
         <coordinates>-18.483333 -70.333333</coordinates>
         <location>
@@ -9900,7 +9790,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Chile -->
+        <!-- A city in Chile -->
         <_name>Balmaceda</_name>
         <coordinates>-45.916667 -71.683333</coordinates>
         <location>
@@ -9910,8 +9800,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Chile -->
-        <_name>ConcepciÃn</_name>
+        <!-- A city in Chile -->
+        <_name msgctxt="City in Chile">ConcepciÃn</_name>
         <coordinates>-36.833333 -73.050000</coordinates>
         <location>
           <name>ConcepciÃn</name>
@@ -9920,7 +9810,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Chile -->
+        <!-- A city in Chile -->
         <_name>Hanga Roa</_name>
         <coordinates>-27.150000 -109.433333</coordinates>
         <location>
@@ -9930,7 +9820,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Chile -->
+        <!-- A city in Chile -->
         <_name>Iquique</_name>
         <coordinates>-20.216667 -70.166667</coordinates>
         <location>
@@ -9940,7 +9830,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Chile -->
+        <!-- A city in Chile -->
         <_name>La Serena</_name>
         <coordinates>-29.907778 -71.254167</coordinates>
         <location>
@@ -9950,7 +9840,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Chile -->
+        <!-- A city in Chile -->
         <_name>Puerto Montt</_name>
         <coordinates>-41.471667 -72.936944</coordinates>
         <location>
@@ -9960,7 +9850,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Chile -->
+        <!-- A city in Chile -->
         <_name>Punta Arenas</_name>
         <coordinates>-53.150000 -70.916667</coordinates>
         <location>
@@ -9970,7 +9860,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Chile -->
+        <!-- A city in Chile -->
         <_name>Santa Teresa de Lo Ovalle</_name>
         <coordinates>-33.383333 -70.783333</coordinates>
         <location>
@@ -9980,8 +9870,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Chile -->
-        <_name>Santiago</_name>
+        <!-- The capital of Chile -->
+        <_name msgctxt="City in Chile">Santiago</_name>
         <coordinates>-33.450000 -70.666667</coordinates>
         <location>
           <name>Pudahuel</name>
@@ -9990,7 +9880,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Chile -->
+        <!-- A city in Chile -->
         <_name>Temuco</_name>
         <coordinates>-38.733333 -72.600000</coordinates>
         <location>
@@ -10010,7 +9900,7 @@
       </timezones>
       <tz-hint>America/Bogota</tz-hint>
       <city>
-        <!-- Translators: this is a city in Colombia -->
+        <!-- A city in Colombia -->
         <_name>Barranquilla</_name>
         <coordinates>10.963889 -74.796389</coordinates>
         <location>
@@ -10020,7 +9910,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Colombia -->
+        <!-- The capital of Colombia -->
         <_name>BogotÃ</_name>
         <coordinates>4.600000 -74.083333</coordinates>
         <location>
@@ -10030,7 +9920,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Colombia -->
+        <!-- A city in Colombia -->
         <_name>Bucaramanga</_name>
         <coordinates>7.129722 -73.125833</coordinates>
         <location>
@@ -10040,7 +9930,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Colombia -->
+        <!-- A city in Colombia -->
         <_name>Cali</_name>
         <coordinates>3.437222 -76.522500</coordinates>
         <location>
@@ -10050,7 +9940,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Colombia -->
+        <!-- A city in Colombia -->
         <_name>Cartagena</_name>
         <coordinates>10.399722 -75.514444</coordinates>
         <location>
@@ -10060,7 +9950,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Colombia -->
+        <!-- A city in Colombia -->
         <_name>CÃcuta</_name>
         <coordinates>7.883333 -72.505278</coordinates>
         <location>
@@ -10070,7 +9960,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Colombia -->
+        <!-- A city in Colombia -->
         <_name>Leticia</_name>
         <coordinates>-4.215278 -69.940556</coordinates>
         <location>
@@ -10080,7 +9970,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Colombia -->
+        <!-- A city in Colombia -->
         <_name>Pereira</_name>
         <coordinates>4.813333 -75.696111</coordinates>
         <location>
@@ -10090,7 +9980,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Colombia -->
+        <!-- A city in Colombia -->
         <_name>Rionegro</_name>
         <coordinates>6.155278 -75.388889</coordinates>
         <location>
@@ -10100,7 +9990,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Colombia -->
+        <!-- A city in Colombia -->
         <_name>San AndrÃs</_name>
         <coordinates>12.584722 -81.700556</coordinates>
         <location>
@@ -10120,7 +10010,7 @@
       </timezones>
       <tz-hint>America/Costa_Rica</tz-hint>
       <city>
-        <!-- Translators: this is a city in Costa Rica -->
+        <!-- A city in Costa Rica -->
         <_name>Alajuela</_name>
         <coordinates>10.016667 -84.216667</coordinates>
         <location>
@@ -10130,8 +10020,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Costa Rica -->
-        <_name>Liberia</_name>
+        <!-- A city in Costa Rica -->
+        <_name msgctxt="City in Costa Rica">Liberia</_name>
         <coordinates>10.633333 -85.433333</coordinates>
         <location>
           <name>Liberia</name>
@@ -10140,7 +10030,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Costa Rica -->
+        <!-- A city in Costa Rica -->
         <_name>Mata de Palo</_name>
         <coordinates>9.950000 -84.150000</coordinates>
         <location>
@@ -10150,7 +10040,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Costa Rica -->
+        <!-- A city in Costa Rica -->
         <_name>Puerto LimÃn</_name>
         <coordinates>10.000000 -83.033333</coordinates>
         <location>
@@ -10160,7 +10050,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Costa Rica -->
+        <!-- The capital of Costa Rica -->
         <_name>San JosÃ</_name>
         <coordinates>9.933333 -84.083333</coordinates>
         <location>
@@ -10183,7 +10073,7 @@
       </timezones>
       <tz-hint>America/Havana</tz-hint>
       <city>
-        <!-- Translators: this is a city in Cuba -->
+        <!-- A city in Cuba -->
         <_name>CamagÃey</_name>
         <coordinates>21.380833 -77.916944</coordinates>
         <location>
@@ -10193,7 +10083,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Cuba -->
+        <!-- A city in Cuba -->
         <_name>Cienfuegos</_name>
         <coordinates>22.146111 -80.435556</coordinates>
         <location>
@@ -10203,7 +10093,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Cuba -->
+        <!-- A city in Cuba -->
         <_name>GuantÃnamo</_name>
         <coordinates>20.144444 -75.209167</coordinates>
         <location>
@@ -10213,7 +10103,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Cuba.
+        <!-- The capital of Cuba.
              "Havana" is the traditional English name.
              The local name in Spanish is "La Habana".
           -->
@@ -10226,7 +10116,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Cuba -->
+        <!-- A city in Cuba -->
         <_name>HolguÃn</_name>
         <coordinates>20.887222 -76.263056</coordinates>
         <location>
@@ -10236,8 +10126,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Cuba -->
-        <_name>Manzanillo</_name>
+        <!-- A city in Cuba -->
+        <_name msgctxt="City in Cuba">Manzanillo</_name>
         <coordinates>20.343333 -77.116667</coordinates>
         <location>
           <name>Manzanillo</name>
@@ -10246,7 +10136,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Cuba -->
+        <!-- A city in Cuba -->
         <_name>Matanzas</_name>
         <coordinates>23.041111 -81.577500</coordinates>
         <location>
@@ -10256,7 +10146,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Cuba -->
+        <!-- A city in Cuba -->
         <_name>Rancho Boyeros</_name>
         <coordinates>23.000000 -82.385833</coordinates>
         <location>
@@ -10266,7 +10156,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Cuba -->
+        <!-- A city in Cuba -->
         <_name>Santiago de Cuba</_name>
         <coordinates>20.024722 -75.821944</coordinates>
         <location>
@@ -10276,7 +10166,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Cuba -->
+        <!-- A city in Cuba -->
         <_name>Varadero</_name>
         <coordinates>23.153611 -81.251389</coordinates>
         <location>
@@ -10300,7 +10190,7 @@
       </timezones>
       <tz-hint>America/Santo_Domingo</tz-hint>
       <city>
-        <!-- Translators: this is a city in the Dominican Republic -->
+        <!-- A city in the Dominican Republic -->
         <_name>Barahona</_name>
         <coordinates>18.200000 -71.100000</coordinates>
         <location>
@@ -10310,7 +10200,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Dominican Republic -->
+        <!-- A city in the Dominican Republic -->
         <_name>La Romana</_name>
         <coordinates>18.416667 -68.966667</coordinates>
         <location>
@@ -10320,7 +10210,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Dominican Republic -->
+        <!-- A city in the Dominican Republic -->
         <_name>Mancha Nueva</_name>
         <coordinates>18.433333 -69.683333</coordinates>
         <location>
@@ -10330,7 +10220,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Dominican Republic -->
+        <!-- A city in the Dominican Republic -->
         <_name>Pantanal</_name>
         <coordinates>18.533333 -68.366667</coordinates>
         <location>
@@ -10340,7 +10230,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Dominican Republic -->
+        <!-- A city in the Dominican Republic -->
         <_name>Puerto Plata</_name>
         <coordinates>19.800000 -70.683333</coordinates>
         <location>
@@ -10350,8 +10240,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Dominican Republic -->
-        <_name>Santiago</_name>
+        <!-- A city in the Dominican Republic -->
+        <_name msgctxt="City in Dominican Republic">Santiago</_name>
         <coordinates>19.450000 -70.700000</coordinates>
         <location>
           <name>Santiago</name>
@@ -10360,7 +10250,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of the Dominican Republic -->
+        <!-- The capital of the Dominican Republic -->
         <_name>Santo Domingo</_name>
         <coordinates>18.466667 -69.900000</coordinates>
         <location>
@@ -10381,22 +10271,19 @@
       <fips-code>EC</fips-code>
       <timezones>
         <timezone id="America/Guayaquil">
-          <!-- Translators: This refers to the time zone for mainland
-               Ecuador (as opposed to the time zone for the Galapagos
-               Islands).
+          <!-- This refers to the time zone for mainland Ecuador (as
+               opposed to the time zone for the Galapagos Islands).
             -->
           <_name>Mainland Ecuador</_name>
         </timezone>
         <timezone id="Pacific/Galapagos">
-          <!-- Translators: This is the time zone for the Galapagos
-               Islands.
-            -->
+          <!-- The time zone for the Galapagos Islands. -->
           <_name>Galapagos Islands</_name>
         </timezone>
       </timezones>
       <tz-hint>America/Guayaquil</tz-hint>
       <city>
-        <!-- Translators: this is a city in Ecuador -->
+        <!-- A city in Ecuador -->
         <_name>Guayaquil</_name>
         <coordinates>-2.166667 -79.900000</coordinates>
         <location>
@@ -10406,7 +10293,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Ecuador -->
+        <!-- A city in Ecuador -->
         <_name>Latacunga</_name>
         <coordinates>-0.933333 -78.616667</coordinates>
         <location>
@@ -10416,7 +10303,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Ecuador -->
+        <!-- A city in Ecuador -->
         <_name>Manta</_name>
         <coordinates>-0.950000 -80.733333</coordinates>
         <location>
@@ -10426,7 +10313,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Ecuador -->
+        <!-- The capital of Ecuador -->
         <_name>Quito</_name>
         <coordinates>-0.216667 -78.500000</coordinates>
         <location>
@@ -10446,7 +10333,7 @@
       </timezones>
       <tz-hint>America/El_Salvador</tz-hint>
       <city>
-        <!-- Translators: this is a city in El Salvador -->
+        <!-- A city in El Salvador -->
         <_name>Comalapa</_name>
         <coordinates>13.501111 -89.075833</coordinates>
         <location>
@@ -10456,7 +10343,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in El Salvador -->
+        <!-- A city in El Salvador -->
         <_name>Ilopango</_name>
         <coordinates>13.701667 -89.109444</coordinates>
         <location>
@@ -10466,7 +10353,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of El Salvador -->
+        <!-- The capital of El Salvador -->
         <_name>San Salvador</_name>
         <coordinates>13.708611 -89.203056</coordinates>
         <location>
@@ -10491,10 +10378,8 @@
       </timezones>
       <tz-hint>Atlantic/Stanley</tz-hint>
       <city>
-        <!-- Translators: this is the capital of the Falkland Islands
-             (Malvinas)
-          -->
-        <_name>Stanley</_name>
+        <!-- The capital of the Falkland Islands (Malvinas) -->
+        <_name msgctxt="City in Falkland Islands (Malvinas)">Stanley</_name>
         <coordinates>-51.700000 -57.850000</coordinates>
         <location>
           <name>Mount Pleasant Airport</name>
@@ -10515,7 +10400,7 @@
       </timezones>
       <tz-hint>America/Cayenne</tz-hint>
       <city>
-        <!-- Translators: this is the capital of French Guiana -->
+        <!-- The capital of French Guiana -->
         <_name>Cayenne</_name>
         <coordinates>4.933333 -52.333333</coordinates>
         <location>
@@ -10535,7 +10420,7 @@
       </timezones>
       <tz-hint>America/Grenada</tz-hint>
       <city>
-        <!-- Translators: this is a city in Grenada -->
+        <!-- A city in Grenada -->
         <_name>Bamboo</_name>
         <coordinates>12.000000 -61.783333</coordinates>
         <location>
@@ -10545,7 +10430,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Grenada -->
+        <!-- The capital of Grenada -->
         <_name>Saint George's</_name>
         <coordinates>12.050000 -61.750000</coordinates>
         <location>
@@ -10567,7 +10452,7 @@
       </timezones>
       <tz-hint>America/Guadeloupe</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Guadeloupe -->
+        <!-- The capital of Guadeloupe -->
         <_name>Basse-Terre</_name>
         <coordinates>16.000000 -61.716667</coordinates>
         <location>
@@ -10577,7 +10462,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Guadeloupe -->
+        <!-- A city in Guadeloupe -->
         <_name>Les Abymes</_name>
         <coordinates>16.266667 -61.500000</coordinates>
         <location>
@@ -10589,7 +10474,7 @@
     </country>
     <country>
       <!-- GT - Guatemala -->
-      <_name>Guatemala</_name>
+      <_name msgctxt="Country">Guatemala</_name>
       <iso-code>GT</iso-code>
       <fips-code>GT</fips-code>
       <timezones>
@@ -10597,8 +10482,8 @@
       </timezones>
       <tz-hint>America/Guatemala</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Guatemala -->
-        <_name>Guatemala</_name>
+        <!-- The capital of Guatemala -->
+        <_name msgctxt="City in Guatemala">Guatemala</_name>
         <coordinates>14.621111 -90.526944</coordinates>
         <location>
           <name>Guatemala Aurora Airport</name>
@@ -10607,7 +10492,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Guatemala -->
+        <!-- A city in Guatemala -->
         <_name>Huehuetenango</_name>
         <coordinates>15.319722 -91.470833</coordinates>
         <location>
@@ -10617,7 +10502,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Guatemala -->
+        <!-- A city in Guatemala -->
         <_name>Puerto Barrios</_name>
         <coordinates>15.716667 -88.600000</coordinates>
         <location>
@@ -10627,7 +10512,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Guatemala -->
+        <!-- A city in Guatemala -->
         <_name>Puerto San JosÃ</_name>
         <coordinates>13.925556 -90.824444</coordinates>
         <location>
@@ -10637,7 +10522,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Guatemala -->
+        <!-- A city in Guatemala -->
         <_name>Retalhuleu</_name>
         <coordinates>14.533333 -91.683333</coordinates>
         <location>
@@ -10647,7 +10532,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Guatemala -->
+        <!-- A city in Guatemala -->
         <_name>Tikal</_name>
         <coordinates>17.225000 -89.613333</coordinates>
         <location>
@@ -10667,8 +10552,8 @@
       </timezones>
       <tz-hint>America/Guyana</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Guyana -->
-        <_name>Georgetown</_name>
+        <!-- The capital of Guyana -->
+        <_name msgctxt="City in Guyana">Georgetown</_name>
         <coordinates>6.800000 -58.166667</coordinates>
         <location>
           <name>Cheddi Jagan International Airport</name>
@@ -10705,7 +10590,7 @@
       </timezones>
       <tz-hint>America/Tegucigalpa</tz-hint>
       <city>
-        <!-- Translators: this is a city in Honduras -->
+        <!-- A city in Honduras -->
         <_name>Amapala</_name>
         <coordinates>13.292222 -87.653889</coordinates>
         <location>
@@ -10715,7 +10600,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Honduras -->
+        <!-- A city in Honduras -->
         <_name>Catacamas</_name>
         <coordinates>14.800000 -85.900000</coordinates>
         <location>
@@ -10725,7 +10610,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Honduras -->
+        <!-- A city in Honduras -->
         <_name>Ciudad Choluteca</_name>
         <coordinates>13.300278 -87.190833</coordinates>
         <location>
@@ -10735,7 +10620,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Honduras -->
+        <!-- A city in Honduras -->
         <_name>Comayagua</_name>
         <coordinates>14.450000 -87.633333</coordinates>
         <location>
@@ -10745,7 +10630,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Honduras -->
+        <!-- A city in Honduras -->
         <_name>Guanaja</_name>
         <coordinates>16.400000 -85.900000</coordinates>
         <location>
@@ -10755,7 +10640,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Honduras -->
+        <!-- A city in Honduras -->
         <_name>La Ceiba</_name>
         <coordinates>15.783333 -86.800000</coordinates>
         <location>
@@ -10765,7 +10650,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Honduras -->
+        <!-- A city in Honduras -->
         <_name>La Esperanza</_name>
         <coordinates>14.300000 -88.183333</coordinates>
         <location>
@@ -10775,7 +10660,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Honduras -->
+        <!-- A city in Honduras -->
         <_name>La Mesa</_name>
         <coordinates>15.416667 -87.883333</coordinates>
         <location>
@@ -10785,7 +10670,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Honduras -->
+        <!-- A city in Honduras -->
         <_name>Puerto Lempira</_name>
         <coordinates>15.266667 -83.766667</coordinates>
         <location>
@@ -10795,7 +10680,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Honduras -->
+        <!-- A city in Honduras -->
         <_name>RoatÃn</_name>
         <coordinates>16.300000 -86.550000</coordinates>
         <location>
@@ -10805,7 +10690,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Honduras -->
+        <!-- A city in Honduras -->
         <_name>Santa Rosa de CopÃn</_name>
         <coordinates>14.766667 -88.783333</coordinates>
         <location>
@@ -10815,7 +10700,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Honduras -->
+        <!-- The capital of Honduras -->
         <_name>Tegucigalpa</_name>
         <coordinates>14.100000 -87.216667</coordinates>
         <location>
@@ -10825,7 +10710,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Honduras -->
+        <!-- A city in Honduras -->
         <_name>Tela</_name>
         <coordinates>15.783333 -87.450000</coordinates>
         <location>
@@ -10835,7 +10720,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Honduras -->
+        <!-- A city in Honduras -->
         <_name>Yoro</_name>
         <coordinates>15.133333 -87.133333</coordinates>
         <location>
@@ -10855,8 +10740,8 @@
       </timezones>
       <tz-hint>America/Jamaica</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Jamaica -->
-        <_name>Kingston</_name>
+        <!-- The capital of Jamaica -->
+        <_name msgctxt="City in Jamaica">Kingston</_name>
         <coordinates>18.000000 -76.800000</coordinates>
         <location>
           <name>Norman Manley Airport</name>
@@ -10865,7 +10750,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Jamaica -->
+        <!-- A city in Jamaica -->
         <_name>Montego Bay</_name>
         <coordinates>18.466667 -77.916667</coordinates>
         <location>
@@ -10887,7 +10772,7 @@
       </timezones>
       <tz-hint>America/Martinique</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Martinique -->
+        <!-- The capital of Martinique -->
         <_name>Fort-de-France</_name>
         <coordinates>14.600000 -61.083333</coordinates>
         <location>
@@ -10897,7 +10782,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Martinique -->
+        <!-- A city in Martinique -->
         <_name>Le Lamentin</_name>
         <coordinates>14.600000 -61.000000</coordinates>
         <location>
@@ -10934,7 +10819,7 @@
       </timezones>
       <tz-hint>America/Curacao</tz-hint>
       <city>
-        <!-- Translators: this is a city in the Netherlands Antilles -->
+        <!-- A city in the Netherlands Antilles -->
         <_name>Benners</_name>
         <coordinates>17.483333 -62.983333</coordinates>
         <location>
@@ -10944,7 +10829,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Netherlands Antilles -->
+        <!-- A city in the Netherlands Antilles -->
         <_name>Cupe Coy</_name>
         <coordinates>18.050000 -63.133333</coordinates>
         <location>
@@ -10954,7 +10839,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Netherlands Antilles -->
+        <!-- A city in the Netherlands Antilles -->
         <_name>Dorp Nikiboko</_name>
         <coordinates>12.150000 -68.266667</coordinates>
         <location>
@@ -10964,7 +10849,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Netherlands Antilles -->
+        <!-- A city in the Netherlands Antilles -->
         <_name>Gato</_name>
         <coordinates>12.166667 -68.966667</coordinates>
         <location>
@@ -10984,7 +10869,7 @@
       </timezones>
       <tz-hint>America/Managua</tz-hint>
       <city>
-        <!-- Translators: this is a city in Nicaragua -->
+        <!-- A city in Nicaragua -->
         <_name>Bluefields</_name>
         <coordinates>12.000000 -83.750000</coordinates>
         <location>
@@ -10994,7 +10879,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Nicaragua -->
+        <!-- A city in Nicaragua -->
         <_name>Chinandega</_name>
         <coordinates>12.616667 -87.150000</coordinates>
         <location>
@@ -11004,7 +10889,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Nicaragua -->
+        <!-- A city in Nicaragua -->
         <_name>Jinotega</_name>
         <coordinates>13.100000 -86.000000</coordinates>
         <location>
@@ -11014,7 +10899,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Nicaragua -->
+        <!-- A city in Nicaragua -->
         <_name>Juigalpa</_name>
         <coordinates>12.083333 -85.400000</coordinates>
         <location>
@@ -11024,7 +10909,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Nicaragua -->
+        <!-- The capital of Nicaragua -->
         <_name>Managua</_name>
         <coordinates>12.150833 -86.268333</coordinates>
         <location>
@@ -11034,7 +10919,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Nicaragua -->
+        <!-- A city in Nicaragua -->
         <_name>Puerto Cabezas</_name>
         <coordinates>14.033333 -83.383333</coordinates>
         <location>
@@ -11044,7 +10929,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Nicaragua -->
+        <!-- A city in Nicaragua -->
         <_name>Rivas</_name>
         <coordinates>11.433333 -85.833333</coordinates>
         <location>
@@ -11066,7 +10951,7 @@
       </timezones>
       <tz-hint>America/Panama</tz-hint>
       <city>
-        <!-- Translators: this is a city in Panama -->
+        <!-- A city in Panama -->
         <_name>David</_name>
         <coordinates>8.433333 -82.433333</coordinates>
         <location>
@@ -11076,7 +10961,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Panama -->
+        <!-- A city in Panama -->
         <_name>Fuerte Kobbe</_name>
         <coordinates>8.916667 -79.583333</coordinates>
         <location>
@@ -11086,7 +10971,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Panama -->
+        <!-- The capital of Panama -->
         <_name>PanamÃ</_name>
         <coordinates>8.966667 -79.533333</coordinates>
         <location>
@@ -11096,7 +10981,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Panama -->
+        <!-- A city in Panama -->
         <_name>Tocumen</_name>
         <coordinates>9.083333 -79.383333</coordinates>
         <location>
@@ -11116,7 +11001,7 @@
       </timezones>
       <tz-hint>America/Asuncion</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Paraguay -->
+        <!-- The capital of Paraguay -->
         <_name>AsunciÃn</_name>
         <coordinates>-25.266667 -57.666667</coordinates>
         <location>
@@ -11126,7 +11011,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Paraguay -->
+        <!-- A city in Paraguay -->
         <_name>Colonia FÃlix de Azara</_name>
         <coordinates>-25.483333 -54.766667</coordinates>
         <location>
@@ -11138,7 +11023,7 @@
     </country>
     <country>
       <!-- PE - Peru -->
-      <_name>Peru</_name>
+      <_name msgctxt="Country">Peru</_name>
       <!-- Could not find information about the following stations,
            which may be in Peru:
            SPLO 
@@ -11150,7 +11035,7 @@
       </timezones>
       <tz-hint>America/Lima</tz-hint>
       <city>
-        <!-- Translators: this is a city in Peru -->
+        <!-- A city in Peru -->
         <_name>Andahuaylas</_name>
         <coordinates>-13.655556 -73.387222</coordinates>
         <location>
@@ -11160,7 +11045,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Peru -->
+        <!-- A city in Peru -->
         <_name>Arequipa</_name>
         <coordinates>-16.398889 -71.535000</coordinates>
         <location>
@@ -11170,7 +11055,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Peru -->
+        <!-- A city in Peru -->
         <_name>Ayacucho</_name>
         <coordinates>-13.158333 -74.223889</coordinates>
         <location>
@@ -11180,7 +11065,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Peru -->
+        <!-- A city in Peru -->
         <_name>Cajamarca</_name>
         <coordinates>-7.166667 -78.516667</coordinates>
         <location>
@@ -11190,7 +11075,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Peru -->
+        <!-- A city in Peru -->
         <_name>Chiclayo</_name>
         <coordinates>-6.773611 -79.841667</coordinates>
         <location>
@@ -11200,7 +11085,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Peru -->
+        <!-- A city in Peru -->
         <_name>Cusco</_name>
         <coordinates>-13.518333 -71.978056</coordinates>
         <location>
@@ -11210,7 +11095,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Peru -->
+        <!-- A city in Peru -->
         <_name>Iquitos</_name>
         <coordinates>-3.748056 -73.247222</coordinates>
         <location>
@@ -11220,7 +11105,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Peru -->
+        <!-- A city in Peru -->
         <_name>JuanjuÃ</_name>
         <coordinates>-7.183333 -76.750000</coordinates>
         <location>
@@ -11230,7 +11115,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Peru -->
+        <!-- A city in Peru -->
         <_name>Juliaca</_name>
         <coordinates>-15.500000 -70.133333</coordinates>
         <location>
@@ -11240,8 +11125,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Peru -->
-        <_name>Lima</_name>
+        <!-- The capital of Peru -->
+        <_name msgctxt="City in Peru">Lima</_name>
         <coordinates>-12.050000 -77.050000</coordinates>
         <location>
           <name>Lima-Callao, Jorge Chavez International Airport</name>
@@ -11250,7 +11135,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Peru -->
+        <!-- A city in Peru -->
         <_name>Pisco</_name>
         <coordinates>-13.700000 -76.216667</coordinates>
         <location>
@@ -11260,7 +11145,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Peru -->
+        <!-- A city in Peru -->
         <_name>Pucallpa</_name>
         <coordinates>-8.382500 -74.538056</coordinates>
         <location>
@@ -11270,7 +11155,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Peru -->
+        <!-- A city in Peru -->
         <_name>Puerto Maldonado</_name>
         <coordinates>-12.600000 -69.183333</coordinates>
         <location>
@@ -11280,7 +11165,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Peru -->
+        <!-- A city in Peru -->
         <_name>Tacna</_name>
         <coordinates>-17.994722 -70.241111</coordinates>
         <location>
@@ -11290,7 +11175,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Peru -->
+        <!-- A city in Peru -->
         <_name>Talara</_name>
         <coordinates>-4.577222 -81.271944</coordinates>
         <location>
@@ -11300,7 +11185,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Peru -->
+        <!-- A city in Peru -->
         <_name>Tarapoto</_name>
         <coordinates>-6.501389 -76.365556</coordinates>
         <location>
@@ -11310,7 +11195,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Peru -->
+        <!-- A city in Peru -->
         <_name>Tingo MarÃa</_name>
         <coordinates>-9.289510 -76.008760</coordinates>
         <location>
@@ -11320,7 +11205,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Peru -->
+        <!-- A city in Peru -->
         <_name>Trujillo</_name>
         <coordinates>-8.111944 -79.025556</coordinates>
         <location>
@@ -11330,7 +11215,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Peru -->
+        <!-- A city in Peru -->
         <_name>Tumbes</_name>
         <coordinates>-3.566667 -80.441389</coordinates>
         <location>
@@ -11340,7 +11225,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Peru -->
+        <!-- A city in Peru -->
         <_name>Yurimaguas</_name>
         <coordinates>-5.900000 -76.083333</coordinates>
         <location>
@@ -11360,7 +11245,7 @@
       </timezones>
       <tz-hint>America/St_Lucia</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Saint Lucia -->
+        <!-- The capital of Saint Lucia -->
         <_name>Castries</_name>
         <coordinates>14.000000 -61.000000</coordinates>
         <location>
@@ -11370,7 +11255,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saint Lucia -->
+        <!-- A city in Saint Lucia -->
         <_name>Pointe Sable</_name>
         <coordinates>13.750000 -60.950000</coordinates>
         <location>
@@ -11380,7 +11265,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saint Lucia -->
+        <!-- A city in Saint Lucia -->
         <_name>Vigie</_name>
         <coordinates>14.033333 -61.016667</coordinates>
         <location>
@@ -11413,9 +11298,7 @@
       </timezones>
       <tz-hint>America/St_Vincent</tz-hint>
       <city>
-        <!-- Translators: this is a city in Saint Vincent and the
-             Grenadines
-          -->
+        <!-- A city in Saint Vincent and the Grenadines -->
         <_name>Arnos Vale</_name>
         <coordinates>13.133333 -61.200000</coordinates>
         <location>
@@ -11425,9 +11308,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Saint Vincent and the
-             Grenadines
-          -->
+        <!-- The capital of Saint Vincent and the Grenadines -->
         <_name>Kingstown</_name>
         <coordinates>13.133333 -61.216667</coordinates>
         <location>
@@ -11463,7 +11344,7 @@
       </timezones>
       <tz-hint>America/Paramaribo</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Suriname -->
+        <!-- The capital of Suriname -->
         <_name>Paramaribo</_name>
         <coordinates>5.833333 -55.166667</coordinates>
         <location>
@@ -11473,7 +11354,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Suriname -->
+        <!-- A city in Suriname -->
         <_name>Zanderij</_name>
         <coordinates>5.450000 -55.200000</coordinates>
         <location>
@@ -11493,7 +11374,7 @@
       </timezones>
       <tz-hint>America/Port_of_Spain</tz-hint>
       <city>
-        <!-- Translators: this is a city in Trinidad and Tobago -->
+        <!-- A city in Trinidad and Tobago -->
         <_name>Bon Accord</_name>
         <coordinates>11.150000 -60.833333</coordinates>
         <location>
@@ -11503,7 +11384,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Trinidad and Tobago -->
+        <!-- A city in Trinidad and Tobago -->
         <_name>Piarco</_name>
         <coordinates>10.583333 -61.333333</coordinates>
         <location>
@@ -11513,7 +11394,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Trinidad and Tobago -->
+        <!-- The capital of Trinidad and Tobago -->
         <_name>Port-of-Spain</_name>
         <coordinates>10.650000 -61.516667</coordinates>
         <location>
@@ -11549,7 +11430,7 @@
       </timezones>
       <tz-hint>America/Montevideo</tz-hint>
       <city>
-        <!-- Translators: this is a city in Uruguay -->
+        <!-- A city in Uruguay -->
         <_name>Carrasco</_name>
         <coordinates>-34.885278 -56.060556</coordinates>
         <location>
@@ -11559,7 +11440,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Uruguay -->
+        <!-- A city in Uruguay -->
         <_name>Colonia</_name>
         <coordinates>-34.466667 -57.850000</coordinates>
         <location>
@@ -11569,7 +11450,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Uruguay -->
+        <!-- A city in Uruguay -->
         <_name>Durazno</_name>
         <coordinates>-33.413056 -56.500556</coordinates>
         <location>
@@ -11579,7 +11460,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Uruguay -->
+        <!-- A city in Uruguay -->
         <_name>Maldonado</_name>
         <coordinates>-34.900000 -54.950000</coordinates>
         <location>
@@ -11589,8 +11470,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Uruguay -->
-        <_name>Montevideo</_name>
+        <!-- The capital of Uruguay -->
+        <_name msgctxt="City in Uruguay">Montevideo</_name>
         <coordinates>-34.858056 -56.170833</coordinates>
         <location>
           <name>Melilla</name>
@@ -11609,7 +11490,7 @@
       </timezones>
       <tz-hint>America/Caracas</tz-hint>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>Acarigua</_name>
         <coordinates>9.559722 -69.201944</coordinates>
         <location>
@@ -11619,8 +11500,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
-        <_name>Barcelona</_name>
+        <!-- A city in Venezuela -->
+        <_name msgctxt="City in Venezuela">Barcelona</_name>
         <coordinates>10.133333 -64.700000</coordinates>
         <location>
           <name>Barcelona</name>
@@ -11629,7 +11510,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>Barinas</_name>
         <coordinates>8.629167 -70.207222</coordinates>
         <location>
@@ -11639,7 +11520,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>Barquisimeto</_name>
         <coordinates>10.073889 -69.322778</coordinates>
         <location>
@@ -11649,7 +11530,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>Calabozo</_name>
         <coordinates>8.934444 -67.426667</coordinates>
         <location>
@@ -11659,7 +11540,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Venezuela -->
+        <!-- The capital of Venezuela -->
         <_name>Caracas</_name>
         <coordinates>10.500000 -66.916667</coordinates>
         <location>
@@ -11679,7 +11560,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>Ciudad BolÃvar</_name>
         <coordinates>8.122222 -63.549722</coordinates>
         <location>
@@ -11689,7 +11570,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>Coro</_name>
         <coordinates>11.409167 -69.667222</coordinates>
         <location>
@@ -11699,7 +11580,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>El Variante</_name>
         <coordinates>7.579444 -72.073889</coordinates>
         <location>
@@ -11709,7 +11590,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>El VigÃa</_name>
         <coordinates>8.621944 -71.650556</coordinates>
         <location>
@@ -11719,7 +11600,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>Guanare</_name>
         <coordinates>9.050000 -69.750000</coordinates>
         <location>
@@ -11729,7 +11610,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>Guaricure</_name>
         <coordinates>11.766667 -70.131111</coordinates>
         <location>
@@ -11739,7 +11620,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>Guasdalito</_name>
         <coordinates>7.247222 -70.729444</coordinates>
         <location>
@@ -11749,7 +11630,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>GÃiria</_name>
         <coordinates>10.571111 -62.294444</coordinates>
         <location>
@@ -11759,7 +11640,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>La Chica</_name>
         <coordinates>10.933333 -64.016667</coordinates>
         <location>
@@ -11769,7 +11650,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>Maracaibo</_name>
         <coordinates>10.631667 -71.640556</coordinates>
         <location>
@@ -11779,7 +11660,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>Maracay</_name>
         <coordinates>10.246944 -67.595833</coordinates>
         <location>
@@ -11789,7 +11670,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>MaturÃn</_name>
         <coordinates>9.750000 -63.176667</coordinates>
         <location>
@@ -11799,7 +11680,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>Mene Grande</_name>
         <coordinates>9.850278 -70.925556</coordinates>
         <location>
@@ -11809,7 +11690,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>Morocure</_name>
         <coordinates>8.260278 -62.707500</coordinates>
         <location>
@@ -11819,8 +11700,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
-        <_name>MÃrida</_name>
+        <!-- A city in Venezuela -->
+        <_name msgctxt="City in Venezuela">MÃrida</_name>
         <coordinates>8.598333 -71.145000</coordinates>
         <location>
           <name>MÃrida</name>
@@ -11829,7 +11710,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>Paramillo</_name>
         <coordinates>7.805556 -72.216944</coordinates>
         <location>
@@ -11839,7 +11720,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>Puerto Ayacucho</_name>
         <coordinates>5.663889 -67.623611</coordinates>
         <location>
@@ -11849,7 +11730,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>Puerto Borburata</_name>
         <coordinates>10.483889 -67.983889</coordinates>
         <location>
@@ -11859,7 +11740,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>San Antonio del TÃchira</_name>
         <coordinates>7.817778 -72.442500</coordinates>
         <location>
@@ -11869,7 +11750,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>San Felipe</_name>
         <coordinates>10.340556 -68.737222</coordinates>
         <location>
@@ -11879,8 +11760,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
-        <_name>San Fernando</_name>
+        <!-- A city in Venezuela -->
+        <_name msgctxt="City in Venezuela">San Fernando</_name>
         <coordinates>7.896667 -67.467222</coordinates>
         <location>
           <name>San Fernando</name>
@@ -11889,7 +11770,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>San Juan de los Morros</_name>
         <coordinates>9.911111 -67.358333</coordinates>
         <location>
@@ -11899,7 +11780,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>San TomÃ</_name>
         <coordinates>8.940833 -64.130833</coordinates>
         <location>
@@ -11909,7 +11790,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>Santa BÃrbara</_name>
         <coordinates>8.983333 -71.900000</coordinates>
         <location>
@@ -11919,8 +11800,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
-        <_name>Valencia</_name>
+        <!-- A city in Venezuela -->
+        <_name msgctxt="City in Venezuela">Valencia</_name>
         <coordinates>10.180556 -68.003889</coordinates>
         <location>
           <name>Valencia</name>
@@ -11929,7 +11810,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Venezuela -->
+        <!-- A city in Venezuela -->
         <_name>Valera</_name>
         <coordinates>9.317778 -70.603611</coordinates>
         <location>
@@ -11952,7 +11833,7 @@
       </timezones>
       <tz-hint>Europe/Tirane</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Albania.
+        <!-- The capital of Albania.
              "Tirana" is the traditional English name.
              The local name is "TiranÃ".
           -->
@@ -11989,8 +11870,8 @@
       </timezones>
       <tz-hint>Europe/Vienna</tz-hint>
       <city>
-        <!-- Translators: this is a city in Austria.
-             This is one of several cities in Austria called "Aigen".
+        <!-- A city in Austria.
+             One of several cities in Austria called "Aigen".
           -->
         <_name>Aigen im Ennstal</_name>
         <coordinates>47.516667 14.133333</coordinates>
@@ -12001,7 +11882,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Austria -->
+        <!-- A city in Austria -->
         <_name>Graz</_name>
         <coordinates>47.066667 15.450000</coordinates>
         <location>
@@ -12011,7 +11892,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Austria -->
+        <!-- A city in Austria -->
         <_name>Hohenems</_name>
         <coordinates>47.366667 9.683056</coordinates>
         <location>
@@ -12021,7 +11902,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Austria -->
+        <!-- A city in Austria -->
         <_name>Innsbruck</_name>
         <coordinates>47.266667 11.400000</coordinates>
         <location>
@@ -12031,7 +11912,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Austria -->
+        <!-- A city in Austria -->
         <_name>Klagenfurt</_name>
         <coordinates>46.624722 14.305278</coordinates>
         <location>
@@ -12041,7 +11922,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Austria -->
+        <!-- A city in Austria -->
         <_name>Linz</_name>
         <coordinates>48.300000 14.300000</coordinates>
         <location>
@@ -12051,7 +11932,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Austria -->
+        <!-- A city in Austria -->
         <_name>Salzburg</_name>
         <coordinates>47.800000 13.033333</coordinates>
         <location>
@@ -12061,7 +11942,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Austria -->
+        <!-- A city in Austria -->
         <_name>Teesdorf</_name>
         <coordinates>47.950000 16.283333</coordinates>
         <location>
@@ -12071,7 +11952,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Austria -->
+        <!-- A city in Austria -->
         <_name>Tulln</_name>
         <coordinates>48.333333 16.050000</coordinates>
         <location>
@@ -12081,7 +11962,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Austria.
+        <!-- The capital of Austria.
              "Vienna" is the traditional English name.
              The local name in German is "Wien".
           -->
@@ -12094,7 +11975,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Austria -->
+        <!-- A city in Austria -->
         <_name>Wiener Neustadt</_name>
         <coordinates>47.800000 16.250000</coordinates>
         <location>
@@ -12104,7 +11985,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Austria -->
+        <!-- A city in Austria -->
         <_name>Zell am See</_name>
         <coordinates>47.316667 12.783333</coordinates>
         <location>
@@ -12114,7 +11995,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Austria -->
+        <!-- A city in Austria -->
         <_name>Zeltweg</_name>
         <coordinates>47.183333 14.750000</coordinates>
         <location>
@@ -12134,8 +12015,8 @@
       </timezones>
       <tz-hint>Europe/Minsk</tz-hint>
       <city>
-        <!-- Translators: this is a city in Belarus -->
-        <_name>Brest</_name>
+        <!-- A city in Belarus -->
+        <_name msgctxt="City in Belarus">Brest</_name>
         <coordinates>52.100000 23.700000</coordinates>
         <location>
           <name>Brest</name>
@@ -12144,7 +12025,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Belarus -->
+        <!-- A city in Belarus -->
         <_name>Homyel'</_name>
         <coordinates>52.441667 30.983333</coordinates>
         <location>
@@ -12154,7 +12035,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Belarus -->
+        <!-- A city in Belarus -->
         <_name>Hrodna</_name>
         <coordinates>53.681389 23.814722</coordinates>
         <location>
@@ -12164,7 +12045,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Belarus -->
+        <!-- A city in Belarus -->
         <_name>Loshitsa</_name>
         <coordinates>53.850000 27.533333</coordinates>
         <location>
@@ -12174,7 +12055,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Belarus -->
+        <!-- The capital of Belarus -->
         <_name>Minsk</_name>
         <coordinates>53.900000 27.566667</coordinates>
         <location>
@@ -12189,7 +12070,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Belarus -->
+        <!-- A city in Belarus -->
         <_name>Vitsyebsk</_name>
         <coordinates>55.192500 30.194444</coordinates>
         <location>
@@ -12215,18 +12096,17 @@
       </timezones>
       <tz-hint>Europe/Brussels</tz-hint>
       <state>
-        <!-- Translators: This is a state in Belgium. local name (nl):
-             Antwerpen. local name (fr): Anvers. local name (de):
-             Antwerpen.
+        <!-- A state in Belgium. local name (nl): Antwerpen. local name
+             (fr): Anvers. local name (de): Antwerpen.
           -->
-        <_name>Antwerp</_name>
+        <_name msgctxt="State in Belgium">Antwerp</_name>
         <fips-code>BE01</fips-code>
         <city>
-          <!-- Translators: this is a city in Antwerp in Belgium.
+          <!-- A city in Antwerp in Belgium.
                "Antwerp" is the traditional English name.
                The local name is "Antwerpen".
             -->
-          <_name>Antwerp</_name>
+          <_name msgctxt="City in Antwerp, Belgium">Antwerp</_name>
           <coordinates>51.216667 4.416667</coordinates>
           <location>
             <name>Antwerp / Deurne</name>
@@ -12235,7 +12115,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Antwerp in Belgium -->
+          <!-- A city in Antwerp in Belgium -->
           <_name>Deurne</_name>
           <coordinates>51.216667 4.466667</coordinates>
           <location>
@@ -12246,10 +12126,10 @@
         </city>
       </state>
       <state>
-        <!-- Translators: This is a state in Belgium. local name (nl):
-             Brussel, Vlaams- en Waals-Brabant. local name (fr):
-             Bruxelles, Brabant flamand et wallon. local name (de):
-             BrÃssel, FlÃmish- und Wallonisch-Brabant.
+        <!-- A state in Belgium. local name (nl): Brussel, Vlaams- en
+             Waals-Brabant. local name (fr): Bruxelles, Brabant flamand
+             et wallon. local name (de): BrÃssel, FlÃmish- und
+             Wallonisch-Brabant.
           -->
         <_name>Brussels, Flemish and Walloon Brabant</_name>
         <fips-code>BE02</fips-code>
@@ -12257,8 +12137,8 @@
         <fips-code>BE11</fips-code>
         <fips-code>BE12</fips-code>
         <city>
-          <!-- Translators: this is a city in Brussels, Flemish and
-               Walloon Brabant in Belgium
+          <!-- A city in Brussels, Flemish and Walloon Brabant in
+               Belgium
             -->
           <_name>Beauvechain</_name>
           <coordinates>50.783333 4.766667</coordinates>
@@ -12269,7 +12149,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is the capital of Belgium.
+          <!-- The capital of Belgium.
                "Brussels" is the traditional English name.
                The local name in French is "Bruxelles".
                The local name in Dutch is "Brussel".
@@ -12283,8 +12163,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Brussels, Flemish and
-               Walloon Brabant in Belgium
+          <!-- A city in Brussels, Flemish and Walloon Brabant in
+               Belgium
             -->
           <_name>Schaffen</_name>
           <coordinates>51.000000 5.083333</coordinates>
@@ -12296,19 +12176,19 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Belgium -->
+        <!-- A state/province/territory in Belgium -->
         <_name>East-Flanders</_name>
         <fips-code>BE08</fips-code>
       </state>
       <state>
-        <!-- Translators: This is a state in Belgium. local name (fr):
-             Hainaut. local name (fr_BE): Hinnot. local name (nl):
-             Henegouwen. local name (de): Hennegau.
+        <!-- A state in Belgium. local name (fr): Hainaut. local name
+             (fr_BE): Hinnot. local name (nl): Henegouwen. local name
+             (de): Hennegau.
           -->
         <_name>Hainaut</_name>
         <fips-code>BE03</fips-code>
         <city>
-          <!-- Translators: this is a city in Hainaut in Belgium -->
+          <!-- A city in Hainaut in Belgium -->
           <_name>Charleroi</_name>
           <coordinates>50.416667 4.433333</coordinates>
           <location>
@@ -12318,7 +12198,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Hainaut in Belgium -->
+          <!-- A city in Hainaut in Belgium -->
           <_name>ChiÃvres</_name>
           <coordinates>50.583333 3.800000</coordinates>
           <location>
@@ -12328,7 +12208,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Hainaut in Belgium -->
+          <!-- A city in Hainaut in Belgium -->
           <_name>Gosselies</_name>
           <coordinates>50.466667 4.416667</coordinates>
           <location>
@@ -12339,14 +12219,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: This is a state in Belgium. local name (nl):
-             Limburg. local name (fr): Limbourg. local name (de):
-             Limburg.
+        <!-- A state in Belgium. local name (nl): Limburg. local name
+             (fr): Limbourg. local name (de): Limburg.
           -->
         <_name>Limburg</_name>
         <fips-code>BE05</fips-code>
         <city>
-          <!-- Translators: this is a city in Limburg in Belgium -->
+          <!-- A city in Limburg in Belgium -->
           <_name>Kleine-Brogel</_name>
           <coordinates>51.166667 5.433333</coordinates>
           <location>
@@ -12357,14 +12236,14 @@
         </city>
       </state>
       <state>
-        <!-- Translators: This is a state in Belgium. local name (fr):
-             LiÃge. local name (fr_BE): LÃdje. local name (nl): Luik.
-             local name (de): LÃttich.
+        <!-- A state in Belgium. local name (fr): LiÃge. local name
+             (fr_BE): LÃdje. local name (nl): Luik. local name (de):
+             LÃttich.
           -->
         <_name>LiÃge</_name>
         <fips-code>BE04</fips-code>
         <city>
-          <!-- Translators: this is a city in LiÃge in Belgium -->
+          <!-- A city in LiÃge in Belgium -->
           <_name>Bierset</_name>
           <coordinates>50.650000 5.433333</coordinates>
           <location>
@@ -12374,7 +12253,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in LiÃge in Belgium -->
+          <!-- A city in LiÃge in Belgium -->
           <_name>Elsenborn</_name>
           <coordinates>50.450000 6.216667</coordinates>
           <location>
@@ -12385,12 +12264,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Belgium -->
-        <_name>Luxembourg</_name>
+        <!-- A state/province/territory in Belgium -->
+        <_name msgctxt="State in Belgium">Luxembourg</_name>
         <fips-code>BE06</fips-code>
         <city>
-          <!-- Translators: this is the capital of Belgium -->
-          <_name>Luxembourg</_name>
+          <!-- The capital of Belgium -->
+          <_name msgctxt="City in Luxembourg, Belgium">Luxembourg</_name>
           <coordinates>49.611667 6.130000</coordinates>
           <location>
             <name>Luxembourg Airport</name>
@@ -12400,11 +12279,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Belgium -->
+        <!-- A state/province/territory in Belgium -->
         <_name>Namur</_name>
         <fips-code>BE07</fips-code>
         <city>
-          <!-- Translators: this is a city in Namur in Belgium -->
+          <!-- A city in Namur in Belgium -->
           <_name>Florennes</_name>
           <coordinates>50.250000 4.616667</coordinates>
           <location>
@@ -12415,14 +12294,14 @@
         </city>
       </state>
       <state>
-        <!-- Translators: This is a state in Belgium. local name (nl):
-             West-Vlaanderen. local name (fr): Flandre occidentale.
-             local name (de): Westflandern.
+        <!-- A state in Belgium. local name (nl): West-Vlaanderen.
+             local name (fr): Flandre occidentale. local name (de):
+             Westflandern.
           -->
         <_name>West-Flanders</_name>
         <fips-code>BE09</fips-code>
         <city>
-          <!-- Translators: this is a city in West-Flanders in Belgium -->
+          <!-- A city in West-Flanders in Belgium -->
           <_name>Koksijde</_name>
           <coordinates>51.100000 2.650000</coordinates>
           <location>
@@ -12432,7 +12311,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in West-Flanders in Belgium -->
+          <!-- A city in West-Flanders in Belgium -->
           <_name>Oostende</_name>
           <coordinates>51.216667 2.916667</coordinates>
           <location>
@@ -12453,7 +12332,7 @@
       </timezones>
       <tz-hint>Europe/Sarajevo</tz-hint>
       <city>
-        <!-- Translators: this is a city in Bosnia and Herzegovina -->
+        <!-- A city in Bosnia and Herzegovina -->
         <_name>Banja Luka</_name>
         <coordinates>44.775833 17.185556</coordinates>
         <location>
@@ -12463,7 +12342,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bosnia and Herzegovina -->
+        <!-- A city in Bosnia and Herzegovina -->
         <_name>Mostar</_name>
         <coordinates>43.343333 17.808056</coordinates>
         <location>
@@ -12473,7 +12352,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Bosnia and Herzegovina -->
+        <!-- The capital of Bosnia and Herzegovina -->
         <_name>Sarajevo</_name>
         <coordinates>43.850000 18.383333</coordinates>
         <location>
@@ -12493,7 +12372,7 @@
       </timezones>
       <tz-hint>Europe/Sofia</tz-hint>
       <city>
-        <!-- Translators: this is a city in Bulgaria -->
+        <!-- A city in Bulgaria -->
         <_name>Burgas</_name>
         <coordinates>42.506058 27.467810</coordinates>
         <location>
@@ -12503,7 +12382,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bulgaria -->
+        <!-- A city in Bulgaria -->
         <_name>Gorna Oryakhovitsa</_name>
         <coordinates>43.127778 25.701667</coordinates>
         <location>
@@ -12513,7 +12392,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bulgaria -->
+        <!-- A city in Bulgaria -->
         <_name>Plovdiv</_name>
         <coordinates>42.150000 24.750000</coordinates>
         <location>
@@ -12523,7 +12402,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Bulgaria.
+        <!-- The capital of Bulgaria.
              "Sofia" is the traditional English name.
              The local name is "Sofiya".
           -->
@@ -12536,7 +12415,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Bulgaria -->
+        <!-- A city in Bulgaria -->
         <_name>Varna</_name>
         <coordinates>43.216667 27.916667</coordinates>
         <location>
@@ -12556,7 +12435,7 @@
       </timezones>
       <tz-hint>Europe/Zagreb</tz-hint>
       <city>
-        <!-- Translators: this is a city in Croatia -->
+        <!-- A city in Croatia -->
         <_name>Bol</_name>
         <coordinates>43.261944 16.655000</coordinates>
         <location>
@@ -12566,7 +12445,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Croatia -->
+        <!-- A city in Croatia -->
         <_name>Donji Zemunik</_name>
         <coordinates>44.106667 15.380556</coordinates>
         <location>
@@ -12576,7 +12455,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Croatia -->
+        <!-- A city in Croatia -->
         <_name>Dubrovnik</_name>
         <coordinates>42.650556 18.091389</coordinates>
         <location>
@@ -12586,7 +12465,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Croatia -->
+        <!-- A city in Croatia -->
         <_name>Jelovice</_name>
         <coordinates>45.498056 14.014444</coordinates>
         <location>
@@ -12596,7 +12475,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Croatia -->
+        <!-- A city in Croatia -->
         <_name>LiÅka</_name>
         <coordinates>44.576667 14.376111</coordinates>
         <location>
@@ -12606,7 +12485,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Croatia -->
+        <!-- A city in Croatia -->
         <_name>OmiÅalj</_name>
         <coordinates>45.208889 14.556389</coordinates>
         <location>
@@ -12616,7 +12495,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Croatia -->
+        <!-- A city in Croatia -->
         <_name>Osijek</_name>
         <coordinates>45.551111 18.693889</coordinates>
         <location>
@@ -12626,7 +12505,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Croatia -->
+        <!-- A city in Croatia -->
         <_name>Pleso</_name>
         <coordinates>45.733333 16.083333</coordinates>
         <location>
@@ -12636,7 +12515,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Croatia -->
+        <!-- A city in Croatia -->
         <_name>Rijeka</_name>
         <coordinates>45.343056 14.409167</coordinates>
         <location>
@@ -12646,7 +12525,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Croatia -->
+        <!-- A city in Croatia -->
         <_name>Split</_name>
         <coordinates>43.513889 16.455833</coordinates>
         <location>
@@ -12656,7 +12535,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Croatia -->
+        <!-- A city in Croatia -->
         <_name>Zadar</_name>
         <coordinates>44.119722 15.242222</coordinates>
         <location>
@@ -12666,7 +12545,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Croatia -->
+        <!-- The capital of Croatia -->
         <_name>Zagreb</_name>
         <coordinates>45.800000 16.000000</coordinates>
         <location>
@@ -12676,7 +12555,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Croatia -->
+        <!-- A city in Croatia -->
         <_name>Äepin</_name>
         <coordinates>45.523611 18.563333</coordinates>
         <location>
@@ -12686,7 +12565,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Croatia -->
+        <!-- A city in Croatia -->
         <_name>Äilipi</_name>
         <coordinates>42.553056 18.276111</coordinates>
         <location>
@@ -12706,7 +12585,7 @@
       </timezones>
       <tz-hint>Asia/Nicosia</tz-hint>
       <city>
-        <!-- Translators: this is a city in Cyprus -->
+        <!-- A city in Cyprus -->
         <_name>Akrotiri</_name>
         <coordinates>34.604167 32.958333</coordinates>
         <location>
@@ -12716,7 +12595,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Cyprus -->
+        <!-- A city in Cyprus -->
         <_name>Larnaca</_name>
         <coordinates>34.916667 33.629167</coordinates>
         <location>
@@ -12726,7 +12605,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Cyprus -->
+        <!-- The capital of Cyprus -->
         <_name>Nicosia</_name>
         <coordinates>35.166667 33.366667</coordinates>
         <location>
@@ -12736,7 +12615,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Cyprus -->
+        <!-- A city in Cyprus -->
         <_name>Paphos</_name>
         <coordinates>34.766667 32.416667</coordinates>
         <location>
@@ -12746,7 +12625,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Cyprus -->
+        <!-- A city in Cyprus -->
         <_name>Tymbou</_name>
         <coordinates>35.133333 33.512500</coordinates>
         <location>
@@ -12770,7 +12649,7 @@
       </timezones>
       <tz-hint>Europe/Prague</tz-hint>
       <city>
-        <!-- Translators: this is a city in the Czech Republic -->
+        <!-- A city in the Czech Republic -->
         <_name>Brno</_name>
         <coordinates>49.200000 16.633333</coordinates>
         <location>
@@ -12780,7 +12659,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Czech Republic -->
+        <!-- A city in the Czech Republic -->
         <_name>HoleÅov</_name>
         <coordinates>49.333333 17.583333</coordinates>
         <location>
@@ -12790,7 +12669,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Czech Republic -->
+        <!-- A city in the Czech Republic -->
         <_name>Karlovy Vary</_name>
         <coordinates>50.216667 12.900000</coordinates>
         <location>
@@ -12800,7 +12679,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Czech Republic -->
+        <!-- A city in the Czech Republic -->
         <_name>Liberec</_name>
         <coordinates>50.763889 15.065278</coordinates>
         <location>
@@ -12810,7 +12689,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Czech Republic -->
+        <!-- A city in the Czech Republic -->
         <_name>Ostrava</_name>
         <coordinates>49.833333 18.283333</coordinates>
         <location>
@@ -12820,7 +12699,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of the Czech Republic.
+        <!-- The capital of the Czech Republic.
              "Prague" is the traditional English name.
              The local name in Czech is "Praha".
           -->
@@ -12843,7 +12722,7 @@
       </timezones>
       <tz-hint>Europe/Copenhagen</tz-hint>
       <city>
-        <!-- Translators: this is a city in Denmark -->
+        <!-- A city in Denmark -->
         <_name>Beldringe</_name>
         <coordinates>55.466667 10.333333</coordinates>
         <location>
@@ -12853,7 +12732,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Denmark -->
+        <!-- A city in Denmark -->
         <_name>Billund</_name>
         <coordinates>55.733333 9.116667</coordinates>
         <location>
@@ -12863,7 +12742,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Denmark.
+        <!-- The capital of Denmark.
              "Copenhagen" is the traditional English name.
              The local name is "KÃbenhavn".
           -->
@@ -12876,7 +12755,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Denmark -->
+        <!-- A city in Denmark -->
         <_name>Esbjerg</_name>
         <coordinates>55.466667 8.450000</coordinates>
         <location>
@@ -12886,7 +12765,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Denmark -->
+        <!-- A city in Denmark -->
         <_name>Karup</_name>
         <coordinates>56.300000 9.166667</coordinates>
         <location>
@@ -12896,7 +12775,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Denmark -->
+        <!-- A city in Denmark -->
         <_name>Kastrup</_name>
         <coordinates>55.633333 12.650000</coordinates>
         <location>
@@ -12906,7 +12785,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Denmark -->
+        <!-- A city in Denmark -->
         <_name>Mejlby</_name>
         <coordinates>56.000000 8.333333</coordinates>
         <location>
@@ -12916,7 +12795,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Denmark -->
+        <!-- A city in Denmark -->
         <_name>Odense</_name>
         <coordinates>55.400000 10.383333</coordinates>
         <location>
@@ -12926,7 +12805,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Denmark -->
+        <!-- A city in Denmark -->
         <_name>Roskilde</_name>
         <coordinates>55.650000 12.083333</coordinates>
         <location>
@@ -12936,7 +12815,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Denmark -->
+        <!-- A city in Denmark -->
         <_name>RÃnne</_name>
         <coordinates>55.100000 14.700000</coordinates>
         <location>
@@ -12946,7 +12825,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Denmark -->
+        <!-- A city in Denmark -->
         <_name>Skrydstrup</_name>
         <coordinates>55.233333 9.250000</coordinates>
         <location>
@@ -12956,7 +12835,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Denmark -->
+        <!-- A city in Denmark -->
         <_name>Sottrupskov</_name>
         <coordinates>54.966667 9.750000</coordinates>
         <location>
@@ -12966,7 +12845,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Denmark -->
+        <!-- A city in Denmark -->
         <_name>Tirstrup</_name>
         <coordinates>56.300000 10.700000</coordinates>
         <location>
@@ -12976,7 +12855,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Denmark -->
+        <!-- A city in Denmark -->
         <_name>Vamdrup</_name>
         <coordinates>55.416667 9.283333</coordinates>
         <location>
@@ -12986,7 +12865,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Denmark -->
+        <!-- A city in Denmark -->
         <_name>Ãlborg</_name>
         <coordinates>57.050000 9.933333</coordinates>
         <location>
@@ -13006,7 +12885,7 @@
       </timezones>
       <tz-hint>Europe/Tallinn</tz-hint>
       <city>
-        <!-- Translators: this is a city in Estonia -->
+        <!-- A city in Estonia -->
         <_name>Kuressaare</_name>
         <coordinates>58.248056 22.503889</coordinates>
         <location>
@@ -13016,7 +12895,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Estonia -->
+        <!-- A city in Estonia -->
         <_name>KÃrdla</_name>
         <coordinates>58.997778 22.749167</coordinates>
         <location>
@@ -13026,7 +12905,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Estonia -->
+        <!-- A city in Estonia -->
         <_name>PÃrnu</_name>
         <coordinates>58.374722 24.513611</coordinates>
         <location>
@@ -13036,7 +12915,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Estonia -->
+        <!-- The capital of Estonia -->
         <_name>Tallinn</_name>
         <coordinates>59.433889 24.728056</coordinates>
         <location>
@@ -13046,7 +12925,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Estonia -->
+        <!-- A city in Estonia -->
         <_name>Tartu</_name>
         <coordinates>58.366111 26.736111</coordinates>
         <location>
@@ -13056,7 +12935,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Estonia -->
+        <!-- A city in Estonia -->
         <_name>Ãlenurme</_name>
         <coordinates>58.315833 26.724167</coordinates>
         <location>
@@ -13082,7 +12961,7 @@
       </timezones>
       <tz-hint>Atlantic/Faroe</tz-hint>
       <city>
-        <!-- Translators: this is a city in the Faroe Islands -->
+        <!-- A city in the Faroe Islands -->
         <_name>SÃrvÃgur</_name>
         <coordinates>62.066667 -7.300000</coordinates>
         <location>
@@ -13092,7 +12971,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of the Faroe Islands -->
+        <!-- The capital of the Faroe Islands -->
         <_name>TÃrshavn</_name>
         <coordinates>62.016667 -6.766667</coordinates>
         <location>
@@ -13113,7 +12992,7 @@
       </timezones>
       <tz-hint>Europe/Helsinki</tz-hint>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>EnontekiÃ</_name>
         <coordinates>68.383333 23.633333</coordinates>
         <location>
@@ -13123,7 +13002,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>Halli</_name>
         <coordinates>61.866667 24.833333</coordinates>
         <location>
@@ -13133,7 +13012,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Finland.
+        <!-- The capital of Finland.
              The local name in Swedish is "Helsingfors".
           -->
         <_name>Helsinki</_name>
@@ -13150,7 +13029,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>Ivalo</_name>
         <coordinates>68.650000 27.600000</coordinates>
         <location>
@@ -13160,7 +13039,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>Joensuu</_name>
         <coordinates>62.600000 29.766667</coordinates>
         <location>
@@ -13170,7 +13049,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>JyvÃskylÃ</_name>
         <coordinates>62.233333 25.733333</coordinates>
         <location>
@@ -13180,7 +13059,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>Kajaani</_name>
         <coordinates>64.233333 27.683333</coordinates>
         <location>
@@ -13190,7 +13069,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>Kauhava</_name>
         <coordinates>63.100000 23.083333</coordinates>
         <location>
@@ -13200,7 +13079,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>Kemi</_name>
         <coordinates>65.733333 24.566667</coordinates>
         <location>
@@ -13210,7 +13089,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>KittilÃ</_name>
         <coordinates>67.666667 24.900000</coordinates>
         <location>
@@ -13220,7 +13099,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland.
+        <!-- A city in Finland.
              The local name in Swedish is "Kronoby".
           -->
         <_name>Kruunupyy</_name>
@@ -13232,7 +13111,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>Kuopio</_name>
         <coordinates>62.900000 27.683333</coordinates>
         <location>
@@ -13242,7 +13121,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>Kuusamo</_name>
         <coordinates>65.966667 29.183333</coordinates>
         <location>
@@ -13252,7 +13131,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>Lappeenranta</_name>
         <coordinates>61.066667 28.183333</coordinates>
         <location>
@@ -13262,7 +13141,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>Mikkeli</_name>
         <coordinates>61.683333 27.250000</coordinates>
         <location>
@@ -13272,7 +13151,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>Oulu</_name>
         <coordinates>65.016667 25.466667</coordinates>
         <location>
@@ -13282,7 +13161,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>Pirkkala</_name>
         <coordinates>61.466667 23.566667</coordinates>
         <location>
@@ -13292,7 +13171,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>Pori</_name>
         <coordinates>61.483333 21.783333</coordinates>
         <location>
@@ -13302,7 +13181,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>Rovaniemi</_name>
         <coordinates>66.500000 25.716667</coordinates>
         <location>
@@ -13312,7 +13191,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>Savonlinna</_name>
         <coordinates>61.866667 28.883333</coordinates>
         <location>
@@ -13322,7 +13201,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>SeinÃjoki</_name>
         <coordinates>62.800000 22.833333</coordinates>
         <location>
@@ -13332,7 +13211,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>Tampere</_name>
         <coordinates>61.500000 23.750000</coordinates>
         <location>
@@ -13342,7 +13221,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland.
+        <!-- A city in Finland.
              The local name in Swedish is "Ãbo".
           -->
         <_name>Turku</_name>
@@ -13354,7 +13233,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>Utti</_name>
         <coordinates>60.883333 26.933333</coordinates>
         <location>
@@ -13364,7 +13243,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland.
+        <!-- A city in Finland.
              The local name in Swedish is "Vasa".
           -->
         <_name>Vaasa</_name>
@@ -13376,7 +13255,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Finland -->
+        <!-- A city in Finland -->
         <_name>Varkaus</_name>
         <coordinates>62.316667 27.916667</coordinates>
         <location>
@@ -13396,7 +13275,7 @@
       </timezones>
       <tz-hint>Europe/Paris</tz-hint>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Abbeville</_name>
         <coordinates>50.100000 1.833333</coordinates>
         <location>
@@ -13406,7 +13285,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Acon</_name>
         <coordinates>48.766667 1.100000</coordinates>
         <location>
@@ -13416,7 +13295,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Agen</_name>
         <coordinates>44.200000 0.633333</coordinates>
         <location>
@@ -13426,7 +13305,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Ajaccio</_name>
         <coordinates>41.916667 8.733333</coordinates>
         <location>
@@ -13436,7 +13315,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>AlenÃon</_name>
         <coordinates>48.433333 0.083333</coordinates>
         <location>
@@ -13446,8 +13325,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France.
-             This is one of several cities in France called "AmbÃrieu".
+        <!-- A city in France.
+             One of several cities in France called "AmbÃrieu".
           -->
         <_name>AmbÃrieu-en-Bugey</_name>
         <coordinates>45.950000 5.350000</coordinates>
@@ -13458,7 +13337,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Auch</_name>
         <coordinates>43.650000 0.583333</coordinates>
         <location>
@@ -13468,7 +13347,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Aurillac</_name>
         <coordinates>44.916667 2.450000</coordinates>
         <location>
@@ -13478,7 +13357,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Avord</_name>
         <coordinates>47.033333 2.650000</coordinates>
         <location>
@@ -13488,7 +13367,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Bastia</_name>
         <coordinates>42.702778 9.450000</coordinates>
         <location>
@@ -13498,7 +13377,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Beauvais</_name>
         <coordinates>49.433333 2.083333</coordinates>
         <location>
@@ -13508,7 +13387,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Bergerac</_name>
         <coordinates>44.850000 0.483333</coordinates>
         <location>
@@ -13518,7 +13397,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Biarritz</_name>
         <coordinates>43.483333 -1.566667</coordinates>
         <location>
@@ -13528,8 +13407,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
-        <_name>Bordeaux</_name>
+        <!-- A city in France -->
+        <_name msgctxt="City in France">Bordeaux</_name>
         <coordinates>44.833333 -0.566667</coordinates>
         <location>
           <name>Bordeaux-Merignac Airport</name>
@@ -13538,7 +13417,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Bourges</_name>
         <coordinates>47.083333 2.400000</coordinates>
         <location>
@@ -13548,8 +13427,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
-        <_name>Brest</_name>
+        <!-- A city in France -->
+        <_name msgctxt="City in France">Brest</_name>
         <coordinates>48.400000 -4.483333</coordinates>
         <location>
           <name>Brest</name>
@@ -13558,7 +13437,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Brive</_name>
         <coordinates>45.150000 1.533333</coordinates>
         <location>
@@ -13568,7 +13447,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>BÃziers</_name>
         <coordinates>43.350000 3.250000</coordinates>
         <location>
@@ -13578,7 +13457,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Caen</_name>
         <coordinates>49.183333 -0.350000</coordinates>
         <location>
@@ -13588,7 +13467,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Calvi</_name>
         <coordinates>42.566667 8.750000</coordinates>
         <location>
@@ -13598,7 +13477,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Cambrai</_name>
         <coordinates>50.166667 3.233333</coordinates>
         <location>
@@ -13608,7 +13487,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Cannes</_name>
         <coordinates>43.550000 7.016667</coordinates>
         <location>
@@ -13618,7 +13497,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Carcassonne</_name>
         <coordinates>43.216667 2.350000</coordinates>
         <location>
@@ -13628,7 +13507,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Cazaux</_name>
         <coordinates>44.533333 -1.150000</coordinates>
         <location>
@@ -13638,7 +13517,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>ChambÃry</_name>
         <coordinates>45.600000 5.900000</coordinates>
         <location>
@@ -13648,7 +13527,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Chartres</_name>
         <coordinates>48.450000 1.500000</coordinates>
         <location>
@@ -13658,7 +13537,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Cherbourg</_name>
         <coordinates>49.650000 -1.650000</coordinates>
         <location>
@@ -13668,8 +13547,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France.
-             This is one of several cities in France called "ChÃlons".
+        <!-- A city in France.
+             One of several cities in France called "ChÃlons".
           -->
         <_name>ChÃlons-en-Champagne</_name>
         <coordinates>48.950000 4.366667</coordinates>
@@ -13680,7 +13559,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>ChÃteaudun</_name>
         <coordinates>48.083333 1.333333</coordinates>
         <location>
@@ -13690,7 +13569,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>ChÃteauroux</_name>
         <coordinates>46.816667 1.700000</coordinates>
         <location>
@@ -13700,7 +13579,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Clermont-Ferrand</_name>
         <coordinates>45.783333 3.083333</coordinates>
         <location>
@@ -13710,7 +13589,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Cognac</_name>
         <coordinates>45.700000 -0.333333</coordinates>
         <location>
@@ -13720,7 +13599,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Colmar</_name>
         <coordinates>48.083333 7.366667</coordinates>
         <location>
@@ -13730,7 +13609,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Creil</_name>
         <coordinates>49.266667 2.483333</coordinates>
         <location>
@@ -13740,7 +13619,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Dax</_name>
         <coordinates>43.716667 -1.050000</coordinates>
         <location>
@@ -13750,7 +13629,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Dijon</_name>
         <coordinates>47.316667 5.016667</coordinates>
         <location>
@@ -13760,7 +13639,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Dinard</_name>
         <coordinates>48.633333 -2.066667</coordinates>
         <location>
@@ -13770,7 +13649,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Dole</_name>
         <coordinates>47.100000 5.500000</coordinates>
         <location>
@@ -13780,7 +13659,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Dollemard</_name>
         <coordinates>49.516667 0.066667</coordinates>
         <location>
@@ -13790,7 +13669,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Grenoble</_name>
         <coordinates>45.166667 5.716667</coordinates>
         <location>
@@ -13800,7 +13679,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>HoÃricourt</_name>
         <coordinates>48.633333 4.900000</coordinates>
         <location>
@@ -13810,7 +13689,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>HyÃres</_name>
         <coordinates>43.116667 6.116667</coordinates>
         <location>
@@ -13820,7 +13699,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>HÃsingue</_name>
         <coordinates>47.583333 7.516667</coordinates>
         <location>
@@ -13830,7 +13709,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Istres</_name>
         <coordinates>43.516667 4.983333</coordinates>
         <location>
@@ -13840,7 +13719,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>La Roche-sur-Yon</_name>
         <coordinates>46.666667 -1.433333</coordinates>
         <location>
@@ -13850,7 +13729,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>La Rochelle</_name>
         <coordinates>46.166667 -1.150000</coordinates>
         <location>
@@ -13860,7 +13739,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Lannion</_name>
         <coordinates>48.733333 -3.466667</coordinates>
         <location>
@@ -13870,7 +13749,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Le Mans</_name>
         <coordinates>48.000000 0.200000</coordinates>
         <location>
@@ -13880,7 +13759,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Le Puy</_name>
         <coordinates>45.033333 3.883333</coordinates>
         <location>
@@ -13890,7 +13769,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Lille</_name>
         <coordinates>50.633333 3.066667</coordinates>
         <location>
@@ -13900,7 +13779,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Limoges</_name>
         <coordinates>45.850000 1.250000</coordinates>
         <location>
@@ -13910,7 +13789,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Luxeuil-les-Bains</_name>
         <coordinates>47.816667 6.383333</coordinates>
         <location>
@@ -13920,7 +13799,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Lyon</_name>
         <coordinates>45.750000 4.850000</coordinates>
         <location>
@@ -13935,7 +13814,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Marseille</_name>
         <coordinates>43.300000 5.400000</coordinates>
         <location>
@@ -13945,7 +13824,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Melun</_name>
         <coordinates>48.533333 2.666667</coordinates>
         <location>
@@ -13955,7 +13834,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Metz</_name>
         <coordinates>49.133333 6.166667</coordinates>
         <location>
@@ -13965,7 +13844,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Mont-de-Marsan</_name>
         <coordinates>43.883333 -0.500000</coordinates>
         <location>
@@ -13975,7 +13854,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Montgauch</_name>
         <coordinates>43.000000 1.083333</coordinates>
         <location>
@@ -13985,7 +13864,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Montpellier</_name>
         <coordinates>43.600000 3.883333</coordinates>
         <location>
@@ -13995,7 +13874,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>MontÃlimar</_name>
         <coordinates>44.566667 4.750000</coordinates>
         <location>
@@ -14005,7 +13884,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>MÃcon</_name>
         <coordinates>46.300000 4.833333</coordinates>
         <location>
@@ -14015,7 +13894,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>MÃnà Guen</_name>
         <coordinates>47.783333 -3.433333</coordinates>
         <location>
@@ -14025,7 +13904,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Nancy</_name>
         <coordinates>48.683333 6.200000</coordinates>
         <location>
@@ -14040,7 +13919,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Nantes</_name>
         <coordinates>47.216667 -1.550000</coordinates>
         <location>
@@ -14050,7 +13929,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Nevers</_name>
         <coordinates>46.983333 3.166667</coordinates>
         <location>
@@ -14060,7 +13939,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Nice</_name>
         <coordinates>43.700000 7.250000</coordinates>
         <location>
@@ -14070,7 +13949,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>NÃmes</_name>
         <coordinates>43.833333 4.350000</coordinates>
         <location>
@@ -14080,8 +13959,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
-        <_name>Orange</_name>
+        <!-- A city in France -->
+        <_name msgctxt="City in France">Orange</_name>
         <coordinates>44.133333 4.800000</coordinates>
         <location>
           <name>Orange</name>
@@ -14090,7 +13969,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>OrlÃans</_name>
         <coordinates>47.916667 1.900000</coordinates>
         <location>
@@ -14100,8 +13979,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of France -->
-        <_name>Paris</_name>
+        <!-- The capital of France -->
+        <_name msgctxt="City in France">Paris</_name>
         <coordinates>48.866667 2.333333</coordinates>
         <location>
           <name>Paris-Le Bourget Airport</name>
@@ -14120,7 +13999,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Pau</_name>
         <coordinates>43.300000 -0.366667</coordinates>
         <location>
@@ -14130,7 +14009,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Perpignan</_name>
         <coordinates>42.683333 2.883333</coordinates>
         <location>
@@ -14140,7 +14019,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Poggiale</_name>
         <coordinates>41.516667 9.083333</coordinates>
         <location>
@@ -14150,7 +14029,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Poitiers</_name>
         <coordinates>46.583333 0.333333</coordinates>
         <location>
@@ -14160,7 +14039,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Quimper</_name>
         <coordinates>48.000000 -4.100000</coordinates>
         <location>
@@ -14170,7 +14049,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Reims</_name>
         <coordinates>49.250000 4.033333</coordinates>
         <location>
@@ -14180,7 +14059,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Rennes</_name>
         <coordinates>48.083333 -1.683333</coordinates>
         <location>
@@ -14190,7 +14069,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Rodez</_name>
         <coordinates>44.333333 2.566667</coordinates>
         <location>
@@ -14200,7 +14079,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Romorantin</_name>
         <coordinates>47.366667 1.750000</coordinates>
         <location>
@@ -14210,7 +14089,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Rouen</_name>
         <coordinates>49.433333 1.083333</coordinates>
         <location>
@@ -14220,7 +14099,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Saint-Brieuc</_name>
         <coordinates>48.516667 -2.783333</coordinates>
         <location>
@@ -14230,7 +14109,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Saint-Quentin</_name>
         <coordinates>49.850000 3.283333</coordinates>
         <location>
@@ -14240,7 +14119,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Saint-Yan</_name>
         <coordinates>46.416667 4.033333</coordinates>
         <location>
@@ -14250,7 +14129,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Salon</_name>
         <coordinates>43.633333 5.100000</coordinates>
         <location>
@@ -14260,7 +14139,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Strasbourg</_name>
         <coordinates>48.583333 7.750000</coordinates>
         <location>
@@ -14270,7 +14149,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Tarbes</_name>
         <coordinates>43.233333 0.083333</coordinates>
         <location>
@@ -14280,7 +14159,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Toulouse</_name>
         <coordinates>43.600000 1.433333</coordinates>
         <location>
@@ -14295,7 +14174,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Tours</_name>
         <coordinates>47.383333 0.683333</coordinates>
         <location>
@@ -14305,7 +14184,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Trignac</_name>
         <coordinates>47.316667 -2.183333</coordinates>
         <location>
@@ -14315,7 +14194,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Troyes</_name>
         <coordinates>48.300000 4.083333</coordinates>
         <location>
@@ -14325,7 +14204,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Veauche</_name>
         <coordinates>45.550000 4.283333</coordinates>
         <location>
@@ -14335,8 +14214,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
-        <_name>Vichy</_name>
+        <!-- A city in France -->
+        <_name msgctxt="City in France">Vichy</_name>
         <coordinates>46.116667 3.416667</coordinates>
         <location>
           <name>Vichy</name>
@@ -14345,7 +14224,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>VÃlizy</_name>
         <coordinates>48.800000 2.183333</coordinates>
         <location>
@@ -14355,7 +14234,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in France -->
+        <!-- A city in France -->
         <_name>Ãvreux</_name>
         <coordinates>49.016667 1.150000</coordinates>
         <location>
@@ -14383,13 +14262,11 @@
       </timezones>
       <tz-hint>Europe/Berlin</tz-hint>
       <state>
-        <!-- Translators: this is a state/province/territory in Germany -->
+        <!-- A state/province/territory in Germany -->
         <_name>Baden-WÃrttemberg</_name>
         <fips-code>GM01</fips-code>
         <city>
-          <!-- Translators: this is a city in Baden-WÃrttemberg in
-               Germany
-            -->
+          <!-- A city in Baden-WÃrttemberg in Germany -->
           <_name>Baden-Baden</_name>
           <coordinates>48.750000 8.250000</coordinates>
           <location>
@@ -14399,9 +14276,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Baden-WÃrttemberg in
-               Germany
-            -->
+          <!-- A city in Baden-WÃrttemberg in Germany -->
           <_name>Donaueschingen</_name>
           <coordinates>47.950000 8.500000</coordinates>
           <location>
@@ -14411,9 +14286,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Baden-WÃrttemberg in
-               Germany
-            -->
+          <!-- A city in Baden-WÃrttemberg in Germany -->
           <_name>Friedrichshafen</_name>
           <coordinates>47.650000 9.483333</coordinates>
           <location>
@@ -14423,9 +14296,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Baden-WÃrttemberg in
-               Germany
-            -->
+          <!-- A city in Baden-WÃrttemberg in Germany -->
           <_name>Karlsruhe</_name>
           <coordinates>49.004722 8.385833</coordinates>
           <location>
@@ -14435,9 +14306,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Baden-WÃrttemberg in
-               Germany
-            -->
+          <!-- A city in Baden-WÃrttemberg in Germany -->
           <_name>Lahr</_name>
           <coordinates>48.350000 7.866667</coordinates>
           <location>
@@ -14447,9 +14316,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Baden-WÃrttemberg in
-               Germany
-            -->
+          <!-- A city in Baden-WÃrttemberg in Germany -->
           <_name>Laupheim</_name>
           <coordinates>48.233333 9.883333</coordinates>
           <location>
@@ -14459,9 +14326,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Baden-WÃrttemberg in
-               Germany
-            -->
+          <!-- A city in Baden-WÃrttemberg in Germany -->
           <_name>MeÃstetten</_name>
           <coordinates>48.183333 8.966667</coordinates>
           <location>
@@ -14471,9 +14336,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Baden-WÃrttemberg in
-               Germany
-            -->
+          <!-- A city in Baden-WÃrttemberg in Germany -->
           <_name>Neuostheim</_name>
           <coordinates>49.477500 8.514444</coordinates>
           <location>
@@ -14483,9 +14346,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Baden-WÃrttemberg in
-               Germany
-            -->
+          <!-- A city in Baden-WÃrttemberg in Germany -->
           <_name>Niederstetten</_name>
           <coordinates>49.400000 9.919444</coordinates>
           <location>
@@ -14495,10 +14356,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Baden-WÃrttemberg in
-               Germany
-            -->
-          <_name>Stuttgart</_name>
+          <!-- A city in Baden-WÃrttemberg in Germany -->
+          <_name msgctxt="City in Baden-WÃrttemberg, Germany">Stuttgart</_name>
           <coordinates>48.766667 9.183333</coordinates>
           <location>
             <name>Stuttgart-Echterdingen</name>
@@ -14508,14 +14367,14 @@
         </city>
       </state>
       <state>
-        <!-- Translators: This is a state in Germany.  The local name
-             is "Bayern". Please use that unless you know that it has a
-             different name in your language.
+        <!-- A state in Germany.  The local name is "Bayern". Please
+             use that unless you know that it has a different name in
+             your language.
           -->
         <_name>Bavaria</_name>
         <fips-code>GM02</fips-code>
         <city>
-          <!-- Translators: this is a city in Bavaria in Germany -->
+          <!-- A city in Bavaria in Germany -->
           <_name>Ansbach</_name>
           <coordinates>49.300000 10.583333</coordinates>
           <location>
@@ -14525,7 +14384,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Bavaria in Germany -->
+          <!-- A city in Bavaria in Germany -->
           <_name>Augsburg</_name>
           <coordinates>48.366667 10.883333</coordinates>
           <location>
@@ -14535,7 +14394,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Bavaria in Germany -->
+          <!-- A city in Bavaria in Germany -->
           <_name>DorfgmÃnd</_name>
           <coordinates>49.700000 11.950000</coordinates>
           <location>
@@ -14545,7 +14404,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Bavaria in Germany -->
+          <!-- A city in Bavaria in Germany -->
           <_name>Hof</_name>
           <coordinates>50.316667 11.916667</coordinates>
           <location>
@@ -14555,7 +14414,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Bavaria in Germany -->
+          <!-- A city in Bavaria in Germany -->
           <_name>Illesheim</_name>
           <coordinates>49.466667 10.383333</coordinates>
           <location>
@@ -14565,7 +14424,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Bavaria in Germany -->
+          <!-- A city in Bavaria in Germany -->
           <_name>Katterbach</_name>
           <coordinates>49.316667 10.633333</coordinates>
           <location>
@@ -14575,7 +14434,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Bavaria in Germany -->
+          <!-- A city in Bavaria in Germany -->
           <_name>Lager Lechfeld</_name>
           <coordinates>48.166667 10.850000</coordinates>
           <location>
@@ -14585,7 +14444,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Bavaria in Germany -->
+          <!-- A city in Bavaria in Germany -->
           <_name>Landsberg</_name>
           <coordinates>48.050000 10.866667</coordinates>
           <location>
@@ -14595,7 +14454,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Bavaria in Germany.
+          <!-- A city in Bavaria in Germany.
                "Munich" is the traditional English name.
                The local name is "MÃnchen".
             -->
@@ -14608,9 +14467,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Bavaria in Germany.
-               This is one of several cities in Germany called
-               "Neuburg".
+          <!-- A city in Bavaria in Germany.
+               One of several cities in Germany called "Neuburg".
             -->
           <_name>Neuburg an der Donau</_name>
           <coordinates>48.733333 11.183333</coordinates>
@@ -14621,7 +14479,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Bavaria in Germany.
+          <!-- A city in Bavaria in Germany.
                "Nuremberg" is the traditional English name.
                The local name is "NÃrnberg".
             -->
@@ -14634,7 +14492,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Bavaria in Germany -->
+          <!-- A city in Bavaria in Germany -->
           <_name>Oberpfaffenhofen</_name>
           <coordinates>48.066667 11.266667</coordinates>
           <location>
@@ -14644,7 +14502,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Bavaria in Germany -->
+          <!-- A city in Bavaria in Germany -->
           <_name>Roth</_name>
           <coordinates>49.245000 11.091111</coordinates>
           <location>
@@ -14654,7 +14512,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Bavaria in Germany -->
+          <!-- A city in Bavaria in Germany -->
           <_name>WÃrzburg</_name>
           <coordinates>49.787778 9.936111</coordinates>
           <location>
@@ -14665,12 +14523,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Germany -->
-        <_name>Berlin</_name>
+        <!-- A state/province/territory in Germany -->
+        <_name msgctxt="State in Germany">Berlin</_name>
         <fips-code>GM16</fips-code>
         <city>
-          <!-- Translators: this is the capital of Germany -->
-          <_name>Berlin</_name>
+          <!-- The capital of Germany -->
+          <_name msgctxt="City in Berlin, Germany">Berlin</_name>
           <coordinates>52.516667 13.400000</coordinates>
           <location>
             <name>Berlin-Tempelhof</name>
@@ -14690,17 +14548,17 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Germany -->
+        <!-- A state/province/territory in Germany -->
         <_name>Brandenburg</_name>
         <fips-code>GM11</fips-code>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Germany -->
-        <_name>Bremen</_name>
+        <!-- A state/province/territory in Germany -->
+        <_name msgctxt="State in Germany">Bremen</_name>
         <fips-code>GM03</fips-code>
         <city>
-          <!-- Translators: this is a city in Bremen in Germany -->
-          <_name>Bremen</_name>
+          <!-- A city in Bremen in Germany -->
+          <_name msgctxt="City in Bremen, Germany">Bremen</_name>
           <coordinates>53.083333 8.800000</coordinates>
           <location>
             <name>Bremen</name>
@@ -14710,12 +14568,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Germany -->
-        <_name>Hamburg</_name>
+        <!-- A state/province/territory in Germany -->
+        <_name msgctxt="State in Germany">Hamburg</_name>
         <fips-code>GM04</fips-code>
         <city>
-          <!-- Translators: this is a city in Hamburg in Germany -->
-          <_name>Hamburg</_name>
+          <!-- A city in Hamburg in Germany -->
+          <_name msgctxt="City in Hamburg, Germany">Hamburg</_name>
           <coordinates>53.550000 10.000000</coordinates>
           <location>
             <name>Hamburg-Fuhlsbuettel</name>
@@ -14730,14 +14588,14 @@
         </city>
       </state>
       <state>
-        <!-- Translators: This is a state in Germany.  The local name
-             is "Hessen". Please use that unless you know that it has a
-             different name in your language.
+        <!-- A state in Germany.  The local name is "Hessen". Please
+             use that unless you know that it has a different name in
+             your language.
           -->
         <_name>Hesse</_name>
         <fips-code>GM05</fips-code>
         <city>
-          <!-- Translators: this is a city in Hesse in Germany -->
+          <!-- A city in Hesse in Germany -->
           <_name>Calden</_name>
           <coordinates>51.416667 9.400000</coordinates>
           <location>
@@ -14747,7 +14605,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Hesse in Germany -->
+          <!-- A city in Hesse in Germany -->
           <_name>Frankfurt</_name>
           <coordinates>50.116667 8.683333</coordinates>
           <location>
@@ -14757,7 +14615,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Hesse in Germany -->
+          <!-- A city in Hesse in Germany -->
           <_name>Fritzlar</_name>
           <coordinates>51.133333 9.283333</coordinates>
           <location>
@@ -14767,7 +14625,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Hesse in Germany -->
+          <!-- A city in Hesse in Germany -->
           <_name>Kassel</_name>
           <coordinates>51.316667 9.500000</coordinates>
           <location>
@@ -14777,7 +14635,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Hesse in Germany -->
+          <!-- A city in Hesse in Germany -->
           <_name>Wiesbaden</_name>
           <coordinates>50.083333 8.250000</coordinates>
           <location>
@@ -14788,14 +14646,14 @@
         </city>
       </state>
       <state>
-        <!-- Translators: This is a state in Germany.  The local name
-             is "Niedersachsen". Please use that unless you know that
-             it has a different name in your language.
+        <!-- A state in Germany.  The local name is "Niedersachsen".
+             Please use that unless you know that it has a different
+             name in your language.
           -->
         <_name>Lower Saxony</_name>
         <fips-code>GM06</fips-code>
         <city>
-          <!-- Translators: this is a city in Lower Saxony in Germany -->
+          <!-- A city in Lower Saxony in Germany -->
           <_name>Achum</_name>
           <coordinates>52.283333 9.083333</coordinates>
           <location>
@@ -14805,7 +14663,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Lower Saxony in Germany -->
+          <!-- A city in Lower Saxony in Germany -->
           <_name>Braunschweig</_name>
           <coordinates>52.266667 10.533333</coordinates>
           <location>
@@ -14815,7 +14673,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Lower Saxony in Germany -->
+          <!-- A city in Lower Saxony in Germany -->
           <_name>Celle</_name>
           <coordinates>52.616667 10.083333</coordinates>
           <location>
@@ -14825,7 +14683,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Lower Saxony in Germany -->
+          <!-- A city in Lower Saxony in Germany -->
           <_name>FaÃberg</_name>
           <coordinates>52.900000 10.166667</coordinates>
           <location>
@@ -14835,7 +14693,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Lower Saxony in Germany -->
+          <!-- A city in Lower Saxony in Germany -->
           <_name>Hannover</_name>
           <coordinates>52.366667 9.716667</coordinates>
           <location>
@@ -14845,7 +14703,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Lower Saxony in Germany -->
+          <!-- A city in Lower Saxony in Germany -->
           <_name>Nordholz</_name>
           <coordinates>53.783333 8.600000</coordinates>
           <location>
@@ -14855,7 +14713,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Lower Saxony in Germany -->
+          <!-- A city in Lower Saxony in Germany -->
           <_name>Webershausen</_name>
           <coordinates>53.550000 7.666667</coordinates>
           <location>
@@ -14865,7 +14723,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Lower Saxony in Germany -->
+          <!-- A city in Lower Saxony in Germany -->
           <_name>Wunstorf</_name>
           <coordinates>52.433333 9.416667</coordinates>
           <location>
@@ -14876,16 +14734,14 @@
         </city>
       </state>
       <state>
-        <!-- Translators: This is a state in Germany.  The local name
-             is "Mecklenburg-Vorpommern". Please use that unless you
-             know that it has a different name in your language.
+        <!-- A state in Germany.  The local name is
+             "Mecklenburg-Vorpommern". Please use that unless you know
+             that it has a different name in your language.
           -->
         <_name>Mecklenburg-Western Pomerania</_name>
         <fips-code>GM12</fips-code>
         <city>
-          <!-- Translators: this is a city in Mecklenburg-Western
-               Pomerania in Germany
-            -->
+          <!-- A city in Mecklenburg-Western Pomerania in Germany -->
           <_name>Laage</_name>
           <coordinates>53.933333 12.350000</coordinates>
           <location>
@@ -14895,9 +14751,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mecklenburg-Western
-               Pomerania in Germany
-            -->
+          <!-- A city in Mecklenburg-Western Pomerania in Germany -->
           <_name>Parchim</_name>
           <coordinates>53.433333 11.850000</coordinates>
           <location>
@@ -14907,9 +14761,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mecklenburg-Western
-               Pomerania in Germany
-            -->
+          <!-- A city in Mecklenburg-Western Pomerania in Germany -->
           <_name>Seebad Heringsdorf</_name>
           <coordinates>53.966667 14.166667</coordinates>
           <location>
@@ -14919,9 +14771,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mecklenburg-Western
-               Pomerania in Germany
-            -->
+          <!-- A city in Mecklenburg-Western Pomerania in Germany -->
           <_name>Trollenhagen</_name>
           <coordinates>53.600000 13.300000</coordinates>
           <location>
@@ -14932,16 +14782,14 @@
         </city>
       </state>
       <state>
-        <!-- Translators: This is a state in Germany.  The local name
-             is "Nordrhein-Westfalen". Please use that unless you know
+        <!-- A state in Germany.  The local name is
+             "Nordrhein-Westfalen". Please use that unless you know
              that it has a different name in your language.
           -->
         <_name>North Rhine-Westphalia</_name>
         <fips-code>GM07</fips-code>
         <city>
-          <!-- Translators: this is a city in North Rhine-Westphalia in
-               Germany
-            -->
+          <!-- A city in North Rhine-Westphalia in Germany -->
           <_name>Baal</_name>
           <coordinates>51.616667 6.133333</coordinates>
           <location>
@@ -14951,9 +14799,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Rhine-Westphalia in
-               Germany
-            -->
+          <!-- A city in North Rhine-Westphalia in Germany -->
           <_name>Bonn</_name>
           <coordinates>50.733333 7.100000</coordinates>
           <location>
@@ -14963,9 +14809,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Rhine-Westphalia in
-               Germany
-            -->
+          <!-- A city in North Rhine-Westphalia in Germany -->
           <_name>Bredeck</_name>
           <coordinates>51.916667 8.300000</coordinates>
           <location>
@@ -14975,8 +14819,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Rhine-Westphalia in
-               Germany.
+          <!-- A city in North Rhine-Westphalia in Germany.
                "Cologne" is the traditional English name.
                The local name in German is "KÃln".
             -->
@@ -14989,9 +14832,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Rhine-Westphalia in
-               Germany
-            -->
+          <!-- A city in North Rhine-Westphalia in Germany -->
           <_name>Dortmund</_name>
           <coordinates>51.516667 7.450000</coordinates>
           <location>
@@ -15001,9 +14842,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Rhine-Westphalia in
-               Germany
-            -->
+          <!-- A city in North Rhine-Westphalia in Germany -->
           <_name>Geilenkirchen</_name>
           <coordinates>50.966667 6.116667</coordinates>
           <location>
@@ -15013,9 +14852,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Rhine-Westphalia in
-               Germany
-            -->
+          <!-- A city in North Rhine-Westphalia in Germany -->
           <_name>Kalkar</_name>
           <coordinates>51.733333 6.300000</coordinates>
           <location>
@@ -15025,9 +14862,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Rhine-Westphalia in
-               Germany
-            -->
+          <!-- A city in North Rhine-Westphalia in Germany -->
           <_name>Kalkum</_name>
           <coordinates>51.300000 6.766667</coordinates>
           <location>
@@ -15037,9 +14872,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Rhine-Westphalia in
-               Germany
-            -->
+          <!-- A city in North Rhine-Westphalia in Germany -->
           <_name>Klemenshof</_name>
           <coordinates>50.833333 6.666667</coordinates>
           <location>
@@ -15049,9 +14882,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Rhine-Westphalia in
-               Germany
-            -->
+          <!-- A city in North Rhine-Westphalia in Germany -->
           <_name>Lippstadt</_name>
           <coordinates>51.666667 8.350000</coordinates>
           <location>
@@ -15061,9 +14892,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Rhine-Westphalia in
-               Germany
-            -->
+          <!-- A city in North Rhine-Westphalia in Germany -->
           <_name>MÃnchengladbach</_name>
           <coordinates>51.200000 6.433333</coordinates>
           <location>
@@ -15073,9 +14902,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Rhine-Westphalia in
-               Germany
-            -->
+          <!-- A city in North Rhine-Westphalia in Germany -->
           <_name>MÃnster</_name>
           <coordinates>51.966667 7.633333</coordinates>
           <location>
@@ -15085,9 +14912,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Rhine-Westphalia in
-               Germany
-            -->
+          <!-- A city in North Rhine-Westphalia in Germany -->
           <_name>Paderborn</_name>
           <coordinates>51.716667 8.766667</coordinates>
           <location>
@@ -15097,9 +14922,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Rhine-Westphalia in
-               Germany
-            -->
+          <!-- A city in North Rhine-Westphalia in Germany -->
           <_name>Rheine</_name>
           <coordinates>52.283333 7.450000</coordinates>
           <location>
@@ -15109,9 +14932,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Rhine-Westphalia in
-               Germany
-            -->
+          <!-- A city in North Rhine-Westphalia in Germany -->
           <_name>Wickede</_name>
           <coordinates>51.533333 7.616667</coordinates>
           <location>
@@ -15122,16 +14943,14 @@
         </city>
       </state>
       <state>
-        <!-- Translators: This is a state in Germany.  The local name
-             is "Rheinland-Pfalz". Please use that unless you know that
-             it has a different name in your language.
+        <!-- A state in Germany.  The local name is "Rheinland-Pfalz".
+             Please use that unless you know that it has a different
+             name in your language.
           -->
         <_name>Rhineland-Palatinate</_name>
         <fips-code>GM08</fips-code>
         <city>
-          <!-- Translators: this is a city in Rhineland-Palatinate in
-               Germany
-            -->
+          <!-- A city in Rhineland-Palatinate in Germany -->
           <_name>BÃchel</_name>
           <coordinates>50.166667 7.083333</coordinates>
           <location>
@@ -15141,9 +14960,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Rhineland-Palatinate in
-               Germany
-            -->
+          <!-- A city in Rhineland-Palatinate in Germany -->
           <_name>Hahn</_name>
           <coordinates>49.966667 7.266667</coordinates>
           <location>
@@ -15153,9 +14970,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Rhineland-Palatinate in
-               Germany
-            -->
+          <!-- A city in Rhineland-Palatinate in Germany -->
           <_name>Liebenscheid</_name>
           <coordinates>50.700000 8.100000</coordinates>
           <location>
@@ -15165,9 +14980,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Rhineland-Palatinate in
-               Germany
-            -->
+          <!-- A city in Rhineland-Palatinate in Germany -->
           <_name>Ramstein</_name>
           <coordinates>49.450000 7.533333</coordinates>
           <location>
@@ -15177,9 +14990,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Rhineland-Palatinate in
-               Germany
-            -->
+          <!-- A city in Rhineland-Palatinate in Germany -->
           <_name>Spangdahlem</_name>
           <coordinates>49.983333 6.683333</coordinates>
           <location>
@@ -15189,9 +15000,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Rhineland-Palatinate in
-               Germany
-            -->
+          <!-- A city in Rhineland-Palatinate in Germany -->
           <_name>ZweibrÃcken</_name>
           <coordinates>49.250000 7.366667</coordinates>
           <location>
@@ -15202,11 +15011,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Germany -->
+        <!-- A state/province/territory in Germany -->
         <_name>Saarland</_name>
         <fips-code>GM09</fips-code>
         <city>
-          <!-- Translators: this is a city in Saarland in Germany -->
+          <!-- A city in Saarland in Germany -->
           <_name>Ensheim</_name>
           <coordinates>49.200000 7.100000</coordinates>
           <location>
@@ -15217,14 +15026,14 @@
         </city>
       </state>
       <state>
-        <!-- Translators: This is a state in Germany.  The local name
-             is "Sachsen". Please use that unless you know that it has
-             a different name in your language.
+        <!-- A state in Germany.  The local name is "Sachsen". Please
+             use that unless you know that it has a different name in
+             your language.
           -->
         <_name>Saxony</_name>
         <fips-code>GM13</fips-code>
         <city>
-          <!-- Translators: this is a city in Saxony in Germany -->
+          <!-- A city in Saxony in Germany -->
           <_name>Dresden</_name>
           <coordinates>51.050000 13.750000</coordinates>
           <location>
@@ -15234,7 +15043,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saxony in Germany -->
+          <!-- A city in Saxony in Germany -->
           <_name>Leipzig</_name>
           <coordinates>51.300000 12.333333</coordinates>
           <location>
@@ -15245,14 +15054,14 @@
         </city>
       </state>
       <state>
-        <!-- Translators: This is a state in Germany.  The local name
-             is "Sachsen-Anhalt". Please use that unless you know that
-             it has a different name in your language.
+        <!-- A state in Germany.  The local name is "Sachsen-Anhalt".
+             Please use that unless you know that it has a different
+             name in your language.
           -->
         <_name>Saxony-Anhalt</_name>
         <fips-code>GM14</fips-code>
         <city>
-          <!-- Translators: this is a city in Saxony-Anhalt in Germany -->
+          <!-- A city in Saxony-Anhalt in Germany -->
           <_name>Holzdorf</_name>
           <coordinates>51.766667 13.133333</coordinates>
           <location>
@@ -15263,15 +15072,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: This is a state in Germany. The Danish name
-             is "Slesvig-Holsten".
-          -->
+        <!-- A state in Germany. The Danish name is "Slesvig-Holsten". -->
         <_name>Schleswig-Holstein</_name>
         <fips-code>GM10</fips-code>
         <city>
-          <!-- Translators: this is a city in Schleswig-Holstein in
-               Germany
-            -->
+          <!-- A city in Schleswig-Holstein in Germany -->
           <_name>Hohn</_name>
           <coordinates>54.300000 9.500000</coordinates>
           <location>
@@ -15281,9 +15086,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Schleswig-Holstein in
-               Germany
-            -->
+          <!-- A city in Schleswig-Holstein in Germany -->
           <_name>Kiel</_name>
           <coordinates>54.333333 10.133333</coordinates>
           <location>
@@ -15293,9 +15096,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Schleswig-Holstein in
-               Germany
-            -->
+          <!-- A city in Schleswig-Holstein in Germany -->
           <_name>Schleswig</_name>
           <coordinates>54.516667 9.550000</coordinates>
           <location>
@@ -15305,9 +15106,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Schleswig-Holstein in
-               Germany
-            -->
+          <!-- A city in Schleswig-Holstein in Germany -->
           <_name>Ulstrupfeld</_name>
           <coordinates>54.833333 9.533333</coordinates>
           <location>
@@ -15317,9 +15116,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Schleswig-Holstein in
-               Germany
-            -->
+          <!-- A city in Schleswig-Holstein in Germany -->
           <_name>Vorrade</_name>
           <coordinates>53.816667 10.683333</coordinates>
           <location>
@@ -15329,9 +15126,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Schleswig-Holstein in
-               Germany
-            -->
+          <!-- A city in Schleswig-Holstein in Germany -->
           <_name>Westerland</_name>
           <coordinates>54.900000 8.300000</coordinates>
           <location>
@@ -15342,14 +15137,14 @@
         </city>
       </state>
       <state>
-        <!-- Translators: This is a state in Germany.  The local name
-             is "ThÃringen". Please use that unless you know that it
-             has a different name in your language.
+        <!-- A state in Germany.  The local name is "ThÃringen". Please
+             use that unless you know that it has a different name in
+             your language.
           -->
         <_name>Thuringia</_name>
         <fips-code>GM15</fips-code>
         <city>
-          <!-- Translators: this is a city in Thuringia in Germany -->
+          <!-- A city in Thuringia in Germany -->
           <_name>Altenburg</_name>
           <coordinates>50.983333 12.450000</coordinates>
           <location>
@@ -15359,7 +15154,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Thuringia in Germany -->
+          <!-- A city in Thuringia in Germany -->
           <_name>Bindersleben</_name>
           <coordinates>50.966667 10.950000</coordinates>
           <location>
@@ -15374,7 +15169,7 @@
       <!-- GI - Gibraltar, a British overseas territory on the southern
            tip of Spain.
         -->
-      <_name>Gibraltar</_name>
+      <_name msgctxt="Country">Gibraltar</_name>
       <iso-code>GI</iso-code>
       <fips-code>GI</fips-code>
       <timezones>
@@ -15382,8 +15177,8 @@
       </timezones>
       <tz-hint>Europe/Gibraltar</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Gibraltar -->
-        <_name>Gibraltar</_name>
+        <!-- The capital of Gibraltar -->
+        <_name msgctxt="City in Gibraltar">Gibraltar</_name>
         <coordinates>36.133333 -5.350000</coordinates>
         <location>
           <name>Gibraltar</name>
@@ -15406,7 +15201,7 @@
       </timezones>
       <tz-hint>Europe/Athens</tz-hint>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>AlexandroÃpolis</_name>
         <coordinates>40.847500 25.874444</coordinates>
         <location>
@@ -15416,7 +15211,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>AndravÃda</_name>
         <coordinates>37.900000 21.266667</coordinates>
         <location>
@@ -15426,7 +15221,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>ArgostÃlion</_name>
         <coordinates>38.173056 20.481944</coordinates>
         <location>
@@ -15436,11 +15231,11 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Greece.
+        <!-- The capital of Greece.
              "Athens" is the traditional English name.
              The local name in Greek is "AthÃna / ÎÎÎÎÎ".
           -->
-        <_name>Athens</_name>
+        <_name msgctxt="City in Greece">Athens</_name>
         <coordinates>37.983333 23.733333</coordinates>
         <location>
           <name>Athens Eleftherios Venizelos International Airport</name>
@@ -15449,7 +15244,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>ChrysoÃpolis</_name>
         <coordinates>40.985556 24.693889</coordinates>
         <location>
@@ -15459,7 +15254,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece.
+        <!-- A city in Greece.
              The name is also written "ÎÎÎÏ".
           -->
         <_name>ChÃos</_name>
@@ -15471,7 +15266,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>ElefsÃs</_name>
         <coordinates>38.033333 23.533333</coordinates>
         <location>
@@ -15481,7 +15276,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>IrÃkleion</_name>
         <coordinates>35.325000 25.130556</coordinates>
         <location>
@@ -15491,7 +15286,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece.
+        <!-- A city in Greece.
              The name is also written "ÎÎÎÎÎÎÏÎ".
           -->
         <_name>KalamÃta</_name>
@@ -15503,7 +15298,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>KarpÃsion</_name>
         <coordinates>39.933333 25.233333</coordinates>
         <location>
@@ -15513,7 +15308,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>KatomÃrion</_name>
         <coordinates>38.650000 20.783333</coordinates>
         <location>
@@ -15523,7 +15318,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>Kos</_name>
         <coordinates>36.893333 27.288889</coordinates>
         <location>
@@ -15533,7 +15328,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>KozÃni</_name>
         <coordinates>40.301111 21.786389</coordinates>
         <location>
@@ -15543,7 +15338,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>KÃrpathos</_name>
         <coordinates>35.500000 27.233333</coordinates>
         <location>
@@ -15553,7 +15348,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece.
+        <!-- A city in Greece.
              The name is also written "ÎÎÏÎÏÏÎ".
           -->
         <_name>KÃrkyra</_name>
@@ -15565,7 +15360,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece.
+        <!-- A city in Greece.
              The name is also written "ÎÏÎÎÏÎ".
           -->
         <_name>KÃthira</_name>
@@ -15577,7 +15372,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>LÃrisa</_name>
         <coordinates>39.637222 22.420278</coordinates>
         <location>
@@ -15587,7 +15382,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>MonÃlithos</_name>
         <coordinates>36.400000 25.483333</coordinates>
         <location>
@@ -15597,7 +15392,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>MytilÃni</_name>
         <coordinates>39.110000 26.554722</coordinates>
         <location>
@@ -15607,7 +15402,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece.
+        <!-- A city in Greece.
              The name is also written "ÎÏÎÎÎÎÏ".
           -->
         <_name>MÃkonos</_name>
@@ -15619,7 +15414,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>NÃxos</_name>
         <coordinates>37.105556 25.376389</coordinates>
         <location>
@@ -15629,7 +15424,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>ParadeÃsion</_name>
         <coordinates>36.400000 28.083333</coordinates>
         <location>
@@ -15639,7 +15434,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>PÃros</_name>
         <coordinates>37.083333 25.150000</coordinates>
         <location>
@@ -15649,7 +15444,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>SkÃathos</_name>
         <coordinates>39.166667 23.483333</coordinates>
         <location>
@@ -15659,7 +15454,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>SoÃda</_name>
         <coordinates>35.484444 24.074444</coordinates>
         <location>
@@ -15669,7 +15464,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>SÃmos</_name>
         <coordinates>37.757222 26.976944</coordinates>
         <location>
@@ -15679,7 +15474,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>TanÃgra</_name>
         <coordinates>38.316667 23.533333</coordinates>
         <location>
@@ -15689,7 +15484,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>ThessalonÃki</_name>
         <coordinates>40.640278 22.943889</coordinates>
         <location>
@@ -15699,7 +15494,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>ZÃkynthos</_name>
         <coordinates>37.791389 20.895278</coordinates>
         <location>
@@ -15709,7 +15504,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>Ãno SÃros</_name>
         <coordinates>37.450000 24.933333</coordinates>
         <location>
@@ -15719,7 +15514,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>Ãraxos</_name>
         <coordinates>38.166667 21.416667</coordinates>
         <location>
@@ -15729,7 +15524,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Greece -->
+        <!-- A city in Greece -->
         <_name>Ãyios AthanÃsios</_name>
         <coordinates>39.233333 22.766667</coordinates>
         <location>
@@ -15755,7 +15550,7 @@
       </timezones>
       <tz-hint>Europe/Guernsey</tz-hint>
       <city>
-        <!-- Translators: this is a city in Guernsey -->
+        <!-- A city in Guernsey -->
         <_name>Hautnez</_name>
         <coordinates>49.433333 -2.600000</coordinates>
         <location>
@@ -15766,7 +15561,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Guernsey -->
+        <!-- The capital of Guernsey -->
         <_name>Saint Peter Port</_name>
         <coordinates>49.456111 -2.540833</coordinates>
         <location>
@@ -15791,7 +15586,7 @@
       </timezones>
       <tz-hint>Europe/Budapest</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Hungary -->
+        <!-- The capital of Hungary -->
         <_name>Budapest</_name>
         <coordinates>47.500000 19.083333</coordinates>
         <location>
@@ -15801,7 +15596,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Hungary -->
+        <!-- A city in Hungary -->
         <_name>Debrecen</_name>
         <coordinates>47.533333 21.633333</coordinates>
         <location>
@@ -15811,7 +15606,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Hungary -->
+        <!-- A city in Hungary -->
         <_name>KecskemÃt</_name>
         <coordinates>46.900000 19.783333</coordinates>
         <location>
@@ -15821,7 +15616,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Hungary -->
+        <!-- A city in Hungary -->
         <_name>PÃpa</_name>
         <coordinates>47.333333 17.466667</coordinates>
         <location>
@@ -15831,7 +15626,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Hungary -->
+        <!-- A city in Hungary -->
         <_name>PÃcs</_name>
         <coordinates>46.083333 18.233333</coordinates>
         <location>
@@ -15841,7 +15636,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Hungary -->
+        <!-- A city in Hungary -->
         <_name>Szeged</_name>
         <coordinates>46.250000 20.166667</coordinates>
         <location>
@@ -15851,7 +15646,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Hungary -->
+        <!-- A city in Hungary -->
         <_name>Szolnok</_name>
         <coordinates>47.183333 20.200000</coordinates>
         <location>
@@ -15871,7 +15666,7 @@
       </timezones>
       <tz-hint>Atlantic/Reykjavik</tz-hint>
       <city>
-        <!-- Translators: this is a city in Iceland -->
+        <!-- A city in Iceland -->
         <_name>Akureyri</_name>
         <coordinates>65.666667 -18.100000</coordinates>
         <location>
@@ -15881,7 +15676,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iceland -->
+        <!-- A city in Iceland -->
         <_name>EiÃar</_name>
         <coordinates>65.366667 -14.350000</coordinates>
         <location>
@@ -15891,7 +15686,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Iceland -->
+        <!-- The capital of Iceland -->
         <_name>ReykjavÃk</_name>
         <coordinates>64.150000 -21.950000</coordinates>
         <location>
@@ -15901,7 +15696,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iceland -->
+        <!-- A city in Iceland -->
         <_name>Ytri-NjarÃvÃk</_name>
         <coordinates>63.983333 -22.550000</coordinates>
         <location>
@@ -15918,15 +15713,15 @@
       <fips-code>EI</fips-code>
       <timezones>
         <timezone id="Europe/Dublin">
-          <!-- Translators: This is the time zone in Ireland (GMT in
-               the winter, and Irish Summer Time in the summer.)
+          <!-- The time zone in Ireland (GMT in the winter, and Irish
+               Summer Time in the summer.)
             -->
           <_name>GMT/IST</_name>
         </timezone>
       </timezones>
       <tz-hint>Europe/Dublin</tz-hint>
       <city>
-        <!-- Translators: this is a city in Ireland.
+        <!-- A city in Ireland.
              The local name in Irish is "Corcaigh".
           -->
         <_name>Cork</_name>
@@ -15938,10 +15733,10 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Ireland.
+        <!-- The capital of Ireland.
              The local name in Irish is "Baile Ãtha Cliath".
           -->
-        <_name>Dublin</_name>
+        <_name msgctxt="City in Ireland">Dublin</_name>
         <coordinates>53.333056 -6.248889</coordinates>
         <location>
           <name>Dublin Airport</name>
@@ -15950,7 +15745,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Ireland.
+        <!-- A city in Ireland.
              The local name in Irish is "DÃn Laoghaire".
           -->
         <_name>Dunleary</_name>
@@ -15962,7 +15757,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Ireland -->
+        <!-- A city in Ireland -->
         <_name>Glentavraun</_name>
         <coordinates>53.883333 -8.800000</coordinates>
         <location>
@@ -15972,7 +15767,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Ireland.
+        <!-- A city in Ireland.
              The local name in Irish is "Sionainn".
           -->
         <_name>Shannon</_name>
@@ -15996,8 +15791,8 @@
       </timezones>
       <tz-hint>Europe/Isle_of_Man</tz-hint>
       <city>
-        <!-- Translators: this is the capital of the Isle of Man -->
-        <_name>Douglas</_name>
+        <!-- The capital of the Isle of Man -->
+        <_name msgctxt="City in Isle of Man">Douglas</_name>
         <coordinates>54.150000 -4.483333</coordinates>
         <location>
           <name>Isle of Man, Ronaldsway Airport</name>
@@ -16007,7 +15802,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Isle of Man -->
+        <!-- A city in the Isle of Man -->
         <_name>Ronaldsway</_name>
         <coordinates>54.083333 -4.616667</coordinates>
         <location>
@@ -16028,7 +15823,7 @@
       </timezones>
       <tz-hint>Europe/Rome</tz-hint>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Albenga</_name>
         <coordinates>44.050000 8.216667</coordinates>
         <location>
@@ -16038,7 +15833,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Alghero</_name>
         <coordinates>40.558889 8.318056</coordinates>
         <location>
@@ -16048,7 +15843,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Aviano</_name>
         <coordinates>46.070556 12.594722</coordinates>
         <location>
@@ -16063,7 +15858,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Bari</_name>
         <coordinates>41.133333 16.850000</coordinates>
         <location>
@@ -16073,7 +15868,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Bergamo</_name>
         <coordinates>45.683333 9.716667</coordinates>
         <location>
@@ -16083,7 +15878,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Bologna</_name>
         <coordinates>44.483333 11.333333</coordinates>
         <location>
@@ -16093,7 +15888,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Bolzano</_name>
         <coordinates>46.516667 11.366667</coordinates>
         <location>
@@ -16103,7 +15898,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Brescia</_name>
         <coordinates>45.550000 10.250000</coordinates>
         <location>
@@ -16118,7 +15913,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Breuil-Cervinia</_name>
         <coordinates>45.933333 7.633333</coordinates>
         <location>
@@ -16128,7 +15923,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Brindisi</_name>
         <coordinates>40.633333 17.933333</coordinates>
         <location>
@@ -16138,7 +15933,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Cagliari</_name>
         <coordinates>39.216667 9.116667</coordinates>
         <location>
@@ -16148,7 +15943,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Capri</_name>
         <coordinates>40.550000 14.233333</coordinates>
         <location>
@@ -16158,7 +15953,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Case Arfel</_name>
         <coordinates>44.250000 7.783333</coordinates>
         <location>
@@ -16168,7 +15963,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Catania</_name>
         <coordinates>37.500000 15.100000</coordinates>
         <location>
@@ -16183,7 +15978,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Cervia</_name>
         <coordinates>44.261667 12.358889</coordinates>
         <location>
@@ -16193,7 +15988,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Crotone</_name>
         <coordinates>39.083333 17.133333</coordinates>
         <location>
@@ -16203,7 +15998,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Cuneo</_name>
         <coordinates>44.383333 7.533333</coordinates>
         <location>
@@ -16213,7 +16008,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Decimomannu</_name>
         <coordinates>39.312500 8.969444</coordinates>
         <location>
@@ -16223,7 +16018,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Dobbiaco</_name>
         <coordinates>46.742500 12.231389</coordinates>
         <location>
@@ -16233,7 +16028,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Ferrara</_name>
         <coordinates>44.833333 11.583333</coordinates>
         <location>
@@ -16243,11 +16038,11 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy.
+        <!-- A city in Italy.
              "Florence" is the traditional English name.
              The local name in Italian is "Firenze".
           -->
-        <_name>Florence</_name>
+        <_name msgctxt="City in Italy">Florence</_name>
         <coordinates>43.766667 11.250000</coordinates>
         <location>
           <name>Peretola Airport</name>
@@ -16256,7 +16051,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>ForlÃ</_name>
         <coordinates>44.223611 12.052778</coordinates>
         <location>
@@ -16266,7 +16061,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Frosinone</_name>
         <coordinates>41.633333 13.316667</coordinates>
         <location>
@@ -16276,7 +16071,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy.
+        <!-- A city in Italy.
              "Genoa" is the traditional English name.
              The local name in Italian is "Genova".
           -->
@@ -16289,7 +16084,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Ginosa Marina</_name>
         <coordinates>40.433333 16.883333</coordinates>
         <location>
@@ -16299,7 +16094,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Gioia del Colle</_name>
         <coordinates>40.800000 16.916667</coordinates>
         <location>
@@ -16309,7 +16104,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Grazzanise</_name>
         <coordinates>41.083333 14.100000</coordinates>
         <location>
@@ -16319,7 +16114,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Grosseto</_name>
         <coordinates>42.766667 11.133333</coordinates>
         <location>
@@ -16329,7 +16124,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Grottaglie</_name>
         <coordinates>40.533333 17.433333</coordinates>
         <location>
@@ -16339,7 +16134,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Isola del Cantone</_name>
         <coordinates>44.650000 8.950000</coordinates>
         <location>
@@ -16349,7 +16144,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Laigueglia</_name>
         <coordinates>43.966667 8.150000</coordinates>
         <location>
@@ -16359,7 +16154,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Lampedusa</_name>
         <coordinates>35.500000 12.600000</coordinates>
         <location>
@@ -16369,7 +16164,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Latina</_name>
         <coordinates>41.466667 12.866667</coordinates>
         <location>
@@ -16379,7 +16174,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Lecce</_name>
         <coordinates>40.383333 18.183333</coordinates>
         <location>
@@ -16389,7 +16184,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Messina</_name>
         <coordinates>38.183333 15.566667</coordinates>
         <location>
@@ -16399,7 +16194,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy.
+        <!-- A city in Italy.
              "Milan" is the traditional English name.
              The local name in Italian is "Milano".
           -->
@@ -16417,7 +16212,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Molino di Ancona</_name>
         <coordinates>43.616667 13.366667</coordinates>
         <location>
@@ -16427,11 +16222,11 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy.
+        <!-- A city in Italy.
              "Naples" is the traditional English name.
              The local name in Italian is "Napoli".
           -->
-        <_name>Naples</_name>
+        <_name msgctxt="City in Italy">Naples</_name>
         <coordinates>40.833333 14.250000</coordinates>
         <location>
           <name>Capodichino Airport</name>
@@ -16440,7 +16235,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Olbia</_name>
         <coordinates>40.916667 9.516667</coordinates>
         <location>
@@ -16450,7 +16245,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Palazzo</_name>
         <coordinates>42.716667 10.383333</coordinates>
         <location>
@@ -16460,7 +16255,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Palermo</_name>
         <coordinates>38.116667 13.366667</coordinates>
         <location>
@@ -16475,7 +16270,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Paneveggio</_name>
         <coordinates>46.300000 11.733333</coordinates>
         <location>
@@ -16485,7 +16280,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Pantelleria</_name>
         <coordinates>36.833333 11.950000</coordinates>
         <location>
@@ -16495,7 +16290,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Parma</_name>
         <coordinates>44.800000 10.333333</coordinates>
         <location>
@@ -16505,7 +16300,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Perugia</_name>
         <coordinates>43.133333 12.366667</coordinates>
         <location>
@@ -16515,7 +16310,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Pescara</_name>
         <coordinates>42.466667 14.216667</coordinates>
         <location>
@@ -16525,7 +16320,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Piacenza</_name>
         <coordinates>45.016667 9.666667</coordinates>
         <location>
@@ -16535,7 +16330,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Pisa</_name>
         <coordinates>43.716667 10.383333</coordinates>
         <location>
@@ -16545,7 +16340,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Pontecagnano</_name>
         <coordinates>40.633333 14.883333</coordinates>
         <location>
@@ -16555,7 +16350,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Pratica di Mare</_name>
         <coordinates>41.666667 12.483333</coordinates>
         <location>
@@ -16565,7 +16360,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Reggio di Calabria</_name>
         <coordinates>38.100000 15.650000</coordinates>
         <location>
@@ -16575,7 +16370,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Resia</_name>
         <coordinates>46.833333 10.516667</coordinates>
         <location>
@@ -16585,7 +16380,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Rieti</_name>
         <coordinates>42.400000 12.850000</coordinates>
         <location>
@@ -16595,7 +16390,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Rimini</_name>
         <coordinates>44.063333 12.580833</coordinates>
         <location>
@@ -16605,11 +16400,11 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Italy.
+        <!-- The capital of Italy.
              "Rome" is the traditional English name.
              The local name in Italian is "Roma".
           -->
-        <_name>Rome</_name>
+        <_name msgctxt="City in Italy">Rome</_name>
         <coordinates>41.900000 12.483333</coordinates>
         <location>
           <name>Urbe Airport</name>
@@ -16628,7 +16423,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Ronchi dei Legionari</_name>
         <coordinates>45.823611 13.509722</coordinates>
         <location>
@@ -16638,7 +16433,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Salignano</_name>
         <coordinates>39.833333 18.350000</coordinates>
         <location>
@@ -16648,7 +16443,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>San StÃfano</_name>
         <coordinates>39.107500 9.506111</coordinates>
         <location>
@@ -16658,7 +16453,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Sant'Eufemia Lamezia</_name>
         <coordinates>38.916667 16.250000</coordinates>
         <location>
@@ -16668,7 +16463,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Sporminore</_name>
         <coordinates>46.166667 11.033333</coordinates>
         <location>
@@ -16678,7 +16473,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Tamaricciola</_name>
         <coordinates>41.416667 15.733333</coordinates>
         <location>
@@ -16688,7 +16483,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Tarvisio</_name>
         <coordinates>46.510833 13.594167</coordinates>
         <location>
@@ -16698,7 +16493,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Trapani</_name>
         <coordinates>38.016667 12.483333</coordinates>
         <location>
@@ -16708,7 +16503,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Trevico</_name>
         <coordinates>41.050000 15.216667</coordinates>
         <location>
@@ -16718,7 +16513,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Treviso</_name>
         <coordinates>45.666667 12.245000</coordinates>
         <location>
@@ -16733,7 +16528,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Trieste</_name>
         <coordinates>45.648611 13.780000</coordinates>
         <location>
@@ -16743,7 +16538,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy.
+        <!-- A city in Italy.
              "Turin" is the traditional English name.
              The local name is "Torino".
           -->
@@ -16756,7 +16551,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy.
+        <!-- A city in Italy.
              "Venice" is the traditional English name.
              The local name in Italian is "Venezia".
           -->
@@ -16769,7 +16564,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Verona</_name>
         <coordinates>45.450000 11.000000</coordinates>
         <location>
@@ -16779,7 +16574,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Viterbo</_name>
         <coordinates>42.416667 12.100000</coordinates>
         <location>
@@ -16789,7 +16584,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Italy -->
+        <!-- A city in Italy -->
         <_name>Ãrbatax</_name>
         <coordinates>39.934444 9.705556</coordinates>
         <location>
@@ -16811,7 +16606,7 @@
       </timezones>
       <tz-hint>Europe/Jersey</tz-hint>
       <city>
-        <!-- Translators: this is a city in Jersey -->
+        <!-- A city in Jersey -->
         <_name>La Hougue</_name>
         <coordinates>49.216667 -2.216667</coordinates>
         <location>
@@ -16822,7 +16617,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Jersey -->
+        <!-- The capital of Jersey -->
         <_name>Saint Helier</_name>
         <coordinates>49.183333 -2.100000</coordinates>
         <location>
@@ -16847,7 +16642,7 @@
       </timezones>
       <tz-hint>Europe/Riga</tz-hint>
       <city>
-        <!-- Translators: this is a city in Latvia -->
+        <!-- A city in Latvia -->
         <_name>LiepÄja</_name>
         <coordinates>56.516667 21.016667</coordinates>
         <location>
@@ -16857,7 +16652,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Latvia -->
+        <!-- The capital of Latvia -->
         <_name>RÄga</_name>
         <coordinates>56.950000 24.100000</coordinates>
         <location>
@@ -16881,7 +16676,7 @@
       </timezones>
       <tz-hint>Europe/Vaduz</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Liechtenstein -->
+        <!-- The capital of Liechtenstein -->
         <_name>Vaduz</_name>
         <coordinates>47.133333 9.516667</coordinates>
         <location>
@@ -16901,7 +16696,7 @@
       </timezones>
       <tz-hint>Europe/Vilnius</tz-hint>
       <city>
-        <!-- Translators: this is a city in Lithuania -->
+        <!-- A city in Lithuania -->
         <_name>Kaunas</_name>
         <coordinates>54.900000 23.900000</coordinates>
         <location>
@@ -16911,7 +16706,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Lithuania -->
+        <!-- A city in Lithuania -->
         <_name>Palanga</_name>
         <coordinates>55.917500 21.068611</coordinates>
         <location>
@@ -16921,7 +16716,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Lithuania -->
+        <!-- The capital of Lithuania -->
         <_name>Vilnius</_name>
         <coordinates>54.683333 25.316667</coordinates>
         <location>
@@ -16931,7 +16726,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Lithuania -->
+        <!-- A city in Lithuania -->
         <_name>Åiauliai</_name>
         <coordinates>55.933333 23.316667</coordinates>
         <location>
@@ -16943,7 +16738,7 @@
     </country>
     <country>
       <!-- LU - Luxembourg -->
-      <_name>Luxembourg</_name>
+      <_name msgctxt="Country">Luxembourg</_name>
       <iso-code>LU</iso-code>
       <fips-code>LU</fips-code>
       <timezones>
@@ -16961,7 +16756,7 @@
       </timezones>
       <tz-hint>Europe/Skopje</tz-hint>
       <city>
-        <!-- Translators: this is a city in Macedonia -->
+        <!-- A city in Macedonia -->
         <_name>Ohrid</_name>
         <coordinates>41.117222 20.801944</coordinates>
         <location>
@@ -16971,7 +16766,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Macedonia -->
+        <!-- The capital of Macedonia -->
         <_name>Skopje</_name>
         <coordinates>42.000000 21.433333</coordinates>
         <location>
@@ -16983,7 +16778,7 @@
     </country>
     <country>
       <!-- MT - Malta -->
-      <_name>Malta</_name>
+      <_name msgctxt="Country">Malta</_name>
       <iso-code>MT</iso-code>
       <fips-code>MT</fips-code>
       <timezones>
@@ -16991,7 +16786,7 @@
       </timezones>
       <tz-hint>Europe/Malta</tz-hint>
       <city>
-        <!-- Translators: this is a city in Malta -->
+        <!-- A city in Malta -->
         <_name>Luqa</_name>
         <coordinates>35.858889 14.488611</coordinates>
         <location>
@@ -17001,7 +16796,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Malta -->
+        <!-- The capital of Malta -->
         <_name>Valletta</_name>
         <coordinates>35.899722 14.514722</coordinates>
         <location>
@@ -17021,7 +16816,7 @@
       </timezones>
       <tz-hint>Europe/Chisinau</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Moldova -->
+        <!-- The capital of Moldova -->
         <_name>ChiÅinÄu</_name>
         <coordinates>47.005556 28.857500</coordinates>
         <location>
@@ -17033,7 +16828,7 @@
     </country>
     <country>
       <!-- MC - Monaco -->
-      <_name>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 
@@ -17045,8 +16840,8 @@
       </timezones>
       <tz-hint>Europe/Monaco</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Monaco -->
-        <_name>Monaco</_name>
+        <!-- The capital of Monaco -->
+        <_name msgctxt="City in Monaco">Monaco</_name>
         <coordinates>43.733333 7.416667</coordinates>
         <location>
           <name>Nice</name>
@@ -17069,7 +16864,7 @@
       </timezones>
       <tz-hint>Europe/Podgorica</tz-hint>
       <city>
-        <!-- Translators: this is a city in Montenegro -->
+        <!-- A city in Montenegro -->
         <_name>Podgorica</_name>
         <coordinates>42.441111 19.263611</coordinates>
         <location>
@@ -17079,7 +16874,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Montenegro -->
+        <!-- A city in Montenegro -->
         <_name>Tivat</_name>
         <coordinates>42.436389 18.696111</coordinates>
         <location>
@@ -17103,7 +16898,7 @@
       </timezones>
       <tz-hint>Europe/Amsterdam</tz-hint>
       <city>
-        <!-- Translators: this is the capital of the Netherlands -->
+        <!-- The capital of the Netherlands -->
         <_name>Amsterdam</_name>
         <coordinates>52.350000 4.916667</coordinates>
         <location>
@@ -17113,7 +16908,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Netherlands -->
+        <!-- A city in the Netherlands -->
         <_name>De Kooy</_name>
         <coordinates>52.916667 4.800000</coordinates>
         <location>
@@ -17123,7 +16918,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Netherlands -->
+        <!-- A city in the Netherlands -->
         <_name>Deelen</_name>
         <coordinates>52.066667 5.900000</coordinates>
         <location>
@@ -17133,7 +16928,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Netherlands -->
+        <!-- A city in the Netherlands -->
         <_name>Eindhoven</_name>
         <coordinates>51.450000 5.466667</coordinates>
         <location>
@@ -17143,7 +16938,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Netherlands -->
+        <!-- A city in the Netherlands -->
         <_name>Gilze</_name>
         <coordinates>51.550000 4.950000</coordinates>
         <location>
@@ -17153,7 +16948,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Netherlands -->
+        <!-- A city in the Netherlands -->
         <_name>Groningen</_name>
         <coordinates>53.216667 6.550000</coordinates>
         <location>
@@ -17163,7 +16958,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Netherlands -->
+        <!-- A city in the Netherlands -->
         <_name>Leeuwarden</_name>
         <coordinates>53.200000 5.783333</coordinates>
         <location>
@@ -17173,7 +16968,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Netherlands -->
+        <!-- A city in the Netherlands -->
         <_name>Maastricht</_name>
         <coordinates>50.850000 5.683333</coordinates>
         <location>
@@ -17183,7 +16978,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Netherlands -->
+        <!-- A city in the Netherlands -->
         <_name>Oost-Vlieland</_name>
         <coordinates>53.283333 5.066667</coordinates>
         <location>
@@ -17193,7 +16988,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Netherlands -->
+        <!-- A city in the Netherlands -->
         <_name>Rotterdam</_name>
         <coordinates>51.916667 4.500000</coordinates>
         <location>
@@ -17203,7 +16998,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Netherlands -->
+        <!-- A city in the Netherlands -->
         <_name>Soesterberg</_name>
         <coordinates>52.116667 5.316667</coordinates>
         <location>
@@ -17213,7 +17008,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of the Netherlands.
+        <!-- The capital of the Netherlands.
              "The Hague" is the traditional English name.
              The local name in Dutch is "'s-Gravenhage".
           -->
@@ -17226,7 +17021,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Netherlands -->
+        <!-- A city in the Netherlands -->
         <_name>Valkenburg</_name>
         <coordinates>52.183333 4.433333</coordinates>
         <location>
@@ -17236,7 +17031,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Netherlands -->
+        <!-- A city in the Netherlands -->
         <_name>Volkel</_name>
         <coordinates>51.650000 5.650000</coordinates>
         <location>
@@ -17246,7 +17041,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the Netherlands -->
+        <!-- A city in the Netherlands -->
         <_name>Woensdrecht</_name>
         <coordinates>51.433333 4.300000</coordinates>
         <location>
@@ -17270,7 +17065,7 @@
       </timezones>
       <tz-hint>Europe/Oslo</tz-hint>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Alta</_name>
         <coordinates>69.966667 23.241667</coordinates>
         <location>
@@ -17280,7 +17075,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>BerlevÃg</_name>
         <coordinates>70.850000 29.100000</coordinates>
         <location>
@@ -17290,7 +17085,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>BodÃ</_name>
         <coordinates>67.283333 14.383333</coordinates>
         <location>
@@ -17300,7 +17095,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Bolle</_name>
         <coordinates>68.158611 13.596389</coordinates>
         <location>
@@ -17310,7 +17105,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>BoltÃsen</_name>
         <coordinates>68.533333 16.700000</coordinates>
         <location>
@@ -17320,7 +17115,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>BrÃnnÃysund</_name>
         <coordinates>65.466667 12.216667</coordinates>
         <location>
@@ -17330,7 +17125,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>BÃtsfjord</_name>
         <coordinates>70.632222 29.699722</coordinates>
         <location>
@@ -17340,7 +17135,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Dalem</_name>
         <coordinates>69.066667 18.516667</coordinates>
         <location>
@@ -17350,7 +17145,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Djupdalen</_name>
         <coordinates>63.700000 9.583333</coordinates>
         <location>
@@ -17360,7 +17155,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Eldskog</_name>
         <coordinates>70.050000 25.000000</coordinates>
         <location>
@@ -17370,7 +17165,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Fagernes</_name>
         <coordinates>60.983333 9.250000</coordinates>
         <location>
@@ -17380,7 +17175,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Fiskenes</_name>
         <coordinates>69.263611 16.176667</coordinates>
         <location>
@@ -17390,7 +17185,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Flesland</_name>
         <coordinates>60.293889 5.215278</coordinates>
         <location>
@@ -17400,7 +17195,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>FlorÃ</_name>
         <coordinates>61.600000 5.000000</coordinates>
         <location>
@@ -17410,7 +17205,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>FÃrde</_name>
         <coordinates>61.450000 5.866667</coordinates>
         <location>
@@ -17420,7 +17215,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Gardermoen</_name>
         <coordinates>60.216667 11.100000</coordinates>
         <location>
@@ -17430,7 +17225,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Hammerfest</_name>
         <coordinates>70.661667 23.688333</coordinates>
         <location>
@@ -17440,7 +17235,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Hasvik</_name>
         <coordinates>70.483333 22.150000</coordinates>
         <location>
@@ -17450,7 +17245,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Haugesund</_name>
         <coordinates>59.411944 5.277500</coordinates>
         <location>
@@ -17460,7 +17255,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Holm</_name>
         <coordinates>61.150000 7.166667</coordinates>
         <location>
@@ -17470,7 +17265,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>HonningsvÃg</_name>
         <coordinates>70.983333 25.983333</coordinates>
         <location>
@@ -17480,7 +17275,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Kirkenes</_name>
         <coordinates>69.725000 30.051667</coordinates>
         <location>
@@ -17490,7 +17285,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Kjevik</_name>
         <coordinates>58.200000 8.100000</coordinates>
         <location>
@@ -17500,7 +17295,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Kristiansund</_name>
         <coordinates>63.116667 7.750000</coordinates>
         <location>
@@ -17510,7 +17305,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Langenes</_name>
         <coordinates>69.666667 18.916667</coordinates>
         <location>
@@ -17520,7 +17315,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Mehamn</_name>
         <coordinates>71.033333 27.850000</coordinates>
         <location>
@@ -17530,7 +17325,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Molde</_name>
         <coordinates>62.733333 7.183333</coordinates>
         <location>
@@ -17540,7 +17335,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>MosjÃen</_name>
         <coordinates>65.833333 13.200000</coordinates>
         <location>
@@ -17550,7 +17345,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Namsos</_name>
         <coordinates>64.483333 11.500000</coordinates>
         <location>
@@ -17560,7 +17355,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Narvik</_name>
         <coordinates>68.435556 17.437222</coordinates>
         <location>
@@ -17570,7 +17365,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Notodden</_name>
         <coordinates>59.566667 9.283333</coordinates>
         <location>
@@ -17580,7 +17375,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Oseberg</_name>
         <coordinates>59.316667 10.450000</coordinates>
         <location>
@@ -17590,7 +17385,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Norway -->
+        <!-- The capital of Norway -->
         <_name>Oslo</_name>
         <coordinates>59.916667 10.750000</coordinates>
         <location>
@@ -17600,7 +17395,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Rygge</_name>
         <coordinates>59.383333 10.716667</coordinates>
         <location>
@@ -17610,7 +17405,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>RÃros</_name>
         <coordinates>62.583333 11.400000</coordinates>
         <location>
@@ -17620,7 +17415,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>RÃrvik</_name>
         <coordinates>64.850000 11.233333</coordinates>
         <location>
@@ -17630,7 +17425,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>RÃssvoll</_name>
         <coordinates>66.366667 14.333333</coordinates>
         <location>
@@ -17640,7 +17435,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>RÃst</_name>
         <coordinates>67.516667 12.116667</coordinates>
         <location>
@@ -17650,7 +17445,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Sandane</_name>
         <coordinates>61.766667 6.216667</coordinates>
         <location>
@@ -17660,7 +17455,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Skagen</_name>
         <coordinates>68.583333 15.050000</coordinates>
         <location>
@@ -17670,7 +17465,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Skien</_name>
         <coordinates>59.200000 9.600000</coordinates>
         <location>
@@ -17680,7 +17475,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Sola</_name>
         <coordinates>58.883333 5.600000</coordinates>
         <location>
@@ -17690,7 +17485,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Stokka</_name>
         <coordinates>65.766667 12.566667</coordinates>
         <location>
@@ -17700,7 +17495,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Svartnes</_name>
         <coordinates>70.350000 31.033333</coordinates>
         <location>
@@ -17710,7 +17505,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>SvolvÃr</_name>
         <coordinates>68.233333 14.566667</coordinates>
         <location>
@@ -17720,7 +17515,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>SÃrkjosen</_name>
         <coordinates>69.800000 20.933333</coordinates>
         <location>
@@ -17730,7 +17525,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Torp</_name>
         <coordinates>59.179722 10.242500</coordinates>
         <location>
@@ -17740,7 +17535,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Trondheim</_name>
         <coordinates>63.416667 10.416667</coordinates>
         <location>
@@ -17750,7 +17545,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>VadsÃ</_name>
         <coordinates>70.073056 29.769722</coordinates>
         <location>
@@ -17760,7 +17555,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Ãlesund</_name>
         <coordinates>62.466667 6.150000</coordinates>
         <location>
@@ -17770,7 +17565,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Norway -->
+        <!-- A city in Norway -->
         <_name>Ãrsta</_name>
         <coordinates>62.200000 6.150000</coordinates>
         <location>
@@ -17794,7 +17589,7 @@
       </timezones>
       <tz-hint>Europe/Warsaw</tz-hint>
       <city>
-        <!-- Translators: this is a city in Poland -->
+        <!-- A city in Poland -->
         <_name>GdaÅsk</_name>
         <coordinates>54.350000 18.666667</coordinates>
         <location>
@@ -17804,7 +17599,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Poland -->
+        <!-- A city in Poland -->
         <_name>Katowice</_name>
         <coordinates>50.266667 19.016667</coordinates>
         <location>
@@ -17814,7 +17609,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Poland -->
+        <!-- A city in Poland -->
         <_name>KrakÃw</_name>
         <coordinates>50.083333 19.916667</coordinates>
         <location>
@@ -17824,7 +17619,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Poland -->
+        <!-- A city in Poland -->
         <_name>PoznaÅ</_name>
         <coordinates>52.416667 16.966667</coordinates>
         <location>
@@ -17834,7 +17629,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Poland -->
+        <!-- A city in Poland -->
         <_name>RzeszÃw</_name>
         <coordinates>50.050000 22.000000</coordinates>
         <location>
@@ -17844,7 +17639,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Poland -->
+        <!-- A city in Poland -->
         <_name>Szczecin</_name>
         <coordinates>53.416667 14.583333</coordinates>
         <location>
@@ -17854,11 +17649,11 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Poland.
+        <!-- The capital of Poland.
              "Warsaw" is the traditional English name.
              The local name in Polish is "Warszawa".
           -->
-        <_name>Warsaw</_name>
+        <_name msgctxt="City in Poland">Warsaw</_name>
         <coordinates>52.250000 21.000000</coordinates>
         <location>
           <name>Warszawa-Okecie</name>
@@ -17867,7 +17662,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Poland -->
+        <!-- A city in Poland -->
         <_name>Warszawa</_name>
         <coordinates>52.250000 21.000000</coordinates>
         <location>
@@ -17877,7 +17672,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Poland -->
+        <!-- A city in Poland -->
         <_name>WrocÅaw</_name>
         <coordinates>51.100000 17.033333</coordinates>
         <location>
@@ -17894,30 +17689,29 @@
       <fips-code>PO</fips-code>
       <timezones>
         <timezone id="Atlantic/Azores">
-          <!-- Translators: This refers to the time zone for the
-               Azores. The string is only used in places where
-               "Portugal" is already understood from context.
+          <!-- This refers to the time zone for the Azores. The string
+               is only used in places where "Portugal" is already
+               understood from context.
             -->
           <_name>Azores</_name>
         </timezone>
         <timezone id="Atlantic/Madeira">
-          <!-- Translators: 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.
+          <!-- 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>
         </timezone>
         <timezone id="Europe/Lisbon">
-          <!-- Translators: This refers to the time zone for mainland
-               Portugal (as opposed to the time zone for the Azores).
+          <!-- This refers to the time zone for mainland Portugal (as
+               opposed to the time zone for the Azores).
             -->
           <_name>Mainland Portugal</_name>
         </timezone>
       </timezones>
       <tz-hint>Europe/Lisbon</tz-hint>
       <city>
-        <!-- Translators: this is a city in Portugal -->
+        <!-- A city in Portugal -->
         <_name>Beja</_name>
         <coordinates>38.016667 -7.866667</coordinates>
         <location>
@@ -17927,7 +17721,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Portugal -->
+        <!-- A city in Portugal -->
         <_name>Castelo Branco</_name>
         <coordinates>38.516667 -28.733333</coordinates>
         <location>
@@ -17938,7 +17732,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Portugal -->
+        <!-- A city in Portugal -->
         <_name>Faro</_name>
         <coordinates>37.016667 -7.933333</coordinates>
         <location>
@@ -17948,7 +17742,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Portugal -->
+        <!-- A city in Portugal -->
         <_name>Flor da Rosa</_name>
         <coordinates>36.966667 -25.150000</coordinates>
         <location>
@@ -17959,7 +17753,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Portugal -->
+        <!-- A city in Portugal -->
         <_name>Horta</_name>
         <coordinates>38.533333 -28.633333</coordinates>
         <location>
@@ -17970,7 +17764,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Portugal -->
+        <!-- A city in Portugal -->
         <_name>Lajes</_name>
         <coordinates>38.766667 -27.100000</coordinates>
         <location>
@@ -17981,7 +17775,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Portugal.
+        <!-- The capital of Portugal.
              "Lisbon" is the traditional English name.
              The local name in Portuguese is "Lisboa".
           -->
@@ -17994,7 +17788,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Portugal -->
+        <!-- A city in Portugal -->
         <_name>Monte Real</_name>
         <coordinates>39.850000 -8.866667</coordinates>
         <location>
@@ -18004,7 +17798,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Portugal -->
+        <!-- A city in Portugal -->
         <_name>Montijo</_name>
         <coordinates>38.700000 -8.966667</coordinates>
         <location>
@@ -18014,7 +17808,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Portugal -->
+        <!-- A city in Portugal -->
         <_name>Ovar</_name>
         <coordinates>40.866667 -8.633333</coordinates>
         <location>
@@ -18024,7 +17818,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Portugal -->
+        <!-- A city in Portugal -->
         <_name>Pedras Rubras</_name>
         <coordinates>41.233333 -8.666667</coordinates>
         <location>
@@ -18034,7 +17828,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Portugal -->
+        <!-- A city in Portugal -->
         <_name>Ponta Delgada</_name>
         <coordinates>37.733333 -25.666667</coordinates>
         <location>
@@ -18045,7 +17839,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Portugal -->
+        <!-- A city in Portugal -->
         <_name>Portela</_name>
         <coordinates>38.716667 -9.216667</coordinates>
         <location>
@@ -18055,7 +17849,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Portugal -->
+        <!-- A city in Portugal -->
         <_name>Porto</_name>
         <coordinates>41.150000 -8.616667</coordinates>
         <location>
@@ -18065,7 +17859,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Portugal -->
+        <!-- A city in Portugal -->
         <_name>Porto Santo</_name>
         <coordinates>33.050000 -16.333333</coordinates>
         <location>
@@ -18075,9 +17869,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Portugal.
-             This is one of several cities in Portugal called "Santa
-             Cruz".
+        <!-- A city in Portugal.
+             One of several cities in Portugal called "Santa Cruz".
           -->
         <_name>Santa Cruz das Flores</_name>
         <coordinates>39.450000 -31.116667</coordinates>
@@ -18089,7 +17882,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Portugal -->
+        <!-- A city in Portugal -->
         <_name>Sintra</_name>
         <coordinates>38.800000 -9.383333</coordinates>
         <location>
@@ -18099,7 +17892,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Portugal -->
+        <!-- A city in Portugal -->
         <_name>Ãgua de Pena</_name>
         <coordinates>32.700000 -16.766667</coordinates>
         <location>
@@ -18120,7 +17913,7 @@
       </timezones>
       <tz-hint>Europe/Bucharest</tz-hint>
       <city>
-        <!-- Translators: this is a city in Romania -->
+        <!-- A city in Romania -->
         <_name>Arad</_name>
         <coordinates>46.183333 21.316667</coordinates>
         <location>
@@ -18130,7 +17923,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Romania -->
+        <!-- A city in Romania -->
         <_name>BacÄu</_name>
         <coordinates>46.566667 26.900000</coordinates>
         <location>
@@ -18140,7 +17933,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Romania -->
+        <!-- A city in Romania -->
         <_name>Baia Mare</_name>
         <coordinates>47.666667 23.583333</coordinates>
         <location>
@@ -18150,7 +17943,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Romania.
+        <!-- The capital of Romania.
              "Bucharest" is the traditional English name.
              The local name in Romanian is "BucureÅti".
           -->
@@ -18168,7 +17961,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Romania -->
+        <!-- A city in Romania -->
         <_name>Cluj-Napoca</_name>
         <coordinates>46.766667 23.600000</coordinates>
         <location>
@@ -18178,7 +17971,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Romania -->
+        <!-- A city in Romania -->
         <_name>Craiova</_name>
         <coordinates>44.316667 23.800000</coordinates>
         <location>
@@ -18188,7 +17981,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Romania -->
+        <!-- A city in Romania -->
         <_name>IaÅi</_name>
         <coordinates>47.166667 27.600000</coordinates>
         <location>
@@ -18198,7 +17991,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Romania -->
+        <!-- A city in Romania -->
         <_name>Mihail KogÄlniceanu</_name>
         <coordinates>44.366667 28.450000</coordinates>
         <location>
@@ -18208,7 +18001,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Romania -->
+        <!-- A city in Romania -->
         <_name>Oradea</_name>
         <coordinates>47.066667 21.933333</coordinates>
         <location>
@@ -18218,7 +18011,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Romania -->
+        <!-- A city in Romania -->
         <_name>Salcea</_name>
         <coordinates>47.650000 26.366667</coordinates>
         <location>
@@ -18228,7 +18021,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Romania -->
+        <!-- A city in Romania -->
         <_name>Satu Mare</_name>
         <coordinates>47.800000 22.883333</coordinates>
         <location>
@@ -18238,7 +18031,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Romania -->
+        <!-- A city in Romania -->
         <_name>Sibiu</_name>
         <coordinates>45.800000 24.150000</coordinates>
         <location>
@@ -18248,7 +18041,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Romania -->
+        <!-- A city in Romania -->
         <_name>Suceava</_name>
         <coordinates>47.633333 26.250000</coordinates>
         <location>
@@ -18258,7 +18051,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Romania -->
+        <!-- A city in Romania -->
         <_name>TimiÅoara</_name>
         <coordinates>45.749444 21.227222</coordinates>
         <location>
@@ -18268,7 +18061,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Romania -->
+        <!-- A city in Romania -->
         <_name>Tulcea</_name>
         <coordinates>45.166667 28.800000</coordinates>
         <location>
@@ -18278,7 +18071,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Romania -->
+        <!-- A city in Romania -->
         <_name>TÃrgu-MureÅ</_name>
         <coordinates>46.550000 24.566667</coordinates>
         <location>
@@ -18305,111 +18098,102 @@
       <fips-code>RS</fips-code>
       <timezones>
         <timezone id="Europe/Kaliningrad">
-          <!-- Translators: This is a Russian time zone, used in the
-               city and oblast of Kaliningrad on the Baltic sea. The
-               Russian name is "ÐÐÐÐÐÐÐÐÑÐÐÑÐÐÐ ÐÑÐÐÑ". This string is
-               only used in places where "Russia" is already clear from
-               context.
+          <!-- A Russian time zone, used in the city and oblast of
+               Kaliningrad on the Baltic sea. The Russian name is
+               "ÐÐÐÐÐÐÐÐÑÐÐÑÐÐÐ ÐÑÐÐÑ". This string is only used in
+               places where "Russia" is already clear from context.
             -->
           <_name>Kaliningrad Time</_name>
         </timezone>
         <timezone id="Europe/Moscow">
-          <!-- Translators: This is a Russian time zone, used in most
-               of the European part of Russia, including Moscow. The
-               Russian name is "ÐÐÑÐÐÐÑÐÐÐ ÐÑÐÐÑ". This string is only
-               used in places where "Russia" is already clear from
-               context.
+          <!-- A Russian time zone, used in most of the European part
+               of Russia, including Moscow. The Russian name is
+               "ÐÐÑÐÐÐÑÐÐÐ ÐÑÐÐÑ". This string is only used in places
+               where "Russia" is already clear from context.
             -->
           <_name>Moscow Time</_name>
           <obsoletes>Europe/Volgograd</obsoletes>
         </timezone>
         <timezone id="Europe/Samara">
-          <!-- Translators: This is a Russian time zone, used in the
-               Samara oblast and Udmurtia, on the eastern edge of
-               European Russia. The Russian name is "ÐÐÐÐÑÑÐÐÐ ÐÑÐÐÑ".
-               This string is only used in places where "Russia" is
-               already clear from context.
+          <!-- A Russian time zone, used in the Samara oblast and
+               Udmurtia, on the eastern edge of European Russia. The
+               Russian name is "ÐÐÐÐÑÑÐÐÐ ÐÑÐÐÑ". This string is only
+               used in places where "Russia" is already clear from
+               context.
             -->
           <_name>Samara Time</_name>
         </timezone>
         <timezone id="Asia/Yekaterinburg">
-          <!-- Translators: This is a Russian time zone, used along the
-               Ural mountains, including the city of Yekaterinburg. The
-               Russian name is "ÐÐÐÑÐÑÐÐÐÑÑÐÑÐÐÐ ÐÑÐÐÑ". This string is
-               only used in places where "Russia" is already clear from
-               context.
+          <!-- A Russian time zone, used along the Ural mountains,
+               including the city of Yekaterinburg. The Russian name is
+               "ÐÐÐÑÐÑÐÐÐÑÑÐÑÐÐÐ ÐÑÐÐÑ". This string is only used in
+               places where "Russia" is already clear from context.
             -->
           <_name>Yekaterinburg Time</_name>
         </timezone>
         <timezone id="Asia/Omsk">
-          <!-- Translators: This is a Russian time zone, used in the
-               Omsk and Novosibirsk oblasts and surrounding areas of
-               south-central Russia. The Russian name is "ÐÐÑÐÐÐ
-               ÐÑÐÐÑ". This string is only used in places where
-               "Russia" is already clear from context.
+          <!-- A Russian time zone, used in the Omsk and Novosibirsk
+               oblasts and surrounding areas of south-central Russia.
+               The Russian name is "ÐÐÑÐÐÐ ÐÑÐÐÑ". This string is only
+               used in places where "Russia" is already clear from
+               context.
             -->
           <_name>Omsk Time</_name>
           <obsoletes>Asia/Novosibirsk</obsoletes>
         </timezone>
         <timezone id="Asia/Krasnoyarsk">
-          <!-- Translators: This is a Russian time zone, used in the
-               Krasnoyarsk krai and surrounding areas of central
-               Russia. The Russian name is "ÐÑÐÑÐÐÑÑÑÐÐÐ ÐÑÐÐÑ". This
-               string is only used in places where "Russia" is already
-               clear from context.
+          <!-- A Russian time zone, used in the Krasnoyarsk krai and
+               surrounding areas of central Russia. The Russian name is
+               "ÐÑÐÑÐÐÑÑÑÐÐÐ ÐÑÐÐÑ". This string is only used in places
+               where "Russia" is already clear from context.
             -->
           <_name>Krasnoyarsk Time</_name>
         </timezone>
         <timezone id="Asia/Irkutsk">
-          <!-- Translators: This is a Russian time zone, used in the
-               Irkutsk oblast and surrounding areas of south-central
-               Russia. The Russian name is "ÐÑÐÑÑÑÐÐÐ ÐÑÐÐÑ". This
-               string is only used in places where "Russia" is already
-               clear from context.
+          <!-- A Russian time zone, used in the Irkutsk oblast and
+               surrounding areas of south-central Russia. The Russian
+               name is "ÐÑÐÑÑÑÐÐÐ ÐÑÐÐÑ". This string is only used in
+               places where "Russia" is already clear from context.
             -->
           <_name>Irkutsk Time</_name>
         </timezone>
         <timezone id="Asia/Yakutsk">
-          <!-- Translators: This is a Russian time zone, used in the
-               city of Yakutsk and surrounding areas of east-central
-               Russia. The Russian name is "ÐÐÑÑÑÐÐÐ ÐÑÐÐÑ". This
-               string is only used in places where "Russia" is already
-               clear from context.
+          <!-- A Russian time zone, used in the city of Yakutsk and
+               surrounding areas of east-central Russia. The Russian
+               name is "ÐÐÑÑÑÐÐÐ ÐÑÐÐÑ". This string is only used in
+               places where "Russia" is already clear from context.
             -->
           <_name>Yakutsk Time</_name>
         </timezone>
         <timezone id="Asia/Vladivostok">
-          <!-- Translators: This is a Russian time zone, used in the
-               city of Vladivostok and surrounding areas of eastern
-               Russia. The Russian name is "ÐÐÐÐÐÐÐÑÑÐÐÑÐÐÐ ÐÑÐÐÑ".
-               This string is only used in places where "Russia" is
-               already clear from context.
+          <!-- A Russian time zone, used in the city of Vladivostok and
+               surrounding areas of eastern Russia. The Russian name is
+               "ÐÐÐÐÐÐÐÑÑÐÐÑÐÐÐ ÐÑÐÐÑ". This string is only used in
+               places where "Russia" is already clear from context.
             -->
           <_name>Vladivostok Time</_name>
           <obsoletes>Asia/Sakhalin</obsoletes>
         </timezone>
         <timezone id="Asia/Magadan">
-          <!-- Translators: This is a Russian time zone, used in the
-               Magadan oblast and surrounding areas of eastern Russia.
-               The Russian name is "ÐÐÐÐÐÐÐÑÐÐÐ ÐÑÐÐÑ". This string is
-               only used in places where "Russia" is already clear from
-               context.
+          <!-- A Russian time zone, used in the Magadan oblast and
+               surrounding areas of eastern Russia. The Russian name is
+               "ÐÐÐÐÐÐÐÑÐÐÐ ÐÑÐÐÑ". This string is only used in places
+               where "Russia" is already clear from context.
             -->
           <_name>Magadan Time</_name>
         </timezone>
         <timezone id="Asia/Kamchatka">
-          <!-- Translators: This is a Russian time zone, used in the
-               Kamchatka krai and Chukotka okrug of far-eastern Russia.
-               The Russian name is "ÐÐÐÑÐÑÑÐÐÐ ÐÑÐÐÑ". This string is
-               only used in places where "Russia" is already clear from
-               context.
+          <!-- A Russian time zone, used in the Kamchatka krai and
+               Chukotka okrug of far-eastern Russia. The Russian name
+               is "ÐÐÐÑÐÑÑÐÐÐ ÐÑÐÐÑ". This string is only used in
+               places where "Russia" is already clear from context.
             -->
           <_name>Kamchatka Time</_name>
           <obsoletes>Asia/Anadyr</obsoletes>
         </timezone>
       </timezones>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÐÐÐÐ".
           -->
         <_name>Abakan</_name>
@@ -18422,7 +18206,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÐÐÑ".
           -->
         <_name>Adler</_name>
@@ -18435,7 +18219,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÐÐÑÑÑ".
           -->
         <_name>Anadyr'</_name>
@@ -18448,7 +18232,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÐÐÐ".
           -->
         <_name>Anapa</_name>
@@ -18461,7 +18245,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÑÑÐÐÐÐÐÑÑÐ".
           -->
         <_name>Arkhangel'sk</_name>
@@ -18474,7 +18258,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÑÑÑÐÑÐÐÑ".
           -->
         <_name>Astrakhan'</_name>
@@ -18487,7 +18271,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÑÐÐÑÐ".
           -->
         <_name>Barnaul</_name>
@@ -18500,7 +18284,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÑÐÑÐ".
           -->
         <_name>Bratsk</_name>
@@ -18513,7 +18297,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÑÑÐÑÐ".
           -->
         <_name>Bryansk</_name>
@@ -18526,7 +18310,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÐÑÐÐÐÑÐ".
           -->
         <_name>Chelyabinsk</_name>
@@ -18539,7 +18323,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÑÐ".
           -->
         <_name>Chita</_name>
@@ -18552,7 +18336,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÑÐÑÐÐÐ".
           -->
         <_name>Chul'man</_name>
@@ -18565,7 +18349,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÐÐÐÑÑ".
           -->
         <_name>Engel's</_name>
@@ -18578,7 +18362,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÑÐÑÑÐ".
           -->
         <_name>Irkutsk</_name>
@@ -18591,7 +18375,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÐÐÐÐÐÐÑÐÐ".
           -->
         <_name>Kaliningrad</_name>
@@ -18604,7 +18388,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÐÐÐÑ".
           -->
         <_name>Kazan'</_name>
@@ -18617,7 +18401,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÐÐÑÐÐÐ".
           -->
         <_name>Kemerovo</_name>
@@ -18630,7 +18414,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÐÐÑÐÐÑÐ".
           -->
         <_name>Khabarovsk</_name>
@@ -18643,7 +18427,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÐÑÑ-ÐÐÐÑÐÐÑÐ".
           -->
         <_name>Khanty-Mansiysk</_name>
@@ -18655,7 +18439,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÑÐÑÐÐÐÐÑ".
           -->
         <_name>Krasnodar</_name>
@@ -18668,7 +18452,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÐÐÐÐÐ".
           -->
         <_name>Magadan</_name>
@@ -18681,7 +18465,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÑÐÐÐÐÐÑÐ".
           -->
         <_name>Mikhaylovsk</_name>
@@ -18694,7 +18478,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÐÐÑÐÐÑÐÑÐ ÐÐÐÑ".
           -->
         <_name>Mineral'nyye Vody</_name>
@@ -18707,7 +18491,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÑÐÑÐ".
           -->
         <_name>Mirnyy</_name>
@@ -18720,11 +18504,11 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Russia.
+        <!-- The capital of Russia.
              "Moscow" is the traditional English name.
              The local name in Russian is "Moskva / ÐÐÑÐÐÐ".
           -->
-        <_name>Moscow</_name>
+        <_name msgctxt="City in Russia">Moscow</_name>
         <coordinates>55.752222 37.615556</coordinates>
         <location>
           <name>Vnukovo Airport</name>
@@ -18746,7 +18530,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÑÑÐÐÐÑÐ".
           -->
         <_name>Murmansk</_name>
@@ -18759,7 +18543,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÐÑÑÐÐ".
           -->
         <_name>Nal'chik</_name>
@@ -18772,7 +18556,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÐÐÐÐÐÑÑÐÐÑÐ".
           -->
         <_name>Nizhnevartovsk</_name>
@@ -18785,7 +18569,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÐÐÐÑÐÐÐÑÐ".
           -->
         <_name>Novokuznetsk</_name>
@@ -18798,7 +18582,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÐÐÑÐÐÐÑÑÐ".
           -->
         <_name>Novosibirsk</_name>
@@ -18811,7 +18595,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÑÐ".
           -->
         <_name>Omsk</_name>
@@ -18824,7 +18608,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÑÐÐÐÑÑÐ".
           -->
         <_name>Orenburg</_name>
@@ -18837,7 +18621,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÐÐÐ".
           -->
         <_name>Penza</_name>
@@ -18850,7 +18634,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÑÐÑ".
           -->
         <_name>Perm'</_name>
@@ -18863,7 +18647,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÑÑÐÐÐÐÐÐÐÑÐ-ÐÐÐÑÐÑÑÐÐÐ".
           -->
         <_name>Petropavlovsk</_name>
@@ -18876,7 +18660,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÑÑÐÐ-ÐÐ-ÐÐÐÑ".
           -->
         <_name>Rostov</_name>
@@ -18889,7 +18673,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              "Saint Petersburg" is the traditional English name.
              The local name in Russian is "Sankt-Peterburg /
              ÐÐÐÐÑ-ÐÐÑÐÑÐÑÑÐ".
@@ -18904,7 +18688,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÐÐÐÑÐ".
           -->
         <_name>Samara</_name>
@@ -18917,7 +18701,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia -->
+        <!-- A city in Russia -->
         <_name>Saratov</_name>
         <coordinates>51.540556 46.008611</coordinates>
         <location>
@@ -18928,7 +18712,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÑÐÐÑÐÐÐÐÑ".
           -->
         <_name>Stavropol'</_name>
@@ -18941,7 +18725,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÑÑÐÐÐÐÐ".
           -->
         <_name>Strigino</_name>
@@ -18954,7 +18738,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia.
+        <!-- A city in Russia.
              The local name in Russian is "ÐÑÑÐÑÑ".
           -->
         <_name>Surgut</_name>
@@ -18967,7 +18751,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia -->
+        <!-- A city in Russia -->
         <_name>Syktyvkar</_name>
         <coordinates>61.666667 50.812222</coordinates>
         <location>
@@ -18978,7 +18762,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia -->
+        <!-- A city in Russia -->
         <_name>Tiksi</_name>
         <coordinates>71.687222 128.869444</coordinates>
         <location>
@@ -18989,7 +18773,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia -->
+        <!-- A city in Russia -->
         <_name>Udachnyy</_name>
         <coordinates>66.416667 112.400000</coordinates>
         <location>
@@ -19000,7 +18784,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia -->
+        <!-- A city in Russia -->
         <_name>Ufa</_name>
         <coordinates>54.775000 56.037500</coordinates>
         <location>
@@ -19011,7 +18795,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia -->
+        <!-- A city in Russia -->
         <_name>Ul'yanovsk</_name>
         <coordinates>54.316944 48.366111</coordinates>
         <location>
@@ -19021,7 +18805,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia -->
+        <!-- A city in Russia -->
         <_name>Ulan-Ude</_name>
         <coordinates>51.826053 107.609794</coordinates>
         <location>
@@ -19032,7 +18816,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia -->
+        <!-- A city in Russia -->
         <_name>Velikiye Luki</_name>
         <coordinates>56.340000 30.534722</coordinates>
         <location>
@@ -19043,7 +18827,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia -->
+        <!-- A city in Russia -->
         <_name>Vladivostok</_name>
         <coordinates>43.128056 131.901111</coordinates>
         <location>
@@ -19054,7 +18838,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia -->
+        <!-- A city in Russia -->
         <_name>Volgograd</_name>
         <coordinates>48.804722 44.585833</coordinates>
         <location>
@@ -19065,7 +18849,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia -->
+        <!-- A city in Russia -->
         <_name>Voronezh</_name>
         <coordinates>51.669905 39.192267</coordinates>
         <location>
@@ -19076,7 +18860,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia -->
+        <!-- A city in Russia -->
         <_name>Yakutsk</_name>
         <coordinates>62.033889 129.733056</coordinates>
         <location>
@@ -19087,7 +18871,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia -->
+        <!-- A city in Russia -->
         <_name>Yekaterinburg</_name>
         <coordinates>56.857500 60.612500</coordinates>
         <location>
@@ -19098,7 +18882,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Russia -->
+        <!-- A city in Russia -->
         <_name>Yuzhno-Sakhalinsk</_name>
         <coordinates>46.958116 142.733665</coordinates>
         <location>
@@ -19111,7 +18895,7 @@
     </country>
     <country>
       <!-- SM - San Marino -->
-      <_name>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 
@@ -19123,8 +18907,8 @@
       </timezones>
       <tz-hint>Europe/San_Marino</tz-hint>
       <city>
-        <!-- Translators: this is the capital of San Marino -->
-        <_name>San Marino</_name>
+        <!-- The capital of San Marino -->
+        <_name msgctxt="City in San Marino">San Marino</_name>
         <coordinates>43.933333 12.450000</coordinates>
         <location>
           <name>Rimini</name>
@@ -19143,7 +18927,7 @@
       </timezones>
       <tz-hint>Europe/Belgrade</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Serbia.
+        <!-- The capital of Serbia.
              "Belgrade" is the traditional English name.
              The local name in Serbian is "Beograd".
           -->
@@ -19156,7 +18940,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Serbia -->
+        <!-- A city in Serbia -->
         <_name>NiÅ</_name>
         <coordinates>43.324722 21.903333</coordinates>
         <location>
@@ -19166,7 +18950,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Serbia -->
+        <!-- A city in Serbia -->
         <_name>SurÄin</_name>
         <coordinates>44.793056 20.280278</coordinates>
         <location>
@@ -19176,7 +18960,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Serbia -->
+        <!-- A city in Serbia -->
         <_name>VrÅac</_name>
         <coordinates>45.116667 21.303611</coordinates>
         <location>
@@ -19186,7 +18970,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Serbia -->
+        <!-- A city in Serbia -->
         <_name>Zemun</_name>
         <coordinates>44.843056 20.401111</coordinates>
         <location>
@@ -19206,7 +18990,7 @@
       </timezones>
       <tz-hint>Europe/Bratislava</tz-hint>
       <city>
-        <!-- Translators: this is a city in Slovakia -->
+        <!-- A city in Slovakia -->
         <_name>Barca</_name>
         <coordinates>48.683333 21.266667</coordinates>
         <location>
@@ -19216,7 +19000,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Slovakia -->
+        <!-- The capital of Slovakia -->
         <_name>Bratislava</_name>
         <coordinates>48.150000 17.116667</coordinates>
         <location>
@@ -19226,7 +19010,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Slovakia -->
+        <!-- A city in Slovakia -->
         <_name>Dolnà HriÄov</_name>
         <coordinates>49.233333 18.633333</coordinates>
         <location>
@@ -19236,7 +19020,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Slovakia -->
+        <!-- A city in Slovakia -->
         <_name>Kamenica nad Cirochou</_name>
         <coordinates>48.933333 22.000000</coordinates>
         <location>
@@ -19246,7 +19030,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Slovakia -->
+        <!-- A city in Slovakia -->
         <_name>KoÅice</_name>
         <coordinates>48.716667 21.250000</coordinates>
         <location>
@@ -19256,7 +19040,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Slovakia -->
+        <!-- A city in Slovakia -->
         <_name>LuÄenec</_name>
         <coordinates>48.333333 19.666667</coordinates>
         <location>
@@ -19266,7 +19050,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Slovakia -->
+        <!-- A city in Slovakia -->
         <_name>Nitra</_name>
         <coordinates>48.316667 18.083333</coordinates>
         <location>
@@ -19276,7 +19060,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Slovakia -->
+        <!-- A city in Slovakia -->
         <_name>PieÅÅany</_name>
         <coordinates>48.600000 17.833333</coordinates>
         <location>
@@ -19286,7 +19070,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Slovakia -->
+        <!-- A city in Slovakia -->
         <_name>Poprad</_name>
         <coordinates>49.050000 20.300000</coordinates>
         <location>
@@ -19296,7 +19080,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Slovakia -->
+        <!-- A city in Slovakia -->
         <_name>Prievidza</_name>
         <coordinates>48.766667 18.633333</coordinates>
         <location>
@@ -19306,7 +19090,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Slovakia -->
+        <!-- A city in Slovakia -->
         <_name>SliaÄ</_name>
         <coordinates>48.616667 19.183333</coordinates>
         <location>
@@ -19330,7 +19114,7 @@
       </timezones>
       <tz-hint>Europe/Ljubljana</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Slovenia -->
+        <!-- The capital of Slovenia -->
         <_name>Ljubljana</_name>
         <coordinates>46.055278 14.514444</coordinates>
         <location>
@@ -19340,7 +19124,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Slovenia -->
+        <!-- A city in Slovenia -->
         <_name>Maribor</_name>
         <coordinates>46.554722 15.646667</coordinates>
         <location>
@@ -19350,7 +19134,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Slovenia -->
+        <!-- A city in Slovenia -->
         <_name>PortoroÅ</_name>
         <coordinates>45.516111 13.588333</coordinates>
         <location>
@@ -19371,27 +19155,29 @@
       <fips-code>SP</fips-code>
       <timezones>
         <timezone id="Atlantic/Canary">
+          <!-- This refers to the time zone for the Canary Islands. The
+               string is only used in places where "Spain" is already
+               clear from context.
+            -->
           <_name>Canary Islands</_name>
         </timezone>
         <timezone id="Europe/Madrid">
-          <!-- Translators: This refers to the time zone for mainland
-               Spain (as opposed to the time zone for the Canary
-               Islands).
+          <!-- This refers to the time zone for mainland Spain (as
+               opposed to the time zone for the Canary Islands).
             -->
           <_name>Mainland Spain</_name>
         </timezone>
         <timezone id="Africa/Ceuta">
-          <!-- Translators: This is 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.
+          <!-- 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>
         </timezone>
       </timezones>
       <tz-hint>Europe/Madrid</tz-hint>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>A CoruÃa</_name>
         <coordinates>43.366667 -8.383333</coordinates>
         <location>
@@ -19401,7 +19187,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Agoncillo</_name>
         <coordinates>42.450000 -2.283333</coordinates>
         <location>
@@ -19411,7 +19197,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Alcantarilla</_name>
         <coordinates>37.966667 -1.216667</coordinates>
         <location>
@@ -19421,7 +19207,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Alicante</_name>
         <coordinates>38.350000 -0.483333</coordinates>
         <location>
@@ -19431,7 +19217,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>AlmerÃa</_name>
         <coordinates>36.833333 -2.450000</coordinates>
         <location>
@@ -19441,7 +19227,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Armilla</_name>
         <coordinates>37.150000 -3.616667</coordinates>
         <location>
@@ -19451,7 +19237,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Atogo</_name>
         <coordinates>28.050000 -16.583333</coordinates>
         <location>
@@ -19462,7 +19248,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>AvilÃs</_name>
         <coordinates>43.556944 -5.924722</coordinates>
         <location>
@@ -19472,7 +19258,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Barajas</_name>
         <coordinates>40.483333 -3.583333</coordinates>
         <location>
@@ -19482,8 +19268,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
-        <_name>Barcelona</_name>
+        <!-- A city in Spain -->
+        <_name msgctxt="City in Spain">Barcelona</_name>
         <coordinates>41.383333 2.183333</coordinates>
         <location>
           <name>Barcelona Airport</name>
@@ -19492,7 +19278,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Bilbao</_name>
         <coordinates>43.250000 -2.966667</coordinates>
         <location>
@@ -19502,7 +19288,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Colmenar Viejo</_name>
         <coordinates>40.666667 -3.766667</coordinates>
         <location>
@@ -19512,7 +19298,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Corcovados</_name>
         <coordinates>28.616667 -17.750000</coordinates>
         <location>
@@ -19523,7 +19309,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Cuatro Vientos</_name>
         <coordinates>40.383333 -3.783333</coordinates>
         <location>
@@ -19533,8 +19319,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
-        <_name>CÃrdoba</_name>
+        <!-- A city in Spain -->
+        <_name msgctxt="City in Spain">CÃrdoba</_name>
         <coordinates>37.883333 -4.766667</coordinates>
         <location>
           <name>CÃrdoba Airport</name>
@@ -19543,7 +19329,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>El Matorral</_name>
         <coordinates>28.433333 -13.866667</coordinates>
         <location>
@@ -19554,7 +19340,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>FuenterrabÃa</_name>
         <coordinates>43.366667 -1.783333</coordinates>
         <location>
@@ -19564,7 +19350,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Gando</_name>
         <coordinates>27.950000 -15.366667</coordinates>
         <location>
@@ -19575,7 +19361,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Gerona</_name>
         <coordinates>41.983333 2.816667</coordinates>
         <location>
@@ -19585,7 +19371,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Getafe</_name>
         <coordinates>40.300000 -3.716667</coordinates>
         <location>
@@ -19595,7 +19381,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Granada</_name>
         <coordinates>37.183333 -3.600000</coordinates>
         <location>
@@ -19605,7 +19391,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>GÃime</_name>
         <coordinates>28.966667 -13.600000</coordinates>
         <location>
@@ -19616,7 +19402,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Ibiza</_name>
         <coordinates>38.900000 1.433333</coordinates>
         <location>
@@ -19626,7 +19412,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Jerez</_name>
         <coordinates>36.683333 -6.133333</coordinates>
         <location>
@@ -19636,8 +19422,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
-        <_name>LeÃn</_name>
+        <!-- A city in Spain -->
+        <_name msgctxt="City in Spain">LeÃn</_name>
         <coordinates>42.600000 -5.566667</coordinates>
         <location>
           <name>LeÃn Airport, Virgen del Camino</name>
@@ -19646,7 +19432,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Los BaldÃos</_name>
         <coordinates>28.466667 -16.316667</coordinates>
         <location>
@@ -19657,7 +19443,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Los Llanos</_name>
         <coordinates>38.916667 -1.850000</coordinates>
         <location>
@@ -19667,7 +19453,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Spain -->
+        <!-- The capital of Spain -->
         <_name>Madrid</_name>
         <coordinates>40.400000 -3.683333</coordinates>
         <location>
@@ -19677,7 +19463,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>MahÃn</_name>
         <coordinates>39.883333 4.250000</coordinates>
         <location>
@@ -19687,7 +19473,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Melilla</_name>
         <coordinates>35.316667 -2.950000</coordinates>
         <location>
@@ -19697,7 +19483,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>MorÃn</_name>
         <coordinates>37.133333 -5.450000</coordinates>
         <location>
@@ -19707,7 +19493,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>MÃlaga</_name>
         <coordinates>36.716667 -4.416667</coordinates>
         <location>
@@ -19717,7 +19503,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>NoÃin</_name>
         <coordinates>42.750000 -1.633333</coordinates>
         <location>
@@ -19727,7 +19513,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Palma</_name>
         <coordinates>39.566667 2.650000</coordinates>
         <location>
@@ -19737,7 +19523,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Reus</_name>
         <coordinates>41.150000 1.116667</coordinates>
         <location>
@@ -19747,7 +19533,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Rota</_name>
         <coordinates>36.616667 -6.350000</coordinates>
         <location>
@@ -19757,7 +19543,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Sabadell</_name>
         <coordinates>41.550000 2.100000</coordinates>
         <location>
@@ -19767,7 +19553,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Salamanca</_name>
         <coordinates>40.966667 -5.650000</coordinates>
         <location>
@@ -19777,7 +19563,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>San Javier</_name>
         <coordinates>37.800000 -0.850000</coordinates>
         <location>
@@ -19787,7 +19573,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>San Pablo</_name>
         <coordinates>37.416667 -5.883333</coordinates>
         <location>
@@ -19797,7 +19583,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Santander</_name>
         <coordinates>43.464722 -3.804444</coordinates>
         <location>
@@ -19807,8 +19593,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
-        <_name>Santiago</_name>
+        <!-- A city in Spain -->
+        <_name msgctxt="City in Spain">Santiago</_name>
         <coordinates>42.883333 -8.550000</coordinates>
         <location>
           <name>Santiago Airport, Labacolla</name>
@@ -19817,7 +19603,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Talavera la Real</_name>
         <coordinates>38.883333 -6.766667</coordinates>
         <location>
@@ -19827,7 +19613,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Tamaduste</_name>
         <coordinates>27.816667 -17.883333</coordinates>
         <location>
@@ -19838,7 +19624,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>TorrejÃn del Rey</_name>
         <coordinates>40.650000 -3.333333</coordinates>
         <location>
@@ -19848,8 +19634,8 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
-        <_name>Valencia</_name>
+        <!-- A city in Spain -->
+        <_name msgctxt="City in Spain">Valencia</_name>
         <coordinates>39.466667 -0.366667</coordinates>
         <location>
           <name>Valencia Airport</name>
@@ -19858,7 +19644,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Vigo</_name>
         <coordinates>42.233333 -8.716667</coordinates>
         <location>
@@ -19868,7 +19654,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Villanubla</_name>
         <coordinates>41.700000 -4.833333</coordinates>
         <location>
@@ -19878,7 +19664,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Vitoria-Gasteiz</_name>
         <coordinates>42.850000 -2.666667</coordinates>
         <location>
@@ -19888,7 +19674,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Spain -->
+        <!-- A city in Spain -->
         <_name>Zaragoza</_name>
         <coordinates>41.633333 -0.883333</coordinates>
         <location>
@@ -19915,7 +19701,7 @@
       </timezones>
       <tz-hint>Arctic/Longyearbyen</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Svalbard and Jan Mayen -->
+        <!-- The capital of Svalbard and Jan Mayen -->
         <_name>Longyearbyen</_name>
         <coordinates>78.216667 15.633333</coordinates>
         <location>
@@ -19939,7 +19725,7 @@
       </timezones>
       <tz-hint>Europe/Stockholm</tz-hint>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>BorlÃnge</_name>
         <coordinates>60.483333 15.416667</coordinates>
         <location>
@@ -19949,7 +19735,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>GÃllivare</_name>
         <coordinates>67.133333 20.700000</coordinates>
         <location>
@@ -19959,7 +19745,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>GÃteborg</_name>
         <coordinates>57.716667 11.966667</coordinates>
         <location>
@@ -19974,7 +19760,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>Halmstad</_name>
         <coordinates>56.671389 12.855556</coordinates>
         <location>
@@ -19984,7 +19770,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>JÃnkÃping</_name>
         <coordinates>57.783333 14.183333</coordinates>
         <location>
@@ -19994,7 +19780,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>Kalmar</_name>
         <coordinates>56.666667 16.366667</coordinates>
         <location>
@@ -20004,7 +19790,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>Karlstad</_name>
         <coordinates>59.366667 13.500000</coordinates>
         <location>
@@ -20014,7 +19800,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>Kiruna</_name>
         <coordinates>67.850000 20.216667</coordinates>
         <location>
@@ -20024,7 +19810,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>Kramfors</_name>
         <coordinates>62.933333 17.792500</coordinates>
         <location>
@@ -20034,7 +19820,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>Kristianstad</_name>
         <coordinates>56.033333 14.133333</coordinates>
         <location>
@@ -20044,7 +19830,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>LinkÃping</_name>
         <coordinates>58.416667 15.616667</coordinates>
         <location>
@@ -20054,7 +19840,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>Ljungbyhed</_name>
         <coordinates>56.066667 13.216667</coordinates>
         <location>
@@ -20064,7 +19850,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>LuleÃ</_name>
         <coordinates>65.583333 22.150000</coordinates>
         <location>
@@ -20074,7 +19860,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>Lycksele</_name>
         <coordinates>64.600000 18.666667</coordinates>
         <location>
@@ -20084,7 +19870,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>MalmÃ</_name>
         <coordinates>55.600000 13.000000</coordinates>
         <location>
@@ -20094,7 +19880,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>NorrkÃping</_name>
         <coordinates>58.600000 16.183333</coordinates>
         <location>
@@ -20104,7 +19890,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>NykÃping</_name>
         <coordinates>58.750000 17.000000</coordinates>
         <location>
@@ -20114,7 +19900,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>Ronneby</_name>
         <coordinates>56.200000 15.300000</coordinates>
         <location>
@@ -20124,7 +19910,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>SkellefteÃ</_name>
         <coordinates>64.766667 20.950000</coordinates>
         <location>
@@ -20134,7 +19920,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>SkÃvde</_name>
         <coordinates>58.400000 13.850000</coordinates>
         <location>
@@ -20144,7 +19930,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Sweden -->
+        <!-- The capital of Sweden -->
         <_name>Stockholm</_name>
         <coordinates>59.333333 18.050000</coordinates>
         <location>
@@ -20159,7 +19945,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>Sundsvall</_name>
         <coordinates>62.383333 17.300000</coordinates>
         <location>
@@ -20169,7 +19955,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>SÃderhamn</_name>
         <coordinates>61.300000 17.050000</coordinates>
         <location>
@@ -20179,7 +19965,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>UmeÃ</_name>
         <coordinates>63.833333 20.250000</coordinates>
         <location>
@@ -20189,7 +19975,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>Visby</_name>
         <coordinates>57.633333 18.300000</coordinates>
         <location>
@@ -20199,7 +19985,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>VÃsterÃs</_name>
         <coordinates>59.616667 16.550000</coordinates>
         <location>
@@ -20209,7 +19995,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>VÃxjÃ</_name>
         <coordinates>56.883333 14.816667</coordinates>
         <location>
@@ -20219,7 +20005,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>Ãngelholm</_name>
         <coordinates>56.250000 12.866667</coordinates>
         <location>
@@ -20229,7 +20015,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>Ãrebro</_name>
         <coordinates>59.283333 15.216667</coordinates>
         <location>
@@ -20239,7 +20025,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Sweden -->
+        <!-- A city in Sweden -->
         <_name>ÃrnskÃldsvik</_name>
         <coordinates>63.300000 18.716667</coordinates>
         <location>
@@ -20263,7 +20049,7 @@
       </timezones>
       <tz-hint>Europe/Zurich</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Switzerland -->
+        <!-- The capital of Switzerland -->
         <_name>Bern</_name>
         <coordinates>46.916667 7.466667</coordinates>
         <location>
@@ -20273,7 +20059,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Switzerland.
+        <!-- A city in Switzerland.
              "Geneva" is the traditional English name.
              The local name is "GenÃve".
           -->
@@ -20286,7 +20072,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Switzerland -->
+        <!-- A city in Switzerland -->
         <_name>Grenchen</_name>
         <coordinates>47.183333 7.383333</coordinates>
         <location>
@@ -20296,7 +20082,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Switzerland -->
+        <!-- A city in Switzerland -->
         <_name>Lugano</_name>
         <coordinates>46.000000 8.966667</coordinates>
         <location>
@@ -20306,7 +20092,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Switzerland -->
+        <!-- A city in Switzerland -->
         <_name>NeuchÃtel</_name>
         <coordinates>47.000000 6.966667</coordinates>
         <location>
@@ -20316,7 +20102,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Switzerland -->
+        <!-- A city in Switzerland -->
         <_name>Sankt Gallen</_name>
         <coordinates>47.466667 9.400000</coordinates>
         <location>
@@ -20326,7 +20112,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Switzerland -->
+        <!-- A city in Switzerland -->
         <_name>Sion</_name>
         <coordinates>46.233333 7.350000</coordinates>
         <location>
@@ -20336,7 +20122,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Switzerland -->
+        <!-- A city in Switzerland -->
         <_name>ZÃrich</_name>
         <coordinates>47.366667 8.550000</coordinates>
         <location>
@@ -20360,7 +20146,7 @@
       </timezones>
       <tz-hint>Europe/Istanbul</tz-hint>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Adana</_name>
         <coordinates>37.001667 35.328889</coordinates>
         <location>
@@ -20375,7 +20161,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Turkey -->
+        <!-- The capital of Turkey -->
         <_name>Ankara</_name>
         <coordinates>39.927222 32.864444</coordinates>
         <location>
@@ -20395,7 +20181,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Antalya</_name>
         <coordinates>36.912500 30.689722</coordinates>
         <location>
@@ -20405,7 +20191,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Balikesir</_name>
         <coordinates>39.649167 27.886111</coordinates>
         <location>
@@ -20415,7 +20201,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Bandirma</_name>
         <coordinates>40.352222 27.976667</coordinates>
         <location>
@@ -20425,7 +20211,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Bodrum</_name>
         <coordinates>37.038333 27.429167</coordinates>
         <location>
@@ -20435,7 +20221,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Burdur</_name>
         <coordinates>37.720278 30.290833</coordinates>
         <location>
@@ -20445,7 +20231,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Bursa</_name>
         <coordinates>40.191667 29.061111</coordinates>
         <location>
@@ -20455,7 +20241,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Corlu</_name>
         <coordinates>41.159167 27.800000</coordinates>
         <location>
@@ -20465,7 +20251,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Dalaman</_name>
         <coordinates>36.765000 28.804167</coordinates>
         <location>
@@ -20475,7 +20261,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Diyarbakir</_name>
         <coordinates>37.915833 40.218889</coordinates>
         <location>
@@ -20485,7 +20271,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Erzurum</_name>
         <coordinates>39.908611 41.276944</coordinates>
         <location>
@@ -20495,7 +20281,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Eskisehir</_name>
         <coordinates>39.776667 30.520556</coordinates>
         <location>
@@ -20505,7 +20291,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Gaziantep</_name>
         <coordinates>37.059444 37.382500</coordinates>
         <location>
@@ -20515,7 +20301,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Istanbul</_name>
         <coordinates>41.018611 28.964722</coordinates>
         <location>
@@ -20530,7 +20316,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Izmir</_name>
         <coordinates>38.410375 27.142010</coordinates>
         <location>
@@ -20545,7 +20331,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Kars</_name>
         <coordinates>40.608056 43.097500</coordinates>
         <location>
@@ -20555,7 +20341,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Kayseri</_name>
         <coordinates>38.732222 35.485278</coordinates>
         <location>
@@ -20565,7 +20351,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Kislakoy</_name>
         <coordinates>40.099082 32.602115</coordinates>
         <location>
@@ -20575,7 +20361,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Konya</_name>
         <coordinates>37.865556 32.482500</coordinates>
         <location>
@@ -20585,7 +20371,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Malatya</_name>
         <coordinates>38.353333 38.311944</coordinates>
         <location>
@@ -20595,7 +20381,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Merzifon</_name>
         <coordinates>40.873333 35.463056</coordinates>
         <location>
@@ -20605,7 +20391,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Nevsehir</_name>
         <coordinates>38.625000 34.712222</coordinates>
         <location>
@@ -20615,7 +20401,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Samsun</_name>
         <coordinates>41.286667 36.330000</coordinates>
         <location>
@@ -20625,7 +20411,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Tepetarla</_name>
         <coordinates>40.750000 30.066667</coordinates>
         <location>
@@ -20635,7 +20421,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Trabzon</_name>
         <coordinates>41.005000 39.726944</coordinates>
         <location>
@@ -20645,7 +20431,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Turkey -->
+        <!-- A city in Turkey -->
         <_name>Van</_name>
         <coordinates>38.494167 43.380000</coordinates>
         <location>
@@ -20673,7 +20459,7 @@
       </timezones>
       <tz-hint>Europe/Kiev</tz-hint>
       <city>
-        <!-- Translators: this is a city in Ukraine -->
+        <!-- A city in Ukraine -->
         <_name>Boryspil'</_name>
         <coordinates>50.350000 30.950000</coordinates>
         <location>
@@ -20683,7 +20469,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Ukraine -->
+        <!-- A city in Ukraine -->
         <_name>Chagor</_name>
         <coordinates>48.250000 25.983333</coordinates>
         <location>
@@ -20693,7 +20479,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Ukraine -->
+        <!-- A city in Ukraine -->
         <_name>Dnipropetrovs'k</_name>
         <coordinates>48.450000 34.983333</coordinates>
         <location>
@@ -20703,7 +20489,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Ukraine -->
+        <!-- A city in Ukraine -->
         <_name>Donets'k</_name>
         <coordinates>48.000000 37.800000</coordinates>
         <location>
@@ -20713,7 +20499,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Ukraine -->
+        <!-- A city in Ukraine -->
         <_name>Hostomel'</_name>
         <coordinates>50.583333 30.266667</coordinates>
         <location>
@@ -20723,7 +20509,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Ukraine -->
+        <!-- A city in Ukraine -->
         <_name>Ivano-Frankivs'k</_name>
         <coordinates>48.917222 24.707222</coordinates>
         <location>
@@ -20733,7 +20519,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Ukraine -->
+        <!-- A city in Ukraine -->
         <_name>Kharkiv</_name>
         <coordinates>50.000000 36.250000</coordinates>
         <location>
@@ -20743,7 +20529,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Ukraine.
+        <!-- The capital of Ukraine.
              "Kiev" is the traditional English name.
              The local name in Ukrainian is "Kyyiv".
           -->
@@ -20756,7 +20542,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Ukraine -->
+        <!-- A city in Ukraine -->
         <_name>Kryvyy Rih</_name>
         <coordinates>47.916667 33.350000</coordinates>
         <location>
@@ -20766,7 +20552,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Ukraine -->
+        <!-- A city in Ukraine -->
         <_name>L'viv</_name>
         <coordinates>49.833333 24.000000</coordinates>
         <location>
@@ -20776,7 +20562,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Ukraine -->
+        <!-- A city in Ukraine -->
         <_name>Mokroye</_name>
         <coordinates>47.816667 35.250000</coordinates>
         <location>
@@ -20786,7 +20572,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Ukraine -->
+        <!-- A city in Ukraine -->
         <_name>Mykolayiv</_name>
         <coordinates>46.966667 32.000000</coordinates>
         <location>
@@ -20796,7 +20582,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Ukraine -->
+        <!-- A city in Ukraine -->
         <_name>Odesa</_name>
         <coordinates>46.466667 30.733333</coordinates>
         <location>
@@ -20806,7 +20592,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Ukraine -->
+        <!-- A city in Ukraine -->
         <_name>Rivne</_name>
         <coordinates>50.616667 26.250000</coordinates>
         <location>
@@ -20816,7 +20602,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Ukraine -->
+        <!-- A city in Ukraine -->
         <_name>Simferopol'</_name>
         <coordinates>44.950000 34.100000</coordinates>
         <location>
@@ -20826,7 +20612,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Ukraine -->
+        <!-- A city in Ukraine -->
         <_name>Telichka</_name>
         <coordinates>50.400000 30.566667</coordinates>
         <location>
@@ -20836,7 +20622,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Ukraine -->
+        <!-- A city in Ukraine -->
         <_name>Uzhhorod</_name>
         <coordinates>48.616667 22.300000</coordinates>
         <location>
@@ -20853,26 +20639,24 @@
       <fips-code>UK</fips-code>
       <timezones>
         <timezone id="Europe/London">
-          <!-- Translators: This is the time zone in the UK (GMT in the
-               winter, and British Summer Time in the summer.)
+          <!-- The time zone in the UK (GMT in the winter, and British
+               Summer Time in the summer.)
             -->
           <_name>GMT/BST</_name>
         </timezone>
       </timezones>
       <tz-hint>Europe/London</tz-hint>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             Kingdom
-          -->
+        <!-- A state/province/territory in United Kingdom -->
         <_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>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
-          <_name>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>
@@ -20882,8 +20666,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
           <_name>Biggin Hill</_name>
           <coordinates>51.283333 0.033333</coordinates>
@@ -20895,8 +20679,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
           <_name>Brize Norton</_name>
           <coordinates>51.766667 -1.566667</coordinates>
@@ -20908,10 +20692,10 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
-          <_name>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>
@@ -20921,8 +20705,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
           <_name>Farnborough</_name>
           <coordinates>51.266667 -0.733333</coordinates>
@@ -20933,8 +20717,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
           <_name>Lakenheath</_name>
           <coordinates>52.433333 0.566667</coordinates>
@@ -20945,8 +20729,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is the capital of the United Kingdom -->
-          <_name>London</_name>
+          <!-- The capital of the United Kingdom -->
+          <_name msgctxt="City in East and South East England, United Kingdom">London</_name>
           <coordinates>51.500000 -0.116667</coordinates>
           <location>
             <name>Heathrow Airport</name>
@@ -20968,8 +20752,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
           <_name>Luton</_name>
           <coordinates>51.883333 -0.416667</coordinates>
@@ -20981,8 +20765,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
           <_name>Lydd</_name>
           <coordinates>50.950000 0.916667</coordinates>
@@ -20993,8 +20777,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
           <_name>Manston</_name>
           <coordinates>51.350000 1.366667</coordinates>
@@ -21005,8 +20789,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
           <_name>Marham</_name>
           <coordinates>52.650000 0.550000</coordinates>
@@ -21017,8 +20801,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
           <_name>Mildenhall</_name>
           <coordinates>52.350000 0.516667</coordinates>
@@ -21029,8 +20813,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
           <_name>Northolt</_name>
           <coordinates>51.533333 -0.366667</coordinates>
@@ -21041,8 +20825,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
           <_name>Norwich</_name>
           <coordinates>52.633333 1.300000</coordinates>
@@ -21054,8 +20838,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
           <_name>Odiham</_name>
           <coordinates>51.250000 -0.933333</coordinates>
@@ -21066,8 +20850,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
           <_name>Shoreham-by-Sea</_name>
           <coordinates>50.833333 -0.233333</coordinates>
@@ -21079,8 +20863,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
           <_name>Southampton</_name>
           <coordinates>50.900000 -1.400000</coordinates>
@@ -21092,10 +20876,10 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
-          <_name>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>
@@ -21105,8 +20889,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
           <_name>Stansted Mountfitchet</_name>
           <coordinates>51.900000 0.200000</coordinates>
@@ -21118,8 +20902,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
           <_name>Wainfleet</_name>
           <coordinates>53.100000 0.250000</coordinates>
@@ -21130,8 +20914,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
           <_name>Wattisham</_name>
           <coordinates>52.116667 0.950000</coordinates>
@@ -21143,8 +20927,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in East and South East
-               England in the United Kingdom
+          <!-- A city in East and South East England in the United
+               Kingdom
             -->
           <_name>Wittering</_name>
           <coordinates>52.600000 -0.450000</coordinates>
@@ -21156,7 +20940,7 @@
         </city>
       </state>
       <city>
-        <!-- Translators: this is a city in the United Kingdom -->
+        <!-- A city in the United Kingdom -->
         <_name>Fairford</_name>
         <coordinates>51.700000 -1.783333</coordinates>
         <location>
@@ -21166,17 +20950,13 @@
         </location>
       </city>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             Kingdom
-          -->
+        <!-- A state/province/territory in United Kingdom -->
         <_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>
-          <!-- Translators: this is a city in Midlands in the United
-               Kingdom
-            -->
-          <_name>Birmingham</_name>
+          <!-- A city in Midlands in the United Kingdom -->
+          <_name msgctxt="City in Midlands, United Kingdom">Birmingham</_name>
           <coordinates>52.466667 -1.916667</coordinates>
           <location>
             <name>Birmingham Airport</name>
@@ -21186,9 +20966,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Midlands in the United
-               Kingdom
-            -->
+          <!-- A city in Midlands in the United Kingdom -->
           <_name>Castle Donnington</_name>
           <coordinates>52.833333 -1.333333</coordinates>
           <location>
@@ -21199,9 +20977,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Midlands in the United
-               Kingdom
-            -->
+          <!-- A city in Midlands in the United Kingdom -->
           <_name>Cottesmore</_name>
           <coordinates>52.700000 -0.650000</coordinates>
           <location>
@@ -21211,9 +20987,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Midlands in the United
-               Kingdom
-            -->
+          <!-- A city in Midlands in the United Kingdom -->
           <_name>Coventry</_name>
           <coordinates>52.416667 -1.550000</coordinates>
           <location>
@@ -21223,9 +20997,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Midlands in the United
-               Kingdom
-            -->
+          <!-- A city in Midlands in the United Kingdom -->
           <_name>Cranfield</_name>
           <coordinates>52.066667 -0.600000</coordinates>
           <location>
@@ -21237,15 +21009,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             Kingdom
-          -->
+        <!-- A state/province/territory in United Kingdom -->
         <_name>North East England</_name>
         <fips-code>UKD1|UKD8|UKE5|UKF5|UKI7|UKJ5|UKJ6|UKK9|UKM7|UKN3|UKN6</fips-code>
         <city>
-          <!-- Translators: this is a city in North East England in the
-               United Kingdom
-            -->
+          <!-- A city in North East England in the United Kingdom -->
           <_name>Coningsby</_name>
           <coordinates>53.116667 -0.166667</coordinates>
           <location>
@@ -21255,9 +21023,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North East England in the
-               United Kingdom
-            -->
+          <!-- A city in North East England in the United Kingdom -->
           <_name>Cranwell</_name>
           <coordinates>53.033333 -0.466667</coordinates>
           <location>
@@ -21267,9 +21033,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North East England in the
-               United Kingdom
-            -->
+          <!-- A city in North East England in the United Kingdom -->
           <_name>Dishforth</_name>
           <coordinates>54.150000 -1.416667</coordinates>
           <location>
@@ -21279,10 +21043,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North East England in the
-               United Kingdom
-            -->
-          <_name>Newcastle</_name>
+          <!-- A city in North East England in the United Kingdom -->
+          <_name msgctxt="City in North East England, United Kingdom">Newcastle</_name>
           <coordinates>54.988056 -1.619444</coordinates>
           <location>
             <name>Newcastle</name>
@@ -21292,10 +21054,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North East England in the
-               United Kingdom
-            -->
-          <_name>Stockton</_name>
+          <!-- A city in North East England in the United Kingdom -->
+          <_name msgctxt="City in North East England, United Kingdom">Stockton</_name>
           <coordinates>54.583333 -1.416667</coordinates>
           <location>
             <name>Tees-Side</name>
@@ -21305,9 +21065,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North East England in the
-               United Kingdom
-            -->
+          <!-- A city in North East England in the United Kingdom -->
           <_name>Topcliffe</_name>
           <coordinates>54.183333 -1.383333</coordinates>
           <location>
@@ -21317,9 +21075,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North East England in the
-               United Kingdom
-            -->
+          <!-- A city in North East England in the United Kingdom -->
           <_name>Waddington</_name>
           <coordinates>53.166667 -0.533333</coordinates>
           <location>
@@ -21330,16 +21086,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             Kingdom
-          -->
+        <!-- A state/province/territory in United Kingdom -->
         <_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>
-          <!-- Translators: this is a city in North West England in the
-               United Kingdom
-            -->
+          <!-- A city in North West England in the United Kingdom -->
           <_name>Blackpool</_name>
           <coordinates>53.816667 -3.050000</coordinates>
           <location>
@@ -21350,9 +21102,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North West England in the
-               United Kingdom
-            -->
+          <!-- A city in North West England in the United Kingdom -->
           <_name>Carlisle</_name>
           <coordinates>54.883333 -2.933333</coordinates>
           <location>
@@ -21368,9 +21118,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North West England in the
-               United Kingdom
-            -->
+          <!-- A city in North West England in the United Kingdom -->
           <_name>Church Fenton</_name>
           <coordinates>53.816667 -1.216667</coordinates>
           <location>
@@ -21380,9 +21128,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North West England in the
-               United Kingdom
-            -->
+          <!-- A city in North West England in the United Kingdom -->
           <_name>Kirmington</_name>
           <coordinates>53.583333 -0.333333</coordinates>
           <location>
@@ -21393,9 +21139,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North West England in the
-               United Kingdom
-            -->
+          <!-- A city in North West England in the United Kingdom -->
           <_name>Leeds</_name>
           <coordinates>53.800000 -1.583333</coordinates>
           <location>
@@ -21406,9 +21150,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North West England in the
-               United Kingdom
-            -->
+          <!-- A city in North West England in the United Kingdom -->
           <_name>Leeming Bar</_name>
           <coordinates>54.300000 -1.550000</coordinates>
           <location>
@@ -21418,9 +21160,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North West England in the
-               United Kingdom
-            -->
+          <!-- A city in North West England in the United Kingdom -->
           <_name>Linton upon Ouse</_name>
           <coordinates>54.033333 -1.250000</coordinates>
           <location>
@@ -21430,10 +21170,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North West England in the
-               United Kingdom
-            -->
-          <_name>Liverpool</_name>
+          <!-- A city in North West England in the United Kingdom -->
+          <_name msgctxt="City in North West England, United Kingdom">Liverpool</_name>
           <coordinates>53.416667 -3.000000</coordinates>
           <location>
             <name>Liverpool Airport</name>
@@ -21443,10 +21181,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North West England in the
-               United Kingdom
-            -->
-          <_name>Manchester</_name>
+          <!-- A city in North West England in the United Kingdom -->
+          <_name msgctxt="City in North West England, United Kingdom">Manchester</_name>
           <coordinates>53.500000 -2.216667</coordinates>
           <location>
             <name>Manchester Airport</name>
@@ -21456,9 +21192,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North West England in the
-               United Kingdom
-            -->
+          <!-- A city in North West England in the United Kingdom -->
           <_name>Shawbury</_name>
           <coordinates>52.783333 -2.650000</coordinates>
           <location>
@@ -21470,15 +21204,11 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             Kingdom
-          -->
+        <!-- A state/province/territory in United Kingdom -->
         <_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>
-          <!-- Translators: this is a city in Northern Ireland in the
-               United Kingdom
-            -->
+          <!-- A city in Northern Ireland in the United Kingdom -->
           <_name>Belfast</_name>
           <coordinates>54.583333 -5.933333</coordinates>
           <location>
@@ -21495,9 +21225,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Northern Ireland in the
-               United Kingdom
-            -->
+          <!-- A city in Northern Ireland in the United Kingdom -->
           <_name>Eglinton</_name>
           <coordinates>55.016667 -7.183333</coordinates>
           <location>
@@ -21509,16 +21237,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             Kingdom
-          -->
+        <!-- A state/province/territory in United Kingdom -->
         <_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>
-          <!-- Translators: this is a city in Scotland in the United
-               Kingdom
-            -->
-          <_name>Aberdeen</_name>
+          <!-- A city in Scotland in the United Kingdom -->
+          <_name msgctxt="City in Scotland, United Kingdom">Aberdeen</_name>
           <coordinates>57.133333 -2.100000</coordinates>
           <location>
             <name>Aberdeen / Dyce</name>
@@ -21528,9 +21252,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Scotland in the United
-               Kingdom
-            -->
+          <!-- A city in Scotland in the United Kingdom -->
           <_name>Campbeltown</_name>
           <coordinates>55.433333 -5.633333</coordinates>
           <location>
@@ -21540,9 +21262,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Scotland in the United
-               Kingdom
-            -->
+          <!-- A city in Scotland in the United Kingdom -->
           <_name>Dalcross</_name>
           <coordinates>57.533333 -4.050000</coordinates>
           <location>
@@ -21553,9 +21273,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Scotland in the United
-               Kingdom
-            -->
+          <!-- A city in Scotland in the United Kingdom -->
           <_name>Dundee</_name>
           <coordinates>56.500000 -2.966667</coordinates>
           <location>
@@ -21566,9 +21284,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Scotland in the United
-               Kingdom
-            -->
+          <!-- A city in Scotland in the United Kingdom -->
           <_name>Dyce</_name>
           <coordinates>57.200000 -2.183333</coordinates>
           <location>
@@ -21579,9 +21295,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Scotland in the United
-               Kingdom
-            -->
+          <!-- A city in Scotland in the United Kingdom -->
           <_name>Edinburgh</_name>
           <coordinates>55.950000 -3.200000</coordinates>
           <location>
@@ -21592,10 +21306,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Scotland in the United
-               Kingdom
-            -->
-          <_name>Glasgow</_name>
+          <!-- A city in Scotland in the United Kingdom -->
+          <_name msgctxt="City in Scotland, United Kingdom">Glasgow</_name>
           <coordinates>55.833333 -4.250000</coordinates>
           <location>
             <name>Glasgow Airport</name>
@@ -21605,9 +21317,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Scotland in the United
-               Kingdom
-            -->
+          <!-- A city in Scotland in the United Kingdom -->
           <_name>Gramisdale</_name>
           <coordinates>57.483333 -7.333333</coordinates>
           <location>
@@ -21618,9 +21328,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Scotland in the United
-               Kingdom
-            -->
+          <!-- A city in Scotland in the United Kingdom -->
           <_name>Inverness</_name>
           <coordinates>57.466667 -4.233333</coordinates>
           <location>
@@ -21631,9 +21339,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Scotland in the United
-               Kingdom
-            -->
+          <!-- A city in Scotland in the United Kingdom -->
           <_name>Kilmoluag</_name>
           <coordinates>56.500000 -6.916667</coordinates>
           <location>
@@ -21644,9 +21350,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Scotland in the United
-               Kingdom
-            -->
+          <!-- A city in Scotland in the United Kingdom -->
           <_name>Kinloss</_name>
           <coordinates>57.616667 -3.566667</coordinates>
           <location>
@@ -21657,9 +21361,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Scotland in the United
-               Kingdom
-            -->
+          <!-- A city in Scotland in the United Kingdom -->
           <_name>Kintra</_name>
           <coordinates>55.650000 -6.250000</coordinates>
           <location>
@@ -21669,9 +21371,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Scotland in the United
-               Kingdom
-            -->
+          <!-- A city in Scotland in the United Kingdom -->
           <_name>Kirkwall</_name>
           <coordinates>58.966667 -2.950000</coordinates>
           <location>
@@ -21682,9 +21382,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Scotland in the United
-               Kingdom
-            -->
+          <!-- A city in Scotland in the United Kingdom -->
           <_name>Leuchars</_name>
           <coordinates>56.383333 -2.883333</coordinates>
           <location>
@@ -21695,9 +21393,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Scotland in the United
-               Kingdom
-            -->
+          <!-- A city in Scotland in the United Kingdom -->
           <_name>Lossiemouth</_name>
           <coordinates>57.700000 -3.283333</coordinates>
           <location>
@@ -21708,9 +21404,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Scotland in the United
-               Kingdom
-            -->
+          <!-- A city in Scotland in the United Kingdom -->
           <_name>Mossbank</_name>
           <coordinates>60.450000 -1.200000</coordinates>
           <location>
@@ -21721,9 +21415,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Scotland in the United
-               Kingdom
-            -->
+          <!-- A city in Scotland in the United Kingdom -->
           <_name>Prestwick</_name>
           <coordinates>55.483333 -4.616667</coordinates>
           <location>
@@ -21734,9 +21426,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Scotland in the United
-               Kingdom
-            -->
+          <!-- A city in Scotland in the United Kingdom -->
           <_name>Stornoway</_name>
           <coordinates>58.216667 -6.366667</coordinates>
           <location>
@@ -21747,9 +21437,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Scotland in the United
-               Kingdom
-            -->
+          <!-- A city in Scotland in the United Kingdom -->
           <_name>Sumburgh</_name>
           <coordinates>59.866667 -1.283333</coordinates>
           <location>
@@ -21760,9 +21448,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Scotland in the United
-               Kingdom
-            -->
+          <!-- A city in Scotland in the United Kingdom -->
           <_name>Wick</_name>
           <coordinates>58.433333 -3.083333</coordinates>
           <location>
@@ -21773,14 +21459,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             Kingdom
-          -->
+        <!-- A state/province/territory in United Kingdom -->
         <_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>
-          <!-- Translators: this is a city in South and South West
-               England in the United Kingdom
+          <!-- A city in South and South West England in the United
+               Kingdom
             -->
           <_name>Boscombe</_name>
           <coordinates>51.150000 -1.716667</coordinates>
@@ -21792,8 +21476,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South and South West
-               England in the United Kingdom
+          <!-- A city in South and South West England in the United
+               Kingdom
             -->
           <_name>Bournemouth</_name>
           <coordinates>50.716667 -1.883333</coordinates>
@@ -21805,10 +21489,10 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South and South West
-               England in the United Kingdom
+          <!-- A city in South and South West England in the United
+               Kingdom
             -->
-          <_name>Bristol</_name>
+          <_name msgctxt="City in South and South West England, United Kingdom">Bristol</_name>
           <coordinates>51.450000 -2.583333</coordinates>
           <location>
             <name>Bristol / Lulsgate</name>
@@ -21818,8 +21502,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South and South West
-               England in the United Kingdom
+          <!-- A city in South and South West England in the United
+               Kingdom
             -->
           <_name>Butes</_name>
           <coordinates>49.717500 -2.202500</coordinates>
@@ -21830,8 +21514,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South and South West
-               England in the United Kingdom
+          <!-- A city in South and South West England in the United
+               Kingdom
             -->
           <_name>Exeter</_name>
           <coordinates>50.700000 -3.533333</coordinates>
@@ -21843,8 +21527,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South and South West
-               England in the United Kingdom
+          <!-- A city in South and South West England in the United
+               Kingdom
             -->
           <_name>Filton</_name>
           <coordinates>51.508611 -2.574722</coordinates>
@@ -21855,8 +21539,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South and South West
-               England in the United Kingdom
+          <!-- A city in South and South West England in the United
+               Kingdom
             -->
           <_name>Helston</_name>
           <coordinates>50.099722 -5.272222</coordinates>
@@ -21868,8 +21552,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South and South West
-               England in the United Kingdom
+          <!-- A city in South and South West England in the United
+               Kingdom
             -->
           <_name>Hugh Town</_name>
           <coordinates>49.916667 -6.316667</coordinates>
@@ -21881,8 +21565,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South and South West
-               England in the United Kingdom
+          <!-- A city in South and South West England in the United
+               Kingdom
             -->
           <_name>Lyneham</_name>
           <coordinates>51.516667 -1.966667</coordinates>
@@ -21894,8 +21578,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South and South West
-               England in the United Kingdom
+          <!-- A city in South and South West England in the United
+               Kingdom
             -->
           <_name>Middle Wallop</_name>
           <coordinates>51.133333 -1.583333</coordinates>
@@ -21906,10 +21590,10 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South and South West
-               England in the United Kingdom
+          <!-- A city in South and South West England in the United
+               Kingdom
             -->
-          <_name>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>
@@ -21919,8 +21603,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South and South West
-               England in the United Kingdom
+          <!-- A city in South and South West England in the United
+               Kingdom
             -->
           <_name>Saint Mawgan</_name>
           <coordinates>50.450000 -4.983333</coordinates>
@@ -21932,8 +21616,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South and South West
-               England in the United Kingdom
+          <!-- A city in South and South West England in the United
+               Kingdom
             -->
           <_name>Staverton</_name>
           <coordinates>51.916667 -2.166667</coordinates>
@@ -21945,8 +21629,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South and South West
-               England in the United Kingdom
+          <!-- A city in South and South West England in the United
+               Kingdom
             -->
           <_name>Yeovilton</_name>
           <coordinates>51.004167 -2.650278</coordinates>
@@ -21959,17 +21643,14 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             Kingdom
-          -->
+        <!-- A state/province/territory in United Kingdom -->
         <_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>
-          <!-- Translators: this is a city in Wales in the United
-               Kingdom.
+          <!-- A city in Wales in the United Kingdom.
                The local name in Welsh is "Caerdydd".
             -->
-          <_name>Cardiff</_name>
+          <_name msgctxt="City in Wales, United Kingdom">Cardiff</_name>
           <coordinates>51.500000 -3.200000</coordinates>
           <location>
             <name>Cardiff-Wales Airport</name>
@@ -21979,9 +21660,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wales in the United
-               Kingdom
-            -->
+          <!-- A city in Wales in the United Kingdom -->
           <_name>Hawarden</_name>
           <coordinates>53.183333 -3.033333</coordinates>
           <location>
@@ -21991,9 +21670,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wales in the United
-               Kingdom
-            -->
+          <!-- A city in Wales in the United Kingdom -->
           <_name>Pembrey</_name>
           <coordinates>51.689167 -4.277222</coordinates>
           <location>
@@ -22004,9 +21681,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wales in the United
-               Kingdom
-            -->
+          <!-- A city in Wales in the United Kingdom -->
           <_name>Saint Athan</_name>
           <coordinates>51.402778 -3.413889</coordinates>
           <location>
@@ -22017,9 +21692,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wales in the United
-               Kingdom
-            -->
+          <!-- A city in Wales in the United Kingdom -->
           <_name>Valley</_name>
           <coordinates>53.283333 -4.566667</coordinates>
           <location>
@@ -22052,7 +21725,7 @@
       </timezones>
       <tz-hint>Europe/Mariehamn</tz-hint>
       <city>
-        <!-- Translators: this is a city in the Ãland Islands.
+        <!-- A city in the Ãland Islands.
              The local name in Finnish is "Maarianhamina".
           -->
         <_name>Mariehamn</_name>
@@ -22077,7 +21750,7 @@
       </timezones>
       <tz-hint>Asia/Bahrain</tz-hint>
       <city>
-        <!-- Translators: this is a city in Bahrain.
+        <!-- A city in Bahrain.
              The name is also written "ØÙØØ".
           -->
         <_name>Al Hadd</_name>
@@ -22089,7 +21762,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Bahrain.
+        <!-- The capital of Bahrain.
              "Manama" is the traditional English name.
              The local name in Arabic is "Al Manamah / ØÙÙÙØÙØ".
           -->
@@ -22116,7 +21789,7 @@
       </timezones>
       <tz-hint>Asia/Tehran</tz-hint>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ØØØØØÙ".
           -->
         <_name>Abadan</_name>
@@ -22128,7 +21801,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran -->
+        <!-- A city in Iran -->
         <_name>Abadeh</_name>
         <coordinates>31.160833 52.650556</coordinates>
         <location>
@@ -22138,7 +21811,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran -->
+        <!-- A city in Iran -->
         <_name>AbÅ MÅsÄ</_name>
         <coordinates>25.914444 54.995278</coordinates>
         <location>
@@ -22153,7 +21826,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ØØØØØØÛ".
           -->
         <_name>Aghajari</_name>
@@ -22165,7 +21838,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ØÙÙØØ".
           -->
         <_name>Ahvaz</_name>
@@ -22177,7 +21850,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ØØØØÙÙ".
           -->
         <_name>Ardabil</_name>
@@ -22189,7 +21862,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ØÙØØ ØØØØ".
           -->
         <_name>Bandar 'Abbas</_name>
@@ -22201,7 +21874,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ØÙØØ ØÙØÙØ".
           -->
         <_name>Bandar-e Bushehr</_name>
@@ -22213,7 +21886,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ØÙØØ ÙÙÚÙ".
           -->
         <_name>Bandar-e Lengeh</_name>
@@ -22225,7 +21898,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ØÙØØ ÙØÙØÙØ".
           -->
         <_name>Bandar-e Mahshahr</_name>
@@ -22237,7 +21910,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran -->
+        <!-- A city in Iran -->
         <_name>Birjand</_name>
         <coordinates>32.873889 59.214444</coordinates>
         <location>
@@ -22247,7 +21920,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ÚØÙ ØÙØØ".
           -->
         <_name>Chah Bahar</_name>
@@ -22259,7 +21932,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ØÙØØØØÙ".
           -->
         <_name>Dayrestan</_name>
@@ -22271,7 +21944,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ØÙ ÚÙØØØÙ".
           -->
         <_name>Do Gonbadan</_name>
@@ -22283,7 +21956,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran -->
+        <!-- A city in Iran -->
         <_name>Esfahan</_name>
         <coordinates>32.659722 51.671389</coordinates>
         <location>
@@ -22293,7 +21966,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ÙØØ".
           -->
         <_name>Fasa</_name>
@@ -22305,7 +21978,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ÚØÚØÙ".
           -->
         <_name>Gorgan</_name>
@@ -22317,7 +21990,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ÚÙØÙ ØØÙØØØÙ ÙØØÙ".
           -->
         <_name>Gusheh Shahzadeh Qasem</_name>
@@ -22329,7 +22002,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ÙÙØØÙ".
           -->
         <_name>Hamadan</_name>
@@ -22341,7 +22014,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ÙÙØÙ".
           -->
         <_name>Ilam</_name>
@@ -22353,7 +22026,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran -->
+        <!-- A city in Iran -->
         <_name>Iranshahr</_name>
         <coordinates>27.203889 60.691944</coordinates>
         <location>
@@ -22363,7 +22036,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ÙØØ".
           -->
         <_name>Karaj</_name>
@@ -22375,7 +22048,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran -->
+        <!-- A city in Iran -->
         <_name>Kashan</_name>
         <coordinates>33.983611 51.447500</coordinates>
         <location>
@@ -22385,7 +22058,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran -->
+        <!-- A city in Iran -->
         <_name>Kerman</_name>
         <coordinates>30.293889 57.084167</coordinates>
         <location>
@@ -22395,7 +22068,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran -->
+        <!-- A city in Iran -->
         <_name>Kermanshah</_name>
         <coordinates>34.314167 47.065000</coordinates>
         <location>
@@ -22405,7 +22078,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ØØÙ ØØØØ".
           -->
         <_name>Khorramabad</_name>
@@ -22417,7 +22090,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ÙÙØ".
           -->
         <_name>Kish</_name>
@@ -22429,7 +22102,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran -->
+        <!-- A city in Iran -->
         <_name>Lar</_name>
         <coordinates>27.684167 54.343611</coordinates>
         <location>
@@ -22439,7 +22112,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ÙØÙØ".
           -->
         <_name>Mashhad</_name>
@@ -22451,7 +22124,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ÙØØØ ØÙÛÙØÙ".
           -->
         <_name>Masjed Soleyman</_name>
@@ -22463,7 +22136,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ÙÙ ØÙØ".
           -->
         <_name>Now Shahr</_name>
@@ -22475,7 +22148,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ØØÙÙÛÙ".
           -->
         <_name>Orumiyeh</_name>
@@ -22487,7 +22160,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ÙØÙÛÙ".
           -->
         <_name>Qazvin</_name>
@@ -22499,7 +22172,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran -->
+        <!-- A city in Iran -->
         <_name>Rasht</_name>
         <coordinates>37.279444 49.585833</coordinates>
         <location>
@@ -22509,7 +22182,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran -->
+        <!-- A city in Iran -->
         <_name>Sabzevar</_name>
         <coordinates>36.214444 57.679722</coordinates>
         <location>
@@ -22519,7 +22192,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ØØØ ØØ".
           -->
         <_name>Sakht Sar</_name>
@@ -22531,7 +22204,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran -->
+        <!-- A city in Iran -->
         <_name>Sanandaj</_name>
         <coordinates>35.318100 47.000100</coordinates>
         <location>
@@ -22541,7 +22214,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran -->
+        <!-- A city in Iran -->
         <_name>Sarakhs</_name>
         <coordinates>36.534722 61.161111</coordinates>
         <location>
@@ -22551,7 +22224,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ØÙÙØÙ".
           -->
         <_name>Semnan</_name>
@@ -22563,7 +22236,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ØÙØ ØØÙØ".
           -->
         <_name>Shahr-e Bala</_name>
@@ -22575,7 +22248,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ØÙØ ÙØØ".
           -->
         <_name>Shahr-e Kord</_name>
@@ -22587,7 +22260,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ØÛØØØ".
           -->
         <_name>Shiraz</_name>
@@ -22599,7 +22272,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran -->
+        <!-- A city in Iran -->
         <_name>Tabas</_name>
         <coordinates>33.588333 56.922500</coordinates>
         <location>
@@ -22609,7 +22282,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ØØØÙØ".
           -->
         <_name>Tabriz</_name>
@@ -22621,7 +22294,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Iran.
+        <!-- The capital of Iran.
              The name is also written "ØÙØØÙ".
           -->
         <_name>Tehran</_name>
@@ -22633,7 +22306,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ÙØØ".
           -->
         <_name>Yazd</_name>
@@ -22645,7 +22318,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ØØØÙ".
           -->
         <_name>Zabol</_name>
@@ -22657,7 +22330,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Iran.
+        <!-- A city in Iran.
              The name is also written "ØØÙØØÙ (ÚÙ)".
           -->
         <_name>Zahedan-e (Yek)</_name>
@@ -22693,7 +22366,7 @@
       </timezones>
       <tz-hint>Asia/Jerusalem</tz-hint>
       <city>
-        <!-- Translators: this is a city in Israel -->
+        <!-- A city in Israel -->
         <_name>Elat</_name>
         <coordinates>29.561111 34.951667</coordinates>
         <location>
@@ -22703,7 +22376,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Israel -->
+        <!-- A city in Israel -->
         <_name>Mahanayim</_name>
         <coordinates>32.983333 35.566667</coordinates>
         <location>
@@ -22713,7 +22386,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Israel -->
+        <!-- A city in Israel -->
         <_name>Mahane Yisra'el</_name>
         <coordinates>32.000000 34.916667</coordinates>
         <location>
@@ -22723,7 +22396,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Israel -->
+        <!-- A city in Israel -->
         <_name>Ramot Remez</_name>
         <coordinates>32.781667 35.016667</coordinates>
         <location>
@@ -22733,7 +22406,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Israel -->
+        <!-- A city in Israel -->
         <_name>Shizzafon</_name>
         <coordinates>30.041667 35.027778</coordinates>
         <location>
@@ -22743,7 +22416,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Israel -->
+        <!-- A city in Israel -->
         <_name>Tel Aviv</_name>
         <coordinates>32.066667 34.766667</coordinates>
         <location>
@@ -22755,7 +22428,7 @@
     </country>
     <country>
       <!-- JO - Jordan -->
-      <_name>Jordan</_name>
+      <_name msgctxt="Country">Jordan</_name>
       <iso-code>JO</iso-code>
       <fips-code>JO</fips-code>
       <timezones>
@@ -22763,7 +22436,7 @@
       </timezones>
       <tz-hint>Asia/Amman</tz-hint>
       <city>
-        <!-- Translators: this is a city in Jordan -->
+        <!-- A city in Jordan -->
         <_name>Al 'Aqabah</_name>
         <coordinates>29.526667 35.007778</coordinates>
         <location>
@@ -22773,7 +22446,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Jordan -->
+        <!-- A city in Jordan -->
         <_name>Al Jizah</_name>
         <coordinates>31.700000 35.950000</coordinates>
         <location>
@@ -22783,7 +22456,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Jordan.
+        <!-- The capital of Jordan.
              "Amman" is the traditional English name.
              The local name in Arabic is "'Amman".
           -->
@@ -22798,7 +22471,7 @@
     </country>
     <country>
       <!-- KW - Kuwait -->
-      <_name>Kuwait</_name>
+      <_name msgctxt="Country">Kuwait</_name>
       <iso-code>KW</iso-code>
       <fips-code>KU</fips-code>
       <timezones>
@@ -22806,11 +22479,11 @@
       </timezones>
       <tz-hint>Asia/Kuwait</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Kuwait.
+        <!-- The capital of Kuwait.
              "Kuwait" is the traditional English name.
              The local name in Arabic is "Al Kuwayt / ØÙÙÙÙØ".
           -->
-        <_name>Kuwait</_name>
+        <_name msgctxt="City in Kuwait">Kuwait</_name>
         <coordinates>29.369722 47.978333</coordinates>
         <location>
           <name>Kuwait International Airport</name>
@@ -22821,7 +22494,7 @@
     </country>
     <country>
       <!-- LB - Lebanon -->
-      <_name>Lebanon</_name>
+      <_name msgctxt="Country">Lebanon</_name>
       <iso-code>LB</iso-code>
       <fips-code>LE</fips-code>
       <timezones>
@@ -22829,7 +22502,7 @@
       </timezones>
       <tz-hint>Asia/Beirut</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Lebanon.
+        <!-- The capital of Lebanon.
              "Beirut" is the traditional English name.
              The local name is "Beyrouth".
           -->
@@ -22852,7 +22525,7 @@
       </timezones>
       <tz-hint>Asia/Muscat</tz-hint>
       <city>
-        <!-- Translators: this is a city in Oman -->
+        <!-- A city in Oman -->
         <_name>Mu'askar al Murtafi'ah</_name>
         <coordinates>23.563611 58.250000</coordinates>
         <location>
@@ -22862,7 +22535,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Oman.
+        <!-- The capital of Oman.
              "Muscat" is the traditional English name.
              The local name in Arabic is "Masqat".
           -->
@@ -22875,7 +22548,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Oman -->
+        <!-- A city in Oman -->
         <_name>Salalah</_name>
         <coordinates>17.017500 54.082778</coordinates>
         <location>
@@ -22913,7 +22586,7 @@
       </timezones>
       <tz-hint>Asia/Qatar</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Qatar.
+        <!-- The capital of Qatar.
              "Doha" is the traditional English name.
              The local name in Arabic is "Ad Dawhah / ØÙØÙØØ".
           -->
@@ -22945,7 +22618,7 @@
       </timezones>
       <tz-hint>Asia/Riyadh</tz-hint>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>'Ar'ar</_name>
         <coordinates>30.985000 41.020556</coordinates>
         <location>
@@ -22955,7 +22628,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Abha</_name>
         <coordinates>18.216389 42.505278</coordinates>
         <location>
@@ -22965,7 +22638,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Ad Dalfa'ah</_name>
         <coordinates>26.326667 43.676389</coordinates>
         <location>
@@ -22975,7 +22648,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Ad Dammam</_name>
         <coordinates>26.425833 50.114167</coordinates>
         <location>
@@ -22985,7 +22658,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Al 'Aqiq</_name>
         <coordinates>20.266667 41.666667</coordinates>
         <location>
@@ -22995,7 +22668,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Al Qaysumah</_name>
         <coordinates>28.309722 46.127500</coordinates>
         <location>
@@ -23005,7 +22678,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Al Qurayyat</_name>
         <coordinates>31.333333 37.341944</coordinates>
         <location>
@@ -23015,7 +22688,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Al Wajh</_name>
         <coordinates>26.233333 36.466667</coordinates>
         <location>
@@ -23025,7 +22698,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Al Wuday'ah</_name>
         <coordinates>17.033333 47.116667</coordinates>
         <location>
@@ -23035,7 +22708,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Ar Ruqayyiqah</_name>
         <coordinates>25.350000 49.566667</coordinates>
         <location>
@@ -23045,7 +22718,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>At Ta'if</_name>
         <coordinates>21.270278 40.415833</coordinates>
         <location>
@@ -23055,7 +22728,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia.
+        <!-- A city in Saudi Arabia.
              "Dhahran" is the traditional English name.
              The local name in Arabic is "Az Zahran".
           -->
@@ -23068,7 +22741,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Ha'il</_name>
         <coordinates>27.516389 41.696944</coordinates>
         <location>
@@ -23078,7 +22751,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Jiddah</_name>
         <coordinates>21.516944 39.219167</coordinates>
         <location>
@@ -23088,7 +22761,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Jizan</_name>
         <coordinates>16.889167 42.551111</coordinates>
         <location>
@@ -23098,7 +22771,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Khamis Mushayt</_name>
         <coordinates>18.306389 42.729167</coordinates>
         <location>
@@ -23108,7 +22781,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Masjid Ibn Rashid</_name>
         <coordinates>27.916667 45.400000</coordinates>
         <location>
@@ -23118,7 +22791,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia.
+        <!-- A city in Saudi Arabia.
              "Mecca" is the traditional English name.
              The local name in Arabic is "Makkah".
           -->
@@ -23131,7 +22804,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia.
+        <!-- A city in Saudi Arabia.
              "Medina" is the traditional English name.
              The local name in Arabic is "Al Madinah al Munawwarah".
           -->
@@ -23144,7 +22817,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Najran</_name>
         <coordinates>17.505556 44.184167</coordinates>
         <location>
@@ -23154,7 +22827,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Qal'at Bishah</_name>
         <coordinates>20.000000 42.600000</coordinates>
         <location>
@@ -23164,7 +22837,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Qara</_name>
         <coordinates>29.876944 40.226944</coordinates>
         <location>
@@ -23174,7 +22847,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Rafha</_name>
         <coordinates>29.638611 43.501389</coordinates>
         <location>
@@ -23184,7 +22857,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Saudi Arabia.
+        <!-- The capital of Saudi Arabia.
              "Riyadh" is the traditional English name.
              The local name in Arabic is "Ar Riyad".
           -->
@@ -23202,7 +22875,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Tabuk</_name>
         <coordinates>28.383333 36.583333</coordinates>
         <location>
@@ -23212,7 +22885,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Tamrah</_name>
         <coordinates>20.398333 45.415000</coordinates>
         <location>
@@ -23222,7 +22895,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Turayf</_name>
         <coordinates>31.677500 38.653056</coordinates>
         <location>
@@ -23232,7 +22905,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Saudi Arabia -->
+        <!-- A city in Saudi Arabia -->
         <_name>Yanbu' al Bahr</_name>
         <coordinates>24.085278 38.048611</coordinates>
         <location>
@@ -23252,7 +22925,7 @@
       </timezones>
       <tz-hint>Asia/Damascus</tz-hint>
       <city>
-        <!-- Translators: this is a city in Syria -->
+        <!-- A city in Syria -->
         <_name>Al Qamishli</_name>
         <coordinates>37.049722 41.226389</coordinates>
         <location>
@@ -23262,7 +22935,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Syria.
+        <!-- A city in Syria.
              "Aleppo" is the traditional English name.
              The local name in Arabic is "Halab".
           -->
@@ -23275,7 +22948,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Syria.
+        <!-- The capital of Syria.
              "Damascus" is the traditional English name.
              The local name in Arabic is "Dimashq".
           -->
@@ -23288,7 +22961,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Syria -->
+        <!-- A city in Syria -->
         <_name>Dayr az Zawr</_name>
         <coordinates>35.333333 40.150000</coordinates>
         <location>
@@ -23298,7 +22971,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Syria.
+        <!-- A city in Syria.
              "Latakia" is the traditional English name.
              The local name in Arabic is "Al Ladhiqiyah".
           -->
@@ -23325,8 +22998,7 @@
       </timezones>
       <tz-hint>Asia/Dubai</tz-hint>
       <city>
-        <!-- Translators: this is the capital of the United Arab
-             Emirates.
+        <!-- The capital of the United Arab Emirates.
              "Abu Dhabi" is the traditional English name.
              The local name in Arabic is "Abu Zaby".
           -->
@@ -23344,7 +23016,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the United Arab Emirates -->
+        <!-- A city in the United Arab Emirates -->
         <_name>Al 'Ayn</_name>
         <coordinates>24.216667 55.766667</coordinates>
         <location>
@@ -23354,7 +23026,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the United Arab Emirates -->
+        <!-- A city in the United Arab Emirates -->
         <_name>Al Fujayrah</_name>
         <coordinates>25.123056 56.337500</coordinates>
         <location>
@@ -23364,7 +23036,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the United Arab Emirates.
+        <!-- A city in the United Arab Emirates.
              "Dubai" is the traditional English name.
              The local name in Arabic is "Dubayy".
           -->
@@ -23377,7 +23049,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the United Arab Emirates -->
+        <!-- A city in the United Arab Emirates -->
         <_name>Ra's al Khaymah</_name>
         <coordinates>25.791111 55.942778</coordinates>
         <location>
@@ -23387,7 +23059,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in the United Arab Emirates.
+        <!-- A city in the United Arab Emirates.
              "Sharjah" is the traditional English name.
              The local name in Arabic is "Ash Shariqah".
           -->
@@ -23414,7 +23086,7 @@
       </timezones>
       <tz-hint>Asia/Aden</tz-hint>
       <city>
-        <!-- Translators: this is a city in Yemen -->
+        <!-- A city in Yemen -->
         <_name>'Adan</_name>
         <coordinates>12.779444 45.036667</coordinates>
         <location>
@@ -23424,7 +23096,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Yemen -->
+        <!-- A city in Yemen -->
         <_name>'Ataq</_name>
         <coordinates>14.550000 46.800000</coordinates>
         <location>
@@ -23434,7 +23106,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Yemen -->
+        <!-- A city in Yemen -->
         <_name>Al Hudaydah</_name>
         <coordinates>14.797778 42.952222</coordinates>
         <location>
@@ -23444,7 +23116,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Yemen -->
+        <!-- A city in Yemen -->
         <_name>Ma'rib</_name>
         <coordinates>15.416667 45.350000</coordinates>
         <location>
@@ -23454,7 +23126,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Yemen -->
+        <!-- A city in Yemen -->
         <_name>Mori</_name>
         <coordinates>12.633333 53.900000</coordinates>
         <location>
@@ -23464,7 +23136,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Yemen -->
+        <!-- A city in Yemen -->
         <_name>Sa'dah</_name>
         <coordinates>16.935833 43.764444</coordinates>
         <location>
@@ -23474,7 +23146,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is the capital of Yemen.
+        <!-- The capital of Yemen.
              "Sanaa" is the traditional English name.
              The local name in Arabic is "San'a'".
           -->
@@ -23487,7 +23159,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Yemen -->
+        <!-- A city in Yemen -->
         <_name>Say'un</_name>
         <coordinates>15.943333 48.793333</coordinates>
         <location>
@@ -23497,7 +23169,7 @@
         </location>
       </city>
       <city>
-        <!-- Translators: this is a city in Yemen -->
+        <!-- A city in Yemen -->
         <_name>Ta'izz</_name>
         <coordinates>13.566667 44.033333</coordinates>
         <location>
@@ -23572,25 +23244,24 @@
       <fips-code>CA</fips-code>
       <timezones>
         <timezone id="America/Vancouver">
-          <!-- Translators: This is the time zone used on most of the
-               west coast of North America. In Mexico it is called
-               "Tiempo del PacÃfico" and in French-speaking parts of
-               Canada it is called "Heure du Pacifique". The string is
-               only used in places where "US", "Canada" or "Mexico" is
-               already clear from the context.
+          <!-- The time zone used on most of the west coast of North
+               America. In Mexico it is called "Tiempo del PacÃfico"
+               and in French-speaking parts of Canada it is called
+               "Heure du Pacifique". The string is only used in places
+               where "US", "Canada" or "Mexico" is already clear from
+               the context.
             -->
           <_name>Pacific Time</_name>
           <obsoletes>America/Dawson</obsoletes>
           <obsoletes>America/Whitehorse</obsoletes>
         </timezone>
         <timezone id="America/Edmonton">
-          <!-- Translators: This is the time zone used in the
-               central-west part of North America (ie, the Rocky
-               Mountains). In Mexico it is called "Tiempo de la
-               MontaÃa", and in French-speaking parts of Canada it is
-               called "Heure des Rocheuses". The string is only used in
-               places where "US", "Canada" or "Mexico" is already clear
-               from the context.
+          <!-- The time zone used in the central-west part of North
+               America (ie, the Rocky Mountains). In Mexico it is
+               called "Tiempo de la MontaÃa", and in French-speaking
+               parts of Canada it is called "Heure des Rocheuses". The
+               string is only used in places where "US", "Canada" or
+               "Mexico" is already clear from the context.
             -->
           <_name>Mountain Time</_name>
           <obsoletes>America/Cambridge_Bay</obsoletes>
@@ -23598,42 +23269,40 @@
           <obsoletes>America/Yellowknife</obsoletes>
         </timezone>
         <timezone id="America/Dawson_Creek">
-          <!-- Translators: This represents the time zone in the
-               northeastern part of the Canadian province of British
-               Columbia (BC), which is part of the "Mountain Time"
-               zone, but does not observe Daylight Saving Time with the
-               rest of the zone.
+          <!-- This represents the time zone in the northeastern part
+               of the Canadian province of British Columbia (BC), which
+               is part of the "Mountain Time" zone, but does not
+               observe Daylight Saving Time with the rest of the zone.
             -->
           <_name>Mountain Time, no DST (Northeast BC)</_name>
         </timezone>
         <timezone id="America/Winnipeg">
-          <!-- Translators: This is the time zone used in the
-               central-east part of North America. In Mexico it is
-               called "Tiempo del Centro", and in French-speaking parts
-               of Canada it is called "Heure du Centre". The string is
-               only used in places where "US", "Canada" or "Mexico" is
-               already clear from the context.
+          <!-- The time zone used in the central-east part of North
+               America. In Mexico it is called "Tiempo del Centro", and
+               in French-speaking parts of Canada it is called "Heure
+               du Centre". The string is only used in places where
+               "US", "Canada" or "Mexico" is already clear from the
+               context.
             -->
           <_name>Central Time</_name>
           <obsoletes>America/Rainy_River</obsoletes>
           <obsoletes>America/Rankin_Inlet</obsoletes>
         </timezone>
         <timezone id="America/Regina">
-          <!-- Translators: This represents the time zone in the
-               Canadian province of Saskatchewan, which is part of the
-               "Central Time" zone, but does not observe Daylight
-               Saving Time with the rest of the zone.
+          <!-- This represents the time zone in the Canadian province
+               of Saskatchewan, which is part of the "Central Time"
+               zone, but does not observe Daylight Saving Time with the
+               rest of the zone.
             -->
           <_name>Central Time, no DST (Saskatchewan)</_name>
           <obsoletes>America/Swift_Current</obsoletes>
         </timezone>
         <timezone id="America/Toronto">
-          <!-- Translators: This is the time zone used on the east
-               coast of the United States, and the corresponding
-               (non-coastal) part of Canada. In French-speaking parts
-               of Canada it is called "Heure de l'Est". The string is
-               only used in places where "US" or "Canada" is already
-               clear from the context.
+          <!-- The time zone used on the east coast of the United
+               States, and the corresponding (non-coastal) part of
+               Canada. In French-speaking parts of Canada it is called
+               "Heure de l'Est". The string is only used in places
+               where "US" or "Canada" is already clear from the context.
             -->
           <_name>Eastern Time</_name>
           <obsoletes>America/Iqaluit</obsoletes>
@@ -23643,21 +23312,21 @@
           <obsoletes>America/Thunder_Bay</obsoletes>
         </timezone>
         <timezone id="America/Atikokan">
-          <!-- Translators: This represents the time zone in certain
-               parts of Canada (such as Southampton Island, Nunavut,
-               and Atikokan, Ontario) which are part of the "Eastern
-               Time" zone, but which do not observe Daylight Saving
-               Time with the rest of the zone.
+          <!-- This represents the time zone in certain parts of Canada
+               (such as Southampton Island, Nunavut, and Atikokan,
+               Ontario) which are part of the "Eastern Time" zone, but
+               which do not observe Daylight Saving Time with the rest
+               of the zone.
             -->
           <_name>Eastern Time, no DST (Southampton Island, etc)</_name>
           <obsoletes>America/Resolute</obsoletes>
         </timezone>
         <timezone id="America/Halifax">
-          <!-- Translators: This is the time zone used on the east
-               coast of Canada, in Bermuda, and on many Caribbean
-               islands. In French-speaking parts of Canada it is called
-               "Heure de l'Atlantique". The string is only used in
-               places where a country is already clear from the context.
+          <!-- The time zone used on the east coast of Canada, in
+               Bermuda, and on many Caribbean islands. In
+               French-speaking parts of Canada it is called "Heure de
+               l'Atlantique". The string is only used in places where a
+               country is already clear from the context.
             -->
           <_name>Atlantic Time</_name>
           <obsoletes>America/Glace_Bay</obsoletes>
@@ -23665,28 +23334,28 @@
           <obsoletes>America/Moncton</obsoletes>
         </timezone>
         <timezone id="America/Blanc-Sablon">
-          <!-- Translators: This represents the time zone in the far
-               eastern portion of the Canadian province of Quebec,
-               which is part of the "Atlantic Time" zone, but does not
-               observe Daylight Saving Time with the rest of the zone.
+          <!-- This represents the time zone in the far eastern portion
+               of the Canadian province of Quebec, which is part of the
+               "Atlantic Time" zone, but does not observe Daylight
+               Saving Time with the rest of the zone.
             -->
           <_name>Atlantic Time, no DST (Eastern Quebec)</_name>
         </timezone>
         <timezone id="America/St_Johns">
-          <!-- Translators: This is the time zone used in the Canadian
-               province of Newfoundland. In French-speaking parts of
-               Canada it is called "Heure de Terre-Neuve".
+          <!-- The time zone used in the Canadian province of
+               Newfoundland. In French-speaking parts of Canada it is
+               called "Heure de Terre-Neuve".
             -->
           <_name>Newfoundland Time</_name>
         </timezone>
       </timezones>
       <state>
-        <!-- Translators: this is a state/province/territory in Canada -->
+        <!-- A state/province/territory in Canada -->
         <_name>Alberta</_name>
         <fips-code>CA01</fips-code>
         <tz-hint>America/Edmonton</tz-hint>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Banff</_name>
           <coordinates>51.166667 -115.566667</coordinates>
           <location>
@@ -23701,7 +23370,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Bergen</_name>
           <coordinates>51.700000 -114.633333</coordinates>
           <location>
@@ -23711,7 +23380,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Bow Island</_name>
           <coordinates>49.866667 -111.366667</coordinates>
           <location>
@@ -23721,7 +23390,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Brooks</_name>
           <coordinates>50.566667 -111.900000</coordinates>
           <location>
@@ -23731,7 +23400,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Calgary</_name>
           <coordinates>51.083333 -114.083333</coordinates>
           <location>
@@ -23746,7 +23415,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Cardston</_name>
           <coordinates>49.200000 -113.316667</coordinates>
           <location>
@@ -23756,7 +23425,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Claresholm</_name>
           <coordinates>50.033333 -113.583333</coordinates>
           <location>
@@ -23766,7 +23435,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Cold Lake</_name>
           <coordinates>54.465000 -110.183056</coordinates>
           <location>
@@ -23776,7 +23445,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Coleman</_name>
           <coordinates>49.633333 -114.500000</coordinates>
           <location>
@@ -23786,7 +23455,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Coronation</_name>
           <coordinates>52.083333 -111.450000</coordinates>
           <location>
@@ -23796,7 +23465,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Drumheller</_name>
           <coordinates>51.466667 -112.700000</coordinates>
           <location>
@@ -23806,7 +23475,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Edmonton</_name>
           <coordinates>53.550000 -113.500000</coordinates>
           <location>
@@ -23836,7 +23505,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Edson</_name>
           <coordinates>53.583333 -116.416667</coordinates>
           <location>
@@ -23846,7 +23515,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Embarras Portage</_name>
           <coordinates>58.450000 -111.500000</coordinates>
           <location>
@@ -23856,7 +23525,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Esther</_name>
           <coordinates>51.683333 -110.250000</coordinates>
           <location>
@@ -23866,7 +23535,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Fort Chipewyan</_name>
           <coordinates>58.716667 -111.150000</coordinates>
           <location>
@@ -23876,7 +23545,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Fort McMurray</_name>
           <coordinates>56.733333 -111.383333</coordinates>
           <location>
@@ -23891,7 +23560,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Grande Prairie</_name>
           <coordinates>55.166667 -118.800000</coordinates>
           <location>
@@ -23901,7 +23570,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>High Level</_name>
           <coordinates>58.516667 -117.133333</coordinates>
           <location>
@@ -23911,8 +23580,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
-          <_name>Jasper</_name>
+          <!-- A city in Alberta in Canada -->
+          <_name msgctxt="City in Alberta, Canada">Jasper</_name>
           <coordinates>52.883333 -118.083333</coordinates>
           <location>
             <name>Jasper Warden Automated Reporting Station</name>
@@ -23921,7 +23590,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Lac La Biche</_name>
           <coordinates>54.771944 -111.964722</coordinates>
           <location>
@@ -23931,7 +23600,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Lethbridge</_name>
           <coordinates>49.700000 -112.833333</coordinates>
           <location>
@@ -23941,7 +23610,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Medicine Hat</_name>
           <coordinates>50.033333 -110.683333</coordinates>
           <location>
@@ -23951,7 +23620,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Milk River</_name>
           <coordinates>49.133333 -112.083333</coordinates>
           <location>
@@ -23961,7 +23630,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Onefour</_name>
           <coordinates>49.066667 -110.450000</coordinates>
           <location>
@@ -23971,7 +23640,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Peace River</_name>
           <coordinates>56.233333 -117.283333</coordinates>
           <location>
@@ -23981,7 +23650,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Pincher Creek</_name>
           <coordinates>49.483333 -113.950000</coordinates>
           <location>
@@ -23991,7 +23660,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Red Deer</_name>
           <coordinates>52.266667 -113.800000</coordinates>
           <location>
@@ -24001,7 +23670,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Rocky Mountain House</_name>
           <coordinates>52.366667 -114.916667</coordinates>
           <location>
@@ -24011,7 +23680,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Seebe</_name>
           <coordinates>51.100000 -115.066667</coordinates>
           <location>
@@ -24021,7 +23690,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Slave Lake</_name>
           <coordinates>55.283333 -114.783333</coordinates>
           <location>
@@ -24031,7 +23700,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Spirit River</_name>
           <coordinates>55.783333 -118.833333</coordinates>
           <location>
@@ -24041,7 +23710,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Three Hills</_name>
           <coordinates>51.700000 -113.266667</coordinates>
           <location>
@@ -24051,7 +23720,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Vegreville</_name>
           <coordinates>53.500000 -112.050000</coordinates>
           <location>
@@ -24061,7 +23730,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alberta in Canada -->
+          <!-- A city in Alberta in Canada -->
           <_name>Whitecourt</_name>
           <coordinates>54.133333 -115.683333</coordinates>
           <location>
@@ -24077,13 +23746,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Canada -->
+        <!-- A state/province/territory in Canada -->
         <_name>British Columbia</_name>
         <fips-code>CA02</fips-code>
         <tz-hint>America/Vancouver</tz-hint>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Abbotsford</_name>
           <coordinates>49.050000 -122.300000</coordinates>
           <location>
@@ -24093,8 +23761,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Agassiz</_name>
           <coordinates>49.233333 -121.766667</coordinates>
           <location>
@@ -24104,8 +23771,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Allison Harbour</_name>
           <coordinates>51.033333 -127.516667</coordinates>
           <location>
@@ -24115,8 +23781,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Alta Lake</_name>
           <coordinates>50.116667 -122.983333</coordinates>
           <location>
@@ -24126,8 +23791,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Baldonnel</_name>
           <coordinates>56.216667 -120.683333</coordinates>
           <location>
@@ -24137,8 +23801,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Bella Coola</_name>
           <coordinates>52.366667 -126.750000</coordinates>
           <location>
@@ -24148,8 +23811,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Blue River</_name>
           <coordinates>52.100000 -119.300000</coordinates>
           <location>
@@ -24159,8 +23821,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Boat Basin</_name>
           <coordinates>49.483333 -126.400000</coordinates>
           <location>
@@ -24170,8 +23831,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Burns Lake</_name>
           <coordinates>54.216667 -125.766667</coordinates>
           <location>
@@ -24181,8 +23841,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Campbell River</_name>
           <coordinates>50.016667 -125.250000</coordinates>
           <location>
@@ -24192,8 +23851,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Castlegar</_name>
           <coordinates>49.316667 -117.666667</coordinates>
           <location>
@@ -24203,9 +23861,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
-          <_name>Clinton</_name>
+          <!-- A city in British Columbia in Canada -->
+          <_name msgctxt="City in British Columbia, Canada">Clinton</_name>
           <coordinates>51.100000 -121.600000</coordinates>
           <location>
             <name>Clinton</name>
@@ -24214,8 +23871,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Comox</_name>
           <coordinates>49.683333 -124.933333</coordinates>
           <location>
@@ -24225,8 +23881,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Cranbrook</_name>
           <coordinates>49.516667 -115.766667</coordinates>
           <location>
@@ -24236,9 +23891,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
-          <_name>Creston</_name>
+          <!-- A city in British Columbia in Canada -->
+          <_name msgctxt="City in British Columbia, Canada">Creston</_name>
           <coordinates>49.100000 -116.516667</coordinates>
           <location>
             <name>Creston Automatic Weather Reporting System</name>
@@ -24247,8 +23901,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Dease Lake</_name>
           <coordinates>58.450000 -130.033333</coordinates>
           <location>
@@ -24258,8 +23911,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Esquimalt</_name>
           <coordinates>48.433333 -123.416667</coordinates>
           <location>
@@ -24269,8 +23921,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Fort Grahame</_name>
           <coordinates>56.600000 -124.633333</coordinates>
           <location>
@@ -24280,8 +23931,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Fort Nelson</_name>
           <coordinates>58.816667 -122.533333</coordinates>
           <location>
@@ -24291,8 +23941,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Gabriola</_name>
           <coordinates>49.183333 -123.850000</coordinates>
           <location>
@@ -24302,8 +23951,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Golden</_name>
           <coordinates>51.300000 -116.966667</coordinates>
           <location>
@@ -24313,8 +23961,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Hollyburn</_name>
           <coordinates>49.333333 -123.166667</coordinates>
           <location>
@@ -24324,8 +23971,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Hope</_name>
           <coordinates>49.383333 -121.433333</coordinates>
           <location>
@@ -24335,8 +23981,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Kamloops</_name>
           <coordinates>50.666667 -120.333333</coordinates>
           <location>
@@ -24346,8 +23991,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Kelowna</_name>
           <coordinates>49.900000 -119.483333</coordinates>
           <location>
@@ -24357,8 +24001,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Lasqueti</_name>
           <coordinates>49.483333 -124.350000</coordinates>
           <location>
@@ -24368,8 +24011,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Little Prairie</_name>
           <coordinates>55.700000 -121.616667</coordinates>
           <location>
@@ -24379,8 +24021,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Lytton</_name>
           <coordinates>50.233333 -121.566667</coordinates>
           <location>
@@ -24390,8 +24031,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Malahat</_name>
           <coordinates>48.533333 -123.550000</coordinates>
           <location>
@@ -24401,8 +24041,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>McLeod Lake</_name>
           <coordinates>55.000000 -123.033333</coordinates>
           <location>
@@ -24412,8 +24051,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Nakusp</_name>
           <coordinates>50.233333 -117.800000</coordinates>
           <location>
@@ -24423,8 +24061,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Nanaimo</_name>
           <coordinates>49.150000 -123.916667</coordinates>
           <location>
@@ -24434,8 +24071,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Nanoose Bay</_name>
           <coordinates>49.250000 -124.183333</coordinates>
           <location>
@@ -24445,9 +24081,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
-          <_name>Natal</_name>
+          <!-- A city in British Columbia in Canada -->
+          <_name msgctxt="City in British Columbia, Canada">Natal</_name>
           <coordinates>49.733333 -114.850000</coordinates>
           <location>
             <name>Sparwood, Sparwood-Elk Valley Airport</name>
@@ -24461,8 +24096,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Nelson</_name>
           <coordinates>49.483333 -117.283333</coordinates>
           <location>
@@ -24472,8 +24106,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>North Kamloops</_name>
           <coordinates>50.683333 -120.366667</coordinates>
           <location>
@@ -24483,8 +24116,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Ocean Falls</_name>
           <coordinates>52.350000 -127.700000</coordinates>
           <location>
@@ -24494,8 +24126,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Osoyoos</_name>
           <coordinates>49.033333 -119.466667</coordinates>
           <location>
@@ -24505,8 +24136,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Penticton</_name>
           <coordinates>49.500000 -119.583333</coordinates>
           <location>
@@ -24516,8 +24146,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Pitt Meadows</_name>
           <coordinates>49.233333 -122.683333</coordinates>
           <location>
@@ -24527,8 +24156,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Port Hardy</_name>
           <coordinates>50.716667 -127.500000</coordinates>
           <location>
@@ -24538,8 +24166,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Port Simpson</_name>
           <coordinates>54.550000 -130.416667</coordinates>
           <location>
@@ -24549,8 +24176,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Powell River</_name>
           <coordinates>49.883333 -124.550000</coordinates>
           <location>
@@ -24560,8 +24186,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Prince George</_name>
           <coordinates>53.916667 -122.766667</coordinates>
           <location>
@@ -24571,8 +24196,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Prince Rupert</_name>
           <coordinates>54.316667 -130.333333</coordinates>
           <location>
@@ -24582,9 +24206,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
-          <_name>Princeton</_name>
+          <!-- A city in British Columbia in Canada -->
+          <_name msgctxt="City in British Columbia, Canada">Princeton</_name>
           <coordinates>49.450000 -120.500000</coordinates>
           <location>
             <name>Princeton Airport</name>
@@ -24593,8 +24216,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Queen Charlotte</_name>
           <coordinates>53.250000 -132.083333</coordinates>
           <location>
@@ -24604,8 +24226,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Quesnel</_name>
           <coordinates>52.983333 -122.483333</coordinates>
           <location>
@@ -24615,8 +24236,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Revelstoke</_name>
           <coordinates>51.000000 -118.183333</coordinates>
           <location>
@@ -24626,8 +24246,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Rocky Point</_name>
           <coordinates>48.316667 -123.550000</coordinates>
           <location>
@@ -24637,8 +24256,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Salmon Arm</_name>
           <coordinates>50.700000 -119.283333</coordinates>
           <location>
@@ -24648,8 +24266,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Sandspit</_name>
           <coordinates>53.250000 -131.833333</coordinates>
           <location>
@@ -24659,8 +24276,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Smithers</_name>
           <coordinates>54.766667 -127.166667</coordinates>
           <location>
@@ -24670,8 +24286,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Squamish</_name>
           <coordinates>49.700000 -123.150000</coordinates>
           <location>
@@ -24681,8 +24296,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Stephen</_name>
           <coordinates>51.450000 -116.300000</coordinates>
           <location>
@@ -24692,8 +24306,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Steveston</_name>
           <coordinates>49.133333 -123.183333</coordinates>
           <location>
@@ -24703,8 +24316,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Stewart</_name>
           <coordinates>55.933333 -130.000000</coordinates>
           <location>
@@ -24714,8 +24326,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Summerland</_name>
           <coordinates>49.600000 -119.666667</coordinates>
           <location>
@@ -24725,8 +24336,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Terrace</_name>
           <coordinates>54.500000 -128.583333</coordinates>
           <location>
@@ -24736,8 +24346,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Tofino</_name>
           <coordinates>49.133333 -125.900000</coordinates>
           <location>
@@ -24747,8 +24356,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Tow Hill</_name>
           <coordinates>54.066667 -131.783333</coordinates>
           <location>
@@ -24758,8 +24366,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Trout Lake</_name>
           <coordinates>53.816667 -89.883333</coordinates>
           <location>
@@ -24769,9 +24376,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
-          <_name>Vancouver</_name>
+          <!-- A city in British Columbia in Canada -->
+          <_name msgctxt="City in British Columbia, Canada">Vancouver</_name>
           <coordinates>49.250000 -123.133333</coordinates>
           <location>
             <name>Vancouver International Airport</name>
@@ -24780,9 +24386,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
-          <_name>Vernon</_name>
+          <!-- A city in British Columbia in Canada -->
+          <_name msgctxt="City in British Columbia, Canada">Vernon</_name>
           <coordinates>50.266667 -119.266667</coordinates>
           <location>
             <name>Vernon</name>
@@ -24791,9 +24396,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
-          <_name>Victoria</_name>
+          <!-- A city in British Columbia in Canada -->
+          <_name msgctxt="City in British Columbia, Canada">Victoria</_name>
           <coordinates>48.433333 -123.350000</coordinates>
           <location>
             <name>Victoria Harbour</name>
@@ -24837,8 +24441,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>White Rock</_name>
           <coordinates>49.033333 -122.816667</coordinates>
           <location>
@@ -24848,8 +24451,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Williams Lake</_name>
           <coordinates>52.116667 -122.150000</coordinates>
           <location>
@@ -24859,8 +24461,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in British Columbia in Canada
-            -->
+          <!-- A city in British Columbia in Canada -->
           <_name>Winter Harbour</_name>
           <coordinates>50.516667 -128.033333</coordinates>
           <location>
@@ -24871,12 +24472,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Canada -->
+        <!-- A state/province/territory in Canada -->
         <_name>Manitoba</_name>
         <fips-code>CA03</fips-code>
         <tz-hint>America/Winnipeg</tz-hint>
         <city>
-          <!-- Translators: this is a city in Manitoba in Canada -->
+          <!-- A city in Manitoba in Canada -->
           <_name>Berens River</_name>
           <coordinates>52.366667 -97.033333</coordinates>
           <location>
@@ -24886,7 +24487,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Manitoba in Canada -->
+          <!-- A city in Manitoba in Canada -->
           <_name>Brandon</_name>
           <coordinates>49.833333 -99.950000</coordinates>
           <location>
@@ -24896,7 +24497,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Manitoba in Canada -->
+          <!-- A city in Manitoba in Canada -->
           <_name>Carman</_name>
           <coordinates>49.500000 -98.000000</coordinates>
           <location>
@@ -24906,7 +24507,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Manitoba in Canada -->
+          <!-- A city in Manitoba in Canada -->
           <_name>Churchill</_name>
           <coordinates>58.766667 -94.166667</coordinates>
           <location>
@@ -24916,7 +24517,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Manitoba in Canada -->
+          <!-- A city in Manitoba in Canada -->
           <_name>Dauphin</_name>
           <coordinates>51.150000 -100.050000</coordinates>
           <location>
@@ -24926,7 +24527,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Manitoba in Canada -->
+          <!-- A city in Manitoba in Canada -->
           <_name>Flin Flon</_name>
           <coordinates>54.766667 -101.883333</coordinates>
           <location>
@@ -24936,7 +24537,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Manitoba in Canada -->
+          <!-- A city in Manitoba in Canada -->
           <_name>Gillam</_name>
           <coordinates>56.350000 -94.700000</coordinates>
           <location>
@@ -24951,7 +24552,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Manitoba in Canada -->
+          <!-- A city in Manitoba in Canada -->
           <_name>Gimli</_name>
           <coordinates>50.633333 -97.000000</coordinates>
           <location>
@@ -24961,8 +24562,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Manitoba in Canada -->
-          <_name>Grand Rapids</_name>
+          <!-- A city in Manitoba in Canada -->
+          <_name msgctxt="City in Manitoba, Canada">Grand Rapids</_name>
           <coordinates>53.166667 -99.283333</coordinates>
           <location>
             <name>Grand Rapids</name>
@@ -24971,7 +24572,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Manitoba in Canada -->
+          <!-- A city in Manitoba in Canada -->
           <_name>Island Lake</_name>
           <coordinates>53.966667 -94.766667</coordinates>
           <location>
@@ -24981,7 +24582,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Manitoba in Canada -->
+          <!-- A city in Manitoba in Canada -->
           <_name>Lynn Lake</_name>
           <coordinates>56.850000 -101.050000</coordinates>
           <location>
@@ -24991,8 +24592,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Manitoba in Canada -->
-          <_name>Miami</_name>
+          <!-- A city in Manitoba in Canada -->
+          <_name msgctxt="City in Manitoba, Canada">Miami</_name>
           <coordinates>49.366667 -98.250000</coordinates>
           <location>
             <name>Deerwood</name>
@@ -25001,7 +24602,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Manitoba in Canada -->
+          <!-- A city in Manitoba in Canada -->
           <_name>Morden</_name>
           <coordinates>49.183333 -98.100000</coordinates>
           <location>
@@ -25011,7 +24612,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Manitoba in Canada -->
+          <!-- A city in Manitoba in Canada -->
           <_name>Norway House</_name>
           <coordinates>53.966667 -97.833333</coordinates>
           <location>
@@ -25021,7 +24622,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Manitoba in Canada -->
+          <!-- A city in Manitoba in Canada -->
           <_name>Pilot Mound</_name>
           <coordinates>49.200000 -98.900000</coordinates>
           <location>
@@ -25031,7 +24632,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Manitoba in Canada -->
+          <!-- A city in Manitoba in Canada -->
           <_name>Swan River</_name>
           <coordinates>52.100000 -101.266667</coordinates>
           <location>
@@ -25041,7 +24642,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Manitoba in Canada -->
+          <!-- A city in Manitoba in Canada -->
           <_name>The Pas</_name>
           <coordinates>53.816667 -101.233333</coordinates>
           <location>
@@ -25051,7 +24652,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Manitoba in Canada -->
+          <!-- A city in Manitoba in Canada -->
           <_name>Thompson</_name>
           <coordinates>55.750000 -97.866667</coordinates>
           <location>
@@ -25061,7 +24662,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Manitoba in Canada -->
+          <!-- A city in Manitoba in Canada -->
           <_name>Victoria Beach</_name>
           <coordinates>50.700000 -96.550000</coordinates>
           <location>
@@ -25071,7 +24672,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Manitoba in Canada -->
+          <!-- A city in Manitoba in Canada -->
           <_name>Winnipeg</_name>
           <coordinates>49.883333 -97.166667</coordinates>
           <location>
@@ -25087,12 +24688,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Canada -->
+        <!-- A state/province/territory in Canada -->
         <_name>New Brunswick</_name>
         <fips-code>CA04</fips-code>
         <tz-hint>America/Moncton</tz-hint>
         <city>
-          <!-- Translators: this is a city in New Brunswick in Canada -->
+          <!-- A city in New Brunswick in Canada -->
           <_name>Bathurst</_name>
           <coordinates>47.600000 -65.650000</coordinates>
           <location>
@@ -25102,7 +24703,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Brunswick in Canada -->
+          <!-- A city in New Brunswick in Canada -->
           <_name>Dipper Harbour</_name>
           <coordinates>45.083333 -66.416667</coordinates>
           <location>
@@ -25112,7 +24713,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Brunswick in Canada -->
+          <!-- A city in New Brunswick in Canada -->
           <_name>Fredericton</_name>
           <coordinates>45.950000 -66.633333</coordinates>
           <location>
@@ -25122,7 +24723,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Brunswick in Canada -->
+          <!-- A city in New Brunswick in Canada -->
           <_name>Gagetown</_name>
           <coordinates>45.766667 -66.150000</coordinates>
           <location>
@@ -25132,7 +24733,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Brunswick in Canada -->
+          <!-- A city in New Brunswick in Canada -->
           <_name>Moncton</_name>
           <coordinates>46.083333 -64.766667</coordinates>
           <location>
@@ -25142,7 +24743,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Brunswick in Canada -->
+          <!-- A city in New Brunswick in Canada -->
           <_name>Saint John</_name>
           <coordinates>45.266667 -66.066667</coordinates>
           <location>
@@ -25152,7 +24753,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Brunswick in Canada -->
+          <!-- A city in New Brunswick in Canada -->
           <_name>Saint Leonard</_name>
           <coordinates>47.166667 -67.916667</coordinates>
           <location>
@@ -25167,7 +24768,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Brunswick in Canada -->
+          <!-- A city in New Brunswick in Canada -->
           <_name>Saint Stephen</_name>
           <coordinates>45.200000 -67.266667</coordinates>
           <location>
@@ -25178,14 +24779,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Canada -->
+        <!-- A state/province/territory in Canada -->
         <_name>Newfoundland and Labrador</_name>
         <fips-code>CA05</fips-code>
         <tz-hint>America/St_Johns</tz-hint>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
+          <!-- A city in Newfoundland and Labrador in Canada -->
           <_name>Argentia</_name>
           <coordinates>47.300000 -54.000000</coordinates>
           <location>
@@ -25195,9 +24794,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
+          <!-- A city in Newfoundland and Labrador in Canada -->
           <_name>Cape Race</_name>
           <coordinates>46.666667 -53.083333</coordinates>
           <location>
@@ -25207,9 +24804,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
+          <!-- A city in Newfoundland and Labrador in Canada -->
           <_name>Cartwright</_name>
           <coordinates>53.700000 -57.016667</coordinates>
           <location>
@@ -25219,9 +24814,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
+          <!-- A city in Newfoundland and Labrador in Canada -->
           <_name>Deer Lake</_name>
           <coordinates>49.183333 -57.433333</coordinates>
           <location>
@@ -25231,9 +24824,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
+          <!-- A city in Newfoundland and Labrador in Canada -->
           <_name>Englee</_name>
           <coordinates>50.733333 -56.100000</coordinates>
           <location>
@@ -25243,9 +24834,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
+          <!-- A city in Newfoundland and Labrador in Canada -->
           <_name>Ferolle Point</_name>
           <coordinates>51.016667 -57.100000</coordinates>
           <location>
@@ -25255,9 +24844,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
+          <!-- A city in Newfoundland and Labrador in Canada -->
           <_name>Gander</_name>
           <coordinates>48.950000 -54.550000</coordinates>
           <location>
@@ -25267,9 +24854,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
+          <!-- A city in Newfoundland and Labrador in Canada -->
           <_name>Goose Bay</_name>
           <coordinates>53.333333 -60.416667</coordinates>
           <location>
@@ -25279,9 +24864,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
+          <!-- A city in Newfoundland and Labrador in Canada -->
           <_name>Harbour Breton</_name>
           <coordinates>47.483333 -55.833333</coordinates>
           <location>
@@ -25291,10 +24874,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
-          <_name>Hebron</_name>
+          <!-- A city in Newfoundland and Labrador in Canada -->
+          <_name msgctxt="City in Newfoundland and Labrador, Canada">Hebron</_name>
           <coordinates>58.200000 -62.633333</coordinates>
           <location>
             <name>Saglek Bay</name>
@@ -25303,9 +24884,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
+          <!-- A city in Newfoundland and Labrador in Canada -->
           <_name>Hopedale</_name>
           <coordinates>55.450000 -60.216667</coordinates>
           <location>
@@ -25315,9 +24894,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
+          <!-- A city in Newfoundland and Labrador in Canada -->
           <_name>Makkovik</_name>
           <coordinates>55.083333 -59.183333</coordinates>
           <location>
@@ -25327,9 +24904,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
+          <!-- A city in Newfoundland and Labrador in Canada -->
           <_name>Mary's Harbour</_name>
           <coordinates>52.300000 -55.833333</coordinates>
           <location>
@@ -25339,9 +24914,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
+          <!-- A city in Newfoundland and Labrador in Canada -->
           <_name>Mount Pearl Park</_name>
           <coordinates>47.516667 -52.783333</coordinates>
           <location>
@@ -25351,9 +24924,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
+          <!-- A city in Newfoundland and Labrador in Canada -->
           <_name>Nain</_name>
           <coordinates>56.550000 -61.683333</coordinates>
           <location>
@@ -25363,9 +24934,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
+          <!-- A city in Newfoundland and Labrador in Canada -->
           <_name>Neddy Harbour</_name>
           <coordinates>49.533333 -57.866667</coordinates>
           <location>
@@ -25375,9 +24944,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
+          <!-- A city in Newfoundland and Labrador in Canada -->
           <_name>Nutak</_name>
           <coordinates>57.466667 -61.833333</coordinates>
           <location>
@@ -25387,9 +24954,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
+          <!-- A city in Newfoundland and Labrador in Canada -->
           <_name>Saint Anthony</_name>
           <coordinates>51.383333 -55.600000</coordinates>
           <location>
@@ -25399,10 +24964,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
-          <_name>Saint John's</_name>
+          <!-- A city in Newfoundland and Labrador in Canada -->
+          <_name msgctxt="City in Newfoundland and Labrador, Canada">Saint John's</_name>
           <coordinates>47.550000 -52.666667</coordinates>
           <location>
             <name>St. John's</name>
@@ -25411,10 +24974,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
-          <_name>Stephenville</_name>
+          <!-- A city in Newfoundland and Labrador in Canada -->
+          <_name msgctxt="City in Newfoundland and Labrador, Canada">Stephenville</_name>
           <coordinates>48.550000 -58.566667</coordinates>
           <location>
             <name>Stephenville</name>
@@ -25423,9 +24984,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
+          <!-- A city in Newfoundland and Labrador in Canada -->
           <_name>Terra Nova</_name>
           <coordinates>48.500000 -54.216667</coordinates>
           <location>
@@ -25435,9 +24994,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
+          <!-- A city in Newfoundland and Labrador in Canada -->
           <_name>Twillingate</_name>
           <coordinates>49.650000 -54.750000</coordinates>
           <location>
@@ -25447,9 +25004,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Newfoundland and Labrador
-               in Canada
-            -->
+          <!-- A city in Newfoundland and Labrador in Canada -->
           <_name>Wabush</_name>
           <coordinates>52.916667 -66.866667</coordinates>
           <location>
@@ -25460,14 +25015,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Canada -->
+        <!-- A state/province/territory in Canada -->
         <_name>Northwest Territories</_name>
         <fips-code>CA13</fips-code>
         <tz-hint>America/Yellowknife</tz-hint>
         <city>
-          <!-- Translators: this is a city in Northwest Territories in
-               Canada
-            -->
+          <!-- A city in Northwest Territories in Canada -->
           <_name>Aklavik</_name>
           <coordinates>68.216667 -135.000000</coordinates>
           <location>
@@ -25477,9 +25030,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Northwest Territories in
-               Canada
-            -->
+          <!-- A city in Northwest Territories in Canada -->
           <_name>Cape Parry</_name>
           <coordinates>70.166667 -124.666667</coordinates>
           <location>
@@ -25489,9 +25040,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Northwest Territories in
-               Canada
-            -->
+          <!-- A city in Northwest Territories in Canada -->
           <_name>DÃlÄne</_name>
           <coordinates>65.183333 -123.416667</coordinates>
           <location>
@@ -25506,9 +25055,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Northwest Territories in
-               Canada
-            -->
+          <!-- A city in Northwest Territories in Canada -->
           <_name>Fort Good Hope</_name>
           <coordinates>66.266667 -128.633333</coordinates>
           <location>
@@ -25518,9 +25065,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Northwest Territories in
-               Canada
-            -->
+          <!-- A city in Northwest Territories in Canada -->
           <_name>Fort Providence</_name>
           <coordinates>61.366667 -117.650000</coordinates>
           <location>
@@ -25530,9 +25075,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Northwest Territories in
-               Canada
-            -->
+          <!-- A city in Northwest Territories in Canada -->
           <_name>Fort Simpson</_name>
           <coordinates>61.850000 -121.333333</coordinates>
           <location>
@@ -25542,10 +25085,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Northwest Territories in
-               Canada
-            -->
-          <_name>Fort Smith</_name>
+          <!-- A city in Northwest Territories in Canada -->
+          <_name msgctxt="City in Northwest Territories, Canada">Fort Smith</_name>
           <coordinates>60.000000 -111.883333</coordinates>
           <location>
             <name>Fort Smith</name>
@@ -25554,9 +25095,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Northwest Territories in
-               Canada
-            -->
+          <!-- A city in Northwest Territories in Canada -->
           <_name>Hay River</_name>
           <coordinates>60.850000 -115.700000</coordinates>
           <location>
@@ -25566,9 +25105,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Northwest Territories in
-               Canada
-            -->
+          <!-- A city in Northwest Territories in Canada -->
           <_name>Holman</_name>
           <coordinates>70.733333 -117.750000</coordinates>
           <location>
@@ -25578,9 +25115,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Northwest Territories in
-               Canada
-            -->
+          <!-- A city in Northwest Territories in Canada -->
           <_name>Inuvik</_name>
           <coordinates>68.350000 -133.700000</coordinates>
           <location>
@@ -25595,9 +25130,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Northwest Territories in
-               Canada
-            -->
+          <!-- A city in Northwest Territories in Canada -->
           <_name>Nahanni Butte</_name>
           <coordinates>61.050000 -123.366667</coordinates>
           <location>
@@ -25607,9 +25140,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Northwest Territories in
-               Canada
-            -->
+          <!-- A city in Northwest Territories in Canada -->
           <_name>Norman Wells</_name>
           <coordinates>65.283333 -126.850000</coordinates>
           <location>
@@ -25619,9 +25150,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Northwest Territories in
-               Canada
-            -->
+          <!-- A city in Northwest Territories in Canada -->
           <_name>Paulatuk</_name>
           <coordinates>69.383333 -123.983333</coordinates>
           <location>
@@ -25631,9 +25160,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Northwest Territories in
-               Canada
-            -->
+          <!-- A city in Northwest Territories in Canada -->
           <_name>Sachs Harbour</_name>
           <coordinates>71.983333 -125.200000</coordinates>
           <location>
@@ -25643,9 +25170,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Northwest Territories in
-               Canada
-            -->
+          <!-- A city in Northwest Territories in Canada -->
           <_name>Tuktoyaktuk</_name>
           <coordinates>69.450000 -133.066667</coordinates>
           <location>
@@ -25655,9 +25180,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Northwest Territories in
-               Canada
-            -->
+          <!-- A city in Northwest Territories in Canada -->
           <_name>Tununuk</_name>
           <coordinates>69.000000 -134.666667</coordinates>
           <location>
@@ -25667,9 +25190,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Northwest Territories in
-               Canada
-            -->
+          <!-- A city in Northwest Territories in Canada -->
           <_name>Wha Ti</_name>
           <coordinates>63.133333 -117.266667</coordinates>
           <location>
@@ -25679,9 +25200,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Northwest Territories in
-               Canada
-            -->
+          <!-- A city in Northwest Territories in Canada -->
           <_name>Yellowknife</_name>
           <coordinates>62.450000 -114.350000</coordinates>
           <location>
@@ -25692,12 +25211,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Canada -->
+        <!-- A state/province/territory in Canada -->
         <_name>Nova Scotia</_name>
         <fips-code>CA07</fips-code>
         <tz-hint>America/Halifax</tz-hint>
         <city>
-          <!-- Translators: this is a city in Nova Scotia in Canada -->
+          <!-- A city in Nova Scotia in Canada -->
           <_name>Bay Saint Lawrence</_name>
           <coordinates>47.000000 -60.466667</coordinates>
           <location>
@@ -25707,7 +25226,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nova Scotia in Canada -->
+          <!-- A city in Nova Scotia in Canada -->
           <_name>Beaver Harbour</_name>
           <coordinates>44.900000 -62.416667</coordinates>
           <location>
@@ -25717,7 +25236,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nova Scotia in Canada -->
+          <!-- A city in Nova Scotia in Canada -->
           <_name>Caledonia</_name>
           <coordinates>44.366667 -65.033333</coordinates>
           <location>
@@ -25727,7 +25246,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nova Scotia in Canada -->
+          <!-- A city in Nova Scotia in Canada -->
           <_name>Canso</_name>
           <coordinates>45.350000 -61.000000</coordinates>
           <location>
@@ -25737,7 +25256,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nova Scotia in Canada -->
+          <!-- A city in Nova Scotia in Canada -->
           <_name>Caribou Island</_name>
           <coordinates>45.750000 -62.733333</coordinates>
           <location>
@@ -25747,7 +25266,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nova Scotia in Canada -->
+          <!-- A city in Nova Scotia in Canada -->
           <_name>ChÃticamp</_name>
           <coordinates>46.616667 -61.016667</coordinates>
           <location>
@@ -25757,7 +25276,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nova Scotia in Canada -->
+          <!-- A city in Nova Scotia in Canada -->
           <_name>Dingwall</_name>
           <coordinates>46.900000 -60.466667</coordinates>
           <location>
@@ -25767,7 +25286,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nova Scotia in Canada -->
+          <!-- A city in Nova Scotia in Canada -->
           <_name>Grand-Etang</_name>
           <coordinates>46.550000 -61.033333</coordinates>
           <location>
@@ -25777,8 +25296,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nova Scotia in Canada -->
-          <_name>Greenwood</_name>
+          <!-- A city in Nova Scotia in Canada -->
+          <_name msgctxt="City in Nova Scotia, Canada">Greenwood</_name>
           <coordinates>44.983333 -64.900000</coordinates>
           <location>
             <name>Greenwood</name>
@@ -25787,7 +25306,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nova Scotia in Canada -->
+          <!-- A city in Nova Scotia in Canada -->
           <_name>Halifax</_name>
           <coordinates>44.650000 -63.600000</coordinates>
           <location>
@@ -25802,7 +25321,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nova Scotia in Canada -->
+          <!-- A city in Nova Scotia in Canada -->
           <_name>Kentville</_name>
           <coordinates>45.066667 -64.500000</coordinates>
           <location>
@@ -25812,8 +25331,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nova Scotia in Canada -->
-          <_name>Liverpool</_name>
+          <!-- A city in Nova Scotia in Canada -->
+          <_name msgctxt="City in Nova Scotia, Canada">Liverpool</_name>
           <coordinates>44.033333 -64.716667</coordinates>
           <location>
             <name>Western Head</name>
@@ -25822,7 +25341,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nova Scotia in Canada -->
+          <!-- A city in Nova Scotia in Canada -->
           <_name>Sheet Harbour</_name>
           <coordinates>44.933333 -62.533333</coordinates>
           <location>
@@ -25832,8 +25351,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nova Scotia in Canada -->
-          <_name>Sydney</_name>
+          <!-- A city in Nova Scotia in Canada -->
+          <_name msgctxt="City in Nova Scotia, Canada">Sydney</_name>
           <coordinates>46.150000 -60.166667</coordinates>
           <location>
             <name>Sydney</name>
@@ -25842,7 +25361,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nova Scotia in Canada -->
+          <!-- A city in Nova Scotia in Canada -->
           <_name>Westport</_name>
           <coordinates>44.266667 -66.350000</coordinates>
           <location>
@@ -25852,7 +25371,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nova Scotia in Canada -->
+          <!-- A city in Nova Scotia in Canada -->
           <_name>Yarmouth</_name>
           <coordinates>43.833333 -66.116667</coordinates>
           <location>
@@ -25863,12 +25382,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Canada -->
+        <!-- A state/province/territory in Canada -->
         <_name>Nunavut</_name>
         <fips-code>CA14</fips-code>
         <tz-hint>America/Iqaluit</tz-hint>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Arviat</_name>
           <coordinates>61.116667 -94.050000</coordinates>
           <location>
@@ -25878,7 +25397,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Baker Lake</_name>
           <coordinates>64.316667 -96.016667</coordinates>
           <location>
@@ -25888,7 +25407,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Cambridge Bay</_name>
           <coordinates>69.116667 -105.033333</coordinates>
           <location>
@@ -25898,7 +25417,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Cape Dorset</_name>
           <coordinates>64.233333 -76.550000</coordinates>
           <location>
@@ -25908,7 +25427,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Cape Dyer</_name>
           <coordinates>66.666667 -61.366667</coordinates>
           <location>
@@ -25918,7 +25437,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Chesterfield Inlet</_name>
           <coordinates>63.333333 -90.700000</coordinates>
           <location>
@@ -25928,7 +25447,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Clyde River</_name>
           <coordinates>70.450000 -68.566667</coordinates>
           <location>
@@ -25938,7 +25457,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Coral Harbour</_name>
           <coordinates>64.133333 -83.166667</coordinates>
           <location>
@@ -25948,7 +25467,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Ennadai</_name>
           <coordinates>61.133333 -100.883333</coordinates>
           <location>
@@ -25958,8 +25477,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
-          <_name>Eureka</_name>
+          <!-- A city in Nunavut in Canada -->
+          <_name msgctxt="City in Nunavut, Canada">Eureka</_name>
           <coordinates>80.216667 -86.183333</coordinates>
           <location>
             <name>Eureka</name>
@@ -25968,7 +25487,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Gjoa Haven</_name>
           <coordinates>68.633333 -95.916667</coordinates>
           <location>
@@ -25978,7 +25497,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Hall Beach</_name>
           <coordinates>68.766667 -81.200000</coordinates>
           <location>
@@ -25988,7 +25507,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Igloolik</_name>
           <coordinates>69.400000 -81.800000</coordinates>
           <location>
@@ -25998,7 +25517,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Iqaluit</_name>
           <coordinates>63.733333 -68.500000</coordinates>
           <location>
@@ -26008,7 +25527,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Kugaaruk</_name>
           <coordinates>68.533333 -89.816667</coordinates>
           <location>
@@ -26018,7 +25537,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Kugluktuk</_name>
           <coordinates>67.833333 -115.083333</coordinates>
           <location>
@@ -26028,7 +25547,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Pangnirtung</_name>
           <coordinates>66.133333 -65.750000</coordinates>
           <location>
@@ -26038,7 +25557,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Pond Inlet</_name>
           <coordinates>72.700000 -78.000000</coordinates>
           <location>
@@ -26048,7 +25567,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Qikiqtarjuaq</_name>
           <coordinates>67.550000 -64.033333</coordinates>
           <location>
@@ -26063,7 +25582,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Rankin Inlet</_name>
           <coordinates>62.816667 -92.083333</coordinates>
           <location>
@@ -26073,7 +25592,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Repulse Bay</_name>
           <coordinates>66.516667 -86.233333</coordinates>
           <location>
@@ -26083,7 +25602,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Resolute</_name>
           <coordinates>74.683333 -94.900000</coordinates>
           <location>
@@ -26093,7 +25612,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nunavut in Canada -->
+          <!-- A city in Nunavut in Canada -->
           <_name>Taloyoak</_name>
           <coordinates>69.533333 -93.533333</coordinates>
           <location>
@@ -26104,12 +25623,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Canada -->
-        <_name>Ontario</_name>
+        <!-- A state/province/territory in Canada -->
+        <_name msgctxt="State in Canada">Ontario</_name>
         <fips-code>CA08</fips-code>
         <tz-hint>America/Toronto</tz-hint>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Bancroft</_name>
           <coordinates>45.050000 -77.850000</coordinates>
           <location>
@@ -26119,7 +25638,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Beardmore</_name>
           <coordinates>49.600000 -87.950000</coordinates>
           <location>
@@ -26129,7 +25648,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Borden</_name>
           <coordinates>44.283333 -79.916667</coordinates>
           <location>
@@ -26139,8 +25658,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
-          <_name>Burlington</_name>
+          <!-- A city in Ontario in Canada -->
+          <_name msgctxt="City in Ontario, Canada">Burlington</_name>
           <coordinates>43.316667 -79.800000</coordinates>
           <location>
             <name>Burlington Piers</name>
@@ -26149,7 +25668,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Central Patricia</_name>
           <coordinates>51.483333 -90.150000</coordinates>
           <location>
@@ -26159,7 +25678,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Chapleau</_name>
           <coordinates>47.833333 -83.400000</coordinates>
           <location>
@@ -26169,7 +25688,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Cobourg</_name>
           <coordinates>43.966667 -78.166667</coordinates>
           <location>
@@ -26179,7 +25698,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Collingwood</_name>
           <coordinates>44.500000 -80.216667</coordinates>
           <location>
@@ -26189,7 +25708,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Coppell</_name>
           <coordinates>49.533333 -83.833333</coordinates>
           <location>
@@ -26199,7 +25718,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Delhi</_name>
           <coordinates>42.850000 -80.500000</coordinates>
           <location>
@@ -26209,8 +25728,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
-          <_name>Dryden</_name>
+          <!-- A city in Ontario in Canada -->
+          <_name msgctxt="City in Ontario, Canada">Dryden</_name>
           <coordinates>49.783333 -92.833333</coordinates>
           <location>
             <name>Dryden Airport</name>
@@ -26219,7 +25738,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Earlton</_name>
           <coordinates>47.716667 -79.816667</coordinates>
           <location>
@@ -26229,7 +25748,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Elliot Lake</_name>
           <coordinates>46.383333 -82.650000</coordinates>
           <location>
@@ -26239,7 +25758,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Erieau</_name>
           <coordinates>42.250000 -81.916667</coordinates>
           <location>
@@ -26249,7 +25768,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Front of Escott</_name>
           <coordinates>44.433333 -75.950000</coordinates>
           <location>
@@ -26259,7 +25778,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Geraldton</_name>
           <coordinates>49.716667 -86.966667</coordinates>
           <location>
@@ -26269,7 +25788,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Goderich</_name>
           <coordinates>43.733333 -81.700000</coordinates>
           <location>
@@ -26279,7 +25798,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Gore Bay</_name>
           <coordinates>45.916667 -82.466667</coordinates>
           <location>
@@ -26289,7 +25808,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Hallowell</_name>
           <coordinates>44.000000 -77.233333</coordinates>
           <location>
@@ -26299,8 +25818,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
-          <_name>Hamilton</_name>
+          <!-- A city in Ontario in Canada -->
+          <_name msgctxt="City in Ontario, Canada">Hamilton</_name>
           <coordinates>43.250000 -79.833333</coordinates>
           <location>
             <name>Hamilton Airport</name>
@@ -26309,7 +25828,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Heron Bay</_name>
           <coordinates>48.650000 -86.283333</coordinates>
           <location>
@@ -26319,7 +25838,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Kapuskasing</_name>
           <coordinates>49.416667 -82.433333</coordinates>
           <location>
@@ -26329,7 +25848,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Kenora</_name>
           <coordinates>49.766667 -94.466667</coordinates>
           <location>
@@ -26339,8 +25858,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
-          <_name>Kingston</_name>
+          <!-- A city in Ontario in Canada -->
+          <_name msgctxt="City in Ontario, Canada">Kingston</_name>
           <coordinates>44.233333 -76.483333</coordinates>
           <location>
             <name>Kingston</name>
@@ -26350,8 +25869,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
-          <_name>London</_name>
+          <!-- A city in Ontario in Canada -->
+          <_name msgctxt="City in Ontario, Canada">London</_name>
           <coordinates>42.983333 -81.250000</coordinates>
           <location>
             <name>London</name>
@@ -26360,7 +25879,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Moosonee</_name>
           <coordinates>51.266667 -80.650000</coordinates>
           <location>
@@ -26370,7 +25889,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Mount Forest</_name>
           <coordinates>43.966667 -80.733333</coordinates>
           <location>
@@ -26380,7 +25899,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Muskoka Falls</_name>
           <coordinates>45.000000 -79.300000</coordinates>
           <location>
@@ -26390,7 +25909,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Nanticoke</_name>
           <coordinates>42.800000 -80.066667</coordinates>
           <location>
@@ -26400,7 +25919,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>North Bay</_name>
           <coordinates>46.300000 -79.450000</coordinates>
           <location>
@@ -26410,7 +25929,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is the capital of Canada -->
+          <!-- The capital of Canada -->
           <_name>Ottawa</_name>
           <coordinates>45.416667 -75.700000</coordinates>
           <location>
@@ -26421,7 +25940,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Petawawa</_name>
           <coordinates>45.900000 -77.283333</coordinates>
           <location>
@@ -26431,7 +25950,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Peterborough</_name>
           <coordinates>44.300000 -78.333333</coordinates>
           <location>
@@ -26441,7 +25960,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Port Colborne</_name>
           <coordinates>42.883333 -79.233333</coordinates>
           <location>
@@ -26451,7 +25970,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Port Weller</_name>
           <coordinates>43.216667 -79.216667</coordinates>
           <location>
@@ -26461,7 +25980,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Red Lake</_name>
           <coordinates>51.033333 -93.833333</coordinates>
           <location>
@@ -26471,7 +25990,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Saint Catharines</_name>
           <coordinates>43.166667 -79.233333</coordinates>
           <location>
@@ -26481,7 +26000,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Sarnia</_name>
           <coordinates>42.966667 -82.400000</coordinates>
           <location>
@@ -26491,7 +26010,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Sault Sainte Marie</_name>
           <coordinates>46.500000 -84.333333</coordinates>
           <location>
@@ -26501,7 +26020,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Sioux Lookout</_name>
           <coordinates>50.100000 -91.916667</coordinates>
           <location>
@@ -26511,7 +26030,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Sudbury</_name>
           <coordinates>46.500000 -80.966667</coordinates>
           <location>
@@ -26521,7 +26040,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Thunder Bay</_name>
           <coordinates>48.400000 -89.233333</coordinates>
           <location>
@@ -26531,7 +26050,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Timmins</_name>
           <coordinates>48.466667 -81.333333</coordinates>
           <location>
@@ -26541,7 +26060,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Tobermory</_name>
           <coordinates>45.250000 -81.666667</coordinates>
           <location>
@@ -26551,7 +26070,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Toronto</_name>
           <coordinates>43.666667 -79.416667</coordinates>
           <location>
@@ -26573,8 +26092,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
-          <_name>Trenton</_name>
+          <!-- A city in Ontario in Canada -->
+          <_name msgctxt="City in Ontario, Canada">Trenton</_name>
           <coordinates>44.100000 -77.583333</coordinates>
           <location>
             <name>Trenton</name>
@@ -26584,7 +26103,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Upsala</_name>
           <coordinates>49.050000 -90.466667</coordinates>
           <location>
@@ -26594,8 +26113,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
-          <_name>Waterloo</_name>
+          <!-- A city in Ontario in Canada -->
+          <_name msgctxt="City in Ontario, Canada">Waterloo</_name>
           <coordinates>43.466667 -80.533333</coordinates>
           <location>
             <name>Waterloo Well</name>
@@ -26604,7 +26123,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Wawa</_name>
           <coordinates>48.000000 -84.783333</coordinates>
           <location>
@@ -26614,7 +26133,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Whitefish Falls</_name>
           <coordinates>46.100000 -81.716667</coordinates>
           <location>
@@ -26624,7 +26143,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Wiarton</_name>
           <coordinates>44.733333 -81.133333</coordinates>
           <location>
@@ -26634,7 +26153,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ontario in Canada -->
+          <!-- A city in Ontario in Canada -->
           <_name>Windsor</_name>
           <coordinates>42.333333 -83.033333</coordinates>
           <location>
@@ -26645,14 +26164,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Canada -->
+        <!-- A state/province/territory in Canada -->
         <_name>Prince Edward Island</_name>
         <fips-code>CA09</fips-code>
         <tz-hint>America/Halifax</tz-hint>
         <city>
-          <!-- Translators: this is a city in Prince Edward Island in
-               Canada
-            -->
+          <!-- A city in Prince Edward Island in Canada -->
           <_name>Charlottetown</_name>
           <coordinates>46.233333 -63.133333</coordinates>
           <location>
@@ -26662,10 +26179,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Prince Edward Island in
-               Canada
-            -->
-          <_name>Elmira</_name>
+          <!-- A city in Prince Edward Island in Canada -->
+          <_name msgctxt="City in Prince Edward Island, Canada">Elmira</_name>
           <coordinates>46.433333 -62.066667</coordinates>
           <location>
             <name>East Point</name>
@@ -26674,9 +26189,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Prince Edward Island in
-               Canada
-            -->
+          <!-- A city in Prince Edward Island in Canada -->
           <_name>Summerside</_name>
           <coordinates>46.400000 -63.783333</coordinates>
           <location>
@@ -26686,9 +26199,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Prince Edward Island in
-               Canada
-            -->
+          <!-- A city in Prince Edward Island in Canada -->
           <_name>Tignish</_name>
           <coordinates>46.950000 -64.033333</coordinates>
           <location>
@@ -26699,12 +26210,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Canada -->
-        <_name>Quebec</_name>
+        <!-- A state/province/territory in Canada -->
+        <_name msgctxt="State in Canada">Quebec</_name>
         <fips-code>CA10</fips-code>
         <tz-hint>America/Montreal</tz-hint>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Amqui</_name>
           <coordinates>48.466667 -67.433333</coordinates>
           <location>
@@ -26714,7 +26225,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Bagotville</_name>
           <coordinates>48.350000 -70.883333</coordinates>
           <location>
@@ -26724,7 +26235,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Baie-Comeau</_name>
           <coordinates>49.216667 -68.150000</coordinates>
           <location>
@@ -26734,7 +26245,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Baie-Sainte-Catherine</_name>
           <coordinates>48.100000 -69.733333</coordinates>
           <location>
@@ -26744,7 +26255,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Baie-de-la-TrinitÃ</_name>
           <coordinates>49.416667 -67.316667</coordinates>
           <location>
@@ -26754,7 +26265,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Beauceville</_name>
           <coordinates>46.200000 -70.766667</coordinates>
           <location>
@@ -26764,7 +26275,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Beauport</_name>
           <coordinates>46.850000 -71.183333</coordinates>
           <location>
@@ -26774,8 +26285,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
-          <_name>Bedford</_name>
+          <!-- A city in Quebec in Canada -->
+          <_name msgctxt="City in Quebec, Canada">Bedford</_name>
           <coordinates>45.116667 -72.983333</coordinates>
           <location>
             <name>Frelighsburg</name>
@@ -26784,7 +26295,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Bellin</_name>
           <coordinates>60.016667 -70.033333</coordinates>
           <location>
@@ -26794,7 +26305,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Blanc-Sablon</_name>
           <coordinates>51.433333 -57.116667</coordinates>
           <location>
@@ -26804,7 +26315,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Canton-BÃgin</_name>
           <coordinates>48.683333 -71.366667</coordinates>
           <location>
@@ -26814,7 +26325,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Cap-Chat</_name>
           <coordinates>49.083333 -66.683333</coordinates>
           <location>
@@ -26824,7 +26335,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Cap-aux-Meules</_name>
           <coordinates>47.383333 -61.866667</coordinates>
           <location>
@@ -26839,7 +26350,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Cape Cove</_name>
           <coordinates>48.433333 -64.333333</coordinates>
           <location>
@@ -26849,7 +26360,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Chibougamau</_name>
           <coordinates>49.866667 -74.350000</coordinates>
           <location>
@@ -26859,7 +26370,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Fort-Rupert</_name>
           <coordinates>51.483333 -78.766667</coordinates>
           <location>
@@ -26869,7 +26380,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Fox Bay</_name>
           <coordinates>49.266667 -61.850000</coordinates>
           <location>
@@ -26879,7 +26390,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>GaspÃ</_name>
           <coordinates>48.833333 -64.483333</coordinates>
           <location>
@@ -26889,7 +26400,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Gatineau</_name>
           <coordinates>45.483333 -75.650000</coordinates>
           <location>
@@ -26899,7 +26410,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Harrington Harbour</_name>
           <coordinates>50.516667 -59.483333</coordinates>
           <location>
@@ -26909,7 +26420,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Havre-Saint-Pierre</_name>
           <coordinates>50.250000 -63.583333</coordinates>
           <location>
@@ -26919,7 +26430,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Inoucdjouac</_name>
           <coordinates>58.450000 -78.150000</coordinates>
           <location>
@@ -26929,7 +26440,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Ivugivik</_name>
           <coordinates>62.416667 -77.900000</coordinates>
           <location>
@@ -26939,7 +26450,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Jacques-Cartier</_name>
           <coordinates>45.533333 -73.483333</coordinates>
           <location>
@@ -26950,7 +26461,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>JonquiÃre</_name>
           <coordinates>48.416667 -71.250000</coordinates>
           <location>
@@ -26960,7 +26471,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Koartac</_name>
           <coordinates>61.033333 -69.616667</coordinates>
           <location>
@@ -26970,7 +26481,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Kuujjuaq</_name>
           <coordinates>58.100000 -68.400000</coordinates>
           <location>
@@ -26980,7 +26491,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>L'Anse-Saint-Jean</_name>
           <coordinates>48.233333 -70.183333</coordinates>
           <location>
@@ -26990,7 +26501,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>L'Ascension</_name>
           <coordinates>48.683333 -71.666667</coordinates>
           <location>
@@ -27000,7 +26511,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>L'Assomption</_name>
           <coordinates>45.816667 -73.433333</coordinates>
           <location>
@@ -27010,7 +26521,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>La Baie</_name>
           <coordinates>48.333333 -70.866667</coordinates>
           <location>
@@ -27020,7 +26531,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>La Tuque</_name>
           <coordinates>47.450000 -72.783333</coordinates>
           <location>
@@ -27030,7 +26541,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Leaf River</_name>
           <coordinates>58.766667 -69.116667</coordinates>
           <location>
@@ -27040,7 +26551,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Lennoxville</_name>
           <coordinates>45.366667 -71.866667</coordinates>
           <location>
@@ -27050,7 +26561,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Longue-Pointe-de-Mingan</_name>
           <coordinates>50.266667 -64.150000</coordinates>
           <location>
@@ -27065,7 +26576,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Maniwaki</_name>
           <coordinates>46.366667 -75.966667</coordinates>
           <location>
@@ -27075,7 +26586,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Maricourt</_name>
           <coordinates>61.600000 -71.950000</coordinates>
           <location>
@@ -27085,7 +26596,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Matagami</_name>
           <coordinates>49.750000 -77.633333</coordinates>
           <location>
@@ -27095,7 +26606,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Mont-Apica</_name>
           <coordinates>47.983333 -71.433333</coordinates>
           <location>
@@ -27105,7 +26616,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Mont-Joli</_name>
           <coordinates>48.583333 -68.183333</coordinates>
           <location>
@@ -27115,7 +26626,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Montmagny</_name>
           <coordinates>46.966667 -70.550000</coordinates>
           <location>
@@ -27125,7 +26636,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada.
+          <!-- A city in Quebec in Canada.
                The local name in French is "MontrÃal".
             -->
           <_name>Montreal</_name>
@@ -27149,7 +26660,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Natashquan</_name>
           <coordinates>50.183333 -61.816667</coordinates>
           <location>
@@ -27159,7 +26670,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>New Carlisle</_name>
           <coordinates>48.000000 -65.333333</coordinates>
           <location>
@@ -27169,7 +26680,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Nicolet</_name>
           <coordinates>46.216667 -72.600000</coordinates>
           <location>
@@ -27179,7 +26690,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Normandin</_name>
           <coordinates>48.833333 -72.516667</coordinates>
           <location>
@@ -27189,7 +26700,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Notre-Dame-de-la-Salette</_name>
           <coordinates>45.766667 -75.583333</coordinates>
           <location>
@@ -27199,7 +26710,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Nouveau-Comptoir</_name>
           <coordinates>53.000000 -78.816667</coordinates>
           <location>
@@ -27209,7 +26720,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Parent</_name>
           <coordinates>47.916667 -74.616667</coordinates>
           <location>
@@ -27219,7 +26730,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Petite-RiviÃre</_name>
           <coordinates>47.316667 -70.566667</coordinates>
           <location>
@@ -27229,7 +26740,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Port-Menier</_name>
           <coordinates>49.816667 -64.350000</coordinates>
           <location>
@@ -27239,7 +26750,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Portneuf</_name>
           <coordinates>46.683333 -71.883333</coordinates>
           <location>
@@ -27249,7 +26760,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Poste-de-la-Baleine</_name>
           <coordinates>55.266667 -77.783333</coordinates>
           <location>
@@ -27259,7 +26770,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Puvirnituq</_name>
           <coordinates>60.033333 -77.283333</coordinates>
           <location>
@@ -27269,10 +26780,10 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada.
+          <!-- A city in Quebec in Canada.
                The local name in French is "QuÃbec".
             -->
-          <_name>Quebec</_name>
+          <_name msgctxt="City in Quebec, Canada">Quebec</_name>
           <coordinates>46.800000 -71.250000</coordinates>
           <location>
             <name>Quebec</name>
@@ -27281,7 +26792,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Radisson</_name>
           <coordinates>53.783333 -77.616667</coordinates>
           <location>
@@ -27291,7 +26802,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>RiviÃre-du-Loup</_name>
           <coordinates>47.833333 -69.533333</coordinates>
           <location>
@@ -27301,7 +26812,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>RiviÃre-la-Madeleine</_name>
           <coordinates>49.233333 -65.316667</coordinates>
           <location>
@@ -27311,7 +26822,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Roberval</_name>
           <coordinates>48.516667 -72.216667</coordinates>
           <location>
@@ -27321,7 +26832,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Rouyn</_name>
           <coordinates>48.250000 -79.033333</coordinates>
           <location>
@@ -27331,7 +26842,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Saint-Anicet</_name>
           <coordinates>45.133333 -74.350000</coordinates>
           <location>
@@ -27341,7 +26852,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Saint-Chrysostome</_name>
           <coordinates>45.100000 -73.750000</coordinates>
           <location>
@@ -27351,7 +26862,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Saint-Fabien</_name>
           <coordinates>48.283333 -68.866667</coordinates>
           <location>
@@ -27361,7 +26872,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Saint-FranÃois</_name>
           <coordinates>47.000000 -70.816667</coordinates>
           <location>
@@ -27371,7 +26882,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Saint-Henri-de-Taillon</_name>
           <coordinates>48.666667 -71.816667</coordinates>
           <location>
@@ -27381,7 +26892,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Saint-Jean</_name>
           <coordinates>45.300000 -73.250000</coordinates>
           <location>
@@ -27391,7 +26902,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Saint-Joachim</_name>
           <coordinates>47.050000 -70.850000</coordinates>
           <location>
@@ -27401,7 +26912,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Saint-Jovite</_name>
           <coordinates>46.116667 -74.583333</coordinates>
           <location>
@@ -27411,7 +26922,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Sainte-Anne-de-la-PocatiÃre</_name>
           <coordinates>47.366667 -70.033333</coordinates>
           <location>
@@ -27421,7 +26932,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Schefferville</_name>
           <coordinates>54.800000 -66.816667</coordinates>
           <location>
@@ -27431,7 +26942,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Senneville</_name>
           <coordinates>45.433333 -73.966667</coordinates>
           <location>
@@ -27441,7 +26952,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Sept-Ãles</_name>
           <coordinates>50.200000 -66.383333</coordinates>
           <location>
@@ -27456,7 +26967,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Shawinigan</_name>
           <coordinates>46.550000 -72.733333</coordinates>
           <location>
@@ -27466,7 +26977,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Sherbrooke</_name>
           <coordinates>45.400000 -71.900000</coordinates>
           <location>
@@ -27476,7 +26987,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Stoneham</_name>
           <coordinates>46.983333 -71.366667</coordinates>
           <location>
@@ -27486,7 +26997,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Trois-RiviÃres</_name>
           <coordinates>46.350000 -72.550000</coordinates>
           <location>
@@ -27496,7 +27007,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Val-d'Or</_name>
           <coordinates>48.116667 -77.766667</coordinates>
           <location>
@@ -27506,7 +27017,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Valcartier Station</_name>
           <coordinates>46.883333 -71.516667</coordinates>
           <location>
@@ -27516,7 +27027,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quebec in Canada -->
+          <!-- A city in Quebec in Canada -->
           <_name>Varennes</_name>
           <coordinates>45.683333 -73.433333</coordinates>
           <location>
@@ -27527,12 +27038,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Canada -->
+        <!-- A state/province/territory in Canada -->
         <_name>Saskatchewan</_name>
         <fips-code>CA11</fips-code>
         <tz-hint>America/Regina</tz-hint>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Assiniboia</_name>
           <coordinates>49.616667 -105.983333</coordinates>
           <location>
@@ -27542,7 +27053,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Broadview</_name>
           <coordinates>50.383333 -102.566667</coordinates>
           <location>
@@ -27552,7 +27063,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Buffalo Narrows</_name>
           <coordinates>55.854167 -108.484167</coordinates>
           <location>
@@ -27567,7 +27078,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>East Poplar</_name>
           <coordinates>49.066667 -105.383333</coordinates>
           <location>
@@ -27577,7 +27088,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Eastend</_name>
           <coordinates>49.516667 -108.816667</coordinates>
           <location>
@@ -27587,7 +27098,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Estevan</_name>
           <coordinates>49.150000 -103.000000</coordinates>
           <location>
@@ -27597,7 +27108,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Kindersley</_name>
           <coordinates>51.466667 -109.133333</coordinates>
           <location>
@@ -27607,7 +27118,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>La Ronge</_name>
           <coordinates>55.100000 -105.300000</coordinates>
           <location>
@@ -27622,7 +27133,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Leader</_name>
           <coordinates>50.883333 -109.550000</coordinates>
           <location>
@@ -27632,7 +27143,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Lloydminster</_name>
           <coordinates>53.283333 -110.000000</coordinates>
           <location>
@@ -27642,7 +27153,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Lucky Lake</_name>
           <coordinates>50.983333 -107.133333</coordinates>
           <location>
@@ -27652,7 +27163,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Maple Creek</_name>
           <coordinates>49.916667 -109.466667</coordinates>
           <location>
@@ -27667,7 +27178,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Meadow Lake</_name>
           <coordinates>54.129722 -108.434722</coordinates>
           <location>
@@ -27677,7 +27188,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Melfort</_name>
           <coordinates>52.866667 -104.600000</coordinates>
           <location>
@@ -27687,7 +27198,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Nipawin</_name>
           <coordinates>53.366667 -104.016667</coordinates>
           <location>
@@ -27697,7 +27208,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>North Battleford</_name>
           <coordinates>52.766667 -108.283333</coordinates>
           <location>
@@ -27707,7 +27218,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Prince Albert</_name>
           <coordinates>53.200000 -105.750000</coordinates>
           <location>
@@ -27717,7 +27228,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Regina</_name>
           <coordinates>50.450000 -104.616667</coordinates>
           <location>
@@ -27737,7 +27248,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Rockglen</_name>
           <coordinates>49.183333 -105.950000</coordinates>
           <location>
@@ -27747,7 +27258,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Rosetown</_name>
           <coordinates>51.550000 -107.983333</coordinates>
           <location>
@@ -27757,7 +27268,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Saskatoon</_name>
           <coordinates>52.133333 -106.666667</coordinates>
           <location>
@@ -27767,8 +27278,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
-          <_name>Southend</_name>
+          <!-- A city in Saskatchewan in Canada -->
+          <_name msgctxt="City in Saskatchewan, Canada">Southend</_name>
           <coordinates>56.333333 -103.233333</coordinates>
           <location>
             <name>Southend Automatic Weather Reporting System</name>
@@ -27777,7 +27288,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Spiritwood</_name>
           <coordinates>53.366667 -107.516667</coordinates>
           <location>
@@ -27787,7 +27298,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Stony Rapids</_name>
           <coordinates>59.266667 -105.833333</coordinates>
           <location>
@@ -27797,7 +27308,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Swift Current</_name>
           <coordinates>50.283333 -107.766667</coordinates>
           <location>
@@ -27807,7 +27318,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Uranium City</_name>
           <coordinates>59.566667 -108.616667</coordinates>
           <location>
@@ -27817,7 +27328,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Val Marie</_name>
           <coordinates>49.233333 -107.733333</coordinates>
           <location>
@@ -27827,7 +27338,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Watrous</_name>
           <coordinates>51.666667 -105.466667</coordinates>
           <location>
@@ -27837,7 +27348,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Weyburn</_name>
           <coordinates>49.666667 -103.850000</coordinates>
           <location>
@@ -27847,7 +27358,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Wynyard</_name>
           <coordinates>51.766667 -104.183333</coordinates>
           <location>
@@ -27857,7 +27368,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Saskatchewan in Canada -->
+          <!-- A city in Saskatchewan in Canada -->
           <_name>Yorkton</_name>
           <coordinates>51.216667 -102.466667</coordinates>
           <location>
@@ -27873,7 +27384,7 @@
         <fips-code>CA12</fips-code>
         <tz-hint>America/Whitehorse</tz-hint>
         <city>
-          <!-- Translators: this is a city in Yukon Territory in Canada -->
+          <!-- A city in Yukon Territory in Canada -->
           <_name>Burwash Landing</_name>
           <coordinates>61.350000 -139.000000</coordinates>
           <location>
@@ -27883,7 +27394,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Yukon Territory in Canada -->
+          <!-- A city in Yukon Territory in Canada -->
           <_name>Carmacks</_name>
           <coordinates>62.100000 -136.316667</coordinates>
           <location>
@@ -27893,7 +27404,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Yukon Territory in Canada -->
+          <!-- A city in Yukon Territory in Canada -->
           <_name>Dawson</_name>
           <coordinates>64.066667 -139.416667</coordinates>
           <location>
@@ -27903,7 +27414,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Yukon Territory in Canada -->
+          <!-- A city in Yukon Territory in Canada -->
           <_name>Haines Junction</_name>
           <coordinates>60.750000 -137.500000</coordinates>
           <location>
@@ -27913,7 +27424,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Yukon Territory in Canada -->
+          <!-- A city in Yukon Territory in Canada -->
           <_name>Mayo</_name>
           <coordinates>63.600000 -135.916667</coordinates>
           <location>
@@ -27923,7 +27434,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Yukon Territory in Canada -->
+          <!-- A city in Yukon Territory in Canada -->
           <_name>Old Crow</_name>
           <coordinates>67.566667 -139.800000</coordinates>
           <location>
@@ -27933,7 +27444,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Yukon Territory in Canada -->
+          <!-- A city in Yukon Territory in Canada -->
           <_name>Shingle Point</_name>
           <coordinates>69.000000 -137.366667</coordinates>
           <location>
@@ -27943,7 +27454,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Yukon Territory in Canada -->
+          <!-- A city in Yukon Territory in Canada -->
           <_name>Snag</_name>
           <coordinates>62.383333 -140.366667</coordinates>
           <location>
@@ -27953,7 +27464,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Yukon Territory in Canada -->
+          <!-- A city in Yukon Territory in Canada -->
           <_name>Teslin</_name>
           <coordinates>60.166667 -132.700000</coordinates>
           <location>
@@ -27968,7 +27479,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Yukon Territory in Canada -->
+          <!-- A city in Yukon Territory in Canada -->
           <_name>Watson Lake</_name>
           <coordinates>60.116667 -128.800000</coordinates>
           <location>
@@ -27978,7 +27489,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Yukon Territory in Canada -->
+          <!-- A city in Yukon Territory in Canada -->
           <_name>Whitehorse</_name>
           <coordinates>60.716667 -135.050000</coordinates>
           <location>
@@ -28015,13 +27526,13 @@
         </timezone>
       </timezones>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Aguascalientes</_name>
+        <!-- A state/province/territory in Mexico -->
+        <_name msgctxt="State in Mexico">Aguascalientes</_name>
         <fips-code>MX01</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in Aguascalientes in Mexico -->
-          <_name>Aguascalientes</_name>
+          <!-- A city in Aguascalientes in Mexico -->
+          <_name msgctxt="City in Aguascalientes, Mexico">Aguascalientes</_name>
           <coordinates>21.883333 -102.300000</coordinates>
           <location>
             <name>Aguascalientes</name>
@@ -28031,12 +27542,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
+        <!-- A state/province/territory in Mexico -->
         <_name>Baja California</_name>
         <fips-code>MX02</fips-code>
         <tz-hint>America/Tijuana</tz-hint>
         <city>
-          <!-- Translators: this is a city in Baja California in Mexico -->
+          <!-- A city in Baja California in Mexico -->
           <_name>Mexicali</_name>
           <coordinates>32.651944 -115.468333</coordinates>
           <location>
@@ -28046,7 +27557,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Baja California in Mexico -->
+          <!-- A city in Baja California in Mexico -->
           <_name>Tijuana</_name>
           <coordinates>32.533333 -117.016667</coordinates>
           <location>
@@ -28057,15 +27568,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
+        <!-- A state/province/territory in Mexico -->
         <_name>Baja California Sur</_name>
         <fips-code>MX03</fips-code>
         <tz-hint>America/Mazatlan</tz-hint>
         <city>
-          <!-- Translators: this is a city in Baja California Sur in
-               Mexico
-            -->
-          <_name>La Paz</_name>
+          <!-- A city in Baja California Sur in Mexico -->
+          <_name msgctxt="City in Baja California Sur, Mexico">La Paz</_name>
           <coordinates>24.166667 -110.300000</coordinates>
           <location>
             <name>La Paz International Airport</name>
@@ -28074,9 +27583,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Baja California Sur in
-               Mexico
-            -->
+          <!-- A city in Baja California Sur in Mexico -->
           <_name>Loreto</_name>
           <coordinates>26.016667 -111.350000</coordinates>
           <location>
@@ -28086,9 +27593,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Baja California Sur in
-               Mexico
-            -->
+          <!-- A city in Baja California Sur in Mexico -->
           <_name>San Josà del Cabo</_name>
           <coordinates>23.050000 -109.683333</coordinates>
           <location>
@@ -28099,13 +27604,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Campeche</_name>
+        <!-- A state/province/territory in Mexico -->
+        <_name msgctxt="State in Mexico">Campeche</_name>
         <fips-code>MX04</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in Campeche in Mexico -->
-          <_name>Campeche</_name>
+          <!-- A city in Campeche in Mexico -->
+          <_name msgctxt="City in Campeche, Mexico">Campeche</_name>
           <coordinates>19.850000 -90.533333</coordinates>
           <location>
             <name>Campeche</name>
@@ -28114,7 +27619,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Campeche in Mexico -->
+          <!-- A city in Campeche in Mexico -->
           <_name>Carmen</_name>
           <coordinates>18.633333 -91.833333</coordinates>
           <location>
@@ -28125,12 +27630,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
+        <!-- A state/province/territory in Mexico -->
         <_name>Chiapas</_name>
         <fips-code>MX05</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in Chiapas in Mexico -->
+          <!-- A city in Chiapas in Mexico -->
           <_name>Tapachula</_name>
           <coordinates>14.900000 -92.283333</coordinates>
           <location>
@@ -28140,7 +27645,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Chiapas in Mexico -->
+          <!-- A city in Chiapas in Mexico -->
           <_name>Tuxtla</_name>
           <coordinates>16.750000 -93.116667</coordinates>
           <location>
@@ -28151,13 +27656,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Chihuahua</_name>
+        <!-- A state/province/territory in Mexico -->
+        <_name msgctxt="State in Mexico">Chihuahua</_name>
         <fips-code>MX06</fips-code>
         <tz-hint>America/Mazatlan</tz-hint>
         <city>
-          <!-- Translators: this is a city in Chihuahua in Mexico -->
-          <_name>Chihuahua</_name>
+          <!-- A city in Chihuahua in Mexico -->
+          <_name msgctxt="City in Chihuahua, Mexico">Chihuahua</_name>
           <coordinates>28.633333 -106.083333</coordinates>
           <location>
             <name>Chihuahua International Airport</name>
@@ -28167,12 +27672,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
+        <!-- A state/province/territory in Mexico -->
         <_name>Coahuila</_name>
         <fips-code>MX07</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in Coahuila in Mexico -->
+          <!-- A city in Coahuila in Mexico -->
           <_name>Monclova</_name>
           <coordinates>26.900000 -101.416667</coordinates>
           <location>
@@ -28182,7 +27687,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Coahuila in Mexico -->
+          <!-- A city in Coahuila in Mexico -->
           <_name>Piedras Negras</_name>
           <coordinates>28.700000 -100.516667</coordinates>
           <location>
@@ -28192,7 +27697,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Coahuila in Mexico -->
+          <!-- A city in Coahuila in Mexico -->
           <_name>Saltillo</_name>
           <coordinates>25.416667 -101.000000</coordinates>
           <location>
@@ -28202,7 +27707,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Coahuila in Mexico -->
+          <!-- A city in Coahuila in Mexico -->
           <_name>TorreÃn</_name>
           <coordinates>25.550000 -103.433333</coordinates>
           <location>
@@ -28213,13 +27718,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Colima</_name>
+        <!-- A state/province/territory in Mexico -->
+        <_name msgctxt="State in Mexico">Colima</_name>
         <fips-code>MX08</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in Colima in Mexico -->
-          <_name>Colima</_name>
+          <!-- A city in Colima in Mexico -->
+          <_name msgctxt="City in Colima, Mexico">Colima</_name>
           <coordinates>19.233333 -103.716667</coordinates>
           <location>
             <name>Colima</name>
@@ -28228,8 +27733,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colima in Mexico -->
-          <_name>Manzanillo</_name>
+          <!-- A city in Colima in Mexico -->
+          <_name msgctxt="City in Colima, Mexico">Manzanillo</_name>
           <coordinates>19.050000 -104.333333</coordinates>
           <location>
             <name>Manzanillo International Airport</name>
@@ -28239,12 +27744,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Distrito Federal</_name>
+        <!-- A state/province/territory in Mexico -->
+        <_name msgctxt="State in Mexico">Distrito Federal</_name>
         <fips-code>MX09</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is the capital of Mexico.
+          <!-- The capital of Mexico.
                "Mexico City" is the traditional English name.
                The local name in Spanish is "MÃxico".
             -->
@@ -28258,13 +27763,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Durango</_name>
+        <!-- A state/province/territory in Mexico -->
+        <_name msgctxt="State in Mexico">Durango</_name>
         <fips-code>MX10</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in Durango in Mexico -->
-          <_name>Durango</_name>
+          <!-- A city in Durango in Mexico -->
+          <_name msgctxt="City in Durango, Mexico">Durango</_name>
           <coordinates>24.033333 -104.666667</coordinates>
           <location>
             <name>Durango Airport</name>
@@ -28274,13 +27779,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
+        <!-- A state/province/territory in Mexico -->
         <_name>Guanajuato</_name>
         <fips-code>MX11</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in Guanajuato in Mexico -->
-          <_name>LeÃn</_name>
+          <!-- A city in Guanajuato in Mexico -->
+          <_name msgctxt="City in Guanajuato, Mexico">LeÃn</_name>
           <coordinates>21.116667 -101.666667</coordinates>
           <location>
             <name>Del Bajio, LeÃn Airport</name>
@@ -28290,12 +27795,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
+        <!-- A state/province/territory in Mexico -->
         <_name>Guerrero</_name>
         <fips-code>MX12</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in Guerrero in Mexico -->
+          <!-- A city in Guerrero in Mexico -->
           <_name>Acapulco</_name>
           <coordinates>16.850000 -99.916667</coordinates>
           <location>
@@ -28305,7 +27810,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Guerrero in Mexico -->
+          <!-- A city in Guerrero in Mexico -->
           <_name>Ixtapa</_name>
           <coordinates>17.666667 -101.650000</coordinates>
           <location>
@@ -28316,18 +27821,18 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
+        <!-- A state/province/territory in Mexico -->
         <_name>Hidalgo</_name>
         <fips-code>MX13</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
+        <!-- A state/province/territory in Mexico -->
         <_name>Jalisco</_name>
         <fips-code>MX14</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in Jalisco in Mexico -->
+          <!-- A city in Jalisco in Mexico -->
           <_name>Guadalajara</_name>
           <coordinates>20.666667 -103.333333</coordinates>
           <location>
@@ -28337,7 +27842,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Jalisco in Mexico -->
+          <!-- A city in Jalisco in Mexico -->
           <_name>Puerto Vallarta</_name>
           <coordinates>20.616667 -105.250000</coordinates>
           <location>
@@ -28348,12 +27853,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
+        <!-- A state/province/territory in Mexico -->
         <_name>MichoacÃn</_name>
         <fips-code>MX16</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in MichoacÃn in Mexico -->
+          <!-- A city in MichoacÃn in Mexico -->
           <_name>Morelia</_name>
           <coordinates>19.700000 -101.116667</coordinates>
           <location>
@@ -28363,7 +27868,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in MichoacÃn in Mexico -->
+          <!-- A city in MichoacÃn in Mexico -->
           <_name>Uruapan</_name>
           <coordinates>19.416667 -102.066667</coordinates>
           <location>
@@ -28374,12 +27879,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
+        <!-- A state/province/territory in Mexico -->
         <_name>Morelos</_name>
         <fips-code>MX17</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in Morelos in Mexico -->
+          <!-- A city in Morelos in Mexico -->
           <_name>Cuernavaca</_name>
           <coordinates>18.916667 -99.250000</coordinates>
           <location>
@@ -28390,13 +27895,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
+        <!-- A state/province/territory in Mexico -->
         <_name>MÃxico</_name>
         <fips-code>MX15</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in MÃxico in Mexico.
-               This is one of several cities in Mexico called "JuÃrez".
+          <!-- A city in MÃxico in Mexico.
+               One of several cities in Mexico called "JuÃrez".
             -->
           <_name>Ciudad JuÃrez</_name>
           <coordinates>31.733333 -106.483333</coordinates>
@@ -28407,7 +27912,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in MÃxico in Mexico -->
+          <!-- A city in MÃxico in Mexico -->
           <_name>Toluca</_name>
           <coordinates>19.288333 -99.667222</coordinates>
           <location>
@@ -28418,18 +27923,18 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
+        <!-- A state/province/territory in Mexico -->
         <_name>Nayarit</_name>
         <fips-code>MX18</fips-code>
         <tz-hint>America/Mazatlan</tz-hint>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
+        <!-- A state/province/territory in Mexico -->
         <_name>Nuevo LeÃn</_name>
         <fips-code>MX19</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in Nuevo LeÃn in Mexico -->
+          <!-- A city in Nuevo LeÃn in Mexico -->
           <_name>Monterrey</_name>
           <coordinates>25.666667 -100.316667</coordinates>
           <location>
@@ -28445,12 +27950,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Oaxaca</_name>
+        <!-- A state/province/territory in Mexico -->
+        <_name msgctxt="State in Mexico">Oaxaca</_name>
         <fips-code>MX18</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in Oaxaca in Mexico -->
+          <!-- A city in Oaxaca in Mexico -->
           <_name>El Zapote</_name>
           <coordinates>15.771111 -96.263056</coordinates>
           <location>
@@ -28460,7 +27965,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oaxaca in Mexico -->
+          <!-- A city in Oaxaca in Mexico -->
           <_name>Ixtepec</_name>
           <coordinates>16.578056 -95.101389</coordinates>
           <location>
@@ -28470,7 +27975,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oaxaca in Mexico -->
+          <!-- A city in Oaxaca in Mexico -->
           <_name>Laguna Tepic</_name>
           <coordinates>21.516667 -104.883333</coordinates>
           <location>
@@ -28480,8 +27985,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oaxaca in Mexico -->
-          <_name>Oaxaca</_name>
+          <!-- A city in Oaxaca in Mexico -->
+          <_name msgctxt="City in Oaxaca, Mexico">Oaxaca</_name>
           <coordinates>17.050000 -96.716667</coordinates>
           <location>
             <name>Xoxocotlan Airport</name>
@@ -28490,7 +27995,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oaxaca in Mexico -->
+          <!-- A city in Oaxaca in Mexico -->
           <_name>Puerto Escondido</_name>
           <coordinates>15.850000 -97.066667</coordinates>
           <location>
@@ -28501,13 +28006,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Puebla</_name>
+        <!-- A state/province/territory in Mexico -->
+        <_name msgctxt="State in Mexico">Puebla</_name>
         <fips-code>MX21</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in Puebla in Mexico -->
-          <_name>Puebla</_name>
+          <!-- A city in Puebla in Mexico -->
+          <_name msgctxt="City in Puebla, Mexico">Puebla</_name>
           <coordinates>19.050000 -98.200000</coordinates>
           <location>
             <name>Puebla</name>
@@ -28517,13 +28022,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>QuerÃtaro</_name>
+        <!-- A state/province/territory in Mexico -->
+        <_name msgctxt="State in Mexico">QuerÃtaro</_name>
         <fips-code>MX22</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in QuerÃtaro in Mexico -->
-          <_name>QuerÃtaro</_name>
+          <!-- A city in QuerÃtaro in Mexico -->
+          <_name msgctxt="City in QuerÃtaro, Mexico">QuerÃtaro</_name>
           <coordinates>20.600000 -100.383333</coordinates>
           <location>
             <name>QuerÃtaro</name>
@@ -28533,12 +28038,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
+        <!-- A state/province/territory in Mexico -->
         <_name>Quintana Roo</_name>
         <fips-code>MX23</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in Quintana Roo in Mexico -->
+          <!-- A city in Quintana Roo in Mexico -->
           <_name>CancÃn</_name>
           <coordinates>21.166667 -86.833333</coordinates>
           <location>
@@ -28548,7 +28053,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quintana Roo in Mexico -->
+          <!-- A city in Quintana Roo in Mexico -->
           <_name>Chetumal</_name>
           <coordinates>18.500000 -88.300000</coordinates>
           <location>
@@ -28558,7 +28063,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Quintana Roo in Mexico -->
+          <!-- A city in Quintana Roo in Mexico -->
           <_name>Cozumel</_name>
           <coordinates>20.508333 -86.945833</coordinates>
           <location>
@@ -28569,13 +28074,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>San Luis PotosÃ</_name>
+        <!-- A state/province/territory in Mexico -->
+        <_name msgctxt="State in Mexico">San Luis PotosÃ</_name>
         <fips-code>MX24</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in San Luis Potosà in Mexico -->
-          <_name>San Luis PotosÃ</_name>
+          <!-- A city in San Luis Potosà in Mexico -->
+          <_name msgctxt="City in San Luis PotosÃ, Mexico">San Luis PotosÃ</_name>
           <coordinates>22.150000 -100.983333</coordinates>
           <location>
             <name>San Luis PotosÃ</name>
@@ -28585,12 +28090,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
+        <!-- A state/province/territory in Mexico -->
         <_name>Sinaloa</_name>
         <fips-code>MX25</fips-code>
         <tz-hint>America/Mazatlan</tz-hint>
         <city>
-          <!-- Translators: this is a city in Sinaloa in Mexico -->
+          <!-- A city in Sinaloa in Mexico -->
           <_name>CuliacÃn</_name>
           <coordinates>24.799444 -107.389722</coordinates>
           <location>
@@ -28600,7 +28105,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Sinaloa in Mexico -->
+          <!-- A city in Sinaloa in Mexico -->
           <_name>Los Mochis</_name>
           <coordinates>25.766667 -108.966667</coordinates>
           <location>
@@ -28610,7 +28115,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Sinaloa in Mexico -->
+          <!-- A city in Sinaloa in Mexico -->
           <_name>MazatlÃn</_name>
           <coordinates>23.216667 -106.416667</coordinates>
           <location>
@@ -28621,12 +28126,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Sonora</_name>
+        <!-- A state/province/territory in Mexico -->
+        <_name msgctxt="State in Mexico">Sonora</_name>
         <fips-code>MX26</fips-code>
         <tz-hint>America/Mazatlan</tz-hint>
         <city>
-          <!-- Translators: this is a city in Sonora in Mexico -->
+          <!-- A city in Sonora in Mexico -->
           <_name>Ciudad ObregÃn</_name>
           <coordinates>27.483333 -109.933333</coordinates>
           <location>
@@ -28636,7 +28141,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Sonora in Mexico -->
+          <!-- A city in Sonora in Mexico -->
           <_name>Guaymas</_name>
           <coordinates>27.933333 -110.900000</coordinates>
           <location>
@@ -28646,7 +28151,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Sonora in Mexico -->
+          <!-- A city in Sonora in Mexico -->
           <_name>Hermosillo</_name>
           <coordinates>29.066667 -110.966667</coordinates>
           <location>
@@ -28657,12 +28162,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
+        <!-- A state/province/territory in Mexico -->
         <_name>Tabasco</_name>
         <fips-code>MX27</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in Tabasco in Mexico -->
+          <!-- A city in Tabasco in Mexico -->
           <_name>Villahermosa</_name>
           <coordinates>17.983333 -92.916667</coordinates>
           <location>
@@ -28673,12 +28178,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
+        <!-- A state/province/territory in Mexico -->
         <_name>Tamaulipas</_name>
         <fips-code>MX28</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in Tamaulipas in Mexico -->
+          <!-- A city in Tamaulipas in Mexico -->
           <_name>Ciudad Victoria</_name>
           <coordinates>23.733333 -99.133333</coordinates>
           <location>
@@ -28688,7 +28193,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Tamaulipas in Mexico -->
+          <!-- A city in Tamaulipas in Mexico -->
           <_name>Matamoros</_name>
           <coordinates>25.883333 -97.500000</coordinates>
           <location>
@@ -28698,7 +28203,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Tamaulipas in Mexico -->
+          <!-- A city in Tamaulipas in Mexico -->
           <_name>Nuevo Laredo</_name>
           <coordinates>27.500000 -99.516667</coordinates>
           <location>
@@ -28708,7 +28213,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Tamaulipas in Mexico -->
+          <!-- A city in Tamaulipas in Mexico -->
           <_name>Reynosa</_name>
           <coordinates>26.083333 -98.283333</coordinates>
           <location>
@@ -28718,7 +28223,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Tamaulipas in Mexico -->
+          <!-- A city in Tamaulipas in Mexico -->
           <_name>Tampico</_name>
           <coordinates>22.300000 -97.850000</coordinates>
           <location>
@@ -28729,18 +28234,18 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
+        <!-- A state/province/territory in Mexico -->
         <_name>Tlaxcala</_name>
         <fips-code>MX29</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Veracruz</_name>
+        <!-- A state/province/territory in Mexico -->
+        <_name msgctxt="State in Mexico">Veracruz</_name>
         <fips-code>MX30</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in Veracruz in Mexico -->
+          <!-- A city in Veracruz in Mexico -->
           <_name>Las Bajadas</_name>
           <coordinates>19.166667 -96.166667</coordinates>
           <location>
@@ -28750,7 +28255,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Veracruz in Mexico -->
+          <!-- A city in Veracruz in Mexico -->
           <_name>MinatitlÃn</_name>
           <coordinates>17.983333 -94.516667</coordinates>
           <location>
@@ -28760,9 +28265,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Veracruz in Mexico.
-               This is one of several cities in Mexico called "Poza
-               Rica".
+          <!-- A city in Veracruz in Mexico.
+               One of several cities in Mexico called "Poza Rica".
             -->
           <_name>Poza Rica de Hidalgo</_name>
           <coordinates>20.550000 -97.450000</coordinates>
@@ -28773,8 +28277,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Veracruz in Mexico -->
-          <_name>Veracruz</_name>
+          <!-- A city in Veracruz in Mexico -->
+          <_name msgctxt="City in Veracruz, Mexico">Veracruz</_name>
           <coordinates>19.200000 -96.133333</coordinates>
           <location>
             <name>Veracruz / Las Bajadas, General Heriberto Jara Airport</name>
@@ -28784,12 +28288,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
+        <!-- A state/province/territory in Mexico -->
         <_name>YucatÃn</_name>
         <fips-code>MX31</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in YucatÃn in Mexico -->
+          <!-- A city in YucatÃn in Mexico -->
           <_name>ChichÃn-ItzÃ</_name>
           <coordinates>20.666667 -88.566667</coordinates>
           <location>
@@ -28799,8 +28303,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in YucatÃn in Mexico -->
-          <_name>MÃrida</_name>
+          <!-- A city in YucatÃn in Mexico -->
+          <_name msgctxt="City in YucatÃn, Mexico">MÃrida</_name>
           <coordinates>20.966667 -89.616667</coordinates>
           <location>
             <name>Manuel Crecencio Airport</name>
@@ -28810,13 +28314,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in Mexico -->
-        <_name>Zacatecas</_name>
+        <!-- A state/province/territory in Mexico -->
+        <_name msgctxt="State in Mexico">Zacatecas</_name>
         <fips-code>MX32</fips-code>
         <tz-hint>America/Mexico_City</tz-hint>
         <city>
-          <!-- Translators: this is a city in Zacatecas in Mexico -->
-          <_name>Zacatecas</_name>
+          <!-- A city in Zacatecas in Mexico -->
+          <_name msgctxt="City in Zacatecas, Mexico">Zacatecas</_name>
           <coordinates>22.783333 -102.583333</coordinates>
           <location>
             <name>Zacatecas Airport</name>
@@ -28839,10 +28343,8 @@
       </timezones>
       <tz-hint>America/Miquelon</tz-hint>
       <city>
-        <!-- Translators: this is the capital of Saint Pierre and
-             Miquelon
-          -->
-        <_name>Saint-Pierre</_name>
+        <!-- The capital of Saint Pierre and Miquelon -->
+        <_name msgctxt="City in Saint Pierre and Miquelon">Saint-Pierre</_name>
         <coordinates>46.766667 -56.183333</coordinates>
         <location>
           <name>Saint-Pierre</name>
@@ -28900,32 +28402,29 @@
       <fips-code>US</fips-code>
       <timezones>
         <timezone id="America/Adak">
-          <!-- Translators: "Hawaiian-Aleutian Time" is the official
-               name of the time zone used in Hawaii and the Aleutian
-               Islands of Alaska in the United States. This string is
-               for the time zone as it is observed in the Aleutian
-               Islands (with Daylight Saving Time). It is only used in
-               places where "United States" is already clear from
-               context.
+          <!-- "Hawaiian-Aleutian Time" is the official name of the
+               time zone used in Hawaii and the Aleutian Islands of
+               Alaska in the United States. This string is for the time
+               zone as it is observed in the Aleutian Islands (with
+               Daylight Saving Time). It is only used in places where
+               "United States" is already clear from context.
             -->
           <_name>Hawaiian-Aleutian Time (Aleutian Islands)</_name>
         </timezone>
         <timezone id="Pacific/Honolulu">
-          <!-- Translators: "Hawaiian-Aleutian Time" is the official
-               name of the time zone used in Hawaii and the Aleutian
-               Islands of Alaska in the United States. This string is
-               for the time zone as it is observed in Hawaii, where
-               they do not use Daylight Saving Time. It is only used in
-               places where "United States" is already clear from
-               context.
+          <!-- "Hawaiian-Aleutian Time" is the official name of the
+               time zone used in Hawaii and the Aleutian Islands of
+               Alaska in the United States. This string is for the time
+               zone as it is observed in Hawaii, where they do not use
+               Daylight Saving Time. It is only used in places where
+               "United States" is already clear from context.
             -->
           <_name>Hawaiian-Aleutian Time, no DST (Hawaii)</_name>
         </timezone>
         <timezone id="America/Anchorage">
-          <!-- Translators: This is the time zone used in the majority
-               of Alaska in the United States. The string is only used
-               in places where "United States" is already clear from
-               context.
+          <!-- The time zone used in the majority of Alaska in the
+               United States. The string is only used in places where
+               "United States" is already clear from context.
             -->
           <_name>Alaska Time</_name>
           <obsoletes>America/Juneau</obsoletes>
@@ -28941,11 +28440,11 @@
           <obsoletes>America/Shiprock</obsoletes>
         </timezone>
         <timezone id="America/Phoenix">
-          <!-- Translators: This represents the time zone in the US
-               state of Arizona, which is part of the "Mountain Time"
-               zone, but does not observe Daylight Saving Time with the
-               rest of the zone. The string is only used in places
-               where "United States" is already clear from context.
+          <!-- This represents the time zone in the US state of
+               Arizona, which is part of the "Mountain Time" zone, but
+               does not observe Daylight Saving Time with the rest of
+               the zone. The string is only used in places where
+               "United States" is already clear from context.
             -->
           <_name>Mountain Time, no DST (Arizona)</_name>
         </timezone>
@@ -28971,16 +28470,12 @@
         </timezone>
       </timezones>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Alabama</_name>
         <fips-code>US01</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
+          <!-- A city in Alabama in the United States -->
           <_name>Alabaster</_name>
           <coordinates>33.244281 -86.816377</coordinates>
           <location>
@@ -28992,9 +28487,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
+          <!-- A city in Alabama in the United States -->
           <_name>Albertville</_name>
           <coordinates>34.267594 -86.208867</coordinates>
           <location>
@@ -29004,9 +28497,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
+          <!-- A city in Alabama in the United States -->
           <_name>Alexander City</_name>
           <coordinates>32.944012 -85.953853</coordinates>
           <location>
@@ -29016,9 +28507,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
+          <!-- A city in Alabama in the United States -->
           <_name>Andalusia</_name>
           <coordinates>31.308504 -86.483291</coordinates>
           <location>
@@ -29028,9 +28517,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
+          <!-- A city in Alabama in the United States -->
           <_name>Anniston</_name>
           <coordinates>33.659826 -85.831632</coordinates>
           <location>
@@ -29042,10 +28529,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
-          <_name>Auburn</_name>
+          <!-- A city in Alabama in the United States -->
+          <_name msgctxt="City in Alabama, United States">Auburn</_name>
           <coordinates>32.609857 -85.480783</coordinates>
           <location>
             <name>Auburn-Opelika Airport</name>
@@ -29056,10 +28541,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
-          <_name>Birmingham</_name>
+          <!-- A city in Alabama in the United States -->
+          <_name msgctxt="City in Alabama, United States">Birmingham</_name>
           <coordinates>33.520661 -86.802490</coordinates>
           <location>
             <name>Birmingham International Airport</name>
@@ -29070,9 +28553,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
+          <!-- A city in Alabama in the United States -->
           <_name>Cullman</_name>
           <coordinates>34.174821 -86.843612</coordinates>
           <location>
@@ -29082,9 +28563,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
+          <!-- A city in Alabama in the United States -->
           <_name>Daleville</_name>
           <coordinates>31.310172 -85.712991</coordinates>
           <location>
@@ -29094,10 +28573,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
-          <_name>Decatur</_name>
+          <!-- A city in Alabama in the United States -->
+          <_name msgctxt="City in Alabama, United States">Decatur</_name>
           <coordinates>34.605925 -86.983342</coordinates>
           <location>
             <name>Pryor Field</name>
@@ -29107,9 +28584,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
+          <!-- A city in Alabama in the United States -->
           <_name>Dothan</_name>
           <coordinates>31.223231 -85.390489</coordinates>
           <location>
@@ -29121,9 +28596,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
+          <!-- A city in Alabama in the United States -->
           <_name>Evergreen</_name>
           <coordinates>31.433499 -86.956918</coordinates>
           <location>
@@ -29134,9 +28607,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
+          <!-- A city in Alabama in the United States -->
           <_name>Fort Payne</_name>
           <coordinates>34.444255 -85.719689</coordinates>
           <location>
@@ -29146,9 +28617,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
+          <!-- A city in Alabama in the United States -->
           <_name>Gadsden</_name>
           <coordinates>34.014264 -86.006639</coordinates>
           <location>
@@ -29160,9 +28629,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
+          <!-- A city in Alabama in the United States -->
           <_name>Haleyville</_name>
           <coordinates>34.226488 -87.621413</coordinates>
           <location>
@@ -29172,10 +28639,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
-          <_name>Huntsville</_name>
+          <!-- A city in Alabama in the United States -->
+          <_name msgctxt="City in Alabama, United States">Huntsville</_name>
           <coordinates>34.730369 -86.586104</coordinates>
           <location>
             <name>Madison County Executive Airport</name>
@@ -29193,9 +28658,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
+          <!-- A city in Alabama in the United States -->
           <_name>Mobile</_name>
           <coordinates>30.694357 -88.043054</coordinates>
           <location>
@@ -29214,10 +28677,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
-          <_name>Montgomery</_name>
+          <!-- A city in Alabama in the United States -->
+          <_name msgctxt="City in Alabama, United States">Montgomery</_name>
           <coordinates>32.366805 -86.299969</coordinates>
           <location>
             <name>Maxwell Air Force Base / Montgomery</name>
@@ -29235,9 +28696,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
+          <!-- A city in Alabama in the United States -->
           <_name>Muscle Shoals</_name>
           <coordinates>34.744811 -87.667529</coordinates>
           <location>
@@ -29249,9 +28708,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
+          <!-- A city in Alabama in the United States -->
           <_name>Ozark</_name>
           <coordinates>31.459058 -85.640493</coordinates>
           <location>
@@ -29268,10 +28725,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
-          <_name>Troy</_name>
+          <!-- A city in Alabama in the United States -->
+          <_name msgctxt="City in Alabama, United States">Troy</_name>
           <coordinates>31.808768 -85.969951</coordinates>
           <location>
             <name>Troy Municipal Airport</name>
@@ -29280,9 +28735,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alabama in the United
-               States
-            -->
+          <!-- A city in Alabama in the United States -->
           <_name>Tuscaloosa</_name>
           <coordinates>33.209841 -87.569174</coordinates>
           <location>
@@ -29295,16 +28748,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Alaska</_name>
         <fips-code>US02</fips-code>
         <tz-hint>America/Anchorage</tz-hint>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Adak</_name>
           <coordinates>51.880000 -176.658056</coordinates>
           <location>
@@ -29317,10 +28766,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
-          <_name>Alpine</_name>
+          <!-- A city in Alaska in the United States -->
+          <_name msgctxt="City in Alaska, United States">Alpine</_name>
           <coordinates>70.328056 -150.977500</coordinates>
           <location>
             <name>Deadhorse, Alpine Airstrip</name>
@@ -29331,9 +28778,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Ambler</_name>
           <coordinates>67.086111 -157.851389</coordinates>
           <location>
@@ -29345,9 +28790,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Anaktuvuk Pass</_name>
           <coordinates>68.143333 -151.735833</coordinates>
           <location>
@@ -29359,9 +28802,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Anchorage</_name>
           <coordinates>61.218056 -149.900278</coordinates>
           <location>
@@ -29394,9 +28835,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Angoon</_name>
           <coordinates>57.503333 -134.583889</coordinates>
           <location>
@@ -29407,9 +28846,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Aniak</_name>
           <coordinates>61.578333 -159.522222</coordinates>
           <location>
@@ -29421,9 +28858,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Annette</_name>
           <coordinates>55.061667 -131.541667</coordinates>
           <location>
@@ -29434,9 +28869,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Anvik</_name>
           <coordinates>62.656111 -160.206667</coordinates>
           <location>
@@ -29447,9 +28880,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Arctic Village</_name>
           <coordinates>68.126944 -145.537778</coordinates>
           <location>
@@ -29460,9 +28891,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Barrow</_name>
           <coordinates>71.290556 -156.788611</coordinates>
           <location>
@@ -29474,9 +28903,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Bethel</_name>
           <coordinates>60.792222 -161.755833</coordinates>
           <location>
@@ -29488,9 +28915,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Bettles</_name>
           <coordinates>66.918889 -151.516111</coordinates>
           <location>
@@ -29502,9 +28927,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Birchwood</_name>
           <coordinates>61.405278 -149.468889</coordinates>
           <location>
@@ -29515,9 +28938,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Buckland</_name>
           <coordinates>65.979722 -161.123056</coordinates>
           <location>
@@ -29528,9 +28949,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Cantwell</_name>
           <coordinates>63.391667 -148.950833</coordinates>
           <location>
@@ -29540,9 +28959,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Central</_name>
           <coordinates>65.572500 -144.803056</coordinates>
           <location>
@@ -29553,9 +28970,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Chandalar</_name>
           <coordinates>67.505278 -148.493611</coordinates>
           <location>
@@ -29567,9 +28982,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Chignik</_name>
           <coordinates>56.295278 -158.402222</coordinates>
           <location>
@@ -29580,9 +28993,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Chisana</_name>
           <coordinates>62.066111 -142.040833</coordinates>
           <location>
@@ -29593,9 +29004,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Chistochina</_name>
           <coordinates>62.565000 -144.664722</coordinates>
           <location>
@@ -29606,9 +29015,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Chulitna</_name>
           <coordinates>62.886944 -149.583056</coordinates>
           <location>
@@ -29619,9 +29026,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Cold Bay</_name>
           <coordinates>55.185833 -162.721111</coordinates>
           <location>
@@ -29633,9 +29038,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Cordova</_name>
           <coordinates>60.542778 -145.757500</coordinates>
           <location>
@@ -29647,9 +29050,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Deadhorse</_name>
           <coordinates>70.205556 -148.511667</coordinates>
           <location>
@@ -29661,9 +29062,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Deering</_name>
           <coordinates>66.075556 -162.717222</coordinates>
           <location>
@@ -29674,9 +29073,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Delta Junction</_name>
           <coordinates>64.037778 -145.732222</coordinates>
           <location>
@@ -29687,9 +29084,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Dillingham</_name>
           <coordinates>59.039722 -158.457500</coordinates>
           <location>
@@ -29701,10 +29096,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
-          <_name>Eagle</_name>
+          <!-- A city in Alaska in the United States -->
+          <_name msgctxt="City in Alaska, United States">Eagle</_name>
           <coordinates>64.788056 -141.200000</coordinates>
           <location>
             <name>Eagle Airport</name>
@@ -29714,9 +29107,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Egegik</_name>
           <coordinates>58.215556 -157.375833</coordinates>
           <location>
@@ -29727,9 +29118,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Elfin Cove</_name>
           <coordinates>58.194444 -136.343333</coordinates>
           <location>
@@ -29741,9 +29130,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Emmonak</_name>
           <coordinates>62.777778 -164.523056</coordinates>
           <location>
@@ -29754,9 +29141,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Eureka Roadhouse</_name>
           <coordinates>61.938611 -147.168056</coordinates>
           <location>
@@ -29773,9 +29158,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Fairbanks</_name>
           <coordinates>64.837778 -147.716389</coordinates>
           <location>
@@ -29801,9 +29184,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Fort Yukon</_name>
           <coordinates>66.564722 -145.273889</coordinates>
           <location>
@@ -29814,9 +29195,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Galena</_name>
           <coordinates>64.733333 -156.927500</coordinates>
           <location>
@@ -29826,9 +29205,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Gambell</_name>
           <coordinates>63.779722 -171.741111</coordinates>
           <location>
@@ -29840,9 +29217,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Golovin</_name>
           <coordinates>64.543333 -163.029167</coordinates>
           <location>
@@ -29853,9 +29228,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Gulkana</_name>
           <coordinates>62.271389 -145.382222</coordinates>
           <location>
@@ -29867,9 +29240,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Gustavus</_name>
           <coordinates>58.413333 -135.736944</coordinates>
           <location>
@@ -29881,9 +29252,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Haines</_name>
           <coordinates>59.235833 -135.445000</coordinates>
           <location>
@@ -29895,9 +29264,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Healy</_name>
           <coordinates>63.856944 -148.966111</coordinates>
           <location>
@@ -29909,9 +29276,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Homer</_name>
           <coordinates>59.642500 -151.548333</coordinates>
           <location>
@@ -29923,9 +29288,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Hoonah</_name>
           <coordinates>58.110000 -135.443611</coordinates>
           <location>
@@ -29937,9 +29300,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Hooper Bay</_name>
           <coordinates>61.531111 -166.096667</coordinates>
           <location>
@@ -29950,9 +29311,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Huslia</_name>
           <coordinates>65.698611 -156.399722</coordinates>
           <location>
@@ -29962,9 +29321,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Hydaburg</_name>
           <coordinates>55.208056 -132.826667</coordinates>
           <location>
@@ -29975,10 +29332,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
-          <_name>Juneau</_name>
+          <!-- A city in Alaska in the United States -->
+          <_name msgctxt="City in Alaska, United States">Juneau</_name>
           <coordinates>58.301944 -134.419722</coordinates>
           <location>
             <name>Juneau International Airport</name>
@@ -29989,9 +29344,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Kake</_name>
           <coordinates>56.975833 -133.947222</coordinates>
           <location>
@@ -30003,9 +29356,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Kaktovik</_name>
           <coordinates>70.131944 -143.623889</coordinates>
           <location>
@@ -30016,9 +29367,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Kaltag</_name>
           <coordinates>64.327222 -158.721944</coordinates>
           <location>
@@ -30028,9 +29377,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Kenai</_name>
           <coordinates>60.554444 -151.258333</coordinates>
           <location>
@@ -30042,9 +29389,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Ketchikan</_name>
           <coordinates>55.342222 -131.646111</coordinates>
           <location>
@@ -30056,9 +29401,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>King Salmon</_name>
           <coordinates>58.688333 -156.661389</coordinates>
           <location>
@@ -30070,9 +29413,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Kipnuk</_name>
           <coordinates>59.938889 -164.041389</coordinates>
           <location>
@@ -30082,9 +29423,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Kivalina</_name>
           <coordinates>67.726944 -164.533333</coordinates>
           <location>
@@ -30095,9 +29434,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Klawock</_name>
           <coordinates>55.552222 -133.095833</coordinates>
           <location>
@@ -30108,9 +29445,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Kodiak</_name>
           <coordinates>57.790000 -152.407222</coordinates>
           <location>
@@ -30122,9 +29457,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Kotzebue</_name>
           <coordinates>66.898333 -162.596667</coordinates>
           <location>
@@ -30136,9 +29469,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Koyuk</_name>
           <coordinates>64.931944 -161.156944</coordinates>
           <location>
@@ -30149,9 +29480,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Kustatan</_name>
           <coordinates>60.715833 -151.747500</coordinates>
           <location>
@@ -30163,9 +29492,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Lake Minchumina</_name>
           <coordinates>63.882778 -152.312222</coordinates>
           <location>
@@ -30176,9 +29503,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Lime Village</_name>
           <coordinates>61.356389 -155.435556</coordinates>
           <location>
@@ -30189,9 +29514,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Manley Hot Springs</_name>
           <coordinates>65.001111 -150.633889</coordinates>
           <location>
@@ -30201,9 +29524,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>McCarthy</_name>
           <coordinates>61.433333 -142.921667</coordinates>
           <location>
@@ -30215,9 +29536,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>McGrath</_name>
           <coordinates>62.956389 -155.595833</coordinates>
           <location>
@@ -30229,9 +29548,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>McKinley Park</_name>
           <coordinates>63.732778 -148.914167</coordinates>
           <location>
@@ -30242,9 +29559,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Mekoryuk</_name>
           <coordinates>60.388056 -166.185000</coordinates>
           <location>
@@ -30256,9 +29571,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Metlakatla</_name>
           <coordinates>55.129167 -131.572222</coordinates>
           <location>
@@ -30269,9 +29582,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Nabesna</_name>
           <coordinates>62.371944 -143.008611</coordinates>
           <location>
@@ -30282,9 +29593,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Nenana</_name>
           <coordinates>64.563889 -149.093056</coordinates>
           <location>
@@ -30296,9 +29605,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Newhalen</_name>
           <coordinates>59.720000 -154.897222</coordinates>
           <location>
@@ -30310,9 +29617,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Noatak</_name>
           <coordinates>67.571111 -162.965278</coordinates>
           <location>
@@ -30323,9 +29628,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Nome</_name>
           <coordinates>64.501111 -165.406389</coordinates>
           <location>
@@ -30337,9 +29640,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Northway</_name>
           <coordinates>62.961667 -141.937222</coordinates>
           <location>
@@ -30351,9 +29652,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Nuiqsut</_name>
           <coordinates>70.217500 -150.976389</coordinates>
           <location>
@@ -30364,9 +29663,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Palmer</_name>
           <coordinates>61.599722 -149.112778</coordinates>
           <location>
@@ -30378,9 +29675,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Paxson</_name>
           <coordinates>63.089722 -145.613056</coordinates>
           <location>
@@ -30392,10 +29687,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
-          <_name>Petersburg</_name>
+          <!-- A city in Alaska in the United States -->
+          <_name msgctxt="City in Alaska, United States">Petersburg</_name>
           <coordinates>56.812500 -132.955556</coordinates>
           <location>
             <name>Petersburg</name>
@@ -30406,9 +29699,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Platinum</_name>
           <coordinates>59.013056 -161.816389</coordinates>
           <location>
@@ -30425,9 +29716,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Point Hope</_name>
           <coordinates>68.347778 -166.808056</coordinates>
           <location>
@@ -30439,9 +29728,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Point Lay</_name>
           <coordinates>69.757500 -163.051111</coordinates>
           <location>
@@ -30453,9 +29740,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Port Alexander</_name>
           <coordinates>56.249722 -134.644444</coordinates>
           <location>
@@ -30467,9 +29752,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Port Alsworth</_name>
           <coordinates>60.202500 -154.312778</coordinates>
           <location>
@@ -30480,9 +29763,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Port Heiden</_name>
           <coordinates>56.949167 -158.626944</coordinates>
           <location>
@@ -30494,10 +29775,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
-          <_name>Saint George</_name>
+          <!-- A city in Alaska in the United States -->
+          <_name msgctxt="City in Alaska, United States">Saint George</_name>
           <coordinates>56.600000 -169.541667</coordinates>
           <location>
             <name>St. George, St. George Airport</name>
@@ -30507,9 +29786,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Saint Marys</_name>
           <coordinates>62.053056 -163.165833</coordinates>
           <location>
@@ -30521,9 +29798,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Saint Paul</_name>
           <coordinates>57.122222 -170.275000</coordinates>
           <location>
@@ -30534,9 +29809,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Sand Point</_name>
           <coordinates>55.339722 -160.497222</coordinates>
           <location>
@@ -30547,9 +29820,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Savoonga</_name>
           <coordinates>63.694167 -170.478889</coordinates>
           <location>
@@ -30560,9 +29831,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Scammon Bay</_name>
           <coordinates>61.842778 -165.581667</coordinates>
           <location>
@@ -30573,9 +29842,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Selawik</_name>
           <coordinates>66.603889 -160.006944</coordinates>
           <location>
@@ -30587,9 +29854,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Seldovia</_name>
           <coordinates>59.438056 -151.711389</coordinates>
           <location>
@@ -30600,9 +29865,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Seward</_name>
           <coordinates>60.104167 -149.442222</coordinates>
           <location>
@@ -30614,9 +29877,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Shishmaref</_name>
           <coordinates>66.256667 -166.071944</coordinates>
           <location>
@@ -30628,9 +29889,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Sitka</_name>
           <coordinates>57.053056 -135.330000</coordinates>
           <location>
@@ -30642,9 +29901,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Skagway</_name>
           <coordinates>59.458333 -135.313889</coordinates>
           <location>
@@ -30656,9 +29913,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Sleetmute</_name>
           <coordinates>61.702500 -157.169722</coordinates>
           <location>
@@ -30669,9 +29924,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Soldotna</_name>
           <coordinates>60.487778 -151.058333</coordinates>
           <location>
@@ -30683,10 +29936,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
-          <_name>Sutton</_name>
+          <!-- A city in Alaska in the United States -->
+          <_name msgctxt="City in Alaska, United States">Sutton</_name>
           <coordinates>61.711389 -148.894167</coordinates>
           <location>
             <name>Sutton</name>
@@ -30696,9 +29947,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Takotna</_name>
           <coordinates>62.988611 -156.064167</coordinates>
           <location>
@@ -30709,9 +29958,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Talkeetna</_name>
           <coordinates>62.323889 -150.109444</coordinates>
           <location>
@@ -30723,9 +29970,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Tanana</_name>
           <coordinates>65.171944 -152.078889</coordinates>
           <location>
@@ -30737,9 +29982,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Tin City</_name>
           <coordinates>65.558611 -167.948056</coordinates>
           <location>
@@ -30750,9 +29993,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Togiak</_name>
           <coordinates>59.061944 -160.376389</coordinates>
           <location>
@@ -30764,9 +30005,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Unalakleet</_name>
           <coordinates>63.873056 -160.788056</coordinates>
           <location>
@@ -30778,9 +30017,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Unalaska</_name>
           <coordinates>53.873611 -166.536667</coordinates>
           <location>
@@ -30792,9 +30029,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Valdez</_name>
           <coordinates>61.130833 -146.348333</coordinates>
           <location>
@@ -30806,9 +30041,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Wainwright</_name>
           <coordinates>70.636944 -160.038333</coordinates>
           <location>
@@ -30820,9 +30053,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Wasilla</_name>
           <coordinates>61.581389 -149.439444</coordinates>
           <location>
@@ -30833,9 +30064,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Whittier</_name>
           <coordinates>60.773056 -148.683889</coordinates>
           <location>
@@ -30853,9 +30082,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Willow</_name>
           <coordinates>61.747222 -150.037500</coordinates>
           <location>
@@ -30867,9 +30094,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Wrangell</_name>
           <coordinates>56.470833 -132.376667</coordinates>
           <location>
@@ -30881,9 +30106,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Alaska in the United
-               States
-            -->
+          <!-- A city in Alaska in the United States -->
           <_name>Yakutat</_name>
           <coordinates>59.546944 -139.727222</coordinates>
           <location>
@@ -30896,16 +30119,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Arizona</_name>
         <fips-code>US04</fips-code>
         <tz-hint>America/Phoenix</tz-hint>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Bullhead City</_name>
           <coordinates>35.147777 -114.568298</coordinates>
           <location>
@@ -30915,9 +30134,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Casa Grande</_name>
           <coordinates>32.879502 -111.757352</coordinates>
           <location>
@@ -30929,10 +30146,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
-          <_name>Chandler</_name>
+          <!-- A city in Arizona in the United States -->
+          <_name msgctxt="City in Arizona, United States">Chandler</_name>
           <coordinates>33.306160 -111.841250</coordinates>
           <location>
             <name>Chandler Municipal Airport</name>
@@ -30941,9 +30156,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Childs</_name>
           <coordinates>32.452835 -112.843488</coordinates>
           <location>
@@ -30955,10 +30168,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
-          <_name>Douglas</_name>
+          <!-- A city in Arizona in the United States -->
+          <_name msgctxt="City in Arizona, United States">Douglas</_name>
           <coordinates>31.344547 -109.545345</coordinates>
           <location>
             <name>Douglas Bisbee, Bisbee Douglas International Airport</name>
@@ -30969,9 +30180,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Flagstaff</_name>
           <coordinates>35.198067 -111.651273</coordinates>
           <location>
@@ -30983,9 +30192,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Gilbert</_name>
           <coordinates>33.352826 -111.789027</coordinates>
           <location>
@@ -30995,10 +30202,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
-          <_name>Glendale</_name>
+          <!-- A city in Arizona in the United States -->
+          <_name msgctxt="City in Arizona, United States">Glendale</_name>
           <coordinates>33.538652 -112.185987</coordinates>
           <location>
             <name>Glendale Municipal Airport</name>
@@ -31007,9 +30212,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Goodyear</_name>
           <coordinates>33.435320 -112.358214</coordinates>
           <location>
@@ -31021,9 +30224,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Grand Canyon</_name>
           <coordinates>36.054427 -112.139336</coordinates>
           <location>
@@ -31035,9 +30236,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Kingman</_name>
           <coordinates>35.189443 -114.053006</coordinates>
           <location>
@@ -31049,9 +30248,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Mesa</_name>
           <coordinates>33.422269 -111.822640</coordinates>
           <location>
@@ -31070,9 +30267,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Nogales</_name>
           <coordinates>31.340377 -110.934253</coordinates>
           <location>
@@ -31082,9 +30277,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Page</_name>
           <coordinates>36.914722 -111.455833</coordinates>
           <location>
@@ -31096,10 +30289,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
-          <_name>Peoria</_name>
+          <!-- A city in Arizona in the United States -->
+          <_name msgctxt="City in Arizona, United States">Peoria</_name>
           <coordinates>33.580596 -112.237378</coordinates>
           <location>
             <name>Glendale, Glendale Municipal Airport</name>
@@ -31108,9 +30299,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Phoenix</_name>
           <coordinates>33.448377 -112.074037</coordinates>
           <location>
@@ -31136,9 +30325,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Prescott</_name>
           <coordinates>34.540024 -112.468502</coordinates>
           <location>
@@ -31150,9 +30337,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Safford</_name>
           <coordinates>32.833955 -109.707580</coordinates>
           <location>
@@ -31164,9 +30349,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Saint Johns</_name>
           <coordinates>34.505870 -109.360933</coordinates>
           <location>
@@ -31176,9 +30359,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Scottsdale</_name>
           <coordinates>33.509210 -111.899033</coordinates>
           <location>
@@ -31190,9 +30371,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Show Low</_name>
           <coordinates>34.254208 -110.029833</coordinates>
           <location>
@@ -31204,9 +30383,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Sierra Vista</_name>
           <coordinates>31.554539 -110.303691</coordinates>
           <location>
@@ -31218,9 +30395,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Tempe</_name>
           <coordinates>33.414768 -111.909310</coordinates>
           <location>
@@ -31232,9 +30407,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Tucson</_name>
           <coordinates>32.221743 -110.926479</coordinates>
           <location>
@@ -31253,9 +30426,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Window Rock</_name>
           <coordinates>35.680573 -109.052593</coordinates>
           <location>
@@ -31265,9 +30436,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Winslow</_name>
           <coordinates>35.024187 -110.697357</coordinates>
           <location>
@@ -31279,9 +30448,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arizona in the United
-               States
-            -->
+          <!-- A city in Arizona in the United States -->
           <_name>Yuma</_name>
           <coordinates>32.725325 -114.624397</coordinates>
           <location>
@@ -31294,16 +30461,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Arkansas</_name>
         <fips-code>US05</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>Arkadelphia</_name>
           <coordinates>34.120929 -93.053784</coordinates>
           <location>
@@ -31313,9 +30476,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>Batesville</_name>
           <coordinates>35.769799 -91.640972</coordinates>
           <location>
@@ -31327,9 +30488,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>Bentonville</_name>
           <coordinates>36.372854 -94.208817</coordinates>
           <location>
@@ -31341,9 +30500,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>Blytheville</_name>
           <coordinates>35.927295 -89.918975</coordinates>
           <location>
@@ -31353,9 +30510,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>Camden</_name>
           <coordinates>33.584558 -92.834329</coordinates>
           <location>
@@ -31365,9 +30520,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>De Queen</_name>
           <coordinates>34.037892 -94.341317</coordinates>
           <location>
@@ -31377,9 +30530,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>El Dorado</_name>
           <coordinates>33.207630 -92.666267</coordinates>
           <location>
@@ -31391,10 +30542,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
-          <_name>Fayetteville</_name>
+          <!-- A city in Arkansas in the United States -->
+          <_name msgctxt="City in Arkansas, United States">Fayetteville</_name>
           <coordinates>36.062579 -94.157426</coordinates>
           <location>
             <name>Drake Field</name>
@@ -31412,9 +30561,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>Flippin</_name>
           <coordinates>36.278958 -92.597108</coordinates>
           <location>
@@ -31426,10 +30573,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
-          <_name>Fort Smith</_name>
+          <!-- A city in Arkansas in the United States -->
+          <_name msgctxt="City in Arkansas, United States">Fort Smith</_name>
           <coordinates>35.385924 -94.398548</coordinates>
           <location>
             <name>Fort Smith Regional Airport</name>
@@ -31439,9 +30584,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>Harrell</_name>
           <coordinates>33.510114 -92.398762</coordinates>
           <location>
@@ -31451,9 +30594,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>Harrison</_name>
           <coordinates>36.229794 -93.107676</coordinates>
           <location>
@@ -31465,10 +30606,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
-          <_name>Hot Springs</_name>
+          <!-- A city in Arkansas in the United States -->
+          <_name msgctxt="City in Arkansas, United States">Hot Springs</_name>
           <coordinates>34.503700 -93.055179</coordinates>
           <location>
             <name>Memorial Field Airport</name>
@@ -31479,9 +30618,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>Jonesboro</_name>
           <coordinates>35.842297 -90.704279</coordinates>
           <location>
@@ -31493,9 +30630,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>Little Rock</_name>
           <coordinates>34.746481 -92.289595</coordinates>
           <location>
@@ -31514,9 +30649,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>Mena</_name>
           <coordinates>34.586217 -94.239655</coordinates>
           <location>
@@ -31526,10 +30659,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
-          <_name>Monticello</_name>
+          <!-- A city in Arkansas in the United States -->
+          <_name msgctxt="City in Arkansas, United States">Monticello</_name>
           <coordinates>33.628997 -91.790964</coordinates>
           <location>
             <name>Monticello Municipal Airport / Ellis Field</name>
@@ -31538,9 +30669,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>Mount Ida</_name>
           <coordinates>34.556764 -93.634081</coordinates>
           <location>
@@ -31550,10 +30679,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
-          <_name>Mountain Home</_name>
+          <!-- A city in Arkansas in the United States -->
+          <_name msgctxt="City in Arkansas, United States">Mountain Home</_name>
           <coordinates>36.335345 -92.385159</coordinates>
           <location>
             <name>Baxter County Regional Airport</name>
@@ -31562,10 +30689,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
-          <_name>Newport</_name>
+          <!-- A city in Arkansas in the United States -->
+          <_name msgctxt="City in Arkansas, United States">Newport</_name>
           <coordinates>35.604802 -91.281795</coordinates>
           <location>
             <name>Newport Municipal Airport</name>
@@ -31574,9 +30699,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>Pine Bluff</_name>
           <coordinates>34.228431 -92.003196</coordinates>
           <location>
@@ -31588,9 +30711,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>Rogers</_name>
           <coordinates>36.332020 -94.118537</coordinates>
           <location>
@@ -31602,9 +30723,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>Russellville</_name>
           <coordinates>35.278417 -93.133786</coordinates>
           <location>
@@ -31614,9 +30733,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>Searcy</_name>
           <coordinates>35.250641 -91.736249</coordinates>
           <location>
@@ -31626,9 +30743,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>Siloam Springs</_name>
           <coordinates>36.188136 -94.540496</coordinates>
           <location>
@@ -31640,9 +30755,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>Springdale</_name>
           <coordinates>36.186744 -94.128814</coordinates>
           <location>
@@ -31659,10 +30772,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
-          <_name>Stuttgart</_name>
+          <!-- A city in Arkansas in the United States -->
+          <_name msgctxt="City in Arkansas, United States">Stuttgart</_name>
           <coordinates>34.500375 -91.552628</coordinates>
           <location>
             <name>Stuttgart Municipal Airport</name>
@@ -31673,9 +30784,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>Texarkana</_name>
           <coordinates>33.441792 -94.037688</coordinates>
           <location>
@@ -31687,9 +30796,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>Walnut Ridge</_name>
           <coordinates>36.068404 -90.955953</coordinates>
           <location>
@@ -31701,9 +30808,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Arkansas in the United
-               States
-            -->
+          <!-- A city in Arkansas in the United States -->
           <_name>West Memphis</_name>
           <coordinates>35.146480 -90.184539</coordinates>
           <location>
@@ -31714,16 +30819,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>California</_name>
         <fips-code>US06</fips-code>
         <tz-hint>America/Los_Angeles</tz-hint>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Alturas</_name>
           <coordinates>41.487115 -120.542456</coordinates>
           <location>
@@ -31733,9 +30834,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Anaheim</_name>
           <coordinates>33.835293 -117.914504</coordinates>
           <location>
@@ -31747,9 +30846,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Arcata</_name>
           <coordinates>40.866517 -124.082840</coordinates>
           <location>
@@ -31761,10 +30858,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
-          <_name>Auburn</_name>
+          <!-- A city in California in the United States -->
+          <_name msgctxt="City in California, United States">Auburn</_name>
           <coordinates>38.896565 -121.076890</coordinates>
           <location>
             <name>Auburn Municipal Airport</name>
@@ -31773,9 +30868,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Avalon</_name>
           <coordinates>33.342807 -118.327851</coordinates>
           <location>
@@ -31786,9 +30879,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Bakersfield</_name>
           <coordinates>35.373292 -119.018713</coordinates>
           <location>
@@ -31800,9 +30891,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Berkeley</_name>
           <coordinates>37.871593 -122.272747</coordinates>
           <location>
@@ -31814,9 +30903,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Bishop</_name>
           <coordinates>37.363540 -118.395110</coordinates>
           <location>
@@ -31828,9 +30915,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Blythe</_name>
           <coordinates>33.610302 -114.596346</coordinates>
           <location>
@@ -31842,9 +30927,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Burbank</_name>
           <coordinates>34.180839 -118.308966</coordinates>
           <location>
@@ -31856,9 +30939,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Camarillo</_name>
           <coordinates>34.216394 -119.037602</coordinates>
           <location>
@@ -31870,9 +30951,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Campo</_name>
           <coordinates>32.606449 -116.468905</coordinates>
           <location>
@@ -31884,10 +30963,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
-          <_name>Carlsbad</_name>
+          <!-- A city in California in the United States -->
+          <_name msgctxt="City in California, United States">Carlsbad</_name>
           <coordinates>33.158093 -117.350594</coordinates>
           <location>
             <name>McClellan-Palomar Airport</name>
@@ -31898,9 +30975,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Chico</_name>
           <coordinates>39.728494 -121.837478</coordinates>
           <location>
@@ -31912,9 +30987,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>China Lake</_name>
           <coordinates>35.650789 -117.661730</coordinates>
           <location>
@@ -31926,9 +30999,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Chino</_name>
           <coordinates>34.012235 -117.688944</coordinates>
           <location>
@@ -31940,9 +31011,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Chula Vista</_name>
           <coordinates>32.640054 -117.084196</coordinates>
           <location>
@@ -31954,10 +31023,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
-          <_name>Concord</_name>
+          <!-- A city in California in the United States -->
+          <_name msgctxt="City in California, United States">Concord</_name>
           <coordinates>37.977978 -122.031073</coordinates>
           <location>
             <name>Buchanan Field</name>
@@ -31968,10 +31035,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
-          <_name>Corona</_name>
+          <!-- A city in California in the United States -->
+          <_name msgctxt="City in California, United States">Corona</_name>
           <coordinates>33.875293 -117.566438</coordinates>
           <location>
             <name>Chino, Chino Airport</name>
@@ -31982,9 +31047,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Costa Mesa</_name>
           <coordinates>33.641132 -117.918669</coordinates>
           <location>
@@ -31996,9 +31059,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Crescent City</_name>
           <coordinates>41.755948 -124.201747</coordinates>
           <location>
@@ -32010,9 +31071,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Daggett</_name>
           <coordinates>34.863319 -116.888092</coordinates>
           <location>
@@ -32024,9 +31083,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Daly City</_name>
           <coordinates>37.705766 -122.461917</coordinates>
           <location>
@@ -32038,9 +31095,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Edwards</_name>
           <coordinates>34.926088 -117.935068</coordinates>
           <location>
@@ -32057,9 +31112,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>El Cajon</_name>
           <coordinates>32.794773 -116.962527</coordinates>
           <location>
@@ -32071,9 +31124,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>El Centro</_name>
           <coordinates>32.792000 -115.563051</coordinates>
           <location>
@@ -32085,9 +31136,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>El Monte</_name>
           <coordinates>34.068621 -118.027567</coordinates>
           <location>
@@ -32099,9 +31148,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Emigrant Gap</_name>
           <coordinates>39.296845 -120.672712</coordinates>
           <location>
@@ -32112,9 +31159,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Escondido</_name>
           <coordinates>33.119207 -117.086421</coordinates>
           <location>
@@ -32126,10 +31171,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
-          <_name>Eureka</_name>
+          <!-- A city in California in the United States -->
+          <_name msgctxt="City in California, United States">Eureka</_name>
           <coordinates>40.802071 -124.163673</coordinates>
           <location>
             <name>Arcata / Eureka, Arcata Airport</name>
@@ -32140,10 +31183,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
-          <_name>Fairfield</_name>
+          <!-- A city in California in the United States -->
+          <_name msgctxt="City in California, United States">Fairfield</_name>
           <coordinates>38.249358 -122.039966</coordinates>
           <location>
             <name>Fairfield / Travis Air Force Base</name>
@@ -32154,9 +31195,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Fontana</_name>
           <coordinates>34.092233 -117.435048</coordinates>
           <location>
@@ -32168,10 +31207,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
-          <_name>Fremont</_name>
+          <!-- A city in California in the United States -->
+          <_name msgctxt="City in California, United States">Fremont</_name>
           <coordinates>37.548270 -121.988572</coordinates>
           <location>
             <name>Palo Alto Airport</name>
@@ -32182,9 +31219,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Fresno</_name>
           <coordinates>36.747727 -119.772366</coordinates>
           <location>
@@ -32196,9 +31231,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Fullerton</_name>
           <coordinates>33.870292 -117.925338</coordinates>
           <location>
@@ -32210,9 +31243,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Garden Grove</_name>
           <coordinates>33.773905 -117.941448</coordinates>
           <location>
@@ -32222,10 +31253,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
-          <_name>Glendale</_name>
+          <!-- A city in California in the United States -->
+          <_name msgctxt="City in California, United States">Glendale</_name>
           <coordinates>34.142508 -118.255075</coordinates>
           <location>
             <name>Burbank, Burbank-Glendale-Pasadena Airport</name>
@@ -32236,10 +31265,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
-          <_name>Hanford</_name>
+          <!-- A city in California in the United States -->
+          <_name msgctxt="City in California, United States">Hanford</_name>
           <coordinates>36.327450 -119.645684</coordinates>
           <location>
             <name>Hanford Municipal Airport</name>
@@ -32248,9 +31275,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Hawthorne</_name>
           <coordinates>33.916403 -118.352575</coordinates>
           <location>
@@ -32262,10 +31287,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
-          <_name>Hayward</_name>
+          <!-- A city in California in the United States -->
+          <_name msgctxt="City in California, United States">Hayward</_name>
           <coordinates>37.668821 -122.080796</coordinates>
           <location>
             <name>Hayward Air Terminal</name>
@@ -32276,9 +31299,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Huntington Beach</_name>
           <coordinates>33.660297 -117.999227</coordinates>
           <location>
@@ -32290,10 +31311,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
-          <_name>Imperial</_name>
+          <!-- A city in California in the United States -->
+          <_name msgctxt="City in California, United States">Imperial</_name>
           <coordinates>32.847553 -115.569439</coordinates>
           <location>
             <name>Imperial County Airport</name>
@@ -32304,9 +31323,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Imperial Beach</_name>
           <coordinates>32.583944 -117.113085</coordinates>
           <location>
@@ -32318,9 +31335,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Inglewood</_name>
           <coordinates>33.961680 -118.353131</coordinates>
           <location>
@@ -32332,9 +31347,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Inyokern</_name>
           <coordinates>35.646899 -117.812567</coordinates>
           <location>
@@ -32346,9 +31359,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Irvine</_name>
           <coordinates>33.669465 -117.823111</coordinates>
           <location>
@@ -32360,9 +31371,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>La Verne</_name>
           <coordinates>34.100843 -117.767836</coordinates>
           <location>
@@ -32374,10 +31383,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
-          <_name>Lancaster</_name>
+          <!-- A city in California in the United States -->
+          <_name msgctxt="City in California, United States">Lancaster</_name>
           <coordinates>34.698041 -118.136739</coordinates>
           <location>
             <name>General William J. Fox Airfield Airport</name>
@@ -32388,9 +31395,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Lemoore</_name>
           <coordinates>36.300784 -119.782911</coordinates>
           <location>
@@ -32402,9 +31407,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Livermore</_name>
           <coordinates>37.681874 -121.768009</coordinates>
           <location>
@@ -32416,9 +31419,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Lompoc</_name>
           <coordinates>34.639150 -120.457941</coordinates>
           <location>
@@ -32437,9 +31438,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Long Beach</_name>
           <coordinates>33.766962 -118.189235</coordinates>
           <location>
@@ -32451,9 +31450,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Los Alamitos</_name>
           <coordinates>33.803072 -118.072564</coordinates>
           <location>
@@ -32463,9 +31460,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Los Angeles</_name>
           <coordinates>34.052234 -118.243685</coordinates>
           <location>
@@ -32491,9 +31486,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Madera</_name>
           <coordinates>36.961336 -120.060718</coordinates>
           <location>
@@ -32503,10 +31496,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
-          <_name>Marysville</_name>
+          <!-- A city in California in the United States -->
+          <_name msgctxt="City in California, United States">Marysville</_name>
           <coordinates>39.145725 -121.591355</coordinates>
           <location>
             <name>Yuba County Airport</name>
@@ -32524,9 +31515,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Merced</_name>
           <coordinates>37.302163 -120.482968</coordinates>
           <location>
@@ -32543,9 +31532,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Miramar</_name>
           <coordinates>32.893658 -117.118366</coordinates>
           <location>
@@ -32557,9 +31544,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Modesto</_name>
           <coordinates>37.639097 -120.996878</coordinates>
           <location>
@@ -32571,9 +31556,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Montague</_name>
           <coordinates>41.728198 -122.527801</coordinates>
           <location>
@@ -32585,9 +31568,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Monterey</_name>
           <coordinates>36.600238 -121.894676</coordinates>
           <location>
@@ -32599,9 +31580,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Mount Shasta</_name>
           <coordinates>41.309875 -122.310567</coordinates>
           <location>
@@ -32613,9 +31592,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Mount Wilson</_name>
           <coordinates>34.226393 -118.066180</coordinates>
           <location>
@@ -32627,9 +31604,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Mountain View</_name>
           <coordinates>37.386052 -122.083851</coordinates>
           <location>
@@ -32641,9 +31616,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Napa</_name>
           <coordinates>38.297137 -122.285529</coordinates>
           <location>
@@ -32655,9 +31628,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Needles</_name>
           <coordinates>34.848060 -114.614131</coordinates>
           <location>
@@ -32669,9 +31640,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Newhall</_name>
           <coordinates>34.384720 -118.530919</coordinates>
           <location>
@@ -32681,9 +31650,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Norwalk</_name>
           <coordinates>33.902237 -118.081733</coordinates>
           <location>
@@ -32695,9 +31662,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Oakland</_name>
           <coordinates>37.804372 -122.270803</coordinates>
           <location>
@@ -32709,9 +31674,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Oceanside</_name>
           <coordinates>33.195870 -117.379483</coordinates>
           <location>
@@ -32733,10 +31696,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
-          <_name>Ontario</_name>
+          <!-- A city in California in the United States -->
+          <_name msgctxt="City in California, United States">Ontario</_name>
           <coordinates>34.063344 -117.650888</coordinates>
           <location>
             <name>Ontario International Airport</name>
@@ -32747,10 +31708,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
-          <_name>Orange</_name>
+          <!-- A city in California in the United States -->
+          <_name msgctxt="City in California, United States">Orange</_name>
           <coordinates>33.787794 -117.853112</coordinates>
           <location>
             <name>Santa Ana, John Wayne Airport-Orange County Airport</name>
@@ -32761,9 +31720,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Oroville</_name>
           <coordinates>39.513775 -121.556359</coordinates>
           <location>
@@ -32773,9 +31730,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Oxnard</_name>
           <coordinates>34.197505 -119.177052</coordinates>
           <location>
@@ -32793,9 +31748,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Palm Springs</_name>
           <coordinates>33.830296 -116.545292</coordinates>
           <location>
@@ -32812,9 +31765,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Palmdale</_name>
           <coordinates>34.579434 -118.116461</coordinates>
           <location>
@@ -32826,9 +31777,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Palo Alto</_name>
           <coordinates>37.441883 -122.143019</coordinates>
           <location>
@@ -32840,10 +31789,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
-          <_name>Pasadena</_name>
+          <!-- A city in California in the United States -->
+          <_name msgctxt="City in California, United States">Pasadena</_name>
           <coordinates>34.147785 -118.144515</coordinates>
           <location>
             <name>Mount Wilson</name>
@@ -32854,9 +31801,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Paso Robles</_name>
           <coordinates>35.626637 -120.691004</coordinates>
           <location>
@@ -32868,9 +31813,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Pomona</_name>
           <coordinates>34.055289 -117.752279</coordinates>
           <location>
@@ -32882,9 +31825,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Porterville</_name>
           <coordinates>36.065230 -119.016768</coordinates>
           <location>
@@ -32896,9 +31837,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Ramona</_name>
           <coordinates>33.041711 -116.868082</coordinates>
           <location>
@@ -32908,9 +31847,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Rancho Cucamonga</_name>
           <coordinates>34.106399 -117.593108</coordinates>
           <location>
@@ -32922,9 +31859,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Red Bluff</_name>
           <coordinates>40.178489 -122.235830</coordinates>
           <location>
@@ -32936,9 +31871,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Redding</_name>
           <coordinates>40.586540 -122.391675</coordinates>
           <location>
@@ -32950,9 +31883,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Riverside</_name>
           <coordinates>33.953349 -117.396156</coordinates>
           <location>
@@ -32971,9 +31902,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Sacramento</_name>
           <coordinates>38.581572 -121.494400</coordinates>
           <location>
@@ -32997,9 +31926,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Salinas</_name>
           <coordinates>36.677737 -121.655501</coordinates>
           <location>
@@ -33011,9 +31938,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>San Bernardino</_name>
           <coordinates>34.108345 -117.289765</coordinates>
           <location>
@@ -33025,9 +31950,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>San Carlos</_name>
           <coordinates>37.507159 -122.260522</coordinates>
           <location>
@@ -33039,9 +31962,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>San Diego</_name>
           <coordinates>32.715329 -117.157255</coordinates>
           <location>
@@ -33087,9 +32008,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>San Francisco</_name>
           <coordinates>37.774929 -122.419415</coordinates>
           <location>
@@ -33101,9 +32020,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>San Jose</_name>
           <coordinates>37.339386 -121.894955</coordinates>
           <location>
@@ -33120,9 +32037,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>San Luis Obispo</_name>
           <coordinates>35.282752 -120.659616</coordinates>
           <location>
@@ -33134,9 +32049,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Sandberg</_name>
           <coordinates>34.741093 -118.709534</coordinates>
           <location>
@@ -33147,9 +32060,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Santa Ana</_name>
           <coordinates>33.745573 -117.867834</coordinates>
           <location>
@@ -33161,9 +32072,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Santa Barbara</_name>
           <coordinates>34.420831 -119.698190</coordinates>
           <location>
@@ -33175,10 +32084,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
-          <_name>Santa Clara</_name>
+          <!-- A city in California in the United States -->
+          <_name msgctxt="City in California, United States">Santa Clara</_name>
           <coordinates>37.354108 -121.955236</coordinates>
           <location>
             <name>San Jose, San Jose International Airport</name>
@@ -33189,10 +32096,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
-          <_name>Santa Maria</_name>
+          <!-- A city in California in the United States -->
+          <_name msgctxt="City in California, United States">Santa Maria</_name>
           <coordinates>34.953034 -120.435719</coordinates>
           <location>
             <name>Santa Maria Public Airport</name>
@@ -33203,9 +32108,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Santa Monica</_name>
           <coordinates>34.019454 -118.491191</coordinates>
           <location>
@@ -33217,9 +32120,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Santa Rosa</_name>
           <coordinates>38.440467 -122.714431</coordinates>
           <location>
@@ -33231,9 +32132,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Simi Valley</_name>
           <coordinates>34.269447 -118.781482</coordinates>
           <location>
@@ -33243,9 +32142,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>South Lake Tahoe</_name>
           <coordinates>38.933241 -119.984348</coordinates>
           <location>
@@ -33257,10 +32154,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
-          <_name>Stockton</_name>
+          <!-- A city in California in the United States -->
+          <_name msgctxt="City in California, United States">Stockton</_name>
           <coordinates>37.957702 -121.290780</coordinates>
           <location>
             <name>Stockton Metropolitan Airport</name>
@@ -33271,9 +32166,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Sunnyvale</_name>
           <coordinates>37.368830 -122.036350</coordinates>
           <location>
@@ -33285,9 +32178,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Thousand Oaks</_name>
           <coordinates>34.170561 -118.837594</coordinates>
           <location>
@@ -33299,9 +32190,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Torrance</_name>
           <coordinates>33.835849 -118.340629</coordinates>
           <location>
@@ -33313,9 +32202,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Truckee</_name>
           <coordinates>39.327962 -120.183253</coordinates>
           <location>
@@ -33327,9 +32214,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Twentynine Palms</_name>
           <coordinates>34.135558 -116.054169</coordinates>
           <location>
@@ -33341,9 +32226,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Ukiah</_name>
           <coordinates>39.150171 -123.207783</coordinates>
           <location>
@@ -33355,9 +32238,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Vacaville</_name>
           <coordinates>38.356577 -121.987744</coordinates>
           <location>
@@ -33367,9 +32248,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Vallejo</_name>
           <coordinates>38.104086 -122.256637</coordinates>
           <location>
@@ -33381,9 +32260,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Van Nuys</_name>
           <coordinates>34.186672 -118.448971</coordinates>
           <location>
@@ -33395,9 +32272,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Ventura</_name>
           <coordinates>34.278335 -119.293168</coordinates>
           <location>
@@ -33409,9 +32284,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Victorville</_name>
           <coordinates>34.536107 -117.291156</coordinates>
           <location>
@@ -33421,9 +32294,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Visalia</_name>
           <coordinates>36.330228 -119.292058</coordinates>
           <location>
@@ -33435,9 +32306,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>Watsonville</_name>
           <coordinates>36.910231 -121.756895</coordinates>
           <location>
@@ -33447,9 +32316,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in California in the United
-               States
-            -->
+          <!-- A city in California in the United States -->
           <_name>West Covina</_name>
           <coordinates>34.068621 -117.938953</coordinates>
           <location>
@@ -33462,17 +32329,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Colorado</_name>
         <fips-code>US08</fips-code>
         <tz-hint>America/Denver</tz-hint>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
-          <_name>Akron</_name>
+          <!-- A city in Colorado in the United States -->
+          <_name msgctxt="City in Colorado, United States">Akron</_name>
           <coordinates>40.160537 -103.214384</coordinates>
           <location>
             <name>Akron-Washington County Airport</name>
@@ -33481,9 +32344,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Alamosa</_name>
           <coordinates>37.469449 -105.870022</coordinates>
           <location>
@@ -33495,9 +32356,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Arvada</_name>
           <coordinates>39.802764 -105.087484</coordinates>
           <location>
@@ -33509,9 +32368,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Aspen</_name>
           <coordinates>39.191098 -106.817539</coordinates>
           <location>
@@ -33523,10 +32380,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
-          <_name>Aurora</_name>
+          <!-- A city in Colorado in the United States -->
+          <_name msgctxt="City in Colorado, United States">Aurora</_name>
           <coordinates>39.729432 -104.831919</coordinates>
           <location>
             <name>Buckley Air Force Base Airport</name>
@@ -33537,9 +32392,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Broomfield</_name>
           <coordinates>39.920541 -105.086650</coordinates>
           <location>
@@ -33551,10 +32404,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
-          <_name>Burlington</_name>
+          <!-- A city in Colorado in the United States -->
+          <_name msgctxt="City in Colorado, United States">Burlington</_name>
           <coordinates>39.306108 -102.269356</coordinates>
           <location>
             <name>Carson County Airport</name>
@@ -33563,10 +32414,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
-          <_name>Cardiff</_name>
+          <!-- A city in Colorado in the United States -->
+          <_name msgctxt="City in Colorado, United States">Cardiff</_name>
           <coordinates>39.506093 -107.310887</coordinates>
           <location>
             <name>Sunlight</name>
@@ -33575,9 +32424,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Colorado Springs</_name>
           <coordinates>38.833882 -104.821363</coordinates>
           <location>
@@ -33596,9 +32443,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Copper Mountain</_name>
           <coordinates>39.506653 -106.142244</coordinates>
           <location>
@@ -33608,9 +32453,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Cortez</_name>
           <coordinates>37.348883 -108.585926</coordinates>
           <location>
@@ -33622,9 +32465,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Craig</_name>
           <coordinates>40.515249 -107.546454</coordinates>
           <location>
@@ -33636,9 +32477,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Denver</_name>
           <coordinates>39.739154 -104.984703</coordinates>
           <location>
@@ -33662,10 +32501,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
-          <_name>Durango</_name>
+          <!-- A city in Colorado in the United States -->
+          <_name msgctxt="City in Colorado, United States">Durango</_name>
           <coordinates>37.275280 -107.880067</coordinates>
           <location>
             <name>Durango-La Plata County Airport</name>
@@ -33676,10 +32513,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
-          <_name>Eagle</_name>
+          <!-- A city in Colorado in the United States -->
+          <_name msgctxt="City in Colorado, United States">Eagle</_name>
           <coordinates>39.655263 -106.828651</coordinates>
           <location>
             <name>Eagle County Regional</name>
@@ -33690,9 +32525,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Elbert</_name>
           <coordinates>39.219434 -104.537192</coordinates>
           <location>
@@ -33702,9 +32535,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Fort Carson</_name>
           <coordinates>38.737494 -104.788861</coordinates>
           <location>
@@ -33716,9 +32547,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Fort Collins</_name>
           <coordinates>40.585260 -105.084423</coordinates>
           <location>
@@ -33730,9 +32559,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Grand Junction</_name>
           <coordinates>39.063871 -108.550649</coordinates>
           <location>
@@ -33744,9 +32571,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Gunnison</_name>
           <coordinates>38.545825 -106.925321</coordinates>
           <location>
@@ -33758,9 +32583,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Hayden</_name>
           <coordinates>40.491918 -107.257558</coordinates>
           <location>
@@ -33772,9 +32595,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Kremmling</_name>
           <coordinates>40.058874 -106.388920</coordinates>
           <location>
@@ -33784,9 +32605,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>La Junta</_name>
           <coordinates>37.985009 -103.543832</coordinates>
           <location>
@@ -33798,9 +32617,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>La Veta</_name>
           <coordinates>37.505012 -105.007775</coordinates>
           <location>
@@ -33810,9 +32627,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>La Veta Pass</_name>
           <coordinates>37.593063 -105.203336</coordinates>
           <location>
@@ -33822,9 +32637,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Lakewood</_name>
           <coordinates>39.704709 -105.081373</coordinates>
           <location>
@@ -33836,9 +32649,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Lamar</_name>
           <coordinates>38.087231 -102.620750</coordinates>
           <location>
@@ -33848,9 +32659,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Leadville</_name>
           <coordinates>39.250823 -106.292524</coordinates>
           <location>
@@ -33862,9 +32671,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Limon</_name>
           <coordinates>39.263876 -103.692174</coordinates>
           <location>
@@ -33876,9 +32683,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Loveland</_name>
           <coordinates>40.397761 -105.074980</coordinates>
           <location>
@@ -33890,9 +32695,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Meeker</_name>
           <coordinates>40.037473 -107.913130</coordinates>
           <location>
@@ -33902,9 +32705,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Montrose</_name>
           <coordinates>38.478320 -107.876174</coordinates>
           <location>
@@ -33916,9 +32717,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Monument</_name>
           <coordinates>39.091659 -104.872758</coordinates>
           <location>
@@ -33928,9 +32727,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Pagosa Springs</_name>
           <coordinates>37.269450 -107.009762</coordinates>
           <location>
@@ -33940,9 +32737,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Pueblo</_name>
           <coordinates>38.254447 -104.609141</coordinates>
           <location>
@@ -33954,9 +32749,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Red Cliff</_name>
           <coordinates>39.512208 -106.368084</coordinates>
           <location>
@@ -33966,9 +32759,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Rifle</_name>
           <coordinates>39.534702 -107.783120</coordinates>
           <location>
@@ -33978,9 +32769,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Saguache</_name>
           <coordinates>38.087500 -106.141967</coordinates>
           <location>
@@ -33990,9 +32779,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Salida</_name>
           <coordinates>38.534719 -105.998902</coordinates>
           <location>
@@ -34002,10 +32789,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
-          <_name>Springfield</_name>
+          <!-- A city in Colorado in the United States -->
+          <_name msgctxt="City in Colorado, United States">Springfield</_name>
           <coordinates>37.408349 -102.614362</coordinates>
           <location>
             <name>Springfield, Comanche National Grassland</name>
@@ -34014,9 +32799,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Steamboat Springs</_name>
           <coordinates>40.484977 -106.831716</coordinates>
           <location>
@@ -34026,9 +32809,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Tarryall</_name>
           <coordinates>39.121935 -105.475555</coordinates>
           <location>
@@ -34038,9 +32819,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Telluride</_name>
           <coordinates>37.937494 -107.812285</coordinates>
           <location>
@@ -34050,10 +32829,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
-          <_name>Trinidad</_name>
+          <!-- A city in Colorado in the United States -->
+          <_name msgctxt="City in Colorado, United States">Trinidad</_name>
           <coordinates>37.169463 -104.500541</coordinates>
           <location>
             <name>Perry Stokes Airport</name>
@@ -34064,9 +32841,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Colorado in the United
-               States
-            -->
+          <!-- A city in Colorado in the United States -->
           <_name>Westminster</_name>
           <coordinates>39.836653 -105.037205</coordinates>
           <location>
@@ -34079,16 +32854,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Connecticut</_name>
         <fips-code>US09</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in Connecticut in the United
-               States
-            -->
+          <!-- A city in Connecticut in the United States -->
           <_name>Bridgeport</_name>
           <coordinates>41.167041 -73.204835</coordinates>
           <location>
@@ -34100,9 +32871,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Connecticut in the United
-               States
-            -->
+          <!-- A city in Connecticut in the United States -->
           <_name>Danbury</_name>
           <coordinates>41.394817 -73.454011</coordinates>
           <location>
@@ -34114,9 +32883,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Connecticut in the United
-               States
-            -->
+          <!-- A city in Connecticut in the United States -->
           <_name>Groton</_name>
           <coordinates>41.350098 -72.078409</coordinates>
           <location>
@@ -34128,9 +32895,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Connecticut in the United
-               States
-            -->
+          <!-- A city in Connecticut in the United States -->
           <_name>Hartford</_name>
           <coordinates>41.763711 -72.685093</coordinates>
           <location>
@@ -34142,9 +32907,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Connecticut in the United
-               States
-            -->
+          <!-- A city in Connecticut in the United States -->
           <_name>Meriden</_name>
           <coordinates>41.538153 -72.807044</coordinates>
           <location>
@@ -34154,9 +32917,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Connecticut in the United
-               States
-            -->
+          <!-- A city in Connecticut in the United States -->
           <_name>New Haven</_name>
           <coordinates>41.308153 -72.928158</coordinates>
           <location>
@@ -34168,9 +32929,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Connecticut in the United
-               States
-            -->
+          <!-- A city in Connecticut in the United States -->
           <_name>New London</_name>
           <coordinates>41.355654 -72.099521</coordinates>
           <location>
@@ -34182,10 +32941,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Connecticut in the United
-               States
-            -->
-          <_name>Oxford</_name>
+          <!-- A city in Connecticut in the United States -->
+          <_name msgctxt="City in Connecticut, United States">Oxford</_name>
           <coordinates>41.433985 -73.116777</coordinates>
           <location>
             <name>Waterbury-Oxford Airport</name>
@@ -34196,9 +32953,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Connecticut in the United
-               States
-            -->
+          <!-- A city in Connecticut in the United States -->
           <_name>Stamford</_name>
           <coordinates>41.053430 -73.538734</coordinates>
           <location>
@@ -34210,9 +32965,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Connecticut in the United
-               States
-            -->
+          <!-- A city in Connecticut in the United States -->
           <_name>Waterbury</_name>
           <coordinates>41.558152 -73.051497</coordinates>
           <location>
@@ -34224,9 +32977,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Connecticut in the United
-               States
-            -->
+          <!-- A city in Connecticut in the United States -->
           <_name>Willimantic</_name>
           <coordinates>41.710654 -72.208134</coordinates>
           <location>
@@ -34236,9 +32987,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Connecticut in the United
-               States
-            -->
+          <!-- A city in Connecticut in the United States -->
           <_name>Windsor Locks</_name>
           <coordinates>41.929264 -72.627312</coordinates>
           <location>
@@ -34251,16 +33000,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Delaware</_name>
         <fips-code>US10</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in Delaware in the United
-               States
-            -->
+          <!-- A city in Delaware in the United States -->
           <_name>Dover</_name>
           <coordinates>39.158168 -75.524368</coordinates>
           <location>
@@ -34272,10 +33017,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Delaware in the United
-               States
-            -->
-          <_name>Georgetown</_name>
+          <!-- A city in Delaware in the United States -->
+          <_name msgctxt="City in Delaware, United States">Georgetown</_name>
           <coordinates>38.690113 -75.385473</coordinates>
           <location>
             <name>Sussex County Airport</name>
@@ -34284,10 +33027,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Delaware in the United
-               States
-            -->
-          <_name>Wilmington</_name>
+          <!-- A city in Delaware in the United States -->
+          <_name msgctxt="City in Delaware, United States">Wilmington</_name>
           <coordinates>39.745947 -75.546589</coordinates>
           <location>
             <name>New Castle County Airport</name>
@@ -34299,15 +33040,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>District of Columbia</_name>
         <fips-code>US11</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is the capital of the United States -->
-          <_name>Washington</_name>
+          <!-- The capital of the United States -->
+          <_name msgctxt="City in District of Columbia, United States">Washington</_name>
           <coordinates>38.895112 -77.036366</coordinates>
           <location>
             <name>Washington DC, Reagan National Airport</name>
@@ -34326,16 +33065,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Florida</_name>
         <fips-code>US12</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Apalachicola</_name>
           <coordinates>29.725767 -84.983244</coordinates>
           <location>
@@ -34345,9 +33080,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Bartow</_name>
           <coordinates>27.896415 -81.843137</coordinates>
           <location>
@@ -34358,9 +33091,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Boca Raton</_name>
           <coordinates>26.358688 -80.083098</coordinates>
           <location>
@@ -34370,9 +33101,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Bradenton</_name>
           <coordinates>27.498928 -82.574819</coordinates>
           <location>
@@ -34384,9 +33113,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Brooksville</_name>
           <coordinates>28.555272 -82.387871</coordinates>
           <location>
@@ -34398,9 +33125,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Cape Canaveral</_name>
           <coordinates>28.405837 -80.604773</coordinates>
           <location>
@@ -34410,9 +33135,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Cape Coral</_name>
           <coordinates>26.562854 -81.949533</coordinates>
           <location>
@@ -34424,9 +33147,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Clearwater</_name>
           <coordinates>27.965853 -82.800103</coordinates>
           <location>
@@ -34438,9 +33159,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Cocoa</_name>
           <coordinates>28.386116 -80.741998</coordinates>
           <location>
@@ -34452,9 +33171,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Cocoa Beach</_name>
           <coordinates>28.320007 -80.607551</coordinates>
           <location>
@@ -34464,9 +33181,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Crestview</_name>
           <coordinates>30.762133 -86.570508</coordinates>
           <location>
@@ -34487,9 +33202,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Cross City</_name>
           <coordinates>29.634398 -83.125131</coordinates>
           <location>
@@ -34501,9 +33214,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Daytona Beach</_name>
           <coordinates>29.210815 -81.022833</coordinates>
           <location>
@@ -34515,9 +33226,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Destin</_name>
           <coordinates>30.393534 -86.495783</coordinates>
           <location>
@@ -34529,9 +33238,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Fort Lauderdale</_name>
           <coordinates>26.122308 -80.143379</coordinates>
           <location>
@@ -34550,9 +33257,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Fort Myers</_name>
           <coordinates>26.640628 -81.872308</coordinates>
           <location>
@@ -34571,9 +33276,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Fort Pierce</_name>
           <coordinates>27.446706 -80.325606</coordinates>
           <location>
@@ -34583,9 +33286,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Fort Walton Beach</_name>
           <coordinates>30.405755 -86.618842</coordinates>
           <location>
@@ -34597,10 +33298,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
-          <_name>Gainesville</_name>
+          <!-- A city in Florida in the United States -->
+          <_name msgctxt="City in Florida, United States">Gainesville</_name>
           <coordinates>29.651634 -82.324826</coordinates>
           <location>
             <name>Gainesville Regional Airport</name>
@@ -34611,9 +33310,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Hialeah</_name>
           <coordinates>25.857596 -80.278106</coordinates>
           <location>
@@ -34625,9 +33322,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Hollywood</_name>
           <coordinates>26.011201 -80.149490</coordinates>
           <location>
@@ -34637,9 +33332,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Homestead</_name>
           <coordinates>25.468722 -80.477557</coordinates>
           <location>
@@ -34651,10 +33344,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
-          <_name>Jacksonville</_name>
+          <!-- A city in Florida in the United States -->
+          <_name msgctxt="City in Florida, United States">Jacksonville</_name>
           <coordinates>30.332184 -81.655651</coordinates>
           <location>
             <name>Jacksonville, Naval Air Station</name>
@@ -34684,9 +33375,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Key West</_name>
           <coordinates>24.555702 -81.782591</coordinates>
           <location>
@@ -34705,9 +33394,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Lakeland</_name>
           <coordinates>28.039465 -81.949804</coordinates>
           <location>
@@ -34719,10 +33406,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
-          <_name>Leesburg</_name>
+          <!-- A city in Florida in the United States -->
+          <_name msgctxt="City in Florida, United States">Leesburg</_name>
           <coordinates>28.810823 -81.877858</coordinates>
           <location>
             <name>Leesburg Regional Airport</name>
@@ -34732,9 +33417,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Marathon</_name>
           <coordinates>24.713752 -81.090351</coordinates>
           <location>
@@ -34746,9 +33429,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Marianna</_name>
           <coordinates>30.774360 -85.226873</coordinates>
           <location>
@@ -34761,9 +33442,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Mayport</_name>
           <coordinates>30.393296 -81.430642</coordinates>
           <location>
@@ -34775,10 +33454,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
-          <_name>Melbourne</_name>
+          <!-- A city in Florida in the United States -->
+          <_name msgctxt="City in Florida, United States">Melbourne</_name>
           <coordinates>28.083627 -80.608109</coordinates>
           <location>
             <name>Melbourne International Airport</name>
@@ -34789,10 +33466,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
-          <_name>Miami</_name>
+          <!-- A city in Florida in the United States -->
+          <_name msgctxt="City in Florida, United States">Miami</_name>
           <coordinates>25.774266 -80.193659</coordinates>
           <location>
             <name>Miami International Airport</name>
@@ -34817,9 +33492,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Milton</_name>
           <coordinates>30.632415 -87.039688</coordinates>
           <location>
@@ -34837,10 +33510,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
-          <_name>Naples</_name>
+          <!-- A city in Florida in the United States -->
+          <_name msgctxt="City in Florida, United States">Naples</_name>
           <coordinates>26.142036 -81.794810</coordinates>
           <location>
             <name>Naples Municipal Airport</name>
@@ -34851,9 +33522,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>New Smyrna Beach</_name>
           <coordinates>29.025819 -80.926998</coordinates>
           <location>
@@ -34863,9 +33532,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Ocala</_name>
           <coordinates>29.187199 -82.140092</coordinates>
           <location>
@@ -34877,9 +33544,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Okeechobee</_name>
           <coordinates>27.243935 -80.829783</coordinates>
           <location>
@@ -34889,9 +33554,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Orlando</_name>
           <coordinates>28.538335 -81.379237</coordinates>
           <location>
@@ -34922,9 +33585,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Ormond Beach</_name>
           <coordinates>29.285813 -81.055889</coordinates>
           <location>
@@ -34934,9 +33595,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Panama City</_name>
           <coordinates>30.158813 -85.660206</coordinates>
           <location>
@@ -34949,9 +33608,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Pembroke Pines</_name>
           <coordinates>26.003146 -80.223937</coordinates>
           <location>
@@ -34961,9 +33618,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Pensacola</_name>
           <coordinates>30.421309 -87.216915</coordinates>
           <location>
@@ -34984,9 +33639,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Perry</_name>
           <coordinates>30.117435 -83.581815</coordinates>
           <location>
@@ -34997,9 +33650,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Pompano Beach</_name>
           <coordinates>26.237860 -80.124767</coordinates>
           <location>
@@ -35010,9 +33661,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Punta Gorda</_name>
           <coordinates>26.929784 -82.045366</coordinates>
           <location>
@@ -35023,9 +33672,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Sarasota</_name>
           <coordinates>27.336435 -82.530653</coordinates>
           <location>
@@ -35037,10 +33684,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
-          <_name>Springfield</_name>
+          <!-- A city in Florida in the United States -->
+          <_name msgctxt="City in Florida, United States">Springfield</_name>
           <coordinates>30.153257 -85.611315</coordinates>
           <location>
             <name>Tyndall Air Force Base</name>
@@ -35051,9 +33696,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Stuart</_name>
           <coordinates>27.197548 -80.252826</coordinates>
           <location>
@@ -35063,9 +33706,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Tallahassee</_name>
           <coordinates>30.438256 -84.280733</coordinates>
           <location>
@@ -35077,9 +33718,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Tampa</_name>
           <coordinates>27.947522 -82.458428</coordinates>
           <location>
@@ -35115,9 +33754,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>The Villages</_name>
           <coordinates>28.933596 -81.948417</coordinates>
           <location>
@@ -35127,9 +33764,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Titusville</_name>
           <coordinates>28.612219 -80.807554</coordinates>
           <location>
@@ -35147,10 +33782,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
-          <_name>Valparaiso</_name>
+          <!-- A city in Florida in the United States -->
+          <_name msgctxt="City in Florida, United States">Valparaiso</_name>
           <coordinates>30.508531 -86.502728</coordinates>
           <location>
             <name>Valparaiso / Eglin Air Force Base</name>
@@ -35162,9 +33795,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Vero Beach</_name>
           <coordinates>27.638643 -80.397274</coordinates>
           <location>
@@ -35176,9 +33807,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Vilano Beach</_name>
           <coordinates>29.918858 -81.292850</coordinates>
           <location>
@@ -35188,9 +33817,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>West Palm Beach</_name>
           <coordinates>26.715342 -80.053375</coordinates>
           <location>
@@ -35202,9 +33829,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Florida in the United
-               States
-            -->
+          <!-- A city in Florida in the United States -->
           <_name>Winter Haven</_name>
           <coordinates>28.022243 -81.732857</coordinates>
           <location>
@@ -35216,17 +33841,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
-        <_name>Georgia</_name>
+        <!-- A state/province/territory in United States -->
+        <_name msgctxt="State in United States">Georgia</_name>
         <fips-code>US13</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
-          <_name>Albany</_name>
+          <!-- A city in Georgia in the United States -->
+          <_name msgctxt="City in Georgia, United States">Albany</_name>
           <coordinates>31.578507 -84.155741</coordinates>
           <location>
             <name>Southwest Georgia Regional Airport</name>
@@ -35237,10 +33858,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
-          <_name>Alma</_name>
+          <!-- A city in Georgia in the United States -->
+          <_name msgctxt="City in Georgia, United States">Alma</_name>
           <coordinates>31.539370 -82.462356</coordinates>
           <location>
             <name>Bacon County Airport</name>
@@ -35251,10 +33870,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
-          <_name>Athens</_name>
+          <!-- A city in Georgia in the United States -->
+          <_name msgctxt="City in Georgia, United States">Athens</_name>
           <coordinates>33.960948 -83.377936</coordinates>
           <location>
             <name>Athens Airport</name>
@@ -35265,9 +33882,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Atlanta</_name>
           <coordinates>33.748995 -84.387982</coordinates>
           <location>
@@ -35300,10 +33915,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
-          <_name>Augusta</_name>
+          <!-- A city in Georgia in the United States -->
+          <_name msgctxt="City in Georgia, United States">Augusta</_name>
           <coordinates>33.470970 -81.974838</coordinates>
           <location>
             <name>Daniel Field</name>
@@ -35319,9 +33932,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Bainbridge</_name>
           <coordinates>30.903800 -84.575470</coordinates>
           <location>
@@ -35331,9 +33942,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Barretts</_name>
           <coordinates>31.001590 -83.199318</coordinates>
           <location>
@@ -35345,10 +33954,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
-          <_name>Brunswick</_name>
+          <!-- A city in Georgia in the United States -->
+          <_name msgctxt="City in Georgia, United States">Brunswick</_name>
           <coordinates>31.149953 -81.491489</coordinates>
           <location>
             <name>Malcolm McKinnon Airport</name>
@@ -35364,9 +33971,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Canton</_name>
           <coordinates>34.236762 -84.490762</coordinates>
           <location>
@@ -35376,9 +33981,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Cartersville</_name>
           <coordinates>34.165097 -84.799938</coordinates>
           <location>
@@ -35388,10 +33991,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
-          <_name>Columbus</_name>
+          <!-- A city in Georgia in the United States -->
+          <_name msgctxt="City in Georgia, United States">Columbus</_name>
           <coordinates>32.460976 -84.987709</coordinates>
           <location>
             <name>Columbus Metropolitan Airport</name>
@@ -35402,9 +34003,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Dalton</_name>
           <coordinates>34.769802 -84.970223</coordinates>
           <location>
@@ -35414,10 +34013,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
-          <_name>Douglas</_name>
+          <!-- A city in Georgia in the United States -->
+          <_name msgctxt="City in Georgia, United States">Douglas</_name>
           <coordinates>31.508807 -82.849865</coordinates>
           <location>
             <name>Douglas Municipal Airport</name>
@@ -35426,10 +34023,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
-          <_name>Dublin</_name>
+          <!-- A city in Georgia in the United States -->
+          <_name msgctxt="City in Georgia, United States">Dublin</_name>
           <coordinates>32.540445 -82.903754</coordinates>
           <location>
             <name>W H 'Bud' Barron Airport</name>
@@ -35438,9 +34033,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Fort Benning</_name>
           <coordinates>32.352369 -84.968819</coordinates>
           <location>
@@ -35452,10 +34045,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
-          <_name>Gainesville</_name>
+          <!-- A city in Georgia in the United States -->
+          <_name msgctxt="City in Georgia, United States">Gainesville</_name>
           <coordinates>34.297879 -83.824066</coordinates>
           <location>
             <name>Gilmer Memorial Airport</name>
@@ -35464,9 +34055,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Glynco</_name>
           <coordinates>31.222451 -81.510102</coordinates>
           <location>
@@ -35476,10 +34065,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
-          <_name>Greensboro</_name>
+          <!-- A city in Georgia in the United States -->
+          <_name msgctxt="City in Georgia, United States">Greensboro</_name>
           <coordinates>33.575683 -83.182379</coordinates>
           <location>
             <name>Greene County Regional Airport</name>
@@ -35488,9 +34075,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Hinesville</_name>
           <coordinates>31.846877 -81.595945</coordinates>
           <location>
@@ -35502,10 +34087,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
-          <_name>La Grange</_name>
+          <!-- A city in Georgia in the United States -->
+          <_name msgctxt="City in Georgia, United States">La Grange</_name>
           <coordinates>33.039291 -85.031327</coordinates>
           <location>
             <name>Callaway Airport</name>
@@ -35514,10 +34097,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
-          <_name>Lawrenceville</_name>
+          <!-- A city in Georgia in the United States -->
+          <_name msgctxt="City in Georgia, United States">Lawrenceville</_name>
           <coordinates>33.956215 -83.987962</coordinates>
           <location>
             <name>Gwinnett County-Briscoe Field Airport</name>
@@ -35526,9 +34107,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Macon</_name>
           <coordinates>32.840695 -83.632402</coordinates>
           <location>
@@ -35540,9 +34119,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Marietta</_name>
           <coordinates>33.952602 -84.549933</coordinates>
           <location>
@@ -35559,9 +34136,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Milledgeville</_name>
           <coordinates>33.080143 -83.232099</coordinates>
           <location>
@@ -35571,9 +34146,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Moultrie</_name>
           <coordinates>31.179908 -83.789063</coordinates>
           <location>
@@ -35584,9 +34157,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Newnan</_name>
           <coordinates>33.380672 -84.799657</coordinates>
           <location>
@@ -35596,9 +34167,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Peachtree City</_name>
           <coordinates>33.396783 -84.595763</coordinates>
           <location>
@@ -35610,10 +34179,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
-          <_name>Rome</_name>
+          <!-- A city in Georgia in the United States -->
+          <_name msgctxt="City in Georgia, United States">Rome</_name>
           <coordinates>34.257038 -85.164673</coordinates>
           <location>
             <name>R. B. Russell Airport</name>
@@ -35624,9 +34191,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Savannah</_name>
           <coordinates>32.083541 -81.099834</coordinates>
           <location>
@@ -35645,9 +34210,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Statesboro</_name>
           <coordinates>32.448788 -81.783167</coordinates>
           <location>
@@ -35657,9 +34220,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Sylvania</_name>
           <coordinates>32.750444 -81.636776</coordinates>
           <location>
@@ -35669,9 +34230,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Thomaston</_name>
           <coordinates>32.888188 -84.326585</coordinates>
           <location>
@@ -35681,9 +34240,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Thomson</_name>
           <coordinates>33.470693 -82.504573</coordinates>
           <location>
@@ -35693,9 +34250,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Valdosta</_name>
           <coordinates>30.832702 -83.278485</coordinates>
           <location>
@@ -35707,9 +34262,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Vidalia</_name>
           <coordinates>32.217686 -82.413461</coordinates>
           <location>
@@ -35719,9 +34272,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Warner Robins</_name>
           <coordinates>32.620978 -83.599905</coordinates>
           <location>
@@ -35733,9 +34284,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Waycross</_name>
           <coordinates>31.213551 -82.354018</coordinates>
           <location>
@@ -35747,9 +34296,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Georgia in the United
-               States
-            -->
+          <!-- A city in Georgia in the United States -->
           <_name>Winder</_name>
           <coordinates>33.992610 -83.720171</coordinates>
           <location>
@@ -35760,16 +34307,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Hawaii</_name>
         <fips-code>US15</fips-code>
         <tz-hint>Pacific/Honolulu</tz-hint>
         <city>
-          <!-- Translators: this is a city in Hawaii in the United
-               States
-            -->
+          <!-- A city in Hawaii in the United States -->
           <_name>Hilo</_name>
           <coordinates>19.729722 -155.090000</coordinates>
           <location>
@@ -35781,9 +34324,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Hawaii in the United
-               States
-            -->
+          <!-- A city in Hawaii in the United States -->
           <_name>Honolulu</_name>
           <coordinates>21.306944 -157.858333</coordinates>
           <location>
@@ -35807,9 +34348,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Hawaii in the United
-               States
-            -->
+          <!-- A city in Hawaii in the United States -->
           <_name>Kahului</_name>
           <coordinates>20.894722 -156.470000</coordinates>
           <location>
@@ -35821,9 +34360,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Hawaii in the United
-               States
-            -->
+          <!-- A city in Hawaii in the United States -->
           <_name>Kailua</_name>
           <coordinates>19.640556 -155.995556</coordinates>
           <location>
@@ -35835,9 +34372,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Hawaii in the United
-               States
-            -->
+          <!-- A city in Hawaii in the United States -->
           <_name>Kaumalapau</_name>
           <coordinates>20.790000 -156.990000</coordinates>
           <location>
@@ -35849,9 +34384,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Hawaii in the United
-               States
-            -->
+          <!-- A city in Hawaii in the United States -->
           <_name>Kaunakakai</_name>
           <coordinates>21.093333 -157.023889</coordinates>
           <location>
@@ -35863,9 +34396,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Hawaii in the United
-               States
-            -->
+          <!-- A city in Hawaii in the United States -->
           <_name>Kekaha</_name>
           <coordinates>21.970833 -159.715000</coordinates>
           <location>
@@ -35876,9 +34407,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Hawaii in the United
-               States
-            -->
+          <!-- A city in Hawaii in the United States -->
           <_name>Lahaina</_name>
           <coordinates>20.878333 -156.682500</coordinates>
           <location>
@@ -35890,9 +34419,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Hawaii in the United
-               States
-            -->
+          <!-- A city in Hawaii in the United States -->
           <_name>Lihue</_name>
           <coordinates>21.981111 -159.371111</coordinates>
           <location>
@@ -35904,9 +34431,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Hawaii in the United
-               States
-            -->
+          <!-- A city in Hawaii in the United States -->
           <_name>WahiawÄ</_name>
           <coordinates>21.502778 -158.023611</coordinates>
           <location>
@@ -35918,9 +34443,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Hawaii in the United
-               States
-            -->
+          <!-- A city in Hawaii in the United States -->
           <_name>Waikiâi</_name>
           <coordinates>19.860556 -155.652222</coordinates>
           <location>
@@ -35932,15 +34455,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Idaho</_name>
         <fips-code>US16</fips-code>
         <tz-hint>America/Denver</tz-hint>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
+          <!-- A city in Idaho in the United States -->
           <_name>Boise</_name>
           <coordinates>43.613500 -116.203451</coordinates>
           <location>
@@ -35952,8 +34472,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
+          <!-- A city in Idaho in the United States -->
           <_name>Burley</_name>
           <coordinates>42.535743 -113.792795</coordinates>
           <location>
@@ -35965,9 +34484,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
-          <_name>Caldwell</_name>
+          <!-- A city in Idaho in the United States -->
+          <_name msgctxt="City in Idaho, United States">Caldwell</_name>
           <coordinates>43.662938 -116.687360</coordinates>
           <location>
             <name>Caldwell Industrial Airport</name>
@@ -35976,8 +34494,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
+          <!-- A city in Idaho in the United States -->
           <_name>Challis</_name>
           <coordinates>44.504644 -114.231731</coordinates>
           <location>
@@ -35987,8 +34504,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
+          <!-- A city in Idaho in the United States -->
           <_name>Coeur d'Alene</_name>
           <coordinates>47.677683 -116.780466</coordinates>
           <location>
@@ -36001,8 +34517,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
+          <!-- A city in Idaho in the United States -->
           <_name>Hailey</_name>
           <coordinates>43.519629 -114.315325</coordinates>
           <location>
@@ -36014,8 +34529,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
+          <!-- A city in Idaho in the United States -->
           <_name>Idaho Falls</_name>
           <coordinates>43.466581 -112.034137</coordinates>
           <location>
@@ -36027,8 +34541,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
+          <!-- A city in Idaho in the United States -->
           <_name>Jerome</_name>
           <coordinates>42.724073 -114.518653</coordinates>
           <location>
@@ -36038,8 +34551,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
+          <!-- A city in Idaho in the United States -->
           <_name>Lewiston</_name>
           <coordinates>46.416551 -117.017657</coordinates>
           <location>
@@ -36052,9 +34564,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
-          <_name>Lowell</_name>
+          <!-- A city in Idaho in the United States -->
+          <_name msgctxt="City in Idaho, United States">Lowell</_name>
           <coordinates>46.144073 -115.595690</coordinates>
           <location>
             <name>Lowell</name>
@@ -36066,9 +34577,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
-          <_name>Malta</_name>
+          <!-- A city in Idaho in the United States -->
+          <_name msgctxt="City in Idaho, United States">Malta</_name>
           <coordinates>42.306302 -113.369168</coordinates>
           <location>
             <name>Malta</name>
@@ -36079,8 +34589,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
+          <!-- A city in Idaho in the United States -->
           <_name>McCall</_name>
           <coordinates>44.911006 -116.098736</coordinates>
           <location>
@@ -36092,9 +34601,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
-          <_name>Moscow</_name>
+          <!-- A city in Idaho in the United States -->
+          <_name msgctxt="City in Idaho, United States">Moscow</_name>
           <coordinates>46.732388 -117.000165</coordinates>
           <location>
             <name>Pullman / Moscow, Pullman / Moscow Regional Airport</name>
@@ -36105,9 +34613,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
-          <_name>Mountain Home</_name>
+          <!-- A city in Idaho in the United States -->
+          <_name msgctxt="City in Idaho, United States">Mountain Home</_name>
           <coordinates>43.132950 -115.691198</coordinates>
           <location>
             <name>Mountain Home Air Force Base</name>
@@ -36118,8 +34625,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
+          <!-- A city in Idaho in the United States -->
           <_name>Mullan</_name>
           <coordinates>47.470208 -115.801825</coordinates>
           <location>
@@ -36130,8 +34636,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
+          <!-- A city in Idaho in the United States -->
           <_name>Pocatello</_name>
           <coordinates>42.871303 -112.445534</coordinates>
           <location>
@@ -36143,8 +34648,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
+          <!-- A city in Idaho in the United States -->
           <_name>Rexburg</_name>
           <coordinates>43.826023 -111.789688</coordinates>
           <location>
@@ -36154,8 +34658,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
+          <!-- A city in Idaho in the United States -->
           <_name>Salmon</_name>
           <coordinates>45.175755 -113.895901</coordinates>
           <location>
@@ -36167,8 +34670,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
+          <!-- A city in Idaho in the United States -->
           <_name>Sandpoint</_name>
           <coordinates>48.276590 -116.553248</coordinates>
           <location>
@@ -36179,8 +34681,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
+          <!-- A city in Idaho in the United States -->
           <_name>Soda Springs</_name>
           <coordinates>42.654365 -111.604669</coordinates>
           <location>
@@ -36192,9 +34693,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
-          <_name>Stanley</_name>
+          <!-- A city in Idaho in the United States -->
+          <_name msgctxt="City in Idaho, United States">Stanley</_name>
           <coordinates>44.211297 -114.945918</coordinates>
           <location>
             <name>Stanley Ranger Station</name>
@@ -36203,8 +34703,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Idaho in the United States
-            -->
+          <!-- A city in Idaho in the United States -->
           <_name>Twin Falls</_name>
           <coordinates>42.562967 -114.460871</coordinates>
           <location>
@@ -36217,16 +34716,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Illinois</_name>
         <fips-code>US17</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Alton</_name>
           <coordinates>38.890604 -90.184276</coordinates>
           <location>
@@ -36238,10 +34733,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Aurora</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Aurora</_name>
           <coordinates>41.760585 -88.320071</coordinates>
           <location>
             <name>Aurora Municipal Airport</name>
@@ -36252,9 +34745,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Belleville</_name>
           <coordinates>38.520050 -89.983993</coordinates>
           <location>
@@ -36266,10 +34757,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Bloomington</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Bloomington</_name>
           <coordinates>40.484203 -88.993687</coordinates>
           <location>
             <name>Bloomington / Normal, Central Illinois Regional Airport at Bloomington-Normal</name>
@@ -36280,9 +34769,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Cahokia</_name>
           <coordinates>38.570885 -90.190111</coordinates>
           <location>
@@ -36294,10 +34781,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Cairo</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Cairo</_name>
           <coordinates>37.005329 -89.176461</coordinates>
           <location>
             <name>Cairo Regional Airport</name>
@@ -36308,9 +34793,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Carbondale</_name>
           <coordinates>37.727273 -89.216750</coordinates>
           <location>
@@ -36322,9 +34805,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Carmi</_name>
           <coordinates>38.090880 -88.158649</coordinates>
           <location>
@@ -36334,9 +34815,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Centralia</_name>
           <coordinates>38.525049 -89.133404</coordinates>
           <location>
@@ -36346,9 +34825,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Champaign</_name>
           <coordinates>40.116420 -88.243383</coordinates>
           <location>
@@ -36360,10 +34837,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Charleston</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Charleston</_name>
           <coordinates>39.496146 -88.176152</coordinates>
           <location>
             <name>Mattoon / Charleston, Coles County Memorial Airport</name>
@@ -36374,10 +34849,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Chicago</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Chicago</_name>
           <coordinates>41.850033 -87.650052</coordinates>
           <location>
             <name>Chicago Midway Airport</name>
@@ -36416,10 +34889,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Danville</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Danville</_name>
           <coordinates>40.124481 -87.630021</coordinates>
           <location>
             <name>Vermilion County Airport</name>
@@ -36430,9 +34901,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>DeKalb</_name>
           <coordinates>41.929474 -88.750365</coordinates>
           <location>
@@ -36442,10 +34911,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Decatur</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Decatur</_name>
           <coordinates>39.840315 -88.954800</coordinates>
           <location>
             <name>Decatur Airport</name>
@@ -36456,9 +34923,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Effingham</_name>
           <coordinates>39.120042 -88.543383</coordinates>
           <location>
@@ -36468,10 +34933,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Fairfield</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Fairfield</_name>
           <coordinates>38.378937 -88.359768</coordinates>
           <location>
             <name>Fairfield Municipal Airport</name>
@@ -36480,9 +34943,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Flora</_name>
           <coordinates>38.668936 -88.485604</coordinates>
           <location>
@@ -36492,10 +34953,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Freeport</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Freeport</_name>
           <coordinates>42.296686 -89.621227</coordinates>
           <location>
             <name>Albertus Airport</name>
@@ -36504,9 +34963,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Galesburg</_name>
           <coordinates>40.947816 -90.371240</coordinates>
           <location>
@@ -36518,9 +34975,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Grafton</_name>
           <coordinates>38.970048 -90.431505</coordinates>
           <location>
@@ -36531,10 +34986,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Harrisburg</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Harrisburg</_name>
           <coordinates>37.738381 -88.540607</coordinates>
           <location>
             <name>Harrisburg-Raleigh Airport</name>
@@ -36543,10 +34996,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Jacksonville</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Jacksonville</_name>
           <coordinates>39.733936 -90.229010</coordinates>
           <location>
             <name>Jacksonville Municipal Airport</name>
@@ -36555,9 +35006,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Joliet</_name>
           <coordinates>41.525031 -88.081725</coordinates>
           <location>
@@ -36567,9 +35016,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Kankakee</_name>
           <coordinates>41.120033 -87.861153</coordinates>
           <location>
@@ -36579,9 +35026,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Lacon</_name>
           <coordinates>41.024758 -89.411201</coordinates>
           <location>
@@ -36591,10 +35036,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Lawrenceville</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Lawrenceville</_name>
           <coordinates>38.729214 -87.681693</coordinates>
           <location>
             <name>Lawrenceville-Vincennes International Airport</name>
@@ -36603,10 +35046,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Lincoln</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Lincoln</_name>
           <coordinates>40.148377 -89.364818</coordinates>
           <location>
             <name>Logan County Airport</name>
@@ -36615,10 +35056,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Litchfield</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Litchfield</_name>
           <coordinates>39.175326 -89.654258</coordinates>
           <location>
             <name>Litchfield Municipal Airport</name>
@@ -36627,9 +35066,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Macomb</_name>
           <coordinates>40.459208 -90.671797</coordinates>
           <location>
@@ -36639,10 +35076,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Marion</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Marion</_name>
           <coordinates>37.730605 -88.933126</coordinates>
           <location>
             <name>Williamson County Regional Airport</name>
@@ -36653,9 +35088,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Mattoon</_name>
           <coordinates>39.483090 -88.372826</coordinates>
           <location>
@@ -36667,9 +35100,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Metropolis</_name>
           <coordinates>37.151165 -88.731998</coordinates>
           <location>
@@ -36679,9 +35110,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Moline</_name>
           <coordinates>41.506700 -90.515134</coordinates>
           <location>
@@ -36693,10 +35122,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Morris</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Morris</_name>
           <coordinates>41.357254 -88.421178</coordinates>
           <location>
             <name>Morris Municipal-James R Washburn Field Airport</name>
@@ -36705,9 +35132,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Mount Carmel</_name>
           <coordinates>38.410880 -87.761417</coordinates>
           <location>
@@ -36717,10 +35142,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Mount Vernon</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Mount Vernon</_name>
           <coordinates>38.317271 -88.903120</coordinates>
           <location>
             <name>Mount Vernon Airport</name>
@@ -36731,9 +35154,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Murphysboro</_name>
           <coordinates>37.764495 -89.335089</coordinates>
           <location>
@@ -36745,9 +35166,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Naperville</_name>
           <coordinates>41.785863 -88.147289</coordinates>
           <location>
@@ -36759,9 +35178,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Normal</_name>
           <coordinates>40.514203 -88.990631</coordinates>
           <location>
@@ -36773,9 +35190,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Olney</_name>
           <coordinates>38.730881 -88.085315</coordinates>
           <location>
@@ -36785,10 +35200,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Paris</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Paris</_name>
           <coordinates>39.611146 -87.696137</coordinates>
           <location>
             <name>Edgar County Airport</name>
@@ -36797,10 +35210,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Peoria</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Peoria</_name>
           <coordinates>40.693649 -89.588986</coordinates>
           <location>
             <name>Greater Peoria Regional Airport</name>
@@ -36811,10 +35222,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Peru</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Peru</_name>
           <coordinates>41.327535 -89.128973</coordinates>
           <location>
             <name>Illinois Valley Regional-Walter A Duncan Field Airport</name>
@@ -36823,10 +35232,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Pittsfield</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Pittsfield</_name>
           <coordinates>39.607825 -90.805129</coordinates>
           <location>
             <name>Pittsfield Penstone Municipal Airport</name>
@@ -36835,10 +35242,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Pontiac</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Pontiac</_name>
           <coordinates>40.880867 -88.629784</coordinates>
           <location>
             <name>Pontiac Municipal Airport</name>
@@ -36847,9 +35252,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Quincy</_name>
           <coordinates>39.935602 -91.409873</coordinates>
           <location>
@@ -36861,9 +35264,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Rantoul</_name>
           <coordinates>40.308367 -88.155879</coordinates>
           <location>
@@ -36873,9 +35274,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Robinson</_name>
           <coordinates>39.005320 -87.739194</coordinates>
           <location>
@@ -36885,9 +35284,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Rochelle</_name>
           <coordinates>41.923918 -89.068707</coordinates>
           <location>
@@ -36897,9 +35294,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Rockford</_name>
           <coordinates>42.271131 -89.093995</coordinates>
           <location>
@@ -36911,9 +35306,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Romeoville</_name>
           <coordinates>41.647531 -88.089506</coordinates>
           <location>
@@ -36925,10 +35318,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Salem</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Salem</_name>
           <coordinates>38.626993 -88.945616</coordinates>
           <location>
             <name>Salem-Leckrone Airport</name>
@@ -36939,9 +35330,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Savanna</_name>
           <coordinates>42.094467 -90.156794</coordinates>
           <location>
@@ -36951,10 +35340,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Sparta</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Sparta</_name>
           <coordinates>38.123105 -89.701766</coordinates>
           <location>
             <name>Sparta Community-Hunter Field Airport</name>
@@ -36963,10 +35350,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Springfield</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Springfield</_name>
           <coordinates>39.801717 -89.643711</coordinates>
           <location>
             <name>Abraham Lincoln Capital Airport</name>
@@ -36977,9 +35362,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Sterling</_name>
           <coordinates>41.788642 -89.696219</coordinates>
           <location>
@@ -36989,9 +35372,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Taylorville</_name>
           <coordinates>39.548935 -89.294533</coordinates>
           <location>
@@ -37001,9 +35382,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Urbana</_name>
           <coordinates>40.110588 -88.207270</coordinates>
           <location>
@@ -37015,9 +35394,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>Waukegan</_name>
           <coordinates>42.363633 -87.844794</coordinates>
           <location>
@@ -37029,9 +35406,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
+          <!-- A city in Illinois in the United States -->
           <_name>West Chicago</_name>
           <coordinates>41.884751 -88.203961</coordinates>
           <location>
@@ -37043,10 +35418,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Illinois in the United
-               States
-            -->
-          <_name>Wheeling</_name>
+          <!-- A city in Illinois in the United States -->
+          <_name msgctxt="City in Illinois, United States">Wheeling</_name>
           <coordinates>42.139193 -87.928959</coordinates>
           <location>
             <name>Chicago / Wheeling, Pal-Waukee Airport</name>
@@ -37058,17 +35431,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
-        <_name>Indiana</_name>
+        <!-- A state/province/territory in United States -->
+        <_name msgctxt="State in United States">Indiana</_name>
         <fips-code>US18</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in Indiana in the United
-               States
-            -->
-          <_name>Anderson</_name>
+          <!-- A city in Indiana in the United States -->
+          <_name msgctxt="City in Indiana, United States">Anderson</_name>
           <coordinates>40.105320 -85.680254</coordinates>
           <location>
             <name>Anderson Municipal</name>
@@ -37077,10 +35446,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Indiana in the United
-               States
-            -->
-          <_name>Bloomington</_name>
+          <!-- A city in Indiana in the United States -->
+          <_name msgctxt="City in Indiana, United States">Bloomington</_name>
           <coordinates>39.165325 -86.526386</coordinates>
           <location>
             <name>Monroe County Airport</name>
@@ -37091,10 +35458,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Indiana in the United
-               States
-            -->
-          <_name>Columbus</_name>
+          <!-- A city in Indiana in the United States -->
+          <_name msgctxt="City in Indiana, United States">Columbus</_name>
           <coordinates>39.201440 -85.921380</coordinates>
           <location>
             <name>Columbus / Bakalar</name>
@@ -37103,10 +35468,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Indiana in the United
-               States
-            -->
-          <_name>Elkhart</_name>
+          <!-- A city in Indiana in the United States -->
+          <_name msgctxt="City in Indiana, United States">Elkhart</_name>
           <coordinates>41.681993 -85.976667</coordinates>
           <location>
             <name>Elkhart Municipal</name>
@@ -37117,9 +35480,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Indiana in the United
-               States
-            -->
+          <!-- A city in Indiana in the United States -->
           <_name>Evansville</_name>
           <coordinates>37.974764 -87.555848</coordinates>
           <location>
@@ -37132,9 +35493,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Indiana in the United
-               States
-            -->
+          <!-- A city in Indiana in the United States -->
           <_name>Fort Wayne</_name>
           <coordinates>41.130604 -85.128860</coordinates>
           <location>
@@ -37146,9 +35505,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Indiana in the United
-               States
-            -->
+          <!-- A city in Indiana in the United States -->
           <_name>Gary</_name>
           <coordinates>41.593370 -87.346427</coordinates>
           <location>
@@ -37161,9 +35518,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Indiana in the United
-               States
-            -->
+          <!-- A city in Indiana in the United States -->
           <_name>Goshen</_name>
           <coordinates>41.582272 -85.834438</coordinates>
           <location>
@@ -37173,9 +35528,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Indiana in the United
-               States
-            -->
+          <!-- A city in Indiana in the United States -->
           <_name>Indianapolis</_name>
           <coordinates>39.768377 -86.158042</coordinates>
           <location>
@@ -37192,9 +35545,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Indiana in the United
-               States
-            -->
+          <!-- A city in Indiana in the United States -->
           <_name>Kokomo</_name>
           <coordinates>40.486427 -86.133603</coordinates>
           <location>
@@ -37204,10 +35555,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Indiana in the United
-               States
-            -->
-          <_name>Lafayette</_name>
+          <!-- A city in Indiana in the United States -->
+          <_name msgctxt="City in Indiana, United States">Lafayette</_name>
           <coordinates>40.416702 -86.875287</coordinates>
           <location>
             <name>Purdue University Airport</name>
@@ -37218,9 +35567,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Indiana in the United
-               States
-            -->
+          <!-- A city in Indiana in the United States -->
           <_name>Muncie</_name>
           <coordinates>40.193377 -85.386360</coordinates>
           <location>
@@ -37232,10 +35579,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Indiana in the United
-               States
-            -->
-          <_name>Peru</_name>
+          <!-- A city in Indiana in the United States -->
+          <_name msgctxt="City in Indiana, United States">Peru</_name>
           <coordinates>40.753653 -86.068881</coordinates>
           <location>
             <name>Grissom Air Force Base / Peru</name>
@@ -37246,9 +35591,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Indiana in the United
-               States
-            -->
+          <!-- A city in Indiana in the United States -->
           <_name>Shelbyville</_name>
           <coordinates>39.521437 -85.776924</coordinates>
           <location>
@@ -37258,9 +35601,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Indiana in the United
-               States
-            -->
+          <!-- A city in Indiana in the United States -->
           <_name>South Bend</_name>
           <coordinates>41.683381 -86.250007</coordinates>
           <location>
@@ -37272,9 +35613,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Indiana in the United
-               States
-            -->
+          <!-- A city in Indiana in the United States -->
           <_name>Terre Haute</_name>
           <coordinates>39.466703 -87.413909</coordinates>
           <location>
@@ -37286,10 +35625,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Indiana in the United
-               States
-            -->
-          <_name>Valparaiso</_name>
+          <!-- A city in Indiana in the United States -->
+          <_name msgctxt="City in Indiana, United States">Valparaiso</_name>
           <coordinates>41.473095 -87.061141</coordinates>
           <location>
             <name>Porter County Municipal Airport</name>
@@ -37299,10 +35636,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Indiana in the United
-               States
-            -->
-          <_name>Warsaw</_name>
+          <!-- A city in Indiana in the United States -->
+          <_name msgctxt="City in Indiana, United States">Warsaw</_name>
           <coordinates>41.238100 -85.853047</coordinates>
           <location>
             <name>Warsaw Municipal Airport</name>
@@ -37312,14 +35647,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Iowa</_name>
         <fips-code>US19</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Ames</_name>
           <coordinates>42.034708 -93.619940</coordinates>
           <location>
@@ -37331,7 +35664,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Ankeny</_name>
           <coordinates>41.729710 -93.605773</coordinates>
           <location>
@@ -37341,8 +35674,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Atlantic</_name>
+          <!-- A city in Iowa in the United States -->
+          <_name msgctxt="City in Iowa, United States">Atlantic</_name>
           <coordinates>41.403601 -95.013878</coordinates>
           <location>
             <name>Atlantic</name>
@@ -37353,7 +35686,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Audubon</_name>
           <coordinates>41.718042 -94.932487</coordinates>
           <location>
@@ -37363,8 +35696,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Boone</_name>
+          <!-- A city in Iowa in the United States -->
+          <_name msgctxt="City in Iowa, United States">Boone</_name>
           <coordinates>42.059705 -93.880227</coordinates>
           <location>
             <name>Boone Municipal</name>
@@ -37375,8 +35708,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Burlington</_name>
+          <!-- A city in Iowa in the United States -->
+          <_name msgctxt="City in Iowa, United States">Burlington</_name>
           <coordinates>40.807539 -91.112923</coordinates>
           <location>
             <name>Burlington Regional Airport</name>
@@ -37387,7 +35720,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Carroll</_name>
           <coordinates>42.065818 -94.866930</coordinates>
           <location>
@@ -37399,7 +35732,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Cedar Rapids</_name>
           <coordinates>42.008333 -91.644068</coordinates>
           <location>
@@ -37411,7 +35744,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Chariton</_name>
           <coordinates>41.013889 -93.306598</coordinates>
           <location>
@@ -37423,7 +35756,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Charles City</_name>
           <coordinates>43.066361 -92.672411</coordinates>
           <location>
@@ -37435,7 +35768,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Cherokee</_name>
           <coordinates>42.749428 -95.551674</coordinates>
           <location>
@@ -37445,7 +35778,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Clarinda</_name>
           <coordinates>40.741935 -95.038313</coordinates>
           <location>
@@ -37457,7 +35790,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Clarion</_name>
           <coordinates>42.731639 -93.732992</coordinates>
           <location>
@@ -37469,8 +35802,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Clinton</_name>
+          <!-- A city in Iowa in the United States -->
+          <_name msgctxt="City in Iowa, United States">Clinton</_name>
           <coordinates>41.844473 -90.188738</coordinates>
           <location>
             <name>Clinton Municipal Airport</name>
@@ -37481,7 +35814,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Council Bluffs</_name>
           <coordinates>41.261943 -95.861123</coordinates>
           <location>
@@ -37493,8 +35826,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Creston</_name>
+          <!-- A city in Iowa in the United States -->
+          <_name msgctxt="City in Iowa, United States">Creston</_name>
           <coordinates>41.058600 -94.361347</coordinates>
           <location>
             <name>Creston</name>
@@ -37505,7 +35838,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Davenport</_name>
           <coordinates>41.523644 -90.577637</coordinates>
           <location>
@@ -37517,7 +35850,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Decorah</_name>
           <coordinates>43.303306 -91.785709</coordinates>
           <location>
@@ -37529,8 +35862,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Denison</_name>
+          <!-- A city in Iowa in the United States -->
+          <_name msgctxt="City in Iowa, United States">Denison</_name>
           <coordinates>42.017766 -95.355276</coordinates>
           <location>
             <name>Denison</name>
@@ -37541,7 +35874,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Des Moines</_name>
           <coordinates>41.600545 -93.609106</coordinates>
           <location>
@@ -37553,7 +35886,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Dubuque</_name>
           <coordinates>42.500558 -90.664572</coordinates>
           <location>
@@ -37565,7 +35898,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Estherville</_name>
           <coordinates>43.401626 -94.832764</coordinates>
           <location>
@@ -37577,8 +35910,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Fairfield</_name>
+          <!-- A city in Iowa in the United States -->
+          <_name msgctxt="City in Iowa, United States">Fairfield</_name>
           <coordinates>41.008631 -91.962673</coordinates>
           <location>
             <name>Fairfield</name>
@@ -37589,7 +35922,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Fort Dodge</_name>
           <coordinates>42.497469 -94.168016</coordinates>
           <location>
@@ -37601,7 +35934,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Fort Madison</_name>
           <coordinates>40.629763 -91.315151</coordinates>
           <location>
@@ -37613,7 +35946,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Harlan</_name>
           <coordinates>41.653044 -95.325554</coordinates>
           <location>
@@ -37623,7 +35956,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Iowa City</_name>
           <coordinates>41.661128 -91.530168</coordinates>
           <location>
@@ -37635,7 +35968,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Keokuk</_name>
           <coordinates>40.397266 -91.384874</coordinates>
           <location>
@@ -37646,8 +35979,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Knoxville</_name>
+          <!-- A city in Iowa in the United States -->
+          <_name msgctxt="City in Iowa, United States">Knoxville</_name>
           <coordinates>41.320830 -93.109371</coordinates>
           <location>
             <name>Knoxville</name>
@@ -37657,7 +35990,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Lamoni</_name>
           <coordinates>40.622777 -93.934116</coordinates>
           <location>
@@ -37669,7 +36002,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Le Mars</_name>
           <coordinates>42.794157 -96.165578</coordinates>
           <location>
@@ -37680,7 +36013,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Marshalltown</_name>
           <coordinates>42.049432 -92.907977</coordinates>
           <location>
@@ -37692,7 +36025,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Mason City</_name>
           <coordinates>43.153573 -93.201037</coordinates>
           <location>
@@ -37704,8 +36037,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Monticello</_name>
+          <!-- A city in Iowa in the United States -->
+          <_name msgctxt="City in Iowa, United States">Monticello</_name>
           <coordinates>42.238335 -91.187094</coordinates>
           <location>
             <name>Monticello Municipal</name>
@@ -37716,8 +36049,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Mount Pleasant</_name>
+          <!-- A city in Iowa in the United States -->
+          <_name msgctxt="City in Iowa, United States">Mount Pleasant</_name>
           <coordinates>40.963640 -91.557938</coordinates>
           <location>
             <name>Mount Pleasant Municipal Airport</name>
@@ -37726,7 +36059,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Muscatine</_name>
           <coordinates>41.424473 -91.043205</coordinates>
           <location>
@@ -37738,7 +36071,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Oelwein</_name>
           <coordinates>42.673317 -91.913504</coordinates>
           <location>
@@ -37750,7 +36083,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Orange City</_name>
           <coordinates>43.007209 -96.058352</coordinates>
           <location>
@@ -37762,7 +36095,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Oskaloosa</_name>
           <coordinates>41.296395 -92.644359</coordinates>
           <location>
@@ -37772,7 +36105,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Ottumwa</_name>
           <coordinates>41.020015 -92.411296</coordinates>
           <location>
@@ -37784,7 +36117,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Pella</_name>
           <coordinates>41.408053 -92.916309</coordinates>
           <location>
@@ -37794,7 +36127,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Red Oak</_name>
           <coordinates>41.009715 -95.225547</coordinates>
           <location>
@@ -37806,7 +36139,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Sheldon</_name>
           <coordinates>43.181089 -95.856128</coordinates>
           <location>
@@ -37816,8 +36149,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Shenandoah</_name>
+          <!-- A city in Iowa in the United States -->
+          <_name msgctxt="City in Iowa, United States">Shenandoah</_name>
           <coordinates>40.765553 -95.372210</coordinates>
           <location>
             <name>Shenandoah Municipal</name>
@@ -37828,7 +36161,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Sioux City</_name>
           <coordinates>42.499994 -96.400307</coordinates>
           <location>
@@ -37840,7 +36173,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Spencer</_name>
           <coordinates>43.141358 -95.144439</coordinates>
           <location>
@@ -37852,7 +36185,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Storm Lake</_name>
           <coordinates>42.641092 -95.209718</coordinates>
           <location>
@@ -37864,7 +36197,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Vinton</_name>
           <coordinates>42.168606 -92.023514</coordinates>
           <location>
@@ -37874,8 +36207,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Washington</_name>
+          <!-- A city in Iowa in the United States -->
+          <_name msgctxt="City in Iowa, United States">Washington</_name>
           <coordinates>41.299184 -91.692945</coordinates>
           <location>
             <name>Washington</name>
@@ -37886,8 +36219,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
-          <_name>Waterloo</_name>
+          <!-- A city in Iowa in the United States -->
+          <_name msgctxt="City in Iowa, United States">Waterloo</_name>
           <coordinates>42.492764 -92.342963</coordinates>
           <location>
             <name>Waterloo Municipal Airport</name>
@@ -37898,7 +36231,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Iowa in the United States -->
+          <!-- A city in Iowa in the United States -->
           <_name>Webster City</_name>
           <coordinates>42.469418 -93.816054</coordinates>
           <location>
@@ -37910,16 +36243,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Kansas</_name>
         <fips-code>US20</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Arkansas City</_name>
           <coordinates>37.061974 -97.038371</coordinates>
           <location>
@@ -37929,9 +36258,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Chanute</_name>
           <coordinates>37.679214 -95.457203</coordinates>
           <location>
@@ -37943,9 +36270,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Coffeyville</_name>
           <coordinates>37.037301 -95.616366</coordinates>
           <location>
@@ -37955,9 +36280,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Concordia</_name>
           <coordinates>39.570835 -97.662540</coordinates>
           <location>
@@ -37969,9 +36292,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Dodge City</_name>
           <coordinates>37.752798 -100.017079</coordinates>
           <location>
@@ -37983,10 +36304,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
-          <_name>Elkhart</_name>
+          <!-- A city in Kansas in the United States -->
+          <_name msgctxt="City in Kansas, United States">Elkhart</_name>
           <coordinates>37.008079 -101.890166</coordinates>
           <location>
             <name>Elkhart-Morton County Airport</name>
@@ -37995,9 +36314,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Elwood</_name>
           <coordinates>39.755550 -94.872466</coordinates>
           <location>
@@ -38009,10 +36326,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
-          <_name>Emporia</_name>
+          <!-- A city in Kansas in the United States -->
+          <_name msgctxt="City in Kansas, United States">Emporia</_name>
           <coordinates>38.403903 -96.181663</coordinates>
           <location>
             <name>Emporia Municipal Airport</name>
@@ -38023,10 +36338,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
-          <_name>Garden City</_name>
+          <!-- A city in Kansas in the United States -->
+          <_name msgctxt="City in Kansas, United States">Garden City</_name>
           <coordinates>37.971690 -100.872662</coordinates>
           <location>
             <name>Garden City Regional Airport</name>
@@ -38037,9 +36350,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Goodland</_name>
           <coordinates>39.350833 -101.710172</coordinates>
           <location>
@@ -38052,9 +36363,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Great Bend</_name>
           <coordinates>38.364457 -98.764807</coordinates>
           <location>
@@ -38064,9 +36373,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Hays</_name>
           <coordinates>38.879178 -99.326770</coordinates>
           <location>
@@ -38078,9 +36385,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Hill City</_name>
           <coordinates>39.364728 -99.842065</coordinates>
           <location>
@@ -38092,10 +36397,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
-          <_name>Hutchinson</_name>
+          <!-- A city in Kansas in the United States -->
+          <_name msgctxt="City in Kansas, United States">Hutchinson</_name>
           <coordinates>38.060845 -97.929774</coordinates>
           <location>
             <name>Hutchinson Municipal Airport</name>
@@ -38106,9 +36409,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Junction City</_name>
           <coordinates>39.028609 -96.831398</coordinates>
           <location>
@@ -38118,10 +36419,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
-          <_name>Kansas City</_name>
+          <!-- A city in Kansas in the United States -->
+          <_name msgctxt="City in Kansas, United States">Kansas City</_name>
           <coordinates>39.114171 -94.627457</coordinates>
           <location>
             <name>Kansas City Downtown Airport</name>
@@ -38139,10 +36438,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
-          <_name>Lawrence</_name>
+          <!-- A city in Kansas in the United States -->
+          <_name msgctxt="City in Kansas, United States">Lawrence</_name>
           <coordinates>38.971669 -95.235250</coordinates>
           <location>
             <name>Lawrence Municipal Airport</name>
@@ -38151,9 +36448,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Liberal</_name>
           <coordinates>37.043081 -100.920999</coordinates>
           <location>
@@ -38165,9 +36460,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Manhattan</_name>
           <coordinates>39.183608 -96.571669</coordinates>
           <location>
@@ -38179,9 +36472,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Medicine Lodge</_name>
           <coordinates>37.281134 -98.580361</coordinates>
           <location>
@@ -38193,9 +36484,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Newton</_name>
           <coordinates>38.046678 -97.345037</coordinates>
           <location>
@@ -38205,9 +36494,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Olathe</_name>
           <coordinates>38.881396 -94.819129</coordinates>
           <location>
@@ -38226,9 +36513,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Overland Park</_name>
           <coordinates>38.982228 -94.670792</coordinates>
           <location>
@@ -38240,9 +36525,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Parsons</_name>
           <coordinates>37.340338 -95.261084</coordinates>
           <location>
@@ -38252,9 +36535,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Pratt</_name>
           <coordinates>37.643907 -98.737591</coordinates>
           <location>
@@ -38264,9 +36545,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Russell</_name>
           <coordinates>38.895289 -98.859806</coordinates>
           <location>
@@ -38278,9 +36557,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Salina</_name>
           <coordinates>38.840280 -97.611424</coordinates>
           <location>
@@ -38292,9 +36569,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Topeka</_name>
           <coordinates>39.048334 -95.678037</coordinates>
           <location>
@@ -38313,9 +36588,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Wichita</_name>
           <coordinates>37.692236 -97.337545</coordinates>
           <location>
@@ -38339,9 +36612,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kansas in the United
-               States
-            -->
+          <!-- A city in Kansas in the United States -->
           <_name>Winfield</_name>
           <coordinates>37.239749 -96.995592</coordinates>
           <location>
@@ -38352,16 +36623,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Kentucky</_name>
         <fips-code>US21</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in Kentucky in the United
-               States
-            -->
+          <!-- A city in Kentucky in the United States -->
           <_name>Bowling Green</_name>
           <coordinates>36.990320 -86.443602</coordinates>
           <location>
@@ -38374,9 +36641,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kentucky in the United
-               States
-            -->
+          <!-- A city in Kentucky in the United States -->
           <_name>Covington</_name>
           <coordinates>39.083671 -84.508554</coordinates>
           <location>
@@ -38388,10 +36653,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kentucky in the United
-               States
-            -->
-          <_name>Frankfort</_name>
+          <!-- A city in Kentucky in the United States -->
+          <_name msgctxt="City in Kentucky, United States">Frankfort</_name>
           <coordinates>38.200905 -84.873284</coordinates>
           <location>
             <name>Capital City Airport</name>
@@ -38402,10 +36665,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kentucky in the United
-               States
-            -->
-          <_name>Glasgow</_name>
+          <!-- A city in Kentucky in the United States -->
+          <_name msgctxt="City in Kentucky, United States">Glasgow</_name>
           <coordinates>36.995884 -85.911922</coordinates>
           <location>
             <name>Glasgow Municipal Airport</name>
@@ -38415,10 +36676,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kentucky in the United
-               States
-            -->
-          <_name>Henderson</_name>
+          <!-- A city in Kentucky in the United States -->
+          <_name msgctxt="City in Kentucky, United States">Henderson</_name>
           <coordinates>37.836154 -87.590013</coordinates>
           <location>
             <name>Henderson City</name>
@@ -38430,10 +36689,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kentucky in the United
-               States
-            -->
-          <_name>Jackson</_name>
+          <!-- A city in Kentucky in the United States -->
+          <_name msgctxt="City in Kentucky, United States">Jackson</_name>
           <coordinates>37.553146 -83.383514</coordinates>
           <location>
             <name>Carroll Airport</name>
@@ -38444,10 +36701,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kentucky in the United
-               States
-            -->
-          <_name>Lexington</_name>
+          <!-- A city in Kentucky in the United States -->
+          <_name msgctxt="City in Kentucky, United States">Lexington</_name>
           <coordinates>37.988689 -84.477715</coordinates>
           <location>
             <name>Blue Grass Airport</name>
@@ -38458,10 +36713,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kentucky in the United
-               States
-            -->
-          <_name>London</_name>
+          <!-- A city in Kentucky in the United States -->
+          <_name msgctxt="City in Kentucky, United States">London</_name>
           <coordinates>37.128977 -84.083265</coordinates>
           <location>
             <name>London-Corbin Airport-Magee Field</name>
@@ -38471,9 +36724,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kentucky in the United
-               States
-            -->
+          <!-- A city in Kentucky in the United States -->
           <_name>Louisville</_name>
           <coordinates>38.254238 -85.759407</coordinates>
           <location>
@@ -38492,9 +36743,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kentucky in the United
-               States
-            -->
+          <!-- A city in Kentucky in the United States -->
           <_name>Middlesboro</_name>
           <coordinates>36.608415 -83.716582</coordinates>
           <location>
@@ -38504,10 +36753,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kentucky in the United
-               States
-            -->
-          <_name>Monticello</_name>
+          <!-- A city in Kentucky in the United States -->
+          <_name msgctxt="City in Kentucky, United States">Monticello</_name>
           <coordinates>36.829794 -84.849113</coordinates>
           <location>
             <name>Wayne County Airport</name>
@@ -38516,9 +36763,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kentucky in the United
-               States
-            -->
+          <!-- A city in Kentucky in the United States -->
           <_name>Muldraugh</_name>
           <coordinates>37.937016 -85.991631</coordinates>
           <location>
@@ -38530,9 +36775,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kentucky in the United
-               States
-            -->
+          <!-- A city in Kentucky in the United States -->
           <_name>Owensboro</_name>
           <coordinates>37.774215 -87.113330</coordinates>
           <location>
@@ -38545,9 +36788,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kentucky in the United
-               States
-            -->
+          <!-- A city in Kentucky in the United States -->
           <_name>Paducah</_name>
           <coordinates>37.083389 -88.600048</coordinates>
           <location>
@@ -38560,9 +36801,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Kentucky in the United
-               States
-            -->
+          <!-- A city in Kentucky in the United States -->
           <_name>Somerset</_name>
           <coordinates>37.092022 -84.604108</coordinates>
           <location>
@@ -38575,17 +36814,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Louisiana</_name>
         <fips-code>US22</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
-          <_name>Alexandria</_name>
+          <!-- A city in Louisiana in the United States -->
+          <_name msgctxt="City in Louisiana, United States">Alexandria</_name>
           <coordinates>31.311294 -92.445137</coordinates>
           <location>
             <name>Alexandria International Airport</name>
@@ -38603,9 +36838,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>Amelia</_name>
           <coordinates>29.666320 -91.102045</coordinates>
           <location>
@@ -38616,9 +36849,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>Baton Rouge</_name>
           <coordinates>30.450746 -91.154551</coordinates>
           <location>
@@ -38630,9 +36861,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>Boothville</_name>
           <coordinates>29.343552 -89.419777</coordinates>
           <location>
@@ -38642,9 +36871,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>DeRidder</_name>
           <coordinates>30.846305 -93.289053</coordinates>
           <location>
@@ -38654,9 +36881,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>Fort Polk</_name>
           <coordinates>31.046578 -93.205440</coordinates>
           <location>
@@ -38668,9 +36893,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>Galliano</_name>
           <coordinates>29.442165 -90.299246</coordinates>
           <location>
@@ -38680,10 +36903,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
-          <_name>Garden City</_name>
+          <!-- A city in Louisiana in the United States -->
+          <_name msgctxt="City in Louisiana, United States">Garden City</_name>
           <coordinates>29.765485 -91.465666</coordinates>
           <location>
             <name>Salt Point</name>
@@ -38693,9 +36914,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>Goosport</_name>
           <coordinates>30.256872 -93.180431</coordinates>
           <location>
@@ -38705,9 +36924,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>Grand Isle</_name>
           <coordinates>29.236617 -89.987294</coordinates>
           <location>
@@ -38717,9 +36934,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>Hammond</_name>
           <coordinates>30.504358 -90.461200</coordinates>
           <location>
@@ -38729,9 +36944,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>Hicks</_name>
           <coordinates>31.184905 -93.015991</coordinates>
           <location>
@@ -38741,9 +36954,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>Houma</_name>
           <coordinates>29.595770 -90.719535</coordinates>
           <location>
@@ -38755,10 +36966,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
-          <_name>Lafayette</_name>
+          <!-- A city in Louisiana in the United States -->
+          <_name msgctxt="City in Louisiana, United States">Lafayette</_name>
           <coordinates>30.224090 -92.019843</coordinates>
           <location>
             <name>Lafayette Regional Airport</name>
@@ -38769,9 +36978,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>Lake Charles</_name>
           <coordinates>30.226595 -93.217376</coordinates>
           <location>
@@ -38783,9 +36990,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>Leeville</_name>
           <coordinates>29.248005 -90.207577</coordinates>
           <location>
@@ -38796,10 +37001,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
-          <_name>Monroe</_name>
+          <!-- A city in Louisiana in the United States -->
+          <_name msgctxt="City in Louisiana, United States">Monroe</_name>
           <coordinates>32.509311 -92.119301</coordinates>
           <location>
             <name>Monroe Regional Airport</name>
@@ -38810,9 +37013,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>Natchitoches</_name>
           <coordinates>31.760720 -93.086275</coordinates>
           <location>
@@ -38822,9 +37023,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>New Iberia</_name>
           <coordinates>30.003536 -91.818729</coordinates>
           <location>
@@ -38836,9 +37035,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>New Orleans</_name>
           <coordinates>29.954648 -90.075072</coordinates>
           <location>
@@ -38862,9 +37059,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>Oakdale</_name>
           <coordinates>30.816028 -92.660421</coordinates>
           <location>
@@ -38874,9 +37069,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>Patterson</_name>
           <coordinates>29.693264 -91.302050</coordinates>
           <location>
@@ -38886,9 +37079,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>Peason</_name>
           <coordinates>31.413789 -93.294613</coordinates>
           <location>
@@ -38898,9 +37089,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>Ruston</_name>
           <coordinates>32.523205 -92.637927</coordinates>
           <location>
@@ -38910,9 +37099,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>Shreveport</_name>
           <coordinates>32.525152 -93.750179</coordinates>
           <location>
@@ -38937,9 +37124,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Louisiana in the United
-               States
-            -->
+          <!-- A city in Louisiana in the United States -->
           <_name>Slidell</_name>
           <coordinates>30.275195 -89.781175</coordinates>
           <location>
@@ -38950,16 +37135,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Maine</_name>
         <fips-code>US23</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in Maine in the United States
-            -->
-          <_name>Auburn</_name>
+          <!-- A city in Maine in the United States -->
+          <_name msgctxt="City in Maine, United States">Auburn</_name>
           <coordinates>44.097851 -70.231166</coordinates>
           <location>
             <name>Auburn-Lewiston</name>
@@ -38970,9 +37152,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maine in the United States
-            -->
-          <_name>Augusta</_name>
+          <!-- A city in Maine in the United States -->
+          <_name msgctxt="City in Maine, United States">Augusta</_name>
           <coordinates>44.310624 -69.779490</coordinates>
           <location>
             <name>Augusta State Airport</name>
@@ -38983,8 +37164,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maine in the United States
-            -->
+          <!-- A city in Maine in the United States -->
           <_name>Bangor</_name>
           <coordinates>44.801182 -68.777814</coordinates>
           <location>
@@ -38996,8 +37176,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maine in the United States
-            -->
+          <!-- A city in Maine in the United States -->
           <_name>Bar Harbor</_name>
           <coordinates>44.387579 -68.203902</coordinates>
           <location>
@@ -39009,9 +37188,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maine in the United States
-            -->
-          <_name>Brunswick</_name>
+          <!-- A city in Maine in the United States -->
+          <_name msgctxt="City in Maine, United States">Brunswick</_name>
           <coordinates>43.914524 -69.965328</coordinates>
           <location>
             <name>Brunswick, Naval Air Station</name>
@@ -39022,8 +37200,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maine in the United States
-            -->
+          <!-- A city in Maine in the United States -->
           <_name>Caribou</_name>
           <coordinates>46.860598 -68.011971</coordinates>
           <location>
@@ -39035,8 +37212,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maine in the United States
-            -->
+          <!-- A city in Maine in the United States -->
           <_name>Frenchville</_name>
           <coordinates>47.280873 -68.379765</coordinates>
           <location>
@@ -39048,8 +37224,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maine in the United States
-            -->
+          <!-- A city in Maine in the United States -->
           <_name>Fryeburg</_name>
           <coordinates>44.016459 -70.980624</coordinates>
           <location>
@@ -39060,9 +37235,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maine in the United States
-            -->
-          <_name>Greenville</_name>
+          <!-- A city in Maine in the United States -->
+          <_name msgctxt="City in Maine, United States">Greenville</_name>
           <coordinates>45.459491 -69.590610</coordinates>
           <location>
             <name>Greenville</name>
@@ -39071,8 +37245,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maine in the United States
-            -->
+          <!-- A city in Maine in the United States -->
           <_name>Houlton</_name>
           <coordinates>46.126164 -67.840296</coordinates>
           <location>
@@ -39084,8 +37257,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maine in the United States
-            -->
+          <!-- A city in Maine in the United States -->
           <_name>Millinocket</_name>
           <coordinates>45.657272 -68.709758</coordinates>
           <location>
@@ -39097,9 +37269,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maine in the United States
-            -->
-          <_name>Portland</_name>
+          <!-- A city in Maine in the United States -->
+          <_name msgctxt="City in Maine, United States">Portland</_name>
           <coordinates>43.661471 -70.255326</coordinates>
           <location>
             <name>Portland International Jetport</name>
@@ -39110,8 +37281,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maine in the United States
-            -->
+          <!-- A city in Maine in the United States -->
           <_name>Presque Isle</_name>
           <coordinates>46.681153 -68.015862</coordinates>
           <location>
@@ -39123,8 +37293,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maine in the United States
-            -->
+          <!-- A city in Maine in the United States -->
           <_name>Rockland</_name>
           <coordinates>44.103691 -69.108929</coordinates>
           <location>
@@ -39136,9 +37305,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maine in the United States
-            -->
-          <_name>Sanford</_name>
+          <!-- A city in Maine in the United States -->
+          <_name msgctxt="City in Maine, United States">Sanford</_name>
           <coordinates>43.439249 -70.774225</coordinates>
           <location>
             <name>Sanford Regional Airport</name>
@@ -39149,8 +37317,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maine in the United States
-            -->
+          <!-- A city in Maine in the United States -->
           <_name>Waterville</_name>
           <coordinates>44.552011 -69.631712</coordinates>
           <location>
@@ -39162,8 +37329,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maine in the United States
-            -->
+          <!-- A city in Maine in the United States -->
           <_name>Wiscasset</_name>
           <coordinates>44.002856 -69.665602</coordinates>
           <location>
@@ -39176,16 +37342,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Maryland</_name>
         <fips-code>US24</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in Maryland in the United
-               States
-            -->
+          <!-- A city in Maryland in the United States -->
           <_name>Annapolis</_name>
           <coordinates>38.978445 -76.492183</coordinates>
           <location>
@@ -39195,9 +37357,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maryland in the United
-               States
-            -->
+          <!-- A city in Maryland in the United States -->
           <_name>Baltimore</_name>
           <coordinates>39.290385 -76.612189</coordinates>
           <location>
@@ -39230,9 +37390,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maryland in the United
-               States
-            -->
+          <!-- A city in Maryland in the United States -->
           <_name>Camp Springs</_name>
           <coordinates>38.804003 -76.906640</coordinates>
           <location>
@@ -39242,9 +37400,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maryland in the United
-               States
-            -->
+          <!-- A city in Maryland in the United States -->
           <_name>Cumberland</_name>
           <coordinates>39.652865 -78.762518</coordinates>
           <location>
@@ -39255,9 +37411,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maryland in the United
-               States
-            -->
+          <!-- A city in Maryland in the United States -->
           <_name>Easton</_name>
           <coordinates>38.774283 -76.076330</coordinates>
           <location>
@@ -39267,10 +37421,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maryland in the United
-               States
-            -->
-          <_name>Frederick</_name>
+          <!-- A city in Maryland in the United States -->
+          <_name msgctxt="City in Maryland, United States">Frederick</_name>
           <coordinates>39.414269 -77.410541</coordinates>
           <location>
             <name>Frederick Municipal Airport</name>
@@ -39279,9 +37431,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maryland in the United
-               States
-            -->
+          <!-- A city in Maryland in the United States -->
           <_name>Hagerstown</_name>
           <coordinates>39.641763 -77.719993</coordinates>
           <location>
@@ -39293,9 +37443,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maryland in the United
-               States
-            -->
+          <!-- A city in Maryland in the United States -->
           <_name>Ocean City</_name>
           <coordinates>38.336503 -75.084906</coordinates>
           <location>
@@ -39305,9 +37453,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maryland in the United
-               States
-            -->
+          <!-- A city in Maryland in the United States -->
           <_name>Patuxent</_name>
           <coordinates>38.539288 -76.748577</coordinates>
           <location>
@@ -39319,9 +37465,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maryland in the United
-               States
-            -->
+          <!-- A city in Maryland in the United States -->
           <_name>Saint Marys City</_name>
           <coordinates>38.187070 -76.434396</coordinates>
           <location>
@@ -39331,10 +37475,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Maryland in the United
-               States
-            -->
-          <_name>Salisbury</_name>
+          <!-- A city in Maryland in the United States -->
+          <_name msgctxt="City in Maryland, United States">Salisbury</_name>
           <coordinates>38.360674 -75.599369</coordinates>
           <location>
             <name>Salisbury-Ocean City Wicomico County Regional Airport</name>
@@ -39346,17 +37488,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Massachusetts</_name>
         <fips-code>US25</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
-          <_name>Bedford</_name>
+          <!-- A city in Massachusetts in the United States -->
+          <_name msgctxt="City in Massachusetts, United States">Bedford</_name>
           <coordinates>42.490650 -71.276169</coordinates>
           <location>
             <name>Hanscom Field</name>
@@ -39367,9 +37505,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
+          <!-- A city in Massachusetts in the United States -->
           <_name>Beverly</_name>
           <coordinates>42.558428 -70.880049</coordinates>
           <location>
@@ -39381,9 +37517,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
+          <!-- A city in Massachusetts in the United States -->
           <_name>Boston</_name>
           <coordinates>42.358431 -71.059773</coordinates>
           <location>
@@ -39395,10 +37529,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
-          <_name>Cambridge</_name>
+          <!-- A city in Massachusetts in the United States -->
+          <_name msgctxt="City in Massachusetts, United States">Cambridge</_name>
           <coordinates>42.375097 -71.105608</coordinates>
           <location>
             <name>Boston, Logan International Airport</name>
@@ -39409,9 +37541,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
+          <!-- A city in Massachusetts in the United States -->
           <_name>Chatham</_name>
           <coordinates>41.682056 -69.959738</coordinates>
           <location>
@@ -39423,9 +37553,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
+          <!-- A city in Massachusetts in the United States -->
           <_name>Chicopee Falls</_name>
           <coordinates>42.152038 -72.575922</coordinates>
           <location>
@@ -39436,9 +37564,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
+          <!-- A city in Massachusetts in the United States -->
           <_name>East Milton</_name>
           <coordinates>42.258432 -71.042550</coordinates>
           <location>
@@ -39448,9 +37574,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
+          <!-- A city in Massachusetts in the United States -->
           <_name>Fitchburg</_name>
           <coordinates>42.583423 -71.802296</coordinates>
           <location>
@@ -39461,9 +37585,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
+          <!-- A city in Massachusetts in the United States -->
           <_name>Hyannis</_name>
           <coordinates>41.652889 -70.282799</coordinates>
           <location>
@@ -39475,10 +37597,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
-          <_name>Lawrence</_name>
+          <!-- A city in Massachusetts in the United States -->
+          <_name msgctxt="City in Massachusetts, United States">Lawrence</_name>
           <coordinates>42.707035 -71.163114</coordinates>
           <location>
             <name>Lawrence Municipal Airport</name>
@@ -39489,10 +37609,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
-          <_name>Lowell</_name>
+          <!-- A city in Massachusetts in the United States -->
+          <_name msgctxt="City in Massachusetts, United States">Lowell</_name>
           <coordinates>42.633425 -71.316172</coordinates>
           <location>
             <name>Lawrence, Lawrence Municipal Airport</name>
@@ -39503,9 +37621,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
+          <!-- A city in Massachusetts in the United States -->
           <_name>Nantucket</_name>
           <coordinates>41.283456 -70.099461</coordinates>
           <location>
@@ -39517,9 +37633,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
+          <!-- A city in Massachusetts in the United States -->
           <_name>New Bedford</_name>
           <coordinates>41.636215 -70.934205</coordinates>
           <location>
@@ -39531,9 +37645,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
+          <!-- A city in Massachusetts in the United States -->
           <_name>North Adams</_name>
           <coordinates>42.700915 -73.108715</coordinates>
           <location>
@@ -39543,9 +37655,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
+          <!-- A city in Massachusetts in the United States -->
           <_name>Norwood</_name>
           <coordinates>42.194543 -71.199498</coordinates>
           <location>
@@ -39557,10 +37667,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
-          <_name>Orange</_name>
+          <!-- A city in Massachusetts in the United States -->
+          <_name msgctxt="City in Massachusetts, United States">Orange</_name>
           <coordinates>42.590365 -72.309807</coordinates>
           <location>
             <name>Orange Municipal Airport</name>
@@ -39570,10 +37678,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
-          <_name>Pittsfield</_name>
+          <!-- A city in Massachusetts in the United States -->
+          <_name msgctxt="City in Massachusetts, United States">Pittsfield</_name>
           <coordinates>42.450085 -73.245382</coordinates>
           <location>
             <name>Pittsfield Municipal Airport</name>
@@ -39582,10 +37688,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
-          <_name>Plymouth</_name>
+          <!-- A city in Massachusetts in the United States -->
+          <_name msgctxt="City in Massachusetts, United States">Plymouth</_name>
           <coordinates>41.958437 -70.667258</coordinates>
           <location>
             <name>Plymouth Municipal Airport</name>
@@ -39596,9 +37700,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
+          <!-- A city in Massachusetts in the United States -->
           <_name>Provincetown</_name>
           <coordinates>42.058436 -70.178637</coordinates>
           <location>
@@ -39609,9 +37711,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
+          <!-- A city in Massachusetts in the United States -->
           <_name>Sandwich</_name>
           <coordinates>41.758995 -70.493916</coordinates>
           <location>
@@ -39623,10 +37723,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
-          <_name>Springfield</_name>
+          <!-- A city in Massachusetts in the United States -->
+          <_name msgctxt="City in Massachusetts, United States">Springfield</_name>
           <coordinates>42.101483 -72.589811</coordinates>
           <location>
             <name>Chicopee Falls / Westover Air Force Base</name>
@@ -39636,9 +37734,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
+          <!-- A city in Massachusetts in the United States -->
           <_name>Taunton</_name>
           <coordinates>41.900101 -71.089767</coordinates>
           <location>
@@ -39648,9 +37744,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
+          <!-- A city in Massachusetts in the United States -->
           <_name>Vineyard Haven</_name>
           <coordinates>41.454279 -70.603639</coordinates>
           <location>
@@ -39662,9 +37756,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
+          <!-- A city in Massachusetts in the United States -->
           <_name>Westfield</_name>
           <coordinates>42.125093 -72.749538</coordinates>
           <location>
@@ -39676,9 +37768,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Massachusetts in the
-               United States
-            -->
+          <!-- A city in Massachusetts in the United States -->
           <_name>Worcester</_name>
           <coordinates>42.262593 -71.802293</coordinates>
           <location>
@@ -39691,16 +37781,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Michigan</_name>
         <fips-code>US26</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Adrian</_name>
           <coordinates>41.897547 -84.037166</coordinates>
           <location>
@@ -39710,10 +37796,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
-          <_name>Alma</_name>
+          <!-- A city in Michigan in the United States -->
+          <_name msgctxt="City in Michigan, United States">Alma</_name>
           <coordinates>43.378920 -84.659727</coordinates>
           <location>
             <name>Gratiot Community Airport</name>
@@ -39722,9 +37806,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Alpena</_name>
           <coordinates>45.061679 -83.432753</coordinates>
           <location>
@@ -39736,9 +37818,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Ann Arbor</_name>
           <coordinates>42.270872 -83.726329</coordinates>
           <location>
@@ -39750,9 +37830,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Bad Axe</_name>
           <coordinates>43.801959 -83.000777</coordinates>
           <location>
@@ -39762,9 +37840,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Battle Creek</_name>
           <coordinates>42.321152 -85.179714</coordinates>
           <location>
@@ -39776,9 +37852,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Bellaire</_name>
           <coordinates>44.980282 -85.211173</coordinates>
           <location>
@@ -39788,9 +37862,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Benton Harbor</_name>
           <coordinates>42.116706 -86.454189</coordinates>
           <location>
@@ -39801,9 +37873,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Big Rapids</_name>
           <coordinates>43.698078 -85.483656</coordinates>
           <location>
@@ -39813,9 +37883,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Cadillac</_name>
           <coordinates>44.251953 -85.401162</coordinates>
           <location>
@@ -39825,9 +37893,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Caro</_name>
           <coordinates>43.491132 -83.396897</coordinates>
           <location>
@@ -39837,9 +37903,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Charlevoix</_name>
           <coordinates>45.318063 -85.258400</coordinates>
           <location>
@@ -39849,10 +37913,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
-          <_name>Charlotte</_name>
+          <!-- A city in Michigan in the United States -->
+          <_name msgctxt="City in Michigan, United States">Charlotte</_name>
           <coordinates>42.563648 -84.835821</coordinates>
           <location>
             <name>Fitch H Beach Airport</name>
@@ -39861,9 +37923,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Cheboygan</_name>
           <coordinates>45.646956 -84.474480</coordinates>
           <location>
@@ -39873,9 +37933,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Coldwater</_name>
           <coordinates>41.940326 -85.000522</coordinates>
           <location>
@@ -39885,9 +37943,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Copper Harbor</_name>
           <coordinates>47.468794 -87.888442</coordinates>
           <location>
@@ -39899,9 +37955,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Detroit</_name>
           <coordinates>42.331427 -83.045754</coordinates>
           <location>
@@ -39932,9 +37986,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Escanaba</_name>
           <coordinates>45.745247 -87.064580</coordinates>
           <location>
@@ -39946,9 +37998,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Flint</_name>
           <coordinates>43.012527 -83.687456</coordinates>
           <location>
@@ -39960,10 +38010,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
-          <_name>Frankfort</_name>
+          <!-- A city in Michigan in the United States -->
+          <_name msgctxt="City in Michigan, United States">Frankfort</_name>
           <coordinates>44.633610 -86.234540</coordinates>
           <location>
             <name>Frankfort Dow Memorial Field Airport</name>
@@ -39972,9 +38020,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Gaylord</_name>
           <coordinates>45.027513 -84.674752</coordinates>
           <location>
@@ -39984,10 +38030,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
-          <_name>Grand Rapids</_name>
+          <!-- A city in Michigan in the United States -->
+          <_name msgctxt="City in Michigan, United States">Grand Rapids</_name>
           <coordinates>42.963360 -85.668086</coordinates>
           <location>
             <name>Gerald R. Ford International Airport</name>
@@ -39998,9 +38042,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Grayling</_name>
           <coordinates>44.661404 -84.714751</coordinates>
           <location>
@@ -40010,9 +38052,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Grosse Ile</_name>
           <coordinates>42.129208 -83.144368</coordinates>
           <location>
@@ -40022,9 +38062,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Hancock</_name>
           <coordinates>47.126871 -88.580956</coordinates>
           <location>
@@ -40036,9 +38074,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Harbor Springs</_name>
           <coordinates>45.431676 -84.991999</coordinates>
           <location>
@@ -40048,9 +38084,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Hillsdale</_name>
           <coordinates>41.920047 -84.630510</coordinates>
           <location>
@@ -40060,9 +38094,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Holland</_name>
           <coordinates>42.787523 -86.108930</coordinates>
           <location>
@@ -40072,9 +38104,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Houghton Lake</_name>
           <coordinates>44.314739 -84.764750</coordinates>
           <location>
@@ -40086,9 +38116,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Howell</_name>
           <coordinates>42.607255 -83.929395</coordinates>
           <location>
@@ -40098,9 +38126,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Iron Mountain</_name>
           <coordinates>45.820233 -88.065960</coordinates>
           <location>
@@ -40112,9 +38138,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Ironwood</_name>
           <coordinates>46.454670 -90.171008</coordinates>
           <location>
@@ -40127,10 +38151,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
-          <_name>Jackson</_name>
+          <!-- A city in Michigan in the United States -->
+          <_name msgctxt="City in Michigan, United States">Jackson</_name>
           <coordinates>42.245869 -84.401346</coordinates>
           <location>
             <name>Jackson County-Reynolds Field Airport</name>
@@ -40141,9 +38163,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Kalamazoo</_name>
           <coordinates>42.291707 -85.587229</coordinates>
           <location>
@@ -40155,9 +38175,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Kingsford</_name>
           <coordinates>45.794956 -88.072071</coordinates>
           <location>
@@ -40169,9 +38187,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Kinross</_name>
           <coordinates>46.275019 -84.514768</coordinates>
           <location>
@@ -40183,9 +38199,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Lambertville</_name>
           <coordinates>41.765882 -83.627992</coordinates>
           <location>
@@ -40195,9 +38209,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Lansing</_name>
           <coordinates>42.732535 -84.555535</coordinates>
           <location>
@@ -40209,9 +38221,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Livonia</_name>
           <coordinates>42.368370 -83.352710</coordinates>
           <location>
@@ -40223,9 +38233,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Ludington</_name>
           <coordinates>43.955283 -86.452583</coordinates>
           <location>
@@ -40235,9 +38243,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Mackinac Island</_name>
           <coordinates>45.849180 -84.618934</coordinates>
           <location>
@@ -40247,9 +38253,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Manistee</_name>
           <coordinates>44.244447 -86.324253</coordinates>
           <location>
@@ -40261,9 +38265,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Manistique</_name>
           <coordinates>45.957751 -86.246252</coordinates>
           <location>
@@ -40273,9 +38275,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Marquette</_name>
           <coordinates>46.543544 -87.395417</coordinates>
           <location>
@@ -40287,10 +38287,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
-          <_name>Marshall</_name>
+          <!-- A city in Michigan in the United States -->
+          <_name msgctxt="City in Michigan, United States">Marshall</_name>
           <coordinates>42.272264 -84.963315</coordinates>
           <location>
             <name>Brooks Field Airport</name>
@@ -40299,10 +38297,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
-          <_name>Marysville</_name>
+          <!-- A city in Michigan in the United States -->
+          <_name msgctxt="City in Michigan, United States">Marysville</_name>
           <coordinates>42.912531 -82.486860</coordinates>
           <location>
             <name>St. Clair County International Airport</name>
@@ -40311,9 +38307,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Mason</_name>
           <coordinates>42.579203 -84.443585</coordinates>
           <location>
@@ -40323,9 +38317,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Menominee</_name>
           <coordinates>45.107763 -87.614274</coordinates>
           <location>
@@ -40338,10 +38330,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
-          <_name>Monroe</_name>
+          <!-- A city in Michigan in the United States -->
+          <_name msgctxt="City in Michigan, United States">Monroe</_name>
           <coordinates>41.916434 -83.397710</coordinates>
           <location>
             <name>Custer Airport</name>
@@ -40350,10 +38340,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
-          <_name>Mount Pleasant</_name>
+          <!-- A city in Michigan in the United States -->
+          <_name msgctxt="City in Michigan, United States">Mount Pleasant</_name>
           <coordinates>43.597808 -84.767514</coordinates>
           <location>
             <name>Mount Pleasant Municipal Airport</name>
@@ -40362,9 +38350,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Munising</_name>
           <coordinates>46.411057 -86.647936</coordinates>
           <location>
@@ -40374,9 +38360,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Muskegon</_name>
           <coordinates>43.234181 -86.248392</coordinates>
           <location>
@@ -40388,9 +38372,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Newberry</_name>
           <coordinates>46.354998 -85.509559</coordinates>
           <location>
@@ -40400,9 +38382,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Oscoda</_name>
           <coordinates>44.420293 -83.330801</coordinates>
           <location>
@@ -40414,9 +38394,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Owosso</_name>
           <coordinates>42.997805 -84.176636</coordinates>
           <location>
@@ -40426,9 +38404,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Pellston</_name>
           <coordinates>45.552789 -84.783936</coordinates>
           <location>
@@ -40440,10 +38416,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
-          <_name>Pontiac</_name>
+          <!-- A city in Michigan in the United States -->
+          <_name msgctxt="City in Michigan, United States">Pontiac</_name>
           <coordinates>42.638922 -83.291047</coordinates>
           <location>
             <name>Oakland County International Airport</name>
@@ -40454,9 +38428,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Port Hope</_name>
           <coordinates>43.940845 -82.712712</coordinates>
           <location>
@@ -40468,9 +38440,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Rogers City</_name>
           <coordinates>45.421402 -83.818330</coordinates>
           <location>
@@ -40480,9 +38450,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Saginaw</_name>
           <coordinates>43.419470 -83.950807</coordinates>
           <location>
@@ -40499,10 +38467,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
-          <_name>Saint James</_name>
+          <!-- A city in Michigan in the United States -->
+          <_name msgctxt="City in Michigan, United States">Saint James</_name>
           <coordinates>45.751110 -85.515643</coordinates>
           <location>
             <name>Beaver Island, Beaver Island Airport</name>
@@ -40511,9 +38477,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Sault Ste. Marie</_name>
           <coordinates>46.495300 -84.345317</coordinates>
           <location>
@@ -40525,9 +38489,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>South Haven</_name>
           <coordinates>42.403087 -86.273641</coordinates>
           <location>
@@ -40537,9 +38499,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Sterling Heights</_name>
           <coordinates>42.580312 -83.030203</coordinates>
           <location>
@@ -40551,9 +38511,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Sturgis</_name>
           <coordinates>41.799217 -85.419148</coordinates>
           <location>
@@ -40563,9 +38521,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Traverse City</_name>
           <coordinates>44.763057 -85.620632</coordinates>
           <location>
@@ -40577,10 +38533,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
-          <_name>Troy</_name>
+          <!-- A city in Michigan in the United States -->
+          <_name msgctxt="City in Michigan, United States">Troy</_name>
           <coordinates>42.605589 -83.149930</coordinates>
           <location>
             <name>Oakland / Troy Airport</name>
@@ -40589,9 +38543,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Michigan in the United
-               States
-            -->
+          <!-- A city in Michigan in the United States -->
           <_name>Warren</_name>
           <coordinates>42.477536 -83.027700</coordinates>
           <location>
@@ -40604,16 +38556,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Minnesota</_name>
         <fips-code>US27</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Aitkin</_name>
           <coordinates>46.533013 -93.710249</coordinates>
           <location>
@@ -40623,9 +38571,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Albert Lea</_name>
           <coordinates>43.648013 -93.368266</coordinates>
           <location>
@@ -40635,10 +38581,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
-          <_name>Alexandria</_name>
+          <!-- A city in Minnesota in the United States -->
+          <_name msgctxt="City in Minnesota, United States">Alexandria</_name>
           <coordinates>45.885240 -95.377538</coordinates>
           <location>
             <name>Chandler Field</name>
@@ -40649,9 +38593,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Angle Inlet</_name>
           <coordinates>49.345274 -95.062738</coordinates>
           <location>
@@ -40661,10 +38603,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
-          <_name>Appleton</_name>
+          <!-- A city in Minnesota in the United States -->
+          <_name msgctxt="City in Minnesota, United States">Appleton</_name>
           <coordinates>45.196906 -96.019767</coordinates>
           <location>
             <name>Appleton Municipal Airport</name>
@@ -40673,10 +38613,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
-          <_name>Austin</_name>
+          <!-- A city in Minnesota in the United States -->
+          <_name msgctxt="City in Minnesota, United States">Austin</_name>
           <coordinates>43.666630 -92.974637</coordinates>
           <location>
             <name>Austin Municipal</name>
@@ -40685,9 +38623,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Baudette</_name>
           <coordinates>48.712474 -94.599930</coordinates>
           <location>
@@ -40697,9 +38633,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Bemidji</_name>
           <coordinates>47.473563 -94.880277</coordinates>
           <location>
@@ -40711,10 +38645,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
-          <_name>Benson</_name>
+          <!-- A city in Minnesota in the United States -->
+          <_name msgctxt="City in Minnesota, United States">Benson</_name>
           <coordinates>45.314960 -95.600035</coordinates>
           <location>
             <name>Benson Municipal</name>
@@ -40723,9 +38655,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Bigfork</_name>
           <coordinates>47.744387 -93.654085</coordinates>
           <location>
@@ -40735,9 +38665,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Blaine</_name>
           <coordinates>45.160799 -93.234949</coordinates>
           <location>
@@ -40749,9 +38677,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Brainerd</_name>
           <coordinates>46.358022 -94.200829</coordinates>
           <location>
@@ -40763,10 +38689,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
-          <_name>Buffalo</_name>
+          <!-- A city in Minnesota in the United States -->
+          <_name msgctxt="City in Minnesota, United States">Buffalo</_name>
           <coordinates>45.171908 -93.874694</coordinates>
           <location>
             <name>Buffalo Municipal Airport</name>
@@ -40775,10 +38699,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
-          <_name>Cambridge</_name>
+          <!-- A city in Minnesota in the United States -->
+          <_name msgctxt="City in Minnesota, United States">Cambridge</_name>
           <coordinates>45.572741 -93.224392</coordinates>
           <location>
             <name>Cambridge Municipal</name>
@@ -40787,9 +38709,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Cloquet</_name>
           <coordinates>46.721610 -92.459357</coordinates>
           <location>
@@ -40799,9 +38719,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Cook</_name>
           <coordinates>47.852418 -92.689618</coordinates>
           <location>
@@ -40811,9 +38729,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Crane Lake</_name>
           <coordinates>48.266572 -92.488491</coordinates>
           <location>
@@ -40823,9 +38739,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Crookston</_name>
           <coordinates>47.774138 -96.608121</coordinates>
           <location>
@@ -40835,9 +38749,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Detroit Lakes</_name>
           <coordinates>46.817181 -95.845325</coordinates>
           <location>
@@ -40849,9 +38761,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Dodge Center</_name>
           <coordinates>44.028020 -92.854638</coordinates>
           <location>
@@ -40861,9 +38771,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Duluth</_name>
           <coordinates>46.783273 -92.106579</coordinates>
           <location>
@@ -40882,10 +38790,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
-          <_name>Ely</_name>
+          <!-- A city in Minnesota in the United States -->
+          <_name msgctxt="City in Minnesota, United States">Ely</_name>
           <coordinates>47.903237 -91.867087</coordinates>
           <location>
             <name>Ely Municipal Airport</name>
@@ -40896,9 +38802,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Eveleth</_name>
           <coordinates>47.462428 -92.539906</coordinates>
           <location>
@@ -40908,9 +38812,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Fairmont</_name>
           <coordinates>43.652178 -94.461083</coordinates>
           <location>
@@ -40922,9 +38824,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Faribault</_name>
           <coordinates>44.294964 -93.268827</coordinates>
           <location>
@@ -40934,9 +38834,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Fergus Falls</_name>
           <coordinates>46.283015 -96.077558</coordinates>
           <location>
@@ -40948,9 +38846,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Fosston</_name>
           <coordinates>47.576348 -95.751415</coordinates>
           <location>
@@ -40960,9 +38856,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Glencoe</_name>
           <coordinates>44.769129 -94.151642</coordinates>
           <location>
@@ -40972,9 +38866,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Glenwood</_name>
           <coordinates>45.650239 -95.389758</coordinates>
           <location>
@@ -40984,9 +38876,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Grand Marais</_name>
           <coordinates>47.750447 -90.334273</coordinates>
           <location>
@@ -41005,10 +38895,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
-          <_name>Grand Rapids</_name>
+          <!-- A city in Minnesota in the United States -->
+          <_name msgctxt="City in Minnesota, United States">Grand Rapids</_name>
           <coordinates>47.237166 -93.530214</coordinates>
           <location>
             <name>Grand Rapids / Itasca County Airport-Gordon Newstrom Field</name>
@@ -41019,9 +38907,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Granite Falls</_name>
           <coordinates>44.809958 -95.545575</coordinates>
           <location>
@@ -41031,9 +38917,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Hallock</_name>
           <coordinates>48.774426 -96.946447</coordinates>
           <location>
@@ -41043,9 +38927,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Hibbing</_name>
           <coordinates>47.427155 -92.937689</coordinates>
           <location>
@@ -41057,10 +38939,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
-          <_name>Hutchinson</_name>
+          <!-- A city in Minnesota in the United States -->
+          <_name msgctxt="City in Minnesota, United States">Hutchinson</_name>
           <coordinates>44.887740 -94.369706</coordinates>
           <location>
             <name>Hutchinson Municipal Airport-Butler Field</name>
@@ -41069,9 +38949,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>International Falls</_name>
           <coordinates>48.601049 -93.410982</coordinates>
           <location>
@@ -41083,9 +38961,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Inver Grove Heights</_name>
           <coordinates>44.848022 -93.042715</coordinates>
           <location>
@@ -41095,10 +38971,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
-          <_name>Jackson</_name>
+          <!-- A city in Minnesota in the United States -->
+          <_name msgctxt="City in Minnesota, United States">Jackson</_name>
           <coordinates>43.620792 -94.988602</coordinates>
           <location>
             <name>Jackson Municipal Airport</name>
@@ -41107,10 +38981,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
-          <_name>Litchfield</_name>
+          <!-- A city in Minnesota in the United States -->
+          <_name msgctxt="City in Minnesota, United States">Litchfield</_name>
           <coordinates>45.127185 -94.528047</coordinates>
           <location>
             <name>Litchfield Municipal Airport</name>
@@ -41121,9 +38993,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Little Falls</_name>
           <coordinates>45.976354 -94.362502</coordinates>
           <location>
@@ -41133,9 +39003,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Longville</_name>
           <coordinates>46.986344 -94.211364</coordinates>
           <location>
@@ -41145,9 +39013,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Luverne</_name>
           <coordinates>43.654136 -96.212807</coordinates>
           <location>
@@ -41157,10 +39023,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
-          <_name>Madison</_name>
+          <!-- A city in Minnesota in the United States -->
+          <_name msgctxt="City in Minnesota, United States">Madison</_name>
           <coordinates>45.009685 -96.195876</coordinates>
           <location>
             <name>Madison-Lac Qui Parle County Airport</name>
@@ -41169,9 +39033,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Mankato</_name>
           <coordinates>44.163578 -93.999400</coordinates>
           <location>
@@ -41183,9 +39045,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Maple Lake</_name>
           <coordinates>45.229132 -94.001923</coordinates>
           <location>
@@ -41195,10 +39055,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
-          <_name>Marshall</_name>
+          <!-- A city in Minnesota in the United States -->
+          <_name msgctxt="City in Minnesota, United States">Marshall</_name>
           <coordinates>44.446903 -95.788354</coordinates>
           <location>
             <name>Southwest Minnesota Regional Airport - Marshall / Ryan Field</name>
@@ -41209,9 +39067,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>McGregor</_name>
           <coordinates>46.606615 -93.313842</coordinates>
           <location>
@@ -41221,9 +39077,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Minneapolis</_name>
           <coordinates>44.979965 -93.263836</coordinates>
           <location>
@@ -41270,10 +39124,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
-          <_name>Montevideo</_name>
+          <!-- A city in Minnesota in the United States -->
+          <_name msgctxt="City in Minnesota, United States">Montevideo</_name>
           <coordinates>44.942457 -95.723637</coordinates>
           <location>
             <name>Montevideo-Chippewa County Airport</name>
@@ -41282,9 +39134,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Moorhead</_name>
           <coordinates>46.873852 -96.767581</coordinates>
           <location>
@@ -41294,9 +39144,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Moose Lake</_name>
           <coordinates>46.454113 -92.761866</coordinates>
           <location>
@@ -41306,9 +39154,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Mora</_name>
           <coordinates>45.876903 -93.293835</coordinates>
           <location>
@@ -41318,10 +39164,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
-          <_name>Morris</_name>
+          <!-- A city in Minnesota in the United States -->
+          <_name msgctxt="City in Minnesota, United States">Morris</_name>
           <coordinates>45.586072 -95.913941</coordinates>
           <location>
             <name>Morris Municipal Airport</name>
@@ -41330,9 +39174,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>New Ulm</_name>
           <coordinates>44.312463 -94.460529</coordinates>
           <location>
@@ -41342,9 +39184,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Olivia</_name>
           <coordinates>44.776350 -94.989721</coordinates>
           <location>
@@ -41354,9 +39194,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Orr</_name>
           <coordinates>48.053527 -92.831002</coordinates>
           <location>
@@ -41366,9 +39204,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Ortonville</_name>
           <coordinates>45.304687 -96.444779</coordinates>
           <location>
@@ -41378,9 +39214,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Owatonna</_name>
           <coordinates>44.083852 -93.226044</coordinates>
           <location>
@@ -41390,9 +39224,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Park Rapids</_name>
           <coordinates>46.922181 -95.058632</coordinates>
           <location>
@@ -41402,9 +39234,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Paynesville</_name>
           <coordinates>45.380520 -94.711948</coordinates>
           <location>
@@ -41414,9 +39244,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Pine River</_name>
           <coordinates>46.718016 -94.404162</coordinates>
           <location>
@@ -41426,9 +39254,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Pipestone</_name>
           <coordinates>44.000526 -96.317534</coordinates>
           <location>
@@ -41438,9 +39264,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Preston</_name>
           <coordinates>43.670242 -92.083216</coordinates>
           <location>
@@ -41450,10 +39274,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
-          <_name>Princeton</_name>
+          <!-- A city in Minnesota in the United States -->
+          <_name msgctxt="City in Minnesota, United States">Princeton</_name>
           <coordinates>45.569965 -93.581628</coordinates>
           <location>
             <name>Princeton</name>
@@ -41462,9 +39284,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Red Wing</_name>
           <coordinates>44.562468 -92.533801</coordinates>
           <location>
@@ -41474,9 +39294,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Redwood Falls</_name>
           <coordinates>44.539404 -95.116942</coordinates>
           <location>
@@ -41488,10 +39306,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
-          <_name>Rochester</_name>
+          <!-- A city in Minnesota in the United States -->
+          <_name msgctxt="City in Minnesota, United States">Rochester</_name>
           <coordinates>44.021631 -92.469899</coordinates>
           <location>
             <name>Rochester International Airport</name>
@@ -41502,10 +39318,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
-          <_name>Roseau</_name>
+          <!-- A city in Minnesota in the United States -->
+          <_name msgctxt="City in Minnesota, United States">Roseau</_name>
           <coordinates>48.846093 -95.762766</coordinates>
           <location>
             <name>Roseau Municipal Airport / Rudy Billberg Field</name>
@@ -41514,9 +39328,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Rush City</_name>
           <coordinates>45.685514 -92.965490</coordinates>
           <location>
@@ -41526,9 +39338,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Saint Cloud</_name>
           <coordinates>45.560799 -94.162490</coordinates>
           <location>
@@ -41540,10 +39350,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
-          <_name>Saint James</_name>
+          <!-- A city in Minnesota in the United States -->
+          <_name msgctxt="City in Minnesota, United States">Saint James</_name>
           <coordinates>43.982458 -94.626918</coordinates>
           <location>
             <name>St. James, St. James Municipal Airport</name>
@@ -41552,9 +39360,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Silver Bay</_name>
           <coordinates>47.294365 -91.257386</coordinates>
           <location>
@@ -41564,9 +39370,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Slayton</_name>
           <coordinates>43.987742 -95.755846</coordinates>
           <location>
@@ -41576,9 +39380,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Stanton</_name>
           <coordinates>44.471911 -93.022989</coordinates>
           <location>
@@ -41588,9 +39390,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Staples</_name>
           <coordinates>46.355519 -94.792241</coordinates>
           <location>
@@ -41600,9 +39400,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Thief River Falls</_name>
           <coordinates>48.119135 -96.181147</coordinates>
           <location>
@@ -41614,9 +39412,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Tracy</_name>
           <coordinates>44.233291 -95.619177</coordinates>
           <location>
@@ -41626,9 +39422,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Two Harbors</_name>
           <coordinates>47.022711 -91.670732</coordinates>
           <location>
@@ -41638,9 +39432,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Wadena</_name>
           <coordinates>46.442461 -95.136139</coordinates>
           <location>
@@ -41650,9 +39442,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Warroad</_name>
           <coordinates>48.905266 -95.314404</coordinates>
           <location>
@@ -41664,9 +39454,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Waseca</_name>
           <coordinates>44.077741 -93.507443</coordinates>
           <location>
@@ -41676,9 +39464,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Waskish</_name>
           <coordinates>48.161352 -94.512455</coordinates>
           <location>
@@ -41688,9 +39474,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Wheaton</_name>
           <coordinates>45.804405 -96.499233</coordinates>
           <location>
@@ -41700,9 +39484,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Windom</_name>
           <coordinates>43.866346 -95.116937</coordinates>
           <location>
@@ -41712,9 +39494,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Winona</_name>
           <coordinates>44.049963 -91.639315</coordinates>
           <location>
@@ -41724,9 +39504,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Minnesota in the United
-               States
-            -->
+          <!-- A city in Minnesota in the United States -->
           <_name>Worthington</_name>
           <coordinates>43.619964 -95.596398</coordinates>
           <location>
@@ -41739,16 +39517,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Mississippi</_name>
         <fips-code>US28</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
-          <!-- Translators: this is a city in Mississippi in the United
-               States
-            -->
+          <!-- A city in Mississippi in the United States -->
           <_name>Biloxi</_name>
           <coordinates>30.396032 -88.885308</coordinates>
           <location>
@@ -41758,10 +39532,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mississippi in the United
-               States
-            -->
-          <_name>Columbus</_name>
+          <!-- A city in Mississippi in the United States -->
+          <_name msgctxt="City in Mississippi, United States">Columbus</_name>
           <coordinates>33.495674 -88.427263</coordinates>
           <location>
             <name>Columbus / West Point / Starkville, Golden Triangle Regional Airport</name>
@@ -41779,10 +39551,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mississippi in the United
-               States
-            -->
-          <_name>Greenville</_name>
+          <!-- A city in Mississippi in the United States -->
+          <_name msgctxt="City in Mississippi, United States">Greenville</_name>
           <coordinates>33.410116 -91.061774</coordinates>
           <location>
             <name>Mid Delta Regional Airport</name>
@@ -41792,10 +39562,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mississippi in the United
-               States
-            -->
-          <_name>Greenwood</_name>
+          <!-- A city in Mississippi in the United States -->
+          <_name msgctxt="City in Mississippi, United States">Greenwood</_name>
           <coordinates>33.516232 -90.179528</coordinates>
           <location>
             <name>Greenwood-LeFlore Airport</name>
@@ -41806,9 +39574,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mississippi in the United
-               States
-            -->
+          <!-- A city in Mississippi in the United States -->
           <_name>Gulfport</_name>
           <coordinates>30.367420 -89.092816</coordinates>
           <location>
@@ -41820,9 +39586,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mississippi in the United
-               States
-            -->
+          <!-- A city in Mississippi in the United States -->
           <_name>Hattiesburg</_name>
           <coordinates>31.327119 -89.290339</coordinates>
           <location>
@@ -41839,10 +39603,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mississippi in the United
-               States
-            -->
-          <_name>Jackson</_name>
+          <!-- A city in Mississippi in the United States -->
+          <_name msgctxt="City in Mississippi, United States">Jackson</_name>
           <coordinates>32.298757 -90.184810</coordinates>
           <location>
             <name>Hawkins Field Airport</name>
@@ -41858,9 +39620,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mississippi in the United
-               States
-            -->
+          <!-- A city in Mississippi in the United States -->
           <_name>Laurel</_name>
           <coordinates>31.694051 -89.130612</coordinates>
           <location>
@@ -41872,9 +39632,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mississippi in the United
-               States
-            -->
+          <!-- A city in Mississippi in the United States -->
           <_name>McComb</_name>
           <coordinates>31.243787 -90.453154</coordinates>
           <location>
@@ -41886,9 +39644,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mississippi in the United
-               States
-            -->
+          <!-- A city in Mississippi in the United States -->
           <_name>Meridian</_name>
           <coordinates>32.364310 -88.703656</coordinates>
           <location>
@@ -41907,9 +39663,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mississippi in the United
-               States
-            -->
+          <!-- A city in Mississippi in the United States -->
           <_name>Natchez</_name>
           <coordinates>31.560444 -91.403171</coordinates>
           <location>
@@ -41921,9 +39675,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mississippi in the United
-               States
-            -->
+          <!-- A city in Mississippi in the United States -->
           <_name>Olive Branch</_name>
           <coordinates>34.961760 -89.829532</coordinates>
           <location>
@@ -41933,10 +39685,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mississippi in the United
-               States
-            -->
-          <_name>Oxford</_name>
+          <!-- A city in Mississippi in the United States -->
+          <_name msgctxt="City in Mississippi, United States">Oxford</_name>
           <coordinates>34.366495 -89.519248</coordinates>
           <location>
             <name>University-Oxford Airport</name>
@@ -41945,9 +39695,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mississippi in the United
-               States
-            -->
+          <!-- A city in Mississippi in the United States -->
           <_name>Pascagoula</_name>
           <coordinates>30.365755 -88.556127</coordinates>
           <location>
@@ -41957,9 +39705,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mississippi in the United
-               States
-            -->
+          <!-- A city in Mississippi in the United States -->
           <_name>Starkville</_name>
           <coordinates>33.450400 -88.818387</coordinates>
           <location>
@@ -41971,9 +39717,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mississippi in the United
-               States
-            -->
+          <!-- A city in Mississippi in the United States -->
           <_name>Tunica</_name>
           <coordinates>34.684545 -90.382877</coordinates>
           <location>
@@ -41983,9 +39727,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mississippi in the United
-               States
-            -->
+          <!-- A city in Mississippi in the United States -->
           <_name>Tupelo</_name>
           <coordinates>34.257607 -88.703386</coordinates>
           <location>
@@ -41997,9 +39739,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mississippi in the United
-               States
-            -->
+          <!-- A city in Mississippi in the United States -->
           <_name>Vicksburg</_name>
           <coordinates>32.352646 -90.877882</coordinates>
           <location>
@@ -42011,10 +39751,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Mississippi in the United
-               States
-            -->
-          <_name>West Point</_name>
+          <!-- A city in Mississippi in the United States -->
+          <_name msgctxt="City in Mississippi, United States">West Point</_name>
           <coordinates>33.607619 -88.650325</coordinates>
           <location>
             <name>Columbus / West Point / Starkville, Golden Triangle Regional Airport</name>
@@ -42026,16 +39764,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Missouri</_name>
         <fips-code>US29</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
+          <!-- A city in Missouri in the United States -->
           <_name>Cape Girardeau</_name>
           <coordinates>37.305884 -89.518148</coordinates>
           <location>
@@ -42047,9 +39781,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
+          <!-- A city in Missouri in the United States -->
           <_name>Chesterfield</_name>
           <coordinates>38.663108 -90.577067</coordinates>
           <location>
@@ -42061,9 +39793,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
+          <!-- A city in Missouri in the United States -->
           <_name>Chillicothe</_name>
           <coordinates>39.795295 -93.552436</coordinates>
           <location>
@@ -42074,10 +39804,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
-          <_name>Columbia</_name>
+          <!-- A city in Missouri in the United States -->
+          <_name msgctxt="City in Missouri, United States">Columbia</_name>
           <coordinates>38.951705 -92.334072</coordinates>
           <location>
             <name>Columbia Regional Airport</name>
@@ -42088,10 +39816,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
-          <_name>Farmington</_name>
+          <!-- A city in Missouri in the United States -->
+          <_name msgctxt="City in Missouri, United States">Farmington</_name>
           <coordinates>37.780885 -90.421790</coordinates>
           <location>
             <name>Farmington Airport</name>
@@ -42101,9 +39827,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
+          <!-- A city in Missouri in the United States -->
           <_name>Independence</_name>
           <coordinates>39.091116 -94.415507</coordinates>
           <location>
@@ -42114,9 +39838,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
+          <!-- A city in Missouri in the United States -->
           <_name>Jefferson City</_name>
           <coordinates>38.576702 -92.173516</coordinates>
           <location>
@@ -42128,9 +39850,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
+          <!-- A city in Missouri in the United States -->
           <_name>Joplin</_name>
           <coordinates>37.084227 -94.513281</coordinates>
           <location>
@@ -42142,9 +39862,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
+          <!-- A city in Missouri in the United States -->
           <_name>Kaiser</_name>
           <coordinates>38.133645 -92.589906</coordinates>
           <location>
@@ -42155,10 +39873,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
-          <_name>Kansas City</_name>
+          <!-- A city in Missouri in the United States -->
+          <_name msgctxt="City in Missouri, United States">Kansas City</_name>
           <coordinates>39.099727 -94.578567</coordinates>
           <location>
             <name>Kansas City Downtown Airport</name>
@@ -42169,9 +39885,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
+          <!-- A city in Missouri in the United States -->
           <_name>Kirksville</_name>
           <coordinates>40.194754 -92.583250</coordinates>
           <location>
@@ -42183,9 +39897,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
+          <!-- A city in Missouri in the United States -->
           <_name>Knob Noster</_name>
           <coordinates>38.766680 -93.558546</coordinates>
           <location>
@@ -42197,9 +39909,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
+          <!-- A city in Missouri in the United States -->
           <_name>Poplar Bluff</_name>
           <coordinates>36.756999 -90.392888</coordinates>
           <location>
@@ -42209,9 +39919,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
+          <!-- A city in Missouri in the United States -->
           <_name>Robertson</_name>
           <coordinates>38.764218 -90.382060</coordinates>
           <location>
@@ -42223,9 +39931,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
+          <!-- A city in Missouri in the United States -->
           <_name>Rolla</_name>
           <coordinates>37.951430 -91.771269</coordinates>
           <location>
@@ -42237,9 +39943,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
+          <!-- A city in Missouri in the United States -->
           <_name>Sedalia</_name>
           <coordinates>38.704461 -93.228261</coordinates>
           <location>
@@ -42249,10 +39953,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
-          <_name>Springfield</_name>
+          <!-- A city in Missouri in the United States -->
+          <_name msgctxt="City in Missouri, United States">Springfield</_name>
           <coordinates>37.215326 -93.298244</coordinates>
           <location>
             <name>Springfield Regional Airport</name>
@@ -42263,9 +39965,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
+          <!-- A city in Missouri in the United States -->
           <_name>Unity Village</_name>
           <coordinates>38.951396 -94.401618</coordinates>
           <location>
@@ -42276,10 +39976,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
-          <_name>Vichy</_name>
+          <!-- A city in Missouri in the United States -->
+          <_name msgctxt="City in Missouri, United States">Vichy</_name>
           <coordinates>38.111432 -91.760439</coordinates>
           <location>
             <name>Rolla / Vichy, Rolla National Airport</name>
@@ -42290,9 +39988,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
+          <!-- A city in Missouri in the United States -->
           <_name>Waynesville</_name>
           <coordinates>37.828652 -92.200723</coordinates>
           <location>
@@ -42304,9 +40000,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Missouri in the United
-               States
-            -->
+          <!-- A city in Missouri in the United States -->
           <_name>West Plains</_name>
           <coordinates>36.728115 -91.852371</coordinates>
           <location>
@@ -42318,16 +40012,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Montana</_name>
         <fips-code>US30</fips-code>
         <tz-hint>America/Denver</tz-hint>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
+          <!-- A city in Montana in the United States -->
           <_name>Baker</_name>
           <coordinates>46.366950 -104.284663</coordinates>
           <location>
@@ -42337,9 +40027,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
+          <!-- A city in Montana in the United States -->
           <_name>Billings</_name>
           <coordinates>45.783286 -108.500690</coordinates>
           <location>
@@ -42351,9 +40039,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
+          <!-- A city in Montana in the United States -->
           <_name>Black Eagle</_name>
           <coordinates>47.524680 -111.278307</coordinates>
           <location>
@@ -42365,9 +40051,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
+          <!-- A city in Montana in the United States -->
           <_name>Bozeman</_name>
           <coordinates>45.679653 -111.038558</coordinates>
           <location>
@@ -42379,9 +40063,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
+          <!-- A city in Montana in the United States -->
           <_name>Browning</_name>
           <coordinates>48.556917 -113.013418</coordinates>
           <location>
@@ -42391,9 +40073,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
+          <!-- A city in Montana in the United States -->
           <_name>Butte</_name>
           <coordinates>46.003815 -112.534745</coordinates>
           <location>
@@ -42405,9 +40085,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
+          <!-- A city in Montana in the United States -->
           <_name>Cut Bank</_name>
           <coordinates>48.633040 -112.326162</coordinates>
           <location>
@@ -42419,9 +40097,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
+          <!-- A city in Montana in the United States -->
           <_name>Dillon</_name>
           <coordinates>45.216311 -112.637520</coordinates>
           <location>
@@ -42433,9 +40109,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
+          <!-- A city in Montana in the United States -->
           <_name>Drummond</_name>
           <coordinates>46.667431 -113.147286</coordinates>
           <location>
@@ -42447,10 +40121,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
-          <_name>Glasgow</_name>
+          <!-- A city in Montana in the United States -->
+          <_name msgctxt="City in Montana, United States">Glasgow</_name>
           <coordinates>48.196964 -106.636713</coordinates>
           <location>
             <name>Glasgow International Airport</name>
@@ -42461,9 +40133,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
+          <!-- A city in Montana in the United States -->
           <_name>Glendive</_name>
           <coordinates>47.105290 -104.712460</coordinates>
           <location>
@@ -42475,9 +40145,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
+          <!-- A city in Montana in the United States -->
           <_name>Great Falls</_name>
           <coordinates>47.500235 -111.300808</coordinates>
           <location>
@@ -42487,9 +40155,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
+          <!-- A city in Montana in the United States -->
           <_name>Havre</_name>
           <coordinates>48.549999 -109.684089</coordinates>
           <location>
@@ -42501,9 +40167,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
+          <!-- A city in Montana in the United States -->
           <_name>Helena</_name>
           <coordinates>46.592712 -112.036109</coordinates>
           <location>
@@ -42515,10 +40179,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
-          <_name>Jordan</_name>
+          <!-- A city in Montana in the United States -->
+          <_name msgctxt="City in Montana, United States">Jordan</_name>
           <coordinates>47.320834 -106.910066</coordinates>
           <location>
             <name>Jordan Airport</name>
@@ -42529,9 +40191,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
+          <!-- A city in Montana in the United States -->
           <_name>Kalispell</_name>
           <coordinates>48.195793 -114.312908</coordinates>
           <location>
@@ -42541,9 +40201,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
+          <!-- A city in Montana in the United States -->
           <_name>Lewistown</_name>
           <coordinates>47.062473 -109.428238</coordinates>
           <location>
@@ -42555,9 +40213,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
+          <!-- A city in Montana in the United States -->
           <_name>Livingston</_name>
           <coordinates>45.662435 -110.561040</coordinates>
           <location>
@@ -42569,9 +40225,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
+          <!-- A city in Montana in the United States -->
           <_name>Miles City</_name>
           <coordinates>46.408336 -105.840558</coordinates>
           <location>
@@ -42583,9 +40237,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
+          <!-- A city in Montana in the United States -->
           <_name>Missoula</_name>
           <coordinates>46.872146 -113.993998</coordinates>
           <location>
@@ -42597,10 +40249,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
-          <_name>Sidney</_name>
+          <!-- A city in Montana in the United States -->
+          <_name msgctxt="City in Montana, United States">Sidney</_name>
           <coordinates>47.716684 -104.156325</coordinates>
           <location>
             <name>Sidney-Richland</name>
@@ -42611,9 +40261,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
+          <!-- A city in Montana in the United States -->
           <_name>West Yellowstone</_name>
           <coordinates>44.662149 -111.104109</coordinates>
           <location>
@@ -42623,9 +40271,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Montana in the United
-               States
-            -->
+          <!-- A city in Montana in the United States -->
           <_name>Wolf Point</_name>
           <coordinates>48.090574 -105.640557</coordinates>
           <location>
@@ -42638,16 +40284,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Nebraska</_name>
         <fips-code>US31</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Ainsworth</_name>
           <coordinates>42.549999 -99.862624</coordinates>
           <location>
@@ -42659,9 +40301,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Albion</_name>
           <coordinates>41.690844 -98.003672</coordinates>
           <location>
@@ -42671,9 +40311,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Alliance</_name>
           <coordinates>42.101634 -102.872145</coordinates>
           <location>
@@ -42686,10 +40324,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
-          <_name>Aurora</_name>
+          <!-- A city in Nebraska in the United States -->
+          <_name msgctxt="City in Nebraska, United States">Aurora</_name>
           <coordinates>40.867234 -98.004221</coordinates>
           <location>
             <name>Aurora Municipal Airport</name>
@@ -42698,9 +40334,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Beatrice</_name>
           <coordinates>40.268056 -96.746970</coordinates>
           <location>
@@ -42712,9 +40346,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Broken Bow</_name>
           <coordinates>41.401951 -99.639279</coordinates>
           <location>
@@ -42726,9 +40358,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Chadron</_name>
           <coordinates>42.829419 -102.999907</coordinates>
           <location>
@@ -42741,10 +40371,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
-          <_name>Columbus</_name>
+          <!-- A city in Nebraska in the United States -->
+          <_name msgctxt="City in Nebraska, United States">Columbus</_name>
           <coordinates>41.429734 -97.368375</coordinates>
           <location>
             <name>Columbus Municipal Airport</name>
@@ -42755,9 +40383,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Falls City</_name>
           <coordinates>40.060835 -95.601929</coordinates>
           <location>
@@ -42769,10 +40395,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
-          <_name>Fremont</_name>
+          <!-- A city in Nebraska in the United States -->
+          <_name msgctxt="City in Nebraska, United States">Fremont</_name>
           <coordinates>41.433333 -96.498081</coordinates>
           <location>
             <name>Fremont Municipal Airport</name>
@@ -42781,9 +40405,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Grand Island</_name>
           <coordinates>40.925012 -98.342007</coordinates>
           <location>
@@ -42795,9 +40417,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Hastings</_name>
           <coordinates>40.586125 -98.388393</coordinates>
           <location>
@@ -42809,10 +40429,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
-          <_name>Hebron</_name>
+          <!-- A city in Nebraska in the United States -->
+          <_name msgctxt="City in Nebraska, United States">Hebron</_name>
           <coordinates>40.166393 -97.585875</coordinates>
           <location>
             <name>Hebron Municipal Airport</name>
@@ -42821,9 +40439,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Holdrege</_name>
           <coordinates>40.440289 -99.369822</coordinates>
           <location>
@@ -42833,10 +40449,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
-          <_name>Imperial</_name>
+          <!-- A city in Nebraska in the United States -->
+          <_name msgctxt="City in Nebraska, United States">Imperial</_name>
           <coordinates>40.516940 -101.643225</coordinates>
           <location>
             <name>Imperial Municipal Airport</name>
@@ -42848,9 +40462,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Kearney</_name>
           <coordinates>40.699457 -99.081477</coordinates>
           <location>
@@ -42862,9 +40474,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Kimball</_name>
           <coordinates>41.235814 -103.662997</coordinates>
           <location>
@@ -42875,10 +40485,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
-          <_name>Lexington</_name>
+          <!-- A city in Nebraska in the United States -->
+          <_name msgctxt="City in Nebraska, United States">Lexington</_name>
           <coordinates>40.780840 -99.741505</coordinates>
           <location>
             <name>Jim Kelly Field Airport</name>
@@ -42887,10 +40495,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
-          <_name>Lincoln</_name>
+          <!-- A city in Nebraska in the United States -->
+          <_name msgctxt="City in Nebraska, United States">Lincoln</_name>
           <coordinates>40.800001 -96.666960</coordinates>
           <location>
             <name>Lincoln Municipal Airport</name>
@@ -42901,9 +40507,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>McCook</_name>
           <coordinates>40.201948 -100.625708</coordinates>
           <location>
@@ -42916,9 +40520,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Nebraska City</_name>
           <coordinates>40.676668 -95.859169</coordinates>
           <location>
@@ -42928,10 +40530,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
-          <_name>Norfolk</_name>
+          <!-- A city in Nebraska in the United States -->
+          <_name msgctxt="City in Nebraska, United States">Norfolk</_name>
           <coordinates>42.028338 -97.416996</coordinates>
           <location>
             <name>Stefan Memorial Airport</name>
@@ -42942,9 +40542,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>North Platte</_name>
           <coordinates>41.123887 -100.765423</coordinates>
           <location>
@@ -42956,9 +40554,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>O'Neill</_name>
           <coordinates>42.457781 -98.647587</coordinates>
           <location>
@@ -42970,9 +40566,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Ogallala</_name>
           <coordinates>41.128048 -101.719618</coordinates>
           <location>
@@ -42983,9 +40577,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Omaha</_name>
           <coordinates>41.258610 -95.937792</coordinates>
           <location>
@@ -43011,9 +40603,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Ord</_name>
           <coordinates>41.603343 -98.926199</coordinates>
           <location>
@@ -43025,9 +40615,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Plattsmouth</_name>
           <coordinates>41.011388 -95.882231</coordinates>
           <location>
@@ -43037,9 +40625,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Scottsbluff</_name>
           <coordinates>41.866634 -103.667166</coordinates>
           <location>
@@ -43052,10 +40638,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
-          <_name>Sidney</_name>
+          <!-- A city in Nebraska in the United States -->
+          <_name msgctxt="City in Nebraska, United States">Sidney</_name>
           <coordinates>41.142762 -102.977979</coordinates>
           <location>
             <name>Sidney Municipal Airport</name>
@@ -43066,9 +40650,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Tekamah</_name>
           <coordinates>41.778322 -96.221128</coordinates>
           <location>
@@ -43078,9 +40660,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Thedford</_name>
           <coordinates>41.978332 -100.576252</coordinates>
           <location>
@@ -43090,9 +40670,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Valentine</_name>
           <coordinates>42.872783 -100.550967</coordinates>
           <location>
@@ -43104,9 +40682,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
+          <!-- A city in Nebraska in the United States -->
           <_name>Wayne</_name>
           <coordinates>42.230559 -97.017824</coordinates>
           <location>
@@ -43116,10 +40692,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nebraska in the United
-               States
-            -->
-          <_name>York</_name>
+          <!-- A city in Nebraska in the United States -->
+          <_name msgctxt="City in Nebraska, United States">York</_name>
           <coordinates>40.868067 -97.591995</coordinates>
           <location>
             <name>York Municipal Airport</name>
@@ -43129,16 +40703,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Nevada</_name>
         <fips-code>US32</fips-code>
         <tz-hint>America/Los_Angeles</tz-hint>
         <city>
-          <!-- Translators: this is a city in Nevada in the United
-               States
-            -->
+          <!-- A city in Nevada in the United States -->
           <_name>Elko</_name>
           <coordinates>40.832421 -115.763123</coordinates>
           <location>
@@ -43150,10 +40720,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nevada in the United
-               States
-            -->
-          <_name>Ely</_name>
+          <!-- A city in Nevada in the United States -->
+          <_name msgctxt="City in Nevada, United States">Ely</_name>
           <coordinates>39.247439 -114.888630</coordinates>
           <location>
             <name>Ely Airport</name>
@@ -43164,10 +40732,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nevada in the United
-               States
-            -->
-          <_name>Eureka</_name>
+          <!-- A city in Nevada in the United States -->
+          <_name msgctxt="City in Nevada, United States">Eureka</_name>
           <coordinates>39.512707 -115.960613</coordinates>
           <location>
             <name>Eureka</name>
@@ -43178,9 +40744,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nevada in the United
-               States
-            -->
+          <!-- A city in Nevada in the United States -->
           <_name>Fallon</_name>
           <coordinates>39.473529 -118.777374</coordinates>
           <location>
@@ -43192,10 +40756,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nevada in the United
-               States
-            -->
-          <_name>Henderson</_name>
+          <!-- A city in Nevada in the United States -->
+          <_name msgctxt="City in Nevada, United States">Henderson</_name>
           <coordinates>36.039699 -114.981937</coordinates>
           <location>
             <name>Las Vegas, Henderson Executive Airport</name>
@@ -43206,10 +40768,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nevada in the United
-               States
-            -->
-          <_name>Las Vegas</_name>
+          <!-- A city in Nevada in the United States -->
+          <_name msgctxt="City in Nevada, United States">Las Vegas</_name>
           <coordinates>36.174971 -115.137223</coordinates>
           <location>
             <name>North Las Vegas Airport</name>
@@ -43234,9 +40794,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nevada in the United
-               States
-            -->
+          <!-- A city in Nevada in the United States -->
           <_name>Laughlin</_name>
           <coordinates>35.167777 -114.573021</coordinates>
           <location>
@@ -43246,9 +40804,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nevada in the United
-               States
-            -->
+          <!-- A city in Nevada in the United States -->
           <_name>Lovelock</_name>
           <coordinates>40.179354 -118.473481</coordinates>
           <location>
@@ -43260,9 +40816,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nevada in the United
-               States
-            -->
+          <!-- A city in Nevada in the United States -->
           <_name>Mercury</_name>
           <coordinates>36.660511 -115.994475</coordinates>
           <location>
@@ -43273,9 +40827,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nevada in the United
-               States
-            -->
+          <!-- A city in Nevada in the United States -->
           <_name>North Las Vegas</_name>
           <coordinates>36.198859 -115.117501</coordinates>
           <location>
@@ -43287,9 +40839,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nevada in the United
-               States
-            -->
+          <!-- A city in Nevada in the United States -->
           <_name>Reno</_name>
           <coordinates>39.529633 -119.813803</coordinates>
           <location>
@@ -43301,9 +40851,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nevada in the United
-               States
-            -->
+          <!-- A city in Nevada in the United States -->
           <_name>Tonopah</_name>
           <coordinates>38.067155 -117.230082</coordinates>
           <location>
@@ -43315,9 +40863,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Nevada in the United
-               States
-            -->
+          <!-- A city in Nevada in the United States -->
           <_name>Winnemucca</_name>
           <coordinates>40.972958 -117.735685</coordinates>
           <location>
@@ -43330,17 +40876,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>New Hampshire</_name>
         <fips-code>US33</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in New Hampshire in the
-               United States
-            -->
-          <_name>Berlin</_name>
+          <!-- A city in New Hampshire in the United States -->
+          <_name msgctxt="City in New Hampshire, United States">Berlin</_name>
           <coordinates>44.468670 -71.185077</coordinates>
           <location>
             <name>Berlin Municipal Airport</name>
@@ -43351,10 +40893,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Hampshire in the
-               United States
-            -->
-          <_name>Concord</_name>
+          <!-- A city in New Hampshire in the United States -->
+          <_name msgctxt="City in New Hampshire, United States">Concord</_name>
           <coordinates>43.208137 -71.537572</coordinates>
           <location>
             <name>Concord Municipal Airport</name>
@@ -43365,9 +40905,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Hampshire in the
-               United States
-            -->
+          <!-- A city in New Hampshire in the United States -->
           <_name>Gorham</_name>
           <coordinates>44.387839 -71.173131</coordinates>
           <location>
@@ -43378,9 +40916,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Hampshire in the
-               United States
-            -->
+          <!-- A city in New Hampshire in the United States -->
           <_name>Jaffrey</_name>
           <coordinates>42.813973 -72.023136</coordinates>
           <location>
@@ -43392,9 +40928,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Hampshire in the
-               United States
-            -->
+          <!-- A city in New Hampshire in the United States -->
           <_name>Keene</_name>
           <coordinates>42.933692 -72.278141</coordinates>
           <location>
@@ -43406,9 +40940,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Hampshire in the
-               United States
-            -->
+          <!-- A city in New Hampshire in the United States -->
           <_name>Laconia</_name>
           <coordinates>43.527855 -71.470351</coordinates>
           <location>
@@ -43420,10 +40952,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Hampshire in the
-               United States
-            -->
-          <_name>Lebanon</_name>
+          <!-- A city in New Hampshire in the United States -->
+          <_name msgctxt="City in New Hampshire, United States">Lebanon</_name>
           <coordinates>43.642293 -72.251757</coordinates>
           <location>
             <name>Lebanon Municipal Airport</name>
@@ -43434,10 +40964,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Hampshire in the
-               United States
-            -->
-          <_name>Manchester</_name>
+          <!-- A city in New Hampshire in the United States -->
+          <_name msgctxt="City in New Hampshire, United States">Manchester</_name>
           <coordinates>42.995640 -71.454789</coordinates>
           <location>
             <name>Manchester Airport</name>
@@ -43448,9 +40976,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Hampshire in the
-               United States
-            -->
+          <!-- A city in New Hampshire in the United States -->
           <_name>Nashua</_name>
           <coordinates>42.765366 -71.467566</coordinates>
           <location>
@@ -43462,10 +40988,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Hampshire in the
-               United States
-            -->
-          <_name>Plymouth</_name>
+          <!-- A city in New Hampshire in the United States -->
+          <_name msgctxt="City in New Hampshire, United States">Plymouth</_name>
           <coordinates>43.757017 -71.688134</coordinates>
           <location>
             <name>Plymouth Municipal Airport</name>
@@ -43474,10 +40998,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Hampshire in the
-               United States
-            -->
-          <_name>Portsmouth</_name>
+          <!-- A city in New Hampshire in the United States -->
+          <_name msgctxt="City in New Hampshire, United States">Portsmouth</_name>
           <coordinates>43.071755 -70.762553</coordinates>
           <location>
             <name>Pease Air Force Base / Portsmouth</name>
@@ -43488,10 +41010,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Hampshire in the
-               United States
-            -->
-          <_name>Rochester</_name>
+          <!-- A city in New Hampshire in the United States -->
+          <_name msgctxt="City in New Hampshire, United States">Rochester</_name>
           <coordinates>43.304526 -70.975619</coordinates>
           <location>
             <name>Skyhaven Airport</name>
@@ -43500,9 +41020,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Hampshire in the
-               United States
-            -->
+          <!-- A city in New Hampshire in the United States -->
           <_name>Whitefield</_name>
           <coordinates>44.373116 -71.610084</coordinates>
           <location>
@@ -43514,16 +41032,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>New Jersey</_name>
         <fips-code>US34</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in New Jersey in the United
-               States
-            -->
+          <!-- A city in New Jersey in the United States -->
           <_name>Andover</_name>
           <coordinates>40.985931 -74.742109</coordinates>
           <location>
@@ -43533,9 +41047,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Jersey in the United
-               States
-            -->
+          <!-- A city in New Jersey in the United States -->
           <_name>Atlantic City</_name>
           <coordinates>39.364283 -74.422927</coordinates>
           <location>
@@ -43547,9 +41059,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Jersey in the United
-               States
-            -->
+          <!-- A city in New Jersey in the United States -->
           <_name>Belmar</_name>
           <coordinates>40.178447 -74.021804</coordinates>
           <location>
@@ -43561,10 +41071,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Jersey in the United
-               States
-            -->
-          <_name>Caldwell</_name>
+          <!-- A city in New Jersey in the United States -->
+          <_name msgctxt="City in New Jersey, United States">Caldwell</_name>
           <coordinates>40.839822 -74.276537</coordinates>
           <location>
             <name>Essex County Airport</name>
@@ -43575,9 +41083,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Jersey in the United
-               States
-            -->
+          <!-- A city in New Jersey in the United States -->
           <_name>Elizabeth</_name>
           <coordinates>40.663992 -74.210701</coordinates>
           <location>
@@ -43589,9 +41095,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Jersey in the United
-               States
-            -->
+          <!-- A city in New Jersey in the United States -->
           <_name>Jersey City</_name>
           <coordinates>40.728158 -74.077642</coordinates>
           <location>
@@ -43603,9 +41107,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Jersey in the United
-               States
-            -->
+          <!-- A city in New Jersey in the United States -->
           <_name>Juliustown</_name>
           <coordinates>40.013446 -74.668769</coordinates>
           <location>
@@ -43617,9 +41119,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Jersey in the United
-               States
-            -->
+          <!-- A city in New Jersey in the United States -->
           <_name>Millville</_name>
           <coordinates>39.402060 -75.039344</coordinates>
           <location>
@@ -43631,9 +41131,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Jersey in the United
-               States
-            -->
+          <!-- A city in New Jersey in the United States -->
           <_name>Morristown</_name>
           <coordinates>40.796767 -74.481544</coordinates>
           <location>
@@ -43645,9 +41143,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Jersey in the United
-               States
-            -->
+          <!-- A city in New Jersey in the United States -->
           <_name>Mount Holly</_name>
           <coordinates>39.992890 -74.787662</coordinates>
           <location>
@@ -43658,10 +41154,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Jersey in the United
-               States
-            -->
-          <_name>Newark</_name>
+          <!-- A city in New Jersey in the United States -->
+          <_name msgctxt="City in New Jersey, United States">Newark</_name>
           <coordinates>40.735657 -74.172367</coordinates>
           <location>
             <name>Newark International Airport</name>
@@ -43672,9 +41166,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Jersey in the United
-               States
-            -->
+          <!-- A city in New Jersey in the United States -->
           <_name>Paterson</_name>
           <coordinates>40.916765 -74.171811</coordinates>
           <location>
@@ -43686,9 +41178,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Jersey in the United
-               States
-            -->
+          <!-- A city in New Jersey in the United States -->
           <_name>Somerville</_name>
           <coordinates>40.574270 -74.609880</coordinates>
           <location>
@@ -43698,9 +41188,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Jersey in the United
-               States
-            -->
+          <!-- A city in New Jersey in the United States -->
           <_name>Sussex</_name>
           <coordinates>41.209818 -74.607661</coordinates>
           <location>
@@ -43710,9 +41198,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Jersey in the United
-               States
-            -->
+          <!-- A city in New Jersey in the United States -->
           <_name>Teterboro</_name>
           <coordinates>40.859822 -74.059308</coordinates>
           <location>
@@ -43724,10 +41210,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Jersey in the United
-               States
-            -->
-          <_name>Trenton</_name>
+          <!-- A city in New Jersey in the United States -->
+          <_name msgctxt="City in New Jersey, United States">Trenton</_name>
           <coordinates>40.217053 -74.742938</coordinates>
           <location>
             <name>Mercer County Airport</name>
@@ -43739,16 +41223,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>New Mexico</_name>
         <fips-code>US35</fips-code>
         <tz-hint>America/Denver</tz-hint>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Alamogordo</_name>
           <coordinates>32.899532 -105.960265</coordinates>
           <location>
@@ -43765,9 +41245,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Albuquerque</_name>
           <coordinates>35.084491 -106.651137</coordinates>
           <location>
@@ -43786,9 +41264,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Artesia</_name>
           <coordinates>32.842334 -104.403296</coordinates>
           <location>
@@ -43798,10 +41274,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
-          <_name>Carlsbad</_name>
+          <!-- A city in New Mexico in the United States -->
+          <_name msgctxt="City in New Mexico, United States">Carlsbad</_name>
           <coordinates>32.420674 -104.228837</coordinates>
           <location>
             <name>Cavern City Air Terminal Airport</name>
@@ -43812,9 +41286,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Chama</_name>
           <coordinates>36.903068 -106.579479</coordinates>
           <location>
@@ -43824,9 +41296,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Clayton</_name>
           <coordinates>36.451693 -103.184104</coordinates>
           <location>
@@ -43838,9 +41308,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Clines Corners</_name>
           <coordinates>35.009498 -105.669180</coordinates>
           <location>
@@ -43850,9 +41318,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Clovis</_name>
           <coordinates>34.404799 -103.205227</coordinates>
           <location>
@@ -43871,10 +41337,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
-          <_name>Corona</_name>
+          <!-- A city in New Mexico in the United States -->
+          <_name msgctxt="City in New Mexico, United States">Corona</_name>
           <coordinates>34.250907 -105.596669</coordinates>
           <location>
             <name>Corona / Lincoln</name>
@@ -43885,9 +41349,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Deming</_name>
           <coordinates>32.268698 -107.758640</coordinates>
           <location>
@@ -43899,10 +41361,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
-          <_name>Farmington</_name>
+          <!-- A city in New Mexico in the United States -->
+          <_name msgctxt="City in New Mexico, United States">Farmington</_name>
           <coordinates>36.728058 -108.218686</coordinates>
           <location>
             <name>Four Corners Regional Airport</name>
@@ -43913,9 +41373,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Gallup</_name>
           <coordinates>35.528078 -108.742584</coordinates>
           <location>
@@ -43927,9 +41385,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Grants</_name>
           <coordinates>35.147260 -107.851447</coordinates>
           <location>
@@ -43941,9 +41397,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Hobbs</_name>
           <coordinates>32.702612 -103.136040</coordinates>
           <location>
@@ -43955,9 +41409,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Las Cruces</_name>
           <coordinates>32.312316 -106.778337</coordinates>
           <location>
@@ -43967,10 +41419,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
-          <_name>Las Vegas</_name>
+          <!-- A city in New Mexico in the United States -->
+          <_name msgctxt="City in New Mexico, United States">Las Vegas</_name>
           <coordinates>35.593933 -105.223897</coordinates>
           <location>
             <name>Las Vegas Municipal Airport</name>
@@ -43981,9 +41431,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Los Alamos</_name>
           <coordinates>35.888080 -106.306972</coordinates>
           <location>
@@ -43995,9 +41443,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Moriarty</_name>
           <coordinates>34.990050 -106.049189</coordinates>
           <location>
@@ -44009,9 +41455,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Raton</_name>
           <coordinates>36.903358 -104.439153</coordinates>
           <location>
@@ -44021,9 +41465,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Roswell</_name>
           <coordinates>33.394266 -104.523024</coordinates>
           <location>
@@ -44035,9 +41477,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Ruidoso</_name>
           <coordinates>33.331749 -105.673041</coordinates>
           <location>
@@ -44047,9 +41487,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Santa Fe</_name>
           <coordinates>35.686975 -105.937799</coordinates>
           <location>
@@ -44061,9 +41499,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Silver City</_name>
           <coordinates>32.770075 -108.280326</coordinates>
           <location>
@@ -44075,9 +41511,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Taos</_name>
           <coordinates>36.407249 -105.573066</coordinates>
           <location>
@@ -44087,9 +41521,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Torreon</_name>
           <coordinates>35.797244 -107.213933</coordinates>
           <location>
@@ -44101,9 +41533,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Truth or Consequences</_name>
           <coordinates>33.128405 -107.252807</coordinates>
           <location>
@@ -44115,9 +41545,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New Mexico in the United
-               States
-            -->
+          <!-- A city in New Mexico in the United States -->
           <_name>Tucumcari</_name>
           <coordinates>35.171723 -103.724966</coordinates>
           <location>
@@ -44130,17 +41558,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
-        <_name>New York</_name>
+        <!-- A state/province/territory in United States -->
+        <_name msgctxt="State in United States">New York</_name>
         <fips-code>US36</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
-          <_name>Albany</_name>
+          <!-- A city in New York in the United States -->
+          <_name msgctxt="City in New York, United States">Albany</_name>
           <coordinates>42.652579 -73.756232</coordinates>
           <location>
             <name>Albany International Airport</name>
@@ -44151,9 +41575,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Binghamton</_name>
           <coordinates>42.098687 -75.917974</coordinates>
           <location>
@@ -44165,9 +41587,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Black River</_name>
           <coordinates>44.012564 -75.794367</coordinates>
           <location>
@@ -44179,10 +41599,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
-          <_name>Buffalo</_name>
+          <!-- A city in New York in the United States -->
+          <_name msgctxt="City in New York, United States">Buffalo</_name>
           <coordinates>42.886447 -78.878369</coordinates>
           <location>
             <name>Greater Buffalo International Airport</name>
@@ -44193,9 +41611,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Dansville</_name>
           <coordinates>42.560900 -77.696106</coordinates>
           <location>
@@ -44205,9 +41621,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Dunkirk</_name>
           <coordinates>42.479502 -79.333932</coordinates>
           <location>
@@ -44217,9 +41631,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>East Hampton</_name>
           <coordinates>40.963434 -72.184801</coordinates>
           <location>
@@ -44229,10 +41641,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
-          <_name>Elmira</_name>
+          <!-- A city in New York in the United States -->
+          <_name msgctxt="City in New York, United States">Elmira</_name>
           <coordinates>42.089796 -76.807734</coordinates>
           <location>
             <name>Elmira / Corning Regional Airport</name>
@@ -44243,9 +41653,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Farmingdale</_name>
           <coordinates>40.732600 -73.445401</coordinates>
           <location>
@@ -44257,9 +41665,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Fulton</_name>
           <coordinates>43.322846 -76.417158</coordinates>
           <location>
@@ -44269,9 +41675,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Glens Falls</_name>
           <coordinates>43.309516 -73.644006</coordinates>
           <location>
@@ -44283,9 +41687,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Islip</_name>
           <coordinates>40.729821 -73.210393</coordinates>
           <location>
@@ -44297,9 +41699,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Ithaca</_name>
           <coordinates>42.440628 -76.496607</coordinates>
           <location>
@@ -44311,10 +41711,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
-          <_name>Jamestown</_name>
+          <!-- A city in New York in the United States -->
+          <_name msgctxt="City in New York, United States">Jamestown</_name>
           <coordinates>42.097002 -79.235326</coordinates>
           <location>
             <name>Chautauqua County / Jamestown Airport</name>
@@ -44325,9 +41723,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Massena</_name>
           <coordinates>44.928105 -74.891865</coordinates>
           <location>
@@ -44339,9 +41735,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Montauk</_name>
           <coordinates>41.035935 -71.954515</coordinates>
           <location>
@@ -44351,10 +41745,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
-          <_name>Montgomery</_name>
+          <!-- A city in New York in the United States -->
+          <_name msgctxt="City in New York, United States">Montgomery</_name>
           <coordinates>41.527594 -74.236816</coordinates>
           <location>
             <name>Orange County Airport</name>
@@ -44365,10 +41757,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
-          <_name>Monticello</_name>
+          <!-- A city in New York in the United States -->
+          <_name msgctxt="City in New York, United States">Monticello</_name>
           <coordinates>41.655647 -74.689328</coordinates>
           <location>
             <name>Sullivan County International Airport</name>
@@ -44379,10 +41769,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
-          <_name>New York</_name>
+          <!-- A city in New York in the United States -->
+          <_name msgctxt="City in New York, United States">New York</_name>
           <coordinates>40.714269 -74.005973</coordinates>
           <location>
             <name>New York City, Central Park</name>
@@ -44407,9 +41795,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Newburgh</_name>
           <coordinates>41.503427 -74.010418</coordinates>
           <location>
@@ -44421,9 +41807,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Niagara Falls</_name>
           <coordinates>43.094500 -79.056711</coordinates>
           <location>
@@ -44435,9 +41819,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Penn Yan</_name>
           <coordinates>42.660903 -77.053858</coordinates>
           <location>
@@ -44448,9 +41830,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Plattsburgh</_name>
           <coordinates>44.699487 -73.452912</coordinates>
           <location>
@@ -44460,9 +41840,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Poughkeepsie</_name>
           <coordinates>41.700371 -73.920970</coordinates>
           <location>
@@ -44474,10 +41852,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
-          <_name>Rochester</_name>
+          <!-- A city in New York in the United States -->
+          <_name msgctxt="City in New York, United States">Rochester</_name>
           <coordinates>43.154784 -77.615557</coordinates>
           <location>
             <name>Greater Rochester International Airport</name>
@@ -44488,10 +41864,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
-          <_name>Rome</_name>
+          <!-- A city in New York in the United States -->
+          <_name msgctxt="City in New York, United States">Rome</_name>
           <coordinates>43.212847 -75.455730</coordinates>
           <location>
             <name>Griffiss Air Force Base / Rome</name>
@@ -44500,9 +41874,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Saranac Lake</_name>
           <coordinates>44.329496 -74.131266</coordinates>
           <location>
@@ -44514,9 +41886,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Shirley</_name>
           <coordinates>40.801488 -72.867603</coordinates>
           <location>
@@ -44526,9 +41896,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Syracuse</_name>
           <coordinates>43.048122 -76.147424</coordinates>
           <location>
@@ -44540,10 +41908,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
-          <_name>Watertown</_name>
+          <!-- A city in New York in the United States -->
+          <_name msgctxt="City in New York, United States">Watertown</_name>
           <coordinates>43.974784 -75.910757</coordinates>
           <location>
             <name>Watertown International Airport</name>
@@ -44554,9 +41920,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Wellsville</_name>
           <coordinates>42.122012 -77.948058</coordinates>
           <location>
@@ -44566,9 +41930,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Westhampton Beach</_name>
           <coordinates>40.803155 -72.614539</coordinates>
           <location>
@@ -44580,9 +41942,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>White Plains</_name>
           <coordinates>41.033986 -73.762910</coordinates>
           <location>
@@ -44594,9 +41954,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in New York in the United
-               States
-            -->
+          <!-- A city in New York in the United States -->
           <_name>Yonkers</_name>
           <coordinates>40.931210 -73.898747</coordinates>
           <location>
@@ -44609,16 +41967,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>North Carolina</_name>
         <fips-code>US37</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Adamsville</_name>
           <coordinates>35.370995 -77.953319</coordinates>
           <location>
@@ -44630,9 +41984,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Ahoskie</_name>
           <coordinates>36.286822 -76.984681</coordinates>
           <location>
@@ -44642,9 +41994,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Albemarle</_name>
           <coordinates>35.350143 -80.200058</coordinates>
           <location>
@@ -44654,9 +42004,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Andrews</_name>
           <coordinates>35.201755 -83.824067</coordinates>
           <location>
@@ -44666,9 +42014,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Asheboro</_name>
           <coordinates>35.707915 -79.813645</coordinates>
           <location>
@@ -44678,9 +42024,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Asheville</_name>
           <coordinates>35.600945 -82.554015</coordinates>
           <location>
@@ -44692,10 +42036,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
-          <_name>Beaufort</_name>
+          <!-- A city in North Carolina in the United States -->
+          <_name msgctxt="City in North Carolina, United States">Beaufort</_name>
           <coordinates>34.718217 -76.663819</coordinates>
           <location>
             <name>Michael J Smith Field Airport</name>
@@ -44704,9 +42046,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Bogue</_name>
           <coordinates>34.699329 -77.036891</coordinates>
           <location>
@@ -44716,10 +42056,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
-          <_name>Boone</_name>
+          <!-- A city in North Carolina in the United States -->
+          <_name msgctxt="City in North Carolina, United States">Boone</_name>
           <coordinates>36.216795 -81.674552</coordinates>
           <location>
             <name>Watauga County Hospital Heliport</name>
@@ -44728,10 +42066,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
-          <_name>Burlington</_name>
+          <!-- A city in North Carolina in the United States -->
+          <_name msgctxt="City in North Carolina, United States">Burlington</_name>
           <coordinates>36.095692 -79.437799</coordinates>
           <location>
             <name>Burlington Alamance Regional Airport</name>
@@ -44740,9 +42076,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Chapel Hill</_name>
           <coordinates>35.913200 -79.055845</coordinates>
           <location>
@@ -44752,10 +42086,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
-          <_name>Charlotte</_name>
+          <!-- A city in North Carolina in the United States -->
+          <_name msgctxt="City in North Carolina, United States">Charlotte</_name>
           <coordinates>35.227087 -80.843127</coordinates>
           <location>
             <name>Charlotte / Douglas International Airport</name>
@@ -44766,10 +42098,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
-          <_name>Clinton</_name>
+          <!-- A city in North Carolina in the United States -->
+          <_name msgctxt="City in North Carolina, United States">Clinton</_name>
           <coordinates>34.997945 -78.323333</coordinates>
           <location>
             <name>Sampson County Airport</name>
@@ -44778,10 +42108,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
-          <_name>Concord</_name>
+          <!-- A city in North Carolina in the United States -->
+          <_name msgctxt="City in North Carolina, United States">Concord</_name>
           <coordinates>35.408752 -80.579511</coordinates>
           <location>
             <name>Concord Regional Airport</name>
@@ -44790,9 +42118,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Currituck</_name>
           <coordinates>36.449877 -76.015482</coordinates>
           <location>
@@ -44802,9 +42128,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Durham</_name>
           <coordinates>35.994033 -78.898619</coordinates>
           <location>
@@ -44816,9 +42140,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Edenton</_name>
           <coordinates>36.057938 -76.607721</coordinates>
           <location>
@@ -44828,9 +42150,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Elizabeth City</_name>
           <coordinates>36.294601 -76.251046</coordinates>
           <location>
@@ -44842,9 +42162,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Elizabethtown</_name>
           <coordinates>34.629337 -78.605290</coordinates>
           <location>
@@ -44854,9 +42172,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Erwin</_name>
           <coordinates>35.326829 -78.676128</coordinates>
           <location>
@@ -44866,10 +42182,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
-          <_name>Fayetteville</_name>
+          <!-- A city in North Carolina in the United States -->
+          <_name msgctxt="City in North Carolina, United States">Fayetteville</_name>
           <coordinates>35.052664 -78.878359</coordinates>
           <location>
             <name>Fayetteville Regional Airport</name>
@@ -44894,10 +42208,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
-          <_name>Franklin</_name>
+          <!-- A city in North Carolina in the United States -->
+          <_name msgctxt="City in North Carolina, United States">Franklin</_name>
           <coordinates>35.182317 -83.381543</coordinates>
           <location>
             <name>Macon County Airport</name>
@@ -44906,9 +42218,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Gastonia</_name>
           <coordinates>35.262082 -81.187301</coordinates>
           <location>
@@ -44918,9 +42228,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Goldsboro</_name>
           <coordinates>35.384884 -77.992765</coordinates>
           <location>
@@ -44932,10 +42240,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
-          <_name>Greensboro</_name>
+          <!-- A city in North Carolina in the United States -->
+          <_name msgctxt="City in North Carolina, United States">Greensboro</_name>
           <coordinates>36.072635 -79.791975</coordinates>
           <location>
             <name>Piedmont Triad International Airport</name>
@@ -44946,9 +42252,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Hatteras</_name>
           <coordinates>35.219342 -75.690161</coordinates>
           <location>
@@ -44958,9 +42262,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Havelock</_name>
           <coordinates>34.879049 -76.901330</coordinates>
           <location>
@@ -44971,9 +42273,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Hickory</_name>
           <coordinates>35.733188 -81.341197</coordinates>
           <location>
@@ -44985,9 +42285,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Hoffman</_name>
           <coordinates>35.032378 -79.547544</coordinates>
           <location>
@@ -44998,10 +42296,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
-          <_name>Jacksonville</_name>
+          <!-- A city in North Carolina in the United States -->
+          <_name msgctxt="City in North Carolina, United States">Jacksonville</_name>
           <coordinates>34.754052 -77.430241</coordinates>
           <location>
             <name>Jacksonville, New River, Marine Corps Air Station</name>
@@ -45012,9 +42308,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Jefferson</_name>
           <coordinates>36.420403 -81.473438</coordinates>
           <location>
@@ -45024,9 +42318,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Kenansville</_name>
           <coordinates>34.962388 -77.962207</coordinates>
           <location>
@@ -45036,9 +42328,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Kill Devil Hills</_name>
           <coordinates>36.030723 -75.676010</coordinates>
           <location>
@@ -45048,9 +42338,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Kinston</_name>
           <coordinates>35.262664 -77.581635</coordinates>
           <location>
@@ -45062,10 +42350,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
-          <_name>Lexington</_name>
+          <!-- A city in North Carolina in the United States -->
+          <_name msgctxt="City in North Carolina, United States">Lexington</_name>
           <coordinates>35.824027 -80.253384</coordinates>
           <location>
             <name>Davidson County Airport</name>
@@ -45074,9 +42360,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Lincolnton</_name>
           <coordinates>35.473745 -81.254525</coordinates>
           <location>
@@ -45086,9 +42370,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Louisburg</_name>
           <coordinates>36.099039 -78.301106</coordinates>
           <location>
@@ -45098,9 +42380,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Lumberton</_name>
           <coordinates>34.618220 -79.008642</coordinates>
           <location>
@@ -45110,9 +42390,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Manteo</_name>
           <coordinates>35.908226 -75.675730</coordinates>
           <location>
@@ -45122,9 +42400,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Maxton</_name>
           <coordinates>34.735161 -79.348932</coordinates>
           <location>
@@ -45134,10 +42410,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
-          <_name>Monroe</_name>
+          <!-- A city in North Carolina in the United States -->
+          <_name msgctxt="City in North Carolina, United States">Monroe</_name>
           <coordinates>34.985428 -80.549511</coordinates>
           <location>
             <name>Monroe Airport</name>
@@ -45146,9 +42420,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Mount Airy</_name>
           <coordinates>36.499301 -80.607286</coordinates>
           <location>
@@ -45158,9 +42430,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>New Bern</_name>
           <coordinates>35.108493 -77.044114</coordinates>
           <location>
@@ -45172,10 +42442,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
-          <_name>New River</_name>
+          <!-- A city in North Carolina in the United States -->
+          <_name msgctxt="City in North Carolina, United States">New River</_name>
           <coordinates>34.757385 -77.409685</coordinates>
           <location>
             <name>Jacksonville, New River, Marine Corps Air Station</name>
@@ -45186,9 +42454,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>North Wilkesboro</_name>
           <coordinates>36.158465 -81.147584</coordinates>
           <location>
@@ -45198,9 +42464,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Oak Island</_name>
           <coordinates>33.916562 -78.161106</coordinates>
           <location>
@@ -45210,10 +42474,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
-          <_name>Oxford</_name>
+          <!-- A city in North Carolina in the United States -->
+          <_name msgctxt="City in North Carolina, United States">Oxford</_name>
           <coordinates>36.310700 -78.590834</coordinates>
           <location>
             <name>Henderson-Oxford Airport</name>
@@ -45222,9 +42484,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Pinehurst</_name>
           <coordinates>35.195434 -79.469477</coordinates>
           <location>
@@ -45234,9 +42494,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Raleigh</_name>
           <coordinates>35.772096 -78.638615</coordinates>
           <location>
@@ -45248,9 +42506,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Roanoke Rapids</_name>
           <coordinates>36.461540 -77.654146</coordinates>
           <location>
@@ -45260,9 +42516,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Rocky Mount</_name>
           <coordinates>35.938210 -77.790534</coordinates>
           <location>
@@ -45274,9 +42528,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Roe</_name>
           <coordinates>34.992387 -76.308803</coordinates>
           <location>
@@ -45286,9 +42538,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Roxboro</_name>
           <coordinates>36.393752 -78.982788</coordinates>
           <location>
@@ -45298,10 +42548,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
-          <_name>Salisbury</_name>
+          <!-- A city in North Carolina in the United States -->
+          <_name msgctxt="City in North Carolina, United States">Salisbury</_name>
           <coordinates>35.670973 -80.474226</coordinates>
           <location>
             <name>Rowan County Airport</name>
@@ -45310,10 +42558,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
-          <_name>Sanford</_name>
+          <!-- A city in North Carolina in the United States -->
+          <_name msgctxt="City in North Carolina, United States">Sanford</_name>
           <coordinates>35.479876 -79.180299</coordinates>
           <location>
             <name>Sanford-Lee County Regional Airport</name>
@@ -45322,9 +42568,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Shelby</_name>
           <coordinates>35.292351 -81.535646</coordinates>
           <location>
@@ -45334,9 +42578,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Smithfield</_name>
           <coordinates>35.508494 -78.339445</coordinates>
           <location>
@@ -45346,9 +42588,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Southern Pines</_name>
           <coordinates>35.174047 -79.392254</coordinates>
           <location>
@@ -45358,9 +42598,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Statesville</_name>
           <coordinates>35.782636 -80.887296</coordinates>
           <location>
@@ -45370,9 +42608,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Swansboro</_name>
           <coordinates>34.687662 -77.119117</coordinates>
           <location>
@@ -45382,9 +42618,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Wadesboro</_name>
           <coordinates>34.968210 -80.076727</coordinates>
           <location>
@@ -45394,10 +42628,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
-          <_name>Washington</_name>
+          <!-- A city in North Carolina in the United States -->
+          <_name msgctxt="City in North Carolina, United States">Washington</_name>
           <coordinates>35.546552 -77.052174</coordinates>
           <location>
             <name>Warren Field Airport</name>
@@ -45406,9 +42638,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Whiteville</_name>
           <coordinates>34.338780 -78.703072</coordinates>
           <location>
@@ -45418,10 +42648,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
-          <_name>Wilmington</_name>
+          <!-- A city in North Carolina in the United States -->
+          <_name msgctxt="City in North Carolina, United States">Wilmington</_name>
           <coordinates>34.225726 -77.944710</coordinates>
           <location>
             <name>Wilmington International Airport</name>
@@ -45432,9 +42660,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Winston-Salem</_name>
           <coordinates>36.099860 -80.244216</coordinates>
           <location>
@@ -45446,9 +42672,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Carolina in the
-               United States
-            -->
+          <!-- A city in North Carolina in the United States -->
           <_name>Winterville</_name>
           <coordinates>35.529051 -77.401076</coordinates>
           <location>
@@ -45459,16 +42683,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>North Dakota</_name>
         <fips-code>US38</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
-          <!-- Translators: this is a city in North Dakota in the
-               United States
-            -->
+          <!-- A city in North Dakota in the United States -->
           <_name>Bismarck</_name>
           <coordinates>46.808327 -100.783739</coordinates>
           <location>
@@ -45480,9 +42700,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Dakota in the
-               United States
-            -->
+          <!-- A city in North Dakota in the United States -->
           <_name>Bowman</_name>
           <coordinates>46.183062 -103.394906</coordinates>
           <location>
@@ -45492,9 +42710,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Dakota in the
-               United States
-            -->
+          <!-- A city in North Dakota in the United States -->
           <_name>Devils Lake</_name>
           <coordinates>48.112779 -98.865120</coordinates>
           <location>
@@ -45506,9 +42722,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Dakota in the
-               United States
-            -->
+          <!-- A city in North Dakota in the United States -->
           <_name>Dickinson</_name>
           <coordinates>46.879176 -102.789624</coordinates>
           <location>
@@ -45521,9 +42735,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Dakota in the
-               United States
-            -->
+          <!-- A city in North Dakota in the United States -->
           <_name>Fargo</_name>
           <coordinates>46.877186 -96.789803</coordinates>
           <location>
@@ -45535,9 +42747,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Dakota in the
-               United States
-            -->
+          <!-- A city in North Dakota in the United States -->
           <_name>Garrison</_name>
           <coordinates>47.652223 -101.415717</coordinates>
           <location>
@@ -45547,9 +42757,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Dakota in the
-               United States
-            -->
+          <!-- A city in North Dakota in the United States -->
           <_name>Grand Forks</_name>
           <coordinates>47.925257 -97.032855</coordinates>
           <location>
@@ -45568,9 +42776,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Dakota in the
-               United States
-            -->
+          <!-- A city in North Dakota in the United States -->
           <_name>Hettinger</_name>
           <coordinates>46.001395 -102.636824</coordinates>
           <location>
@@ -45581,10 +42787,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Dakota in the
-               United States
-            -->
-          <_name>Jamestown</_name>
+          <!-- A city in North Dakota in the United States -->
+          <_name msgctxt="City in North Dakota, United States">Jamestown</_name>
           <coordinates>46.910544 -98.708436</coordinates>
           <location>
             <name>Jamestown Municipal Airport</name>
@@ -45595,9 +42799,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Dakota in the
-               United States
-            -->
+          <!-- A city in North Dakota in the United States -->
           <_name>Minot</_name>
           <coordinates>48.232509 -101.296273</coordinates>
           <location>
@@ -45616,9 +42818,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Dakota in the
-               United States
-            -->
+          <!-- A city in North Dakota in the United States -->
           <_name>Wahpeton</_name>
           <coordinates>46.265237 -96.605907</coordinates>
           <location>
@@ -45628,9 +42828,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in North Dakota in the
-               United States
-            -->
+          <!-- A city in North Dakota in the United States -->
           <_name>Williston</_name>
           <coordinates>48.146968 -103.617975</coordinates>
           <location>
@@ -45643,15 +42841,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Ohio</_name>
         <fips-code>US39</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
-          <_name>Akron</_name>
+          <!-- A city in Ohio in the United States -->
+          <_name msgctxt="City in Ohio, United States">Akron</_name>
           <coordinates>41.081445 -81.519005</coordinates>
           <location>
             <name>Akron Fulton International Airport</name>
@@ -45669,7 +42865,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
+          <!-- A city in Ohio in the United States -->
           <_name>Ashtabula</_name>
           <coordinates>41.865053 -80.789809</coordinates>
           <location>
@@ -45679,7 +42875,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
+          <!-- A city in Ohio in the United States -->
           <_name>Cincinnati</_name>
           <coordinates>39.162004 -84.456886</coordinates>
           <location>
@@ -45698,7 +42894,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
+          <!-- A city in Ohio in the United States -->
           <_name>Cleveland</_name>
           <coordinates>41.499495 -81.695409</coordinates>
           <location>
@@ -45724,8 +42920,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
-          <_name>Columbus</_name>
+          <!-- A city in Ohio in the United States -->
+          <_name msgctxt="City in Ohio, United States">Columbus</_name>
           <coordinates>39.961176 -82.998794</coordinates>
           <location>
             <name>Port Columbus International Airport</name>
@@ -45757,7 +42953,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
+          <!-- A city in Ohio in the United States -->
           <_name>Dayton</_name>
           <coordinates>39.758948 -84.191607</coordinates>
           <location>
@@ -45783,7 +42979,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
+          <!-- A city in Ohio in the United States -->
           <_name>Defiance</_name>
           <coordinates>41.284493 -84.355780</coordinates>
           <location>
@@ -45793,7 +42989,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
+          <!-- A city in Ohio in the United States -->
           <_name>Elyria</_name>
           <coordinates>41.368380 -82.107649</coordinates>
           <location>
@@ -45803,7 +42999,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
+          <!-- A city in Ohio in the United States -->
           <_name>Findlay</_name>
           <coordinates>41.044220 -83.649932</coordinates>
           <location>
@@ -45815,8 +43011,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
-          <_name>Hamilton</_name>
+          <!-- A city in Ohio in the United States -->
+          <_name msgctxt="City in Ohio, United States">Hamilton</_name>
           <coordinates>39.399501 -84.561335</coordinates>
           <location>
             <name>Butler County Regional Airport</name>
@@ -45827,8 +43023,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
-          <_name>Lancaster</_name>
+          <!-- A city in Ohio in the United States -->
+          <_name msgctxt="City in Ohio, United States">Lancaster</_name>
           <coordinates>39.713675 -82.599329</coordinates>
           <location>
             <name>Fairfield County Airport</name>
@@ -45839,8 +43035,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
-          <_name>Lima</_name>
+          <!-- A city in Ohio in the United States -->
+          <_name msgctxt="City in Ohio, United States">Lima</_name>
           <coordinates>40.742551 -84.105226</coordinates>
           <location>
             <name>Lima Allen County Airport</name>
@@ -45849,7 +43045,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
+          <!-- A city in Ohio in the United States -->
           <_name>Lorain</_name>
           <coordinates>41.452819 -82.182375</coordinates>
           <location>
@@ -45859,7 +43055,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
+          <!-- A city in Ohio in the United States -->
           <_name>Mansfield</_name>
           <coordinates>40.758390 -82.515447</coordinates>
           <location>
@@ -45871,8 +43067,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
-          <_name>Marion</_name>
+          <!-- A city in Ohio in the United States -->
+          <_name msgctxt="City in Ohio, United States">Marion</_name>
           <coordinates>40.588670 -83.128524</coordinates>
           <location>
             <name>Marion Municipal Airport</name>
@@ -45881,7 +43077,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
+          <!-- A city in Ohio in the United States -->
           <_name>New Philadelphia</_name>
           <coordinates>40.489787 -81.445671</coordinates>
           <location>
@@ -45891,8 +43087,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
-          <_name>Newark</_name>
+          <!-- A city in Ohio in the United States -->
+          <_name msgctxt="City in Ohio, United States">Newark</_name>
           <coordinates>40.058121 -82.401264</coordinates>
           <location>
             <name>Newark Heath Airport</name>
@@ -45901,8 +43097,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
-          <_name>Springfield</_name>
+          <!-- A city in Ohio in the United States -->
+          <_name msgctxt="City in Ohio, United States">Springfield</_name>
           <coordinates>39.924227 -83.808817</coordinates>
           <location>
             <name>Springfield-Beckley Municipal Airport</name>
@@ -45911,7 +43107,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
+          <!-- A city in Ohio in the United States -->
           <_name>Toledo</_name>
           <coordinates>41.663938 -83.555212</coordinates>
           <location>
@@ -45930,8 +43126,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
-          <_name>Wilmington</_name>
+          <!-- A city in Ohio in the United States -->
+          <_name msgctxt="City in Ohio, United States">Wilmington</_name>
           <coordinates>39.445339 -83.828537</coordinates>
           <location>
             <name>Airborne Airpark Airport</name>
@@ -45942,7 +43138,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
+          <!-- A city in Ohio in the United States -->
           <_name>Wooster</_name>
           <coordinates>40.805056 -81.935143</coordinates>
           <location>
@@ -45954,7 +43150,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
+          <!-- A city in Ohio in the United States -->
           <_name>Youngstown</_name>
           <coordinates>41.099780 -80.649519</coordinates>
           <location>
@@ -45966,7 +43162,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Ohio in the United States -->
+          <!-- A city in Ohio in the United States -->
           <_name>Zanesville</_name>
           <coordinates>39.940345 -82.013192</coordinates>
           <location>
@@ -45979,16 +43175,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Oklahoma</_name>
         <fips-code>US40</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Ada</_name>
           <coordinates>34.774531 -96.678345</coordinates>
           <location>
@@ -45998,9 +43190,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Altus</_name>
           <coordinates>34.638126 -99.333975</coordinates>
           <location>
@@ -46017,9 +43207,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Alva</_name>
           <coordinates>36.805031 -98.666474</coordinates>
           <location>
@@ -46029,9 +43217,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Ardmore</_name>
           <coordinates>34.174261 -97.143625</coordinates>
           <location>
@@ -46050,9 +43236,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Atoka</_name>
           <coordinates>34.385926 -96.128325</coordinates>
           <location>
@@ -46062,9 +43246,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Bartlesville</_name>
           <coordinates>36.747311 -95.980818</coordinates>
           <location>
@@ -46076,10 +43258,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
-          <_name>Chandler</_name>
+          <!-- A city in Oklahoma in the United States -->
+          <_name msgctxt="City in Oklahoma, United States">Chandler</_name>
           <coordinates>35.701731 -96.880858</coordinates>
           <location>
             <name>Chandler Municipal Airport</name>
@@ -46088,9 +43268,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Chickasha</_name>
           <coordinates>35.052565 -97.936433</coordinates>
           <location>
@@ -46100,9 +43278,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Claremore</_name>
           <coordinates>36.312596 -95.616090</coordinates>
           <location>
@@ -46112,10 +43288,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
-          <_name>Clinton</_name>
+          <!-- A city in Oklahoma in the United States -->
+          <_name msgctxt="City in Oklahoma, United States">Clinton</_name>
           <coordinates>35.515606 -98.967307</coordinates>
           <location>
             <name>Clinton Regional Airport</name>
@@ -46131,9 +43305,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Cushing</_name>
           <coordinates>35.985064 -96.766970</coordinates>
           <location>
@@ -46143,9 +43315,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Duncan</_name>
           <coordinates>34.502303 -97.957813</coordinates>
           <location>
@@ -46155,9 +43325,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Durant</_name>
           <coordinates>33.993986 -96.370824</coordinates>
           <location>
@@ -46167,9 +43335,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>El Reno</_name>
           <coordinates>35.532274 -97.955049</coordinates>
           <location>
@@ -46179,9 +43345,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Enid</_name>
           <coordinates>36.395589 -97.878391</coordinates>
           <location>
@@ -46200,10 +43364,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
-          <_name>Frederick</_name>
+          <!-- A city in Oklahoma in the United States -->
+          <_name msgctxt="City in Oklahoma, United States">Frederick</_name>
           <coordinates>34.392026 -99.018409</coordinates>
           <location>
             <name>Frederick Municipal Airport</name>
@@ -46212,9 +43374,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Gage</_name>
           <coordinates>36.315594 -99.757618</coordinates>
           <location>
@@ -46226,9 +43386,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Grove</_name>
           <coordinates>36.593686 -94.769119</coordinates>
           <location>
@@ -46238,9 +43396,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Guthrie</_name>
           <coordinates>35.878937 -97.425319</coordinates>
           <location>
@@ -46250,9 +43406,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Guymon</_name>
           <coordinates>36.682804 -101.481549</coordinates>
           <location>
@@ -46263,10 +43417,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
-          <_name>Hobart</_name>
+          <!-- A city in Oklahoma in the United States -->
+          <_name msgctxt="City in Oklahoma, United States">Hobart</_name>
           <coordinates>35.029501 -99.093132</coordinates>
           <location>
             <name>Hobart Municipal Airport</name>
@@ -46277,9 +43429,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Idabel</_name>
           <coordinates>33.895665 -94.826328</coordinates>
           <location>
@@ -46289,9 +43439,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Lawton</_name>
           <coordinates>34.608685 -98.390331</coordinates>
           <location>
@@ -46310,9 +43458,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>McAlester</_name>
           <coordinates>34.933430 -95.769713</coordinates>
           <location>
@@ -46324,9 +43470,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Muskogee</_name>
           <coordinates>35.747877 -95.369691</coordinates>
           <location>
@@ -46336,9 +43480,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Norman</_name>
           <coordinates>35.222567 -97.439478</coordinates>
           <location>
@@ -46348,9 +43490,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Oklahoma City</_name>
           <coordinates>35.467560 -97.516428</coordinates>
           <location>
@@ -46376,9 +43516,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Okmulgee</_name>
           <coordinates>35.623437 -95.960550</coordinates>
           <location>
@@ -46388,9 +43526,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Pauls Valley</_name>
           <coordinates>34.740081 -97.222245</coordinates>
           <location>
@@ -46400,9 +43536,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Ponca City</_name>
           <coordinates>36.706981 -97.085595</coordinates>
           <location>
@@ -46414,9 +43548,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Poteau</_name>
           <coordinates>35.053709 -94.623558</coordinates>
           <location>
@@ -46426,9 +43558,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Sallisaw</_name>
           <coordinates>35.460371 -94.787446</coordinates>
           <location>
@@ -46438,10 +43568,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
-          <_name>Seminole</_name>
+          <!-- A city in Oklahoma in the United States -->
+          <_name msgctxt="City in Oklahoma, United States">Seminole</_name>
           <coordinates>35.224520 -96.670573</coordinates>
           <location>
             <name>Seminole Municipal Airport</name>
@@ -46450,9 +43578,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Shawnee</_name>
           <coordinates>35.327293 -96.925300</coordinates>
           <location>
@@ -46462,9 +43588,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Stillwater</_name>
           <coordinates>36.115607 -97.058368</coordinates>
           <location>
@@ -46476,9 +43600,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Tahlequah</_name>
           <coordinates>35.915370 -94.969956</coordinates>
           <location>
@@ -46488,9 +43610,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Tulsa</_name>
           <coordinates>36.153982 -95.992775</coordinates>
           <location>
@@ -46509,9 +43629,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Weatherford</_name>
           <coordinates>35.526163 -98.707574</coordinates>
           <location>
@@ -46521,9 +43639,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oklahoma in the United
-               States
-            -->
+          <!-- A city in Oklahoma in the United States -->
           <_name>Woodward</_name>
           <coordinates>36.433648 -99.390386</coordinates>
           <location>
@@ -46534,16 +43650,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Oregon</_name>
         <fips-code>US41</fips-code>
         <tz-hint>America/Los_Angeles</tz-hint>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
+          <!-- A city in Oregon in the United States -->
           <_name>Astoria</_name>
           <coordinates>46.187884 -123.831253</coordinates>
           <location>
@@ -46555,10 +43667,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
-          <_name>Aurora</_name>
+          <!-- A city in Oregon in the United States -->
+          <_name msgctxt="City in Oregon, United States">Aurora</_name>
           <coordinates>45.230954 -122.755927</coordinates>
           <location>
             <name>Aurora State Airport</name>
@@ -46569,9 +43679,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
+          <!-- A city in Oregon in the United States -->
           <_name>Baker City</_name>
           <coordinates>44.774875 -117.834385</coordinates>
           <location>
@@ -46583,10 +43691,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
-          <_name>Brookings</_name>
+          <!-- A city in Oregon in the United States -->
+          <_name msgctxt="City in Oregon, United States">Brookings</_name>
           <coordinates>42.052611 -124.283982</coordinates>
           <location>
             <name>Brookings Airport</name>
@@ -46595,9 +43701,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
+          <!-- A city in Oregon in the United States -->
           <_name>Burns</_name>
           <coordinates>43.586261 -119.054103</coordinates>
           <location>
@@ -46609,9 +43713,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
+          <!-- A city in Oregon in the United States -->
           <_name>Corvallis</_name>
           <coordinates>44.564566 -123.262044</coordinates>
           <location>
@@ -46621,9 +43723,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
+          <!-- A city in Oregon in the United States -->
           <_name>Eugene</_name>
           <coordinates>44.052069 -123.086754</coordinates>
           <location>
@@ -46635,9 +43735,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
+          <!-- A city in Oregon in the United States -->
           <_name>Hermiston</_name>
           <coordinates>45.840410 -119.289461</coordinates>
           <location>
@@ -46647,9 +43745,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
+          <!-- A city in Oregon in the United States -->
           <_name>Klamath Falls</_name>
           <coordinates>42.224867 -121.781670</coordinates>
           <location>
@@ -46661,9 +43757,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
+          <!-- A city in Oregon in the United States -->
           <_name>La Grande</_name>
           <coordinates>45.324577 -118.087719</coordinates>
           <location>
@@ -46673,9 +43767,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
+          <!-- A city in Oregon in the United States -->
           <_name>Lakeview</_name>
           <coordinates>42.188772 -120.345792</coordinates>
           <location>
@@ -46687,9 +43779,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
+          <!-- A city in Oregon in the United States -->
           <_name>McMinnville</_name>
           <coordinates>45.210116 -123.198716</coordinates>
           <location>
@@ -46699,9 +43789,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
+          <!-- A city in Oregon in the United States -->
           <_name>Meacham</_name>
           <coordinates>45.506519 -118.421349</coordinates>
           <location>
@@ -46713,10 +43801,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
-          <_name>Medford</_name>
+          <!-- A city in Oregon in the United States -->
+          <_name msgctxt="City in Oregon, United States">Medford</_name>
           <coordinates>42.326515 -122.875595</coordinates>
           <location>
             <name>Rogue Valley International Airport</name>
@@ -46727,10 +43813,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
-          <_name>Newport</_name>
+          <!-- A city in Oregon in the United States -->
+          <_name msgctxt="City in Oregon, United States">Newport</_name>
           <coordinates>44.636784 -124.053450</coordinates>
           <location>
             <name>Newport Municipal Airport</name>
@@ -46741,9 +43825,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
+          <!-- A city in Oregon in the United States -->
           <_name>North Bend</_name>
           <coordinates>43.406501 -124.224280</coordinates>
           <location>
@@ -46755,10 +43837,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
-          <_name>Ontario</_name>
+          <!-- A city in Oregon in the United States -->
+          <_name msgctxt="City in Oregon, United States">Ontario</_name>
           <coordinates>44.026553 -116.962938</coordinates>
           <location>
             <name>Ontario Municipal Airport</name>
@@ -46770,9 +43850,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
+          <!-- A city in Oregon in the United States -->
           <_name>Pendleton</_name>
           <coordinates>45.672075 -118.788597</coordinates>
           <location>
@@ -46784,9 +43862,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
+          <!-- A city in Oregon in the United States -->
           <_name>Placer</_name>
           <coordinates>42.632063 -123.315339</coordinates>
           <location>
@@ -46798,10 +43874,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
-          <_name>Portland</_name>
+          <!-- A city in Oregon in the United States -->
+          <_name msgctxt="City in Oregon, United States">Portland</_name>
           <coordinates>45.523452 -122.676207</coordinates>
           <location>
             <name>Portland International Airport</name>
@@ -46826,9 +43900,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
+          <!-- A city in Oregon in the United States -->
           <_name>Redmond</_name>
           <coordinates>44.272620 -121.173921</coordinates>
           <location>
@@ -46840,10 +43912,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
-          <_name>Rome</_name>
+          <!-- A city in Oregon in the United States -->
+          <_name msgctxt="City in Oregon, United States">Rome</_name>
           <coordinates>42.839045 -117.628211</coordinates>
           <location>
             <name>Rome</name>
@@ -46853,9 +43923,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
+          <!-- A city in Oregon in the United States -->
           <_name>Roseburg</_name>
           <coordinates>43.216505 -123.341738</coordinates>
           <location>
@@ -46867,10 +43935,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
-          <_name>Salem</_name>
+          <!-- A city in Oregon in the United States -->
+          <_name msgctxt="City in Oregon, United States">Salem</_name>
           <coordinates>44.942898 -123.035096</coordinates>
           <location>
             <name>McNary Field</name>
@@ -46881,9 +43947,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
+          <!-- A city in Oregon in the United States -->
           <_name>Scappoose</_name>
           <coordinates>45.754281 -122.877604</coordinates>
           <location>
@@ -46893,9 +43957,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Oregon in the United
-               States
-            -->
+          <!-- A city in Oregon in the United States -->
           <_name>The Dalles</_name>
           <coordinates>45.594564 -121.178682</coordinates>
           <location>
@@ -46908,16 +43970,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Pennsylvania</_name>
         <fips-code>US42</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Allentown</_name>
           <coordinates>40.608430 -75.490183</coordinates>
           <location>
@@ -46929,9 +43987,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Altoona</_name>
           <coordinates>40.518681 -78.394736</coordinates>
           <location>
@@ -46943,9 +43999,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Beaver Falls</_name>
           <coordinates>40.752010 -80.319230</coordinates>
           <location>
@@ -46955,9 +44009,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Bradford</_name>
           <coordinates>41.955896 -78.643916</coordinates>
           <location>
@@ -46969,9 +44021,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Butler</_name>
           <coordinates>40.861176 -79.895333</coordinates>
           <location>
@@ -46981,9 +44031,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Clearfield</_name>
           <coordinates>41.027280 -78.439188</coordinates>
           <location>
@@ -46993,9 +44041,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Doylestown</_name>
           <coordinates>40.310106 -75.129894</coordinates>
           <location>
@@ -47005,9 +44051,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Du Bois</_name>
           <coordinates>41.119228 -78.760030</coordinates>
           <location>
@@ -47019,9 +44063,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Erie</_name>
           <coordinates>42.129224 -80.085059</coordinates>
           <location>
@@ -47033,10 +44075,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
-          <_name>Franklin</_name>
+          <!-- A city in Pennsylvania in the United States -->
+          <_name msgctxt="City in Pennsylvania, United States">Franklin</_name>
           <coordinates>41.397836 -79.831444</coordinates>
           <location>
             <name>Venango Regional Airport</name>
@@ -47047,10 +44087,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
-          <_name>Harrisburg</_name>
+          <!-- A city in Pennsylvania in the United States -->
+          <_name msgctxt="City in Pennsylvania, United States">Harrisburg</_name>
           <coordinates>40.273700 -76.884418</coordinates>
           <location>
             <name>Capital City Airport</name>
@@ -47068,10 +44106,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
-          <_name>Indiana</_name>
+          <!-- A city in Pennsylvania in the United States -->
+          <_name msgctxt="City in Pennsylvania, United States">Indiana</_name>
           <coordinates>40.621455 -79.152535</coordinates>
           <location>
             <name>Indiana / Stewart Field</name>
@@ -47080,9 +44116,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Indiantown</_name>
           <coordinates>40.409812 -76.580244</coordinates>
           <location>
@@ -47094,9 +44128,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Johnstown</_name>
           <coordinates>40.326741 -78.921970</coordinates>
           <location>
@@ -47108,10 +44140,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
-          <_name>Lancaster</_name>
+          <!-- A city in Pennsylvania in the United States -->
+          <_name msgctxt="City in Pennsylvania, United States">Lancaster</_name>
           <coordinates>40.037875 -76.305514</coordinates>
           <location>
             <name>Lancaster Airport</name>
@@ -47122,9 +44152,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Latrobe</_name>
           <coordinates>40.321181 -79.379481</coordinates>
           <location>
@@ -47136,9 +44164,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Meadville</_name>
           <coordinates>41.641444 -80.151448</coordinates>
           <location>
@@ -47148,9 +44174,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Mount Pocono</_name>
           <coordinates>41.122034 -75.364628</coordinates>
           <location>
@@ -47160,9 +44184,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Muir</_name>
           <coordinates>40.592310 -76.518572</coordinates>
           <location>
@@ -47174,9 +44196,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>New Castle</_name>
           <coordinates>41.003672 -80.347009</coordinates>
           <location>
@@ -47186,9 +44206,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Philadelphia</_name>
           <coordinates>39.952335 -75.163789</coordinates>
           <location>
@@ -47212,9 +44230,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Pittsburgh</_name>
           <coordinates>40.440625 -79.995886</coordinates>
           <location>
@@ -47233,9 +44249,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Pottstown</_name>
           <coordinates>40.245374 -75.649630</coordinates>
           <location>
@@ -47245,9 +44259,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Quakertown</_name>
           <coordinates>40.441768 -75.341567</coordinates>
           <location>
@@ -47257,9 +44269,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Reading</_name>
           <coordinates>40.335648 -75.926875</coordinates>
           <location>
@@ -47271,9 +44281,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Selinsgrove</_name>
           <coordinates>40.798974 -76.862194</coordinates>
           <location>
@@ -47283,9 +44291,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>State College</_name>
           <coordinates>40.793395 -77.860001</coordinates>
           <location>
@@ -47297,10 +44303,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
-          <_name>Washington</_name>
+          <!-- A city in Pennsylvania in the United States -->
+          <_name msgctxt="City in Pennsylvania, United States">Washington</_name>
           <coordinates>40.173960 -80.246171</coordinates>
           <location>
             <name>Washington County Airport</name>
@@ -47309,9 +44313,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Wilkes-Barre</_name>
           <coordinates>41.245915 -75.881308</coordinates>
           <location>
@@ -47323,9 +44325,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Williamsport</_name>
           <coordinates>41.241190 -77.001079</coordinates>
           <location>
@@ -47337,9 +44337,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
+          <!-- A city in Pennsylvania in the United States -->
           <_name>Willow Grove</_name>
           <coordinates>40.143999 -75.115729</coordinates>
           <location>
@@ -47349,10 +44347,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Pennsylvania in the
-               United States
-            -->
-          <_name>York</_name>
+          <!-- A city in Pennsylvania in the United States -->
+          <_name msgctxt="City in Pennsylvania, United States">York</_name>
           <coordinates>39.962598 -76.727745</coordinates>
           <location>
             <name>York Airport</name>
@@ -47362,16 +44358,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Rhode Island</_name>
         <fips-code>US44</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in Rhode Island in the
-               United States
-            -->
+          <!-- A city in Rhode Island in the United States -->
           <_name>New Shoreham</_name>
           <coordinates>41.172326 -71.557833</coordinates>
           <location>
@@ -47383,10 +44375,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Rhode Island in the
-               United States
-            -->
-          <_name>Newport</_name>
+          <!-- A city in Rhode Island in the United States -->
+          <_name msgctxt="City in Rhode Island, United States">Newport</_name>
           <coordinates>41.490102 -71.312828</coordinates>
           <location>
             <name>Newport State Airport</name>
@@ -47395,9 +44385,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Rhode Island in the
-               United States
-            -->
+          <!-- A city in Rhode Island in the United States -->
           <_name>Pawtucket</_name>
           <coordinates>41.878711 -71.382556</coordinates>
           <location>
@@ -47409,9 +44397,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Rhode Island in the
-               United States
-            -->
+          <!-- A city in Rhode Island in the United States -->
           <_name>Providence</_name>
           <coordinates>41.823989 -71.412834</coordinates>
           <location>
@@ -47430,9 +44416,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Rhode Island in the
-               United States
-            -->
+          <!-- A city in Rhode Island in the United States -->
           <_name>Westerly</_name>
           <coordinates>41.377600 -71.827291</coordinates>
           <location>
@@ -47443,17 +44427,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>South Carolina</_name>
         <fips-code>US45</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in South Carolina in the
-               United States
-            -->
-          <_name>Anderson</_name>
+          <!-- A city in South Carolina in the United States -->
+          <_name msgctxt="City in South Carolina, United States">Anderson</_name>
           <coordinates>34.503439 -82.650133</coordinates>
           <location>
             <name>Anderson County Airport</name>
@@ -47464,10 +44444,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Carolina in the
-               United States
-            -->
-          <_name>Beaufort</_name>
+          <!-- A city in South Carolina in the United States -->
+          <_name msgctxt="City in South Carolina, United States">Beaufort</_name>
           <coordinates>32.431581 -80.669829</coordinates>
           <location>
             <name>Beaufort, Marine Corps Air Station</name>
@@ -47478,10 +44456,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Carolina in the
-               United States
-            -->
-          <_name>Charleston</_name>
+          <!-- A city in South Carolina in the United States -->
+          <_name msgctxt="City in South Carolina, United States">Charleston</_name>
           <coordinates>32.776566 -79.930922</coordinates>
           <location>
             <name>Charleston Air Force Base</name>
@@ -47492,9 +44468,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Carolina in the
-               United States
-            -->
+          <!-- A city in South Carolina in the United States -->
           <_name>Clemson</_name>
           <coordinates>34.683438 -82.837365</coordinates>
           <location>
@@ -47504,10 +44478,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Carolina in the
-               United States
-            -->
-          <_name>Columbia</_name>
+          <!-- A city in South Carolina in the United States -->
+          <_name msgctxt="City in South Carolina, United States">Columbia</_name>
           <coordinates>34.000710 -81.034814</coordinates>
           <location>
             <name>Columbia Owens Downtown Airport</name>
@@ -47532,9 +44504,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Carolina in the
-               United States
-            -->
+          <!-- A city in South Carolina in the United States -->
           <_name>Dalzell</_name>
           <coordinates>34.016821 -80.430082</coordinates>
           <location>
@@ -47546,9 +44516,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Carolina in the
-               United States
-            -->
+          <!-- A city in South Carolina in the United States -->
           <_name>Darlington</_name>
           <coordinates>34.299876 -79.876174</coordinates>
           <location>
@@ -47558,10 +44526,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Carolina in the
-               United States
-            -->
-          <_name>Florence</_name>
+          <!-- A city in South Carolina in the United States -->
+          <_name msgctxt="City in South Carolina, United States">Florence</_name>
           <coordinates>34.195433 -79.762563</coordinates>
           <location>
             <name>Florence Regional Airport</name>
@@ -47572,10 +44538,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Carolina in the
-               United States
-            -->
-          <_name>Greenville</_name>
+          <!-- A city in South Carolina in the United States -->
+          <_name msgctxt="City in South Carolina, United States">Greenville</_name>
           <coordinates>34.852618 -82.394010</coordinates>
           <location>
             <name>Greenville Downtown Airport</name>
@@ -47586,10 +44550,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Carolina in the
-               United States
-            -->
-          <_name>Greenwood</_name>
+          <!-- A city in South Carolina in the United States -->
+          <_name msgctxt="City in South Carolina, United States">Greenwood</_name>
           <coordinates>34.195400 -82.161788</coordinates>
           <location>
             <name>Greenwood County Airport</name>
@@ -47598,9 +44560,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Carolina in the
-               United States
-            -->
+          <!-- A city in South Carolina in the United States -->
           <_name>Greer</_name>
           <coordinates>34.938728 -82.227057</coordinates>
           <location>
@@ -47612,9 +44572,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Carolina in the
-               United States
-            -->
+          <!-- A city in South Carolina in the United States -->
           <_name>Hilton Head Island</_name>
           <coordinates>32.216316 -80.752608</coordinates>
           <location>
@@ -47624,9 +44582,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Carolina in the
-               United States
-            -->
+          <!-- A city in South Carolina in the United States -->
           <_name>Myrtle Beach</_name>
           <coordinates>33.689060 -78.886694</coordinates>
           <location>
@@ -47638,9 +44594,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Carolina in the
-               United States
-            -->
+          <!-- A city in South Carolina in the United States -->
           <_name>North Myrtle Beach</_name>
           <coordinates>33.816006 -78.680016</coordinates>
           <location>
@@ -47652,9 +44606,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Carolina in the
-               United States
-            -->
+          <!-- A city in South Carolina in the United States -->
           <_name>Orangeburg</_name>
           <coordinates>33.491820 -80.855648</coordinates>
           <location>
@@ -47664,9 +44616,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Carolina in the
-               United States
-            -->
+          <!-- A city in South Carolina in the United States -->
           <_name>Rock Hill</_name>
           <coordinates>34.924867 -81.025078</coordinates>
           <location>
@@ -47677,17 +44627,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>South Dakota</_name>
         <fips-code>US46</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
-          <!-- Translators: this is a city in South Dakota in the
-               United States
-            -->
-          <_name>Aberdeen</_name>
+          <!-- A city in South Dakota in the United States -->
+          <_name msgctxt="City in South Dakota, United States">Aberdeen</_name>
           <coordinates>45.464698 -98.486483</coordinates>
           <location>
             <name>Aberdeen Regional Airport</name>
@@ -47698,9 +44644,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Dakota in the
-               United States
-            -->
+          <!-- A city in South Dakota in the United States -->
           <_name>Box Elder</_name>
           <coordinates>44.112488 -103.068232</coordinates>
           <location>
@@ -47713,10 +44657,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Dakota in the
-               United States
-            -->
-          <_name>Brookings</_name>
+          <!-- A city in South Dakota in the United States -->
+          <_name msgctxt="City in South Dakota, United States">Brookings</_name>
           <coordinates>44.311357 -96.798388</coordinates>
           <location>
             <name>Brookings Municipal Airport</name>
@@ -47727,10 +44669,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Dakota in the
-               United States
-            -->
-          <_name>Buffalo</_name>
+          <!-- A city in South Dakota in the United States -->
+          <_name msgctxt="City in South Dakota, United States">Buffalo</_name>
           <coordinates>45.584164 -103.546025</coordinates>
           <location>
             <name>Buffalo</name>
@@ -47740,9 +44680,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Dakota in the
-               United States
-            -->
+          <!-- A city in South Dakota in the United States -->
           <_name>Chamberlain</_name>
           <coordinates>43.810828 -99.330656</coordinates>
           <location>
@@ -47754,9 +44692,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Dakota in the
-               United States
-            -->
+          <!-- A city in South Dakota in the United States -->
           <_name>Custer</_name>
           <coordinates>43.766651 -103.598806</coordinates>
           <location>
@@ -47769,9 +44705,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Dakota in the
-               United States
-            -->
+          <!-- A city in South Dakota in the United States -->
           <_name>Faith</_name>
           <coordinates>45.023039 -102.035992</coordinates>
           <location>
@@ -47782,9 +44716,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Dakota in the
-               United States
-            -->
+          <!-- A city in South Dakota in the United States -->
           <_name>Huron</_name>
           <coordinates>44.363317 -98.214257</coordinates>
           <location>
@@ -47796,9 +44728,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Dakota in the
-               United States
-            -->
+          <!-- A city in South Dakota in the United States -->
           <_name>Mitchell</_name>
           <coordinates>43.709428 -98.029799</coordinates>
           <location>
@@ -47810,9 +44740,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Dakota in the
-               United States
-            -->
+          <!-- A city in South Dakota in the United States -->
           <_name>Mobridge</_name>
           <coordinates>45.537216 -100.427913</coordinates>
           <location>
@@ -47824,9 +44752,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Dakota in the
-               United States
-            -->
+          <!-- A city in South Dakota in the United States -->
           <_name>Philip</_name>
           <coordinates>44.039433 -101.665144</coordinates>
           <location>
@@ -47839,9 +44765,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Dakota in the
-               United States
-            -->
+          <!-- A city in South Dakota in the United States -->
           <_name>Pierre</_name>
           <coordinates>44.368316 -100.350966</coordinates>
           <location>
@@ -47853,9 +44777,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Dakota in the
-               United States
-            -->
+          <!-- A city in South Dakota in the United States -->
           <_name>Pine Ridge</_name>
           <coordinates>43.025541 -102.556274</coordinates>
           <location>
@@ -47866,9 +44788,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Dakota in the
-               United States
-            -->
+          <!-- A city in South Dakota in the United States -->
           <_name>Rapid City</_name>
           <coordinates>44.080543 -103.231015</coordinates>
           <location>
@@ -47881,9 +44801,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Dakota in the
-               United States
-            -->
+          <!-- A city in South Dakota in the United States -->
           <_name>Sioux Falls</_name>
           <coordinates>43.549975 -96.700327</coordinates>
           <location>
@@ -47895,9 +44813,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Dakota in the
-               United States
-            -->
+          <!-- A city in South Dakota in the United States -->
           <_name>Sisseton</_name>
           <coordinates>45.664682 -97.049805</coordinates>
           <location>
@@ -47907,10 +44823,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Dakota in the
-               United States
-            -->
-          <_name>Watertown</_name>
+          <!-- A city in South Dakota in the United States -->
+          <_name msgctxt="City in South Dakota, United States">Watertown</_name>
           <coordinates>44.899409 -97.115073</coordinates>
           <location>
             <name>Watertown Municipal Airport</name>
@@ -47921,9 +44835,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in South Dakota in the
-               United States
-            -->
+          <!-- A city in South Dakota in the United States -->
           <_name>Yankton</_name>
           <coordinates>42.871109 -97.397281</coordinates>
           <location>
@@ -47936,17 +44848,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Tennessee</_name>
         <fips-code>US47</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
-          <!-- Translators: this is a city in Tennessee in the United
-               States
-            -->
-          <_name>Bristol</_name>
+          <!-- A city in Tennessee in the United States -->
+          <_name msgctxt="City in Tennessee, United States">Bristol</_name>
           <coordinates>36.595106 -82.188744</coordinates>
           <location>
             <name>Bristol / Johnson / Kingsport, Tri-City Regional Airport</name>
@@ -47958,9 +44866,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Tennessee in the United
-               States
-            -->
+          <!-- A city in Tennessee in the United States -->
           <_name>Chattanooga</_name>
           <coordinates>35.045630 -85.309680</coordinates>
           <location>
@@ -47973,10 +44879,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Tennessee in the United
-               States
-            -->
-          <_name>Clarksville</_name>
+          <!-- A city in Tennessee in the United States -->
+          <_name msgctxt="City in Tennessee, United States">Clarksville</_name>
           <coordinates>36.529771 -87.359453</coordinates>
           <location>
             <name>Outlaw Field Airport</name>
@@ -47993,9 +44897,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Tennessee in the United
-               States
-            -->
+          <!-- A city in Tennessee in the United States -->
           <_name>Crossville</_name>
           <coordinates>35.948957 -85.026901</coordinates>
           <location>
@@ -48007,9 +44909,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Tennessee in the United
-               States
-            -->
+          <!-- A city in Tennessee in the United States -->
           <_name>Dyersburg</_name>
           <coordinates>36.034516 -89.385628</coordinates>
           <location>
@@ -48021,10 +44921,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Tennessee in the United
-               States
-            -->
-          <_name>Jackson</_name>
+          <!-- A city in Tennessee in the United States -->
+          <_name msgctxt="City in Tennessee, United States">Jackson</_name>
           <coordinates>35.614517 -88.813947</coordinates>
           <location>
             <name>McKellar-Sipes Regional Airport</name>
@@ -48035,9 +44933,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Tennessee in the United
-               States
-            -->
+          <!-- A city in Tennessee in the United States -->
           <_name>Kingsport</_name>
           <coordinates>36.548434 -82.561819</coordinates>
           <location>
@@ -48050,10 +44946,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Tennessee in the United
-               States
-            -->
-          <_name>Knoxville</_name>
+          <!-- A city in Tennessee in the United States -->
+          <_name msgctxt="City in Tennessee, United States">Knoxville</_name>
           <coordinates>35.960638 -83.920739</coordinates>
           <location>
             <name>McGhee Tyson Airport</name>
@@ -48065,9 +44959,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Tennessee in the United
-               States
-            -->
+          <!-- A city in Tennessee in the United States -->
           <_name>Memphis</_name>
           <coordinates>35.149534 -90.048980</coordinates>
           <location>
@@ -48079,9 +44971,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Tennessee in the United
-               States
-            -->
+          <!-- A city in Tennessee in the United States -->
           <_name>Millington</_name>
           <coordinates>35.341474 -89.897308</coordinates>
           <location>
@@ -48093,9 +44983,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Tennessee in the United
-               States
-            -->
+          <!-- A city in Tennessee in the United States -->
           <_name>Nashville</_name>
           <coordinates>36.165890 -86.784443</coordinates>
           <location>
@@ -48107,9 +44995,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Tennessee in the United
-               States
-            -->
+          <!-- A city in Tennessee in the United States -->
           <_name>Oak Ridge</_name>
           <coordinates>36.010356 -84.269645</coordinates>
           <location>
@@ -48120,9 +45006,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Tennessee in the United
-               States
-            -->
+          <!-- A city in Tennessee in the United States -->
           <_name>Smyrna</_name>
           <coordinates>35.982841 -86.518604</coordinates>
           <location>
@@ -48135,15 +45019,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Texas</_name>
         <fips-code>US48</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Abilene</_name>
           <coordinates>32.448736 -99.733144</coordinates>
           <location>
@@ -48162,8 +45043,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Alice</_name>
           <coordinates>27.752249 -98.069725</coordinates>
           <location>
@@ -48175,9 +45055,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Alpine</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Alpine</_name>
           <coordinates>30.358492 -103.661012</coordinates>
           <location>
             <name>Alpine-Casparis Municipal Airport</name>
@@ -48186,8 +45065,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Amarillo</_name>
           <coordinates>35.221997 -101.831297</coordinates>
           <location>
@@ -48199,8 +45077,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Angleton</_name>
           <coordinates>29.169410 -95.431885</coordinates>
           <location>
@@ -48211,9 +45088,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Arlington</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Arlington</_name>
           <coordinates>32.735687 -97.108066</coordinates>
           <location>
             <name>Arlington Municipal Airport</name>
@@ -48224,9 +45100,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Austin</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Austin</_name>
           <coordinates>30.267153 -97.743061</coordinates>
           <location>
             <name>Austin City, Austin Camp Mabry</name>
@@ -48244,8 +45119,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Bay City</_name>
           <coordinates>28.982757 -95.969402</coordinates>
           <location>
@@ -48255,8 +45129,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Beaumont</_name>
           <coordinates>30.086046 -94.101846</coordinates>
           <location>
@@ -48268,8 +45141,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Big Spring</_name>
           <coordinates>32.250398 -101.478736</coordinates>
           <location>
@@ -48279,8 +45151,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Borger</_name>
           <coordinates>35.667820 -101.397388</coordinates>
           <location>
@@ -48292,8 +45163,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Brady</_name>
           <coordinates>31.135168 -99.335055</coordinates>
           <location>
@@ -48303,8 +45173,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Brenham</_name>
           <coordinates>30.166883 -96.397744</coordinates>
           <location>
@@ -48314,8 +45183,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Brownsville</_name>
           <coordinates>25.901747 -97.497484</coordinates>
           <location>
@@ -48327,8 +45195,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Brownwood</_name>
           <coordinates>31.709320 -98.991161</coordinates>
           <location>
@@ -48338,8 +45205,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Burnet</_name>
           <coordinates>30.758238 -98.228358</coordinates>
           <location>
@@ -48350,9 +45216,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Caldwell</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Caldwell</_name>
           <coordinates>30.531315 -96.693030</coordinates>
           <location>
             <name>Caldwell Municipal Airport</name>
@@ -48361,8 +45226,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Canadian</_name>
           <coordinates>35.912820 -100.382077</coordinates>
           <location>
@@ -48372,8 +45236,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Carrollton</_name>
           <coordinates>32.953735 -96.890282</coordinates>
           <location>
@@ -48385,8 +45248,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Childress</_name>
           <coordinates>34.426453 -100.204002</coordinates>
           <location>
@@ -48398,9 +45260,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Clarksville</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Clarksville</_name>
           <coordinates>33.610665 -95.052722</coordinates>
           <location>
             <name>Clarksville / Red River County-J D Trissell Field Airport</name>
@@ -48409,8 +45270,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>College Station</_name>
           <coordinates>30.627977 -96.334407</coordinates>
           <location>
@@ -48422,8 +45282,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Conroe</_name>
           <coordinates>30.311877 -95.456051</coordinates>
           <location>
@@ -48434,8 +45293,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Corpus Christi</_name>
           <coordinates>27.800583 -97.396381</coordinates>
           <location>
@@ -48454,8 +45312,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Corsicana</_name>
           <coordinates>32.095430 -96.468873</coordinates>
           <location>
@@ -48467,8 +45324,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Cotulla</_name>
           <coordinates>28.436934 -99.235032</coordinates>
           <location>
@@ -48480,8 +45336,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Crockett</_name>
           <coordinates>31.318236 -95.456614</coordinates>
           <location>
@@ -48491,8 +45346,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Dalhart</_name>
           <coordinates>36.059477 -102.513250</coordinates>
           <location>
@@ -48504,8 +45358,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Dallas</_name>
           <coordinates>32.783056 -96.806667</coordinates>
           <location>
@@ -48538,9 +45391,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Decatur</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Decatur</_name>
           <coordinates>33.234283 -97.586139</coordinates>
           <location>
             <name>Decatur Municipal Airport</name>
@@ -48549,8 +45401,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Del Rio</_name>
           <coordinates>29.362730 -100.896761</coordinates>
           <location>
@@ -48562,9 +45413,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Denison</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Denison</_name>
           <coordinates>33.755659 -96.536658</coordinates>
           <location>
             <name>Sherman / Denison, Grayson County Airport</name>
@@ -48573,8 +45423,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Denton</_name>
           <coordinates>33.214841 -97.133068</coordinates>
           <location>
@@ -48585,9 +45434,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Dryden</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Dryden</_name>
           <coordinates>30.044635 -102.114578</coordinates>
           <location>
             <name>Terrel County Airport</name>
@@ -48596,8 +45444,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Dumas</_name>
           <coordinates>35.865595 -101.973235</coordinates>
           <location>
@@ -48607,8 +45454,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Edinburg</_name>
           <coordinates>26.301737 -98.163343</coordinates>
           <location>
@@ -48618,8 +45464,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>El Paso</_name>
           <coordinates>31.758720 -106.486931</coordinates>
           <location>
@@ -48632,8 +45477,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Falfurrias</_name>
           <coordinates>27.226987 -98.144171</coordinates>
           <location>
@@ -48643,8 +45487,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Fort Stockton</_name>
           <coordinates>30.894043 -102.879322</coordinates>
           <location>
@@ -48656,8 +45499,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Fort Worth</_name>
           <coordinates>32.725409 -97.320850</coordinates>
           <location>
@@ -48697,8 +45539,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Fredericksburg</_name>
           <coordinates>30.275201 -98.871984</coordinates>
           <location>
@@ -48708,9 +45549,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Gainesville</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Gainesville</_name>
           <coordinates>33.625941 -97.133345</coordinates>
           <location>
             <name>Gainesville Municipal Airport</name>
@@ -48719,8 +45559,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Galveston</_name>
           <coordinates>29.301348 -94.797696</coordinates>
           <location>
@@ -48732,8 +45571,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Garland</_name>
           <coordinates>32.912624 -96.638883</coordinates>
           <location>
@@ -48745,8 +45583,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Gatesville</_name>
           <coordinates>31.435164 -97.743911</coordinates>
           <location>
@@ -48756,9 +45593,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Georgetown</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Georgetown</_name>
           <coordinates>30.632694 -97.677231</coordinates>
           <location>
             <name>Georgetown Municipal Airport</name>
@@ -48769,8 +45605,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Giddings</_name>
           <coordinates>30.182716 -96.936371</coordinates>
           <location>
@@ -48780,8 +45615,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Gilmer</_name>
           <coordinates>32.728747 -94.942438</coordinates>
           <location>
@@ -48791,8 +45625,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Graham</_name>
           <coordinates>33.107060 -98.589502</coordinates>
           <location>
@@ -48802,8 +45635,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Granbury</_name>
           <coordinates>32.442083 -97.794197</coordinates>
           <location>
@@ -48813,8 +45645,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Grand Prairie</_name>
           <coordinates>32.745964 -96.997785</coordinates>
           <location>
@@ -48824,9 +45655,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Greenville</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Greenville</_name>
           <coordinates>33.138449 -96.110807</coordinates>
           <location>
             <name>Greenville / Majors</name>
@@ -48836,8 +45666,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Harlingen</_name>
           <coordinates>26.190631 -97.696103</coordinates>
           <location>
@@ -48849,8 +45678,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Hearne</_name>
           <coordinates>30.878524 -96.593026</coordinates>
           <location>
@@ -48860,8 +45688,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Hebbronville</_name>
           <coordinates>27.306706 -98.678352</coordinates>
           <location>
@@ -48871,8 +45698,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Hillsboro</_name>
           <coordinates>32.010989 -97.130006</coordinates>
           <location>
@@ -48882,8 +45708,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Hondo</_name>
           <coordinates>29.347456 -99.141425</coordinates>
           <location>
@@ -48895,8 +45720,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Houston</_name>
           <coordinates>29.763284 -95.363271</coordinates>
           <location>
@@ -48943,9 +45767,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Huntsville</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Huntsville</_name>
           <coordinates>30.723526 -95.550777</coordinates>
           <location>
             <name>Huntsville Municipal Airport</name>
@@ -48955,8 +45778,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Irving</_name>
           <coordinates>32.814018 -96.948894</coordinates>
           <location>
@@ -48968,9 +45790,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Jacksonville</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Jacksonville</_name>
           <coordinates>31.963778 -95.270504</coordinates>
           <location>
             <name>Cherokee County Airport</name>
@@ -48979,9 +45800,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Jasper</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Jasper</_name>
           <coordinates>30.920199 -93.996576</coordinates>
           <location>
             <name>Jasper County-Bell Field Airport</name>
@@ -48990,8 +45810,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Junction</_name>
           <coordinates>30.489355 -99.772011</coordinates>
           <location>
@@ -49003,8 +45822,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Kerrville</_name>
           <coordinates>30.047433 -99.140319</coordinates>
           <location>
@@ -49014,8 +45832,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Killeen</_name>
           <coordinates>31.117119 -97.727796</coordinates>
           <location>
@@ -49039,8 +45856,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Kingsville</_name>
           <coordinates>27.515869 -97.856109</coordinates>
           <location>
@@ -49052,9 +45868,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>La Grange</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">La Grange</_name>
           <coordinates>29.905503 -96.876647</coordinates>
           <location>
             <name>Fayette Regional Air Center Airport</name>
@@ -49063,8 +45878,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Lake Jackson</_name>
           <coordinates>29.033857 -95.434386</coordinates>
           <location>
@@ -49075,9 +45889,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Lancaster</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Lancaster</_name>
           <coordinates>32.592080 -96.756108</coordinates>
           <location>
             <name>Lancaster Airport</name>
@@ -49086,8 +45899,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Laredo</_name>
           <coordinates>27.506407 -99.507542</coordinates>
           <location>
@@ -49099,8 +45911,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Llano</_name>
           <coordinates>30.759345 -98.675038</coordinates>
           <location>
@@ -49110,8 +45921,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Longview</_name>
           <coordinates>32.500704 -94.740489</coordinates>
           <location>
@@ -49123,8 +45933,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Lubbock</_name>
           <coordinates>33.577863 -101.855166</coordinates>
           <location>
@@ -49136,8 +45945,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Lufkin</_name>
           <coordinates>31.338241 -94.729097</coordinates>
           <location>
@@ -49149,8 +45957,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Marfa</_name>
           <coordinates>30.307938 -104.019072</coordinates>
           <location>
@@ -49160,8 +45967,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>McAllen</_name>
           <coordinates>26.203407 -98.230012</coordinates>
           <location>
@@ -49173,8 +45979,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>McKinney</_name>
           <coordinates>33.197616 -96.615269</coordinates>
           <location>
@@ -49184,8 +45989,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Mesquite</_name>
           <coordinates>32.766796 -96.599159</coordinates>
           <location>
@@ -49195,8 +45999,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Midland</_name>
           <coordinates>31.997346 -102.077915</coordinates>
           <location>
@@ -49213,8 +46016,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Midlothian</_name>
           <coordinates>32.482361 -96.994449</coordinates>
           <location>
@@ -49224,8 +46026,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Mineral Wells</_name>
           <coordinates>32.808461 -98.112822</coordinates>
           <location>
@@ -49237,9 +46038,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Mount Pleasant</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Mount Pleasant</_name>
           <coordinates>33.156786 -94.968269</coordinates>
           <location>
             <name>Mount Pleasant Regional Airport</name>
@@ -49248,8 +46048,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Nacogdoches</_name>
           <coordinates>31.603513 -94.655487</coordinates>
           <location>
@@ -49261,8 +46060,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>New Braunfels</_name>
           <coordinates>29.703002 -98.124453</coordinates>
           <location>
@@ -49272,8 +46070,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Odessa</_name>
           <coordinates>31.845682 -102.367643</coordinates>
           <location>
@@ -49283,9 +46080,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Orange</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Orange</_name>
           <coordinates>30.092988 -93.736555</coordinates>
           <location>
             <name>Orange County Airport</name>
@@ -49294,8 +46090,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Palacios</_name>
           <coordinates>28.708046 -96.217467</coordinates>
           <location>
@@ -49307,8 +46102,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Palestine</_name>
           <coordinates>31.762115 -95.630789</coordinates>
           <location>
@@ -49318,8 +46112,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Pampa</_name>
           <coordinates>35.536156 -100.959871</coordinates>
           <location>
@@ -49329,9 +46122,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Paris</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Paris</_name>
           <coordinates>33.660939 -95.555513</coordinates>
           <location>
             <name>Paris / Cox Field</name>
@@ -49342,9 +46134,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Pasadena</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Pasadena</_name>
           <coordinates>29.691063 -95.209101</coordinates>
           <location>
             <name>Houston, Houston Hobby Airport</name>
@@ -49355,8 +46146,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Pecos</_name>
           <coordinates>31.422912 -103.493229</coordinates>
           <location>
@@ -49366,8 +46156,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Perryton</_name>
           <coordinates>36.400031 -100.802650</coordinates>
           <location>
@@ -49377,8 +46166,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Pine Springs</_name>
           <coordinates>31.892616 -104.815503</coordinates>
           <location>
@@ -49390,8 +46178,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Plainview</_name>
           <coordinates>34.184794 -101.706842</coordinates>
           <location>
@@ -49401,8 +46188,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Plano</_name>
           <coordinates>33.019843 -96.698886</coordinates>
           <location>
@@ -49414,8 +46200,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Port Aransas</_name>
           <coordinates>27.833916 -97.061099</coordinates>
           <location>
@@ -49425,8 +46210,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Port Arthur</_name>
           <coordinates>29.898826 -93.928781</coordinates>
           <location>
@@ -49438,8 +46222,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Port Isabel</_name>
           <coordinates>26.073412 -97.208584</coordinates>
           <location>
@@ -49449,8 +46232,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Port Lavaca</_name>
           <coordinates>28.614997 -96.626089</coordinates>
           <location>
@@ -49460,8 +46242,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Rockport</_name>
           <coordinates>28.020573 -97.054434</coordinates>
           <location>
@@ -49473,8 +46254,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Rocksprings</_name>
           <coordinates>30.015765 -100.205358</coordinates>
           <location>
@@ -49484,8 +46264,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Sabine Pass</_name>
           <coordinates>29.733552 -93.894333</coordinates>
           <location>
@@ -49496,8 +46275,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>San Angelo</_name>
           <coordinates>31.463772 -100.437038</coordinates>
           <location>
@@ -49509,8 +46287,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>San Antonio</_name>
           <coordinates>29.424122 -98.493628</coordinates>
           <location>
@@ -49536,8 +46313,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>San Marcos</_name>
           <coordinates>29.883275 -97.941394</coordinates>
           <location>
@@ -49547,9 +46323,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Seminole</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Seminole</_name>
           <coordinates>32.718993 -102.644910</coordinates>
           <location>
             <name>Gaines County Airport</name>
@@ -49558,8 +46333,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Sherman</_name>
           <coordinates>33.635662 -96.608880</coordinates>
           <location>
@@ -49569,8 +46343,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Snyder</_name>
           <coordinates>32.717886 -100.917618</coordinates>
           <location>
@@ -49580,9 +46353,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Sonora</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Sonora</_name>
           <coordinates>30.566848 -100.643427</coordinates>
           <location>
             <name>Sonora Municipal Airport</name>
@@ -49591,8 +46363,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Spofford</_name>
           <coordinates>29.175239 -100.413688</coordinates>
           <location>
@@ -49603,9 +46374,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Stephenville</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Stephenville</_name>
           <coordinates>32.220696 -98.202263</coordinates>
           <location>
             <name>Clark Field Municipal Airport</name>
@@ -49614,8 +46384,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Sugar Land</_name>
           <coordinates>29.619679 -95.634946</coordinates>
           <location>
@@ -49627,8 +46396,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Sulphur Springs</_name>
           <coordinates>33.138448 -95.601067</coordinates>
           <location>
@@ -49638,8 +46406,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Sweetwater</_name>
           <coordinates>32.470952 -100.405938</coordinates>
           <location>
@@ -49649,8 +46416,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Temple</_name>
           <coordinates>31.098234 -97.342782</coordinates>
           <location>
@@ -49662,8 +46428,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Terrell</_name>
           <coordinates>32.735963 -96.275257</coordinates>
           <location>
@@ -49674,8 +46439,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Tyler</_name>
           <coordinates>32.351260 -95.301062</coordinates>
           <location>
@@ -49687,8 +46451,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Universal City</_name>
           <coordinates>29.548007 -98.291123</coordinates>
           <location>
@@ -49699,8 +46462,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Uvalde</_name>
           <coordinates>29.209684 -99.786168</coordinates>
           <location>
@@ -49710,9 +46472,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Vernon</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Vernon</_name>
           <coordinates>34.154531 -99.265080</coordinates>
           <location>
             <name>Wilbarger County Airport</name>
@@ -49721,9 +46482,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
-          <_name>Victoria</_name>
+          <!-- A city in Texas in the United States -->
+          <_name msgctxt="City in Texas, United States">Victoria</_name>
           <coordinates>28.805267 -97.003598</coordinates>
           <location>
             <name>Victoria Regional Airport</name>
@@ -49734,8 +46494,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Waco</_name>
           <coordinates>31.549333 -97.146670</coordinates>
           <location>
@@ -49753,8 +46512,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Waxahachie</_name>
           <coordinates>32.386531 -96.848331</coordinates>
           <location>
@@ -49764,8 +46522,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Weslaco</_name>
           <coordinates>26.159519 -97.990837</coordinates>
           <location>
@@ -49775,8 +46532,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Wharton</_name>
           <coordinates>29.311637 -96.102737</coordinates>
           <location>
@@ -49786,8 +46542,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Wichita Falls</_name>
           <coordinates>33.913708 -98.493387</coordinates>
           <location>
@@ -49799,8 +46554,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Texas in the United States
-            -->
+          <!-- A city in Texas in the United States -->
           <_name>Wink</_name>
           <coordinates>31.751240 -103.159888</coordinates>
           <location>
@@ -49813,14 +46567,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Utah</_name>
         <fips-code>US49</fips-code>
         <tz-hint>America/Denver</tz-hint>
         <city>
-          <!-- Translators: this is a city in Utah in the United States -->
+          <!-- A city in Utah in the United States -->
           <_name>Bryce Canyon</_name>
           <coordinates>37.628316 -112.167695</coordinates>
           <location>
@@ -49832,7 +46584,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Utah in the United States -->
+          <!-- A city in Utah in the United States -->
           <_name>Cedar City</_name>
           <coordinates>37.677477 -113.061893</coordinates>
           <location>
@@ -49844,7 +46596,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Utah in the United States -->
+          <!-- A city in Utah in the United States -->
           <_name>Delta</_name>
           <coordinates>39.352178 -112.577170</coordinates>
           <location>
@@ -49856,7 +46608,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Utah in the United States -->
+          <!-- A city in Utah in the United States -->
           <_name>Green River</_name>
           <coordinates>38.995250 -110.161804</coordinates>
           <location>
@@ -49866,7 +46618,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Utah in the United States -->
+          <!-- A city in Utah in the United States -->
           <_name>Hanksville</_name>
           <coordinates>38.373038 -110.714039</coordinates>
           <location>
@@ -49878,7 +46630,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Utah in the United States -->
+          <!-- A city in Utah in the United States -->
           <_name>Lakeside</_name>
           <coordinates>41.222430 -112.865534</coordinates>
           <location>
@@ -49888,7 +46640,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Utah in the United States -->
+          <!-- A city in Utah in the United States -->
           <_name>Logan</_name>
           <coordinates>41.735486 -111.834388</coordinates>
           <location>
@@ -49900,7 +46652,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Utah in the United States -->
+          <!-- A city in Utah in the United States -->
           <_name>Milford</_name>
           <coordinates>38.396911 -113.010789</coordinates>
           <location>
@@ -49912,7 +46664,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Utah in the United States -->
+          <!-- A city in Utah in the United States -->
           <_name>Moab</_name>
           <coordinates>38.573315 -109.549840</coordinates>
           <location>
@@ -49922,7 +46674,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Utah in the United States -->
+          <!-- A city in Utah in the United States -->
           <_name>Ogden</_name>
           <coordinates>41.223000 -111.973830</coordinates>
           <location>
@@ -49941,7 +46693,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Utah in the United States -->
+          <!-- A city in Utah in the United States -->
           <_name>Price</_name>
           <coordinates>39.599410 -110.810715</coordinates>
           <location>
@@ -49953,7 +46705,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Utah in the United States -->
+          <!-- A city in Utah in the United States -->
           <_name>Provo</_name>
           <coordinates>40.233844 -111.658534</coordinates>
           <location>
@@ -49965,7 +46717,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Utah in the United States -->
+          <!-- A city in Utah in the United States -->
           <_name>Salt Lake City</_name>
           <coordinates>40.760779 -111.891047</coordinates>
           <location>
@@ -49977,8 +46729,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Utah in the United States -->
-          <_name>Santa Clara</_name>
+          <!-- A city in Utah in the United States -->
+          <_name msgctxt="City in Utah, United States">Santa Clara</_name>
           <coordinates>37.133035 -113.654127</coordinates>
           <location>
             <name>St George, St George Municipal Airport</name>
@@ -49989,7 +46741,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Utah in the United States -->
+          <!-- A city in Utah in the United States -->
           <_name>Vernal</_name>
           <coordinates>40.455516 -109.528748</coordinates>
           <location>
@@ -50001,7 +46753,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Utah in the United States -->
+          <!-- A city in Utah in the United States -->
           <_name>Wendover</_name>
           <coordinates>40.737152 -114.037510</coordinates>
           <location>
@@ -50013,7 +46765,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Utah in the United States -->
+          <!-- A city in Utah in the United States -->
           <_name>West Valley City</_name>
           <coordinates>40.691613 -112.001050</coordinates>
           <location>
@@ -50026,16 +46778,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Vermont</_name>
         <fips-code>US50</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in Vermont in the United
-               States
-            -->
+          <!-- A city in Vermont in the United States -->
           <_name>Barre</_name>
           <coordinates>44.197006 -72.502049</coordinates>
           <location>
@@ -50047,9 +46795,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Vermont in the United
-               States
-            -->
+          <!-- A city in Vermont in the United States -->
           <_name>Bennington</_name>
           <coordinates>42.878135 -73.196774</coordinates>
           <location>
@@ -50059,10 +46805,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Vermont in the United
-               States
-            -->
-          <_name>Burlington</_name>
+          <!-- A city in Vermont in the United States -->
+          <_name msgctxt="City in Vermont, United States">Burlington</_name>
           <coordinates>44.475882 -73.212072</coordinates>
           <location>
             <name>Burlington International Airport</name>
@@ -50073,9 +46817,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Vermont in the United
-               States
-            -->
+          <!-- A city in Vermont in the United States -->
           <_name>Montpelier</_name>
           <coordinates>44.260059 -72.575387</coordinates>
           <location>
@@ -50087,9 +46829,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Vermont in the United
-               States
-            -->
+          <!-- A city in Vermont in the United States -->
           <_name>Morrisville</_name>
           <coordinates>44.561719 -72.598449</coordinates>
           <location>
@@ -50099,9 +46839,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Vermont in the United
-               States
-            -->
+          <!-- A city in Vermont in the United States -->
           <_name>Rutland</_name>
           <coordinates>43.610624 -72.972606</coordinates>
           <location>
@@ -50113,9 +46851,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Vermont in the United
-               States
-            -->
+          <!-- A city in Vermont in the United States -->
           <_name>Saint Johnsbury</_name>
           <coordinates>44.419225 -72.015095</coordinates>
           <location>
@@ -50127,10 +46863,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Vermont in the United
-               States
-            -->
-          <_name>Springfield</_name>
+          <!-- A city in Vermont in the United States -->
+          <_name msgctxt="City in Vermont, United States">Springfield</_name>
           <coordinates>43.298408 -72.482312</coordinates>
           <location>
             <name>Hartness State Springfield Airport</name>
@@ -50142,16 +46876,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Virginia</_name>
         <fips-code>US51</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Abingdon</_name>
           <coordinates>36.709834 -81.977348</coordinates>
           <location>
@@ -50163,10 +46893,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
-          <_name>Alexandria</_name>
+          <!-- A city in Virginia in the United States -->
+          <_name msgctxt="City in Virginia, United States">Alexandria</_name>
           <coordinates>38.804836 -77.046921</coordinates>
           <location>
             <name>Washington DC, Reagan National Airport</name>
@@ -50177,10 +46905,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
-          <_name>Ashland</_name>
+          <!-- A city in Virginia in the United States -->
+          <_name msgctxt="City in Virginia, United States">Ashland</_name>
           <coordinates>37.759032 -77.479984</coordinates>
           <location>
             <name>Hanover County Municipal Airport</name>
@@ -50191,9 +46917,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Blacksburg</_name>
           <coordinates>37.229573 -80.413939</coordinates>
           <location>
@@ -50205,9 +46929,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Charlottesville</_name>
           <coordinates>38.029306 -78.476678</coordinates>
           <location>
@@ -50219,9 +46941,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Chesapeake</_name>
           <coordinates>36.819037 -76.274940</coordinates>
           <location>
@@ -50231,9 +46951,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Chincoteague</_name>
           <coordinates>37.933179 -75.378809</coordinates>
           <location>
@@ -50244,9 +46962,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Culpeper</_name>
           <coordinates>38.473182 -77.996664</coordinates>
           <location>
@@ -50256,10 +46972,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
-          <_name>Danville</_name>
+          <!-- A city in Virginia in the United States -->
+          <_name msgctxt="City in Virginia, United States">Danville</_name>
           <coordinates>36.585972 -79.395023</coordinates>
           <location>
             <name>Danville Regional Airport</name>
@@ -50270,10 +46984,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
-          <_name>Dublin</_name>
+          <!-- A city in Virginia in the United States -->
+          <_name msgctxt="City in Virginia, United States">Dublin</_name>
           <coordinates>37.105678 -80.685343</coordinates>
           <location>
             <name>Dublin / New River Valley</name>
@@ -50284,10 +46996,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
-          <_name>Emporia</_name>
+          <!-- A city in Virginia in the United States -->
+          <_name msgctxt="City in Virginia, United States">Emporia</_name>
           <coordinates>36.685983 -77.542481</coordinates>
           <location>
             <name>Emporia-Greensville Regional Airport</name>
@@ -50296,9 +47006,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Farmville</_name>
           <coordinates>37.302096 -78.391940</coordinates>
           <location>
@@ -50310,10 +47018,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
-          <_name>Franklin</_name>
+          <!-- A city in Virginia in the United States -->
+          <_name msgctxt="City in Virginia, United States">Franklin</_name>
           <coordinates>36.677651 -76.922461</coordinates>
           <location>
             <name>Franklin / J B Rose</name>
@@ -50324,9 +47030,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Hampton</_name>
           <coordinates>37.029869 -76.345222</coordinates>
           <location>
@@ -50338,9 +47042,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Hillsville</_name>
           <coordinates>36.762628 -80.734795</coordinates>
           <location>
@@ -50352,10 +47054,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
-          <_name>Hot Springs</_name>
+          <!-- A city in Virginia in the United States -->
+          <_name msgctxt="City in Virginia, United States">Hot Springs</_name>
           <coordinates>37.999570 -79.831719</coordinates>
           <location>
             <name>Hot Springs / Ingalls</name>
@@ -50366,10 +47066,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
-          <_name>Leesburg</_name>
+          <!-- A city in Virginia in the United States -->
+          <_name msgctxt="City in Virginia, United States">Leesburg</_name>
           <coordinates>39.115662 -77.563602</coordinates>
           <location>
             <name>Leesburg / Godfrey</name>
@@ -50380,9 +47078,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Louisa</_name>
           <coordinates>38.025139 -78.004165</coordinates>
           <location>
@@ -50392,9 +47088,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Lynchburg</_name>
           <coordinates>37.413754 -79.142246</coordinates>
           <location>
@@ -50406,9 +47100,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Manassas</_name>
           <coordinates>38.750949 -77.475267</coordinates>
           <location>
@@ -50420,10 +47112,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
-          <_name>Marion</_name>
+          <!-- A city in Virginia in the United States -->
+          <_name msgctxt="City in Virginia, United States">Marion</_name>
           <coordinates>36.834838 -81.514837</coordinates>
           <location>
             <name>Marion / Wytheville</name>
@@ -50434,9 +47124,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Martinsville</_name>
           <coordinates>36.691526 -79.872539</coordinates>
           <location>
@@ -50448,9 +47136,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Melfa</_name>
           <coordinates>37.649299 -75.741318</coordinates>
           <location>
@@ -50462,10 +47148,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
-          <_name>New River</_name>
+          <!-- A city in Virginia in the United States -->
+          <_name msgctxt="City in Virginia, United States">New River</_name>
           <coordinates>37.133459 -80.591449</coordinates>
           <location>
             <name>Dublin / New River Valley</name>
@@ -50476,9 +47160,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Newport News</_name>
           <coordinates>36.978759 -76.428003</coordinates>
           <location>
@@ -50496,10 +47178,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
-          <_name>Norfolk</_name>
+          <!-- A city in Virginia in the United States -->
+          <_name msgctxt="City in Virginia, United States">Norfolk</_name>
           <coordinates>36.846815 -76.285218</coordinates>
           <location>
             <name>Norfolk, Naval Air Station</name>
@@ -50517,9 +47197,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Oceana</_name>
           <coordinates>36.842093 -76.012986</coordinates>
           <location>
@@ -50531,10 +47209,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
-          <_name>Orange</_name>
+          <!-- A city in Virginia in the United States -->
+          <_name msgctxt="City in Virginia, United States">Orange</_name>
           <coordinates>38.245411 -78.110834</coordinates>
           <location>
             <name>Orange County Airport</name>
@@ -50543,10 +47219,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
-          <_name>Petersburg</_name>
+          <!-- A city in Virginia in the United States -->
+          <_name msgctxt="City in Virginia, United States">Petersburg</_name>
           <coordinates>37.227928 -77.401927</coordinates>
           <location>
             <name>Dinwiddie County Airport</name>
@@ -50557,9 +47231,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Pohick</_name>
           <coordinates>38.710115 -77.196648</coordinates>
           <location>
@@ -50571,10 +47243,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
-          <_name>Portsmouth</_name>
+          <!-- A city in Virginia in the United States -->
+          <_name msgctxt="City in Virginia, United States">Portsmouth</_name>
           <coordinates>36.835426 -76.298274</coordinates>
           <location>
             <name>Norfolk, Naval Air Station</name>
@@ -50585,9 +47255,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Quantico</_name>
           <coordinates>38.522343 -77.293593</coordinates>
           <location>
@@ -50599,9 +47267,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Richlands</_name>
           <coordinates>37.093169 -81.793727</coordinates>
           <location>
@@ -50611,10 +47277,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
-          <_name>Richmond</_name>
+          <!-- A city in Virginia in the United States -->
+          <_name msgctxt="City in Virginia, United States">Richmond</_name>
           <coordinates>37.553758 -77.460262</coordinates>
           <location>
             <name>Richmond International Airport</name>
@@ -50625,9 +47289,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Roanoke</_name>
           <coordinates>37.270970 -79.941427</coordinates>
           <location>
@@ -50639,10 +47301,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
-          <_name>Shenandoah</_name>
+          <!-- A city in Virginia in the United States -->
+          <_name msgctxt="City in Virginia, United States">Shenandoah</_name>
           <coordinates>38.485124 -78.625016</coordinates>
           <location>
             <name>Staunton / Shenandoah</name>
@@ -50653,9 +47313,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>South Hill</_name>
           <coordinates>36.726532 -78.128886</coordinates>
           <location>
@@ -50665,9 +47323,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Stafford</_name>
           <coordinates>38.422069 -77.408316</coordinates>
           <location>
@@ -50677,9 +47333,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Staunton</_name>
           <coordinates>38.149576 -79.071696</coordinates>
           <location>
@@ -50691,9 +47345,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Suffolk</_name>
           <coordinates>36.728205 -76.583562</coordinates>
           <location>
@@ -50703,9 +47355,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Virginia Beach</_name>
           <coordinates>36.852926 -75.977985</coordinates>
           <location>
@@ -50717,9 +47367,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Wakefield</_name>
           <coordinates>36.968206 -76.989683</coordinates>
           <location>
@@ -50731,10 +47379,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
-          <_name>West Point</_name>
+          <!-- A city in Virginia in the United States -->
+          <_name msgctxt="City in Virginia, United States">West Point</_name>
           <coordinates>37.531534 -76.796350</coordinates>
           <location>
             <name>Middle Peninsula Regional Airport</name>
@@ -50743,9 +47389,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Williamsburg</_name>
           <coordinates>37.270702 -76.707457</coordinates>
           <location>
@@ -50755,9 +47399,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Winchester</_name>
           <coordinates>39.185660 -78.163334</coordinates>
           <location>
@@ -50769,9 +47411,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Wise</_name>
           <coordinates>36.975935 -82.575711</coordinates>
           <location>
@@ -50783,9 +47423,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Virginia in the United
-               States
-            -->
+          <!-- A city in Virginia in the United States -->
           <_name>Wytheville</_name>
           <coordinates>36.948453 -81.084811</coordinates>
           <location>
@@ -50798,17 +47436,13 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
-        <_name>Washington</_name>
+        <!-- A state/province/territory in United States -->
+        <_name msgctxt="State in United States">Washington</_name>
         <fips-code>US53</fips-code>
         <tz-hint>America/Los_Angeles</tz-hint>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
-          <_name>Arlington</_name>
+          <!-- A city in Washington in the United States -->
+          <_name msgctxt="City in Washington, United States">Arlington</_name>
           <coordinates>48.198712 -122.125142</coordinates>
           <location>
             <name>Arlington Municipal</name>
@@ -50817,9 +47451,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Bellevue</_name>
           <coordinates>47.610377 -122.200679</coordinates>
           <location>
@@ -50831,9 +47463,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Bellingham</_name>
           <coordinates>48.759553 -122.488225</coordinates>
           <location>
@@ -50845,9 +47475,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Bremerton</_name>
           <coordinates>47.567318 -122.632639</coordinates>
           <location>
@@ -50859,10 +47487,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
-          <_name>Burlington</_name>
+          <!-- A city in Washington in the United States -->
+          <_name msgctxt="City in Washington, United States">Burlington</_name>
           <coordinates>48.475662 -122.325438</coordinates>
           <location>
             <name>Burlington / Mount Vernon, Skagit Regional Airport</name>
@@ -50873,9 +47499,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Deer Park</_name>
           <coordinates>47.954338 -117.476891</coordinates>
           <location>
@@ -50885,9 +47509,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Eastsound</_name>
           <coordinates>48.696771 -122.905462</coordinates>
           <location>
@@ -50897,9 +47519,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Ellensburg</_name>
           <coordinates>46.996514 -120.547847</coordinates>
           <location>
@@ -50909,9 +47529,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Ephrata</_name>
           <coordinates>47.317639 -119.553649</coordinates>
           <location>
@@ -50923,9 +47541,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Everett</_name>
           <coordinates>47.978985 -122.202079</coordinates>
           <location>
@@ -50937,9 +47553,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Fairchild</_name>
           <coordinates>47.634054 -117.668552</coordinates>
           <location>
@@ -50950,9 +47564,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Friday Harbor</_name>
           <coordinates>48.534266 -123.017124</coordinates>
           <location>
@@ -50964,10 +47576,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
-          <_name>Hanford</_name>
+          <!-- A city in Washington in the United States -->
+          <_name msgctxt="City in Washington, United States">Hanford</_name>
           <coordinates>46.583748 -119.387799</coordinates>
           <location>
             <name>Hanford</name>
@@ -50976,9 +47586,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Hoquiam</_name>
           <coordinates>46.980925 -123.889335</coordinates>
           <location>
@@ -50988,9 +47596,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Kelso</_name>
           <coordinates>46.146779 -122.908445</coordinates>
           <location>
@@ -51000,9 +47606,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Moses Lake</_name>
           <coordinates>47.130142 -119.278077</coordinates>
           <location>
@@ -51014,10 +47618,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
-          <_name>Mount Vernon</_name>
+          <!-- A city in Washington in the United States -->
+          <_name msgctxt="City in Washington, United States">Mount Vernon</_name>
           <coordinates>48.421216 -122.334047</coordinates>
           <location>
             <name>Burlington / Mount Vernon, Skagit Regional Airport</name>
@@ -51028,9 +47630,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Oak Harbor</_name>
           <coordinates>48.293156 -122.643225</coordinates>
           <location>
@@ -51042,9 +47642,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Olympia</_name>
           <coordinates>47.037874 -122.900695</coordinates>
           <location>
@@ -51056,9 +47654,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Omak</_name>
           <coordinates>48.410985 -119.527551</coordinates>
           <location>
@@ -51068,9 +47664,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Pasco</_name>
           <coordinates>46.239579 -119.100566</coordinates>
           <location>
@@ -51082,9 +47676,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Port Angeles</_name>
           <coordinates>48.118146 -123.430741</coordinates>
           <location>
@@ -51096,9 +47688,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Pullman</_name>
           <coordinates>46.731274 -117.179616</coordinates>
           <location>
@@ -51110,9 +47700,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Quillayute</_name>
           <coordinates>47.943130 -124.542435</coordinates>
           <location>
@@ -51123,9 +47711,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Renton</_name>
           <coordinates>47.482878 -122.217066</coordinates>
           <location>
@@ -51137,9 +47723,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Seattle</_name>
           <coordinates>47.606209 -122.332071</coordinates>
           <location>
@@ -51158,9 +47742,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Shelton</_name>
           <coordinates>47.215094 -123.100707</coordinates>
           <location>
@@ -51172,9 +47754,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Spokane</_name>
           <coordinates>47.658780 -117.426047</coordinates>
           <location>
@@ -51193,9 +47773,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Stampede</_name>
           <coordinates>47.262890 -121.366482</coordinates>
           <location>
@@ -51206,9 +47784,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Tacoma</_name>
           <coordinates>47.252877 -122.444291</coordinates>
           <location>
@@ -51227,9 +47803,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Tillicum</_name>
           <coordinates>47.123431 -122.557070</coordinates>
           <location>
@@ -51241,10 +47815,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
-          <_name>Vancouver</_name>
+          <!-- A city in Washington in the United States -->
+          <_name msgctxt="City in Washington, United States">Vancouver</_name>
           <coordinates>45.638728 -122.661486</coordinates>
           <location>
             <name>Pearson Field Airport</name>
@@ -51255,9 +47827,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Walla Walla</_name>
           <coordinates>46.064581 -118.343021</coordinates>
           <location>
@@ -51269,9 +47839,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Wenatchee</_name>
           <coordinates>47.423460 -120.310349</coordinates>
           <location>
@@ -51283,9 +47851,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Washington in the United
-               States
-            -->
+          <!-- A city in Washington in the United States -->
           <_name>Yakima</_name>
           <coordinates>46.602071 -120.505899</coordinates>
           <location>
@@ -51298,16 +47864,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>West Virginia</_name>
         <fips-code>US54</fips-code>
         <tz-hint>America/New_York</tz-hint>
         <city>
-          <!-- Translators: this is a city in West Virginia in the
-               United States
-            -->
+          <!-- A city in West Virginia in the United States -->
           <_name>Beckley</_name>
           <coordinates>37.778170 -81.188156</coordinates>
           <location>
@@ -51319,9 +47881,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in West Virginia in the
-               United States
-            -->
+          <!-- A city in West Virginia in the United States -->
           <_name>Bluefield</_name>
           <coordinates>37.269840 -81.222319</coordinates>
           <location>
@@ -51333,9 +47893,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in West Virginia in the
-               United States
-            -->
+          <!-- A city in West Virginia in the United States -->
           <_name>Buckhannon</_name>
           <coordinates>38.993987 -80.232028</coordinates>
           <location>
@@ -51345,10 +47903,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in West Virginia in the
-               United States
-            -->
-          <_name>Charleston</_name>
+          <!-- A city in West Virginia in the United States -->
+          <_name msgctxt="City in West Virginia, United States">Charleston</_name>
           <coordinates>38.349820 -81.632623</coordinates>
           <location>
             <name>Yeager Airport</name>
@@ -51359,9 +47915,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in West Virginia in the
-               United States
-            -->
+          <!-- A city in West Virginia in the United States -->
           <_name>Clarksburg</_name>
           <coordinates>39.280645 -80.344534</coordinates>
           <location>
@@ -51373,9 +47927,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in West Virginia in the
-               United States
-            -->
+          <!-- A city in West Virginia in the United States -->
           <_name>Elkins</_name>
           <coordinates>38.925940 -79.846735</coordinates>
           <location>
@@ -51387,9 +47939,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in West Virginia in the
-               United States
-            -->
+          <!-- A city in West Virginia in the United States -->
           <_name>Huntington</_name>
           <coordinates>38.419250 -82.445154</coordinates>
           <location>
@@ -51401,9 +47951,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in West Virginia in the
-               United States
-            -->
+          <!-- A city in West Virginia in the United States -->
           <_name>Lewisburg</_name>
           <coordinates>37.801788 -80.445630</coordinates>
           <location>
@@ -51415,9 +47963,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in West Virginia in the
-               United States
-            -->
+          <!-- A city in West Virginia in the United States -->
           <_name>Martinsburg</_name>
           <coordinates>39.456210 -77.963887</coordinates>
           <location>
@@ -51429,9 +47975,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in West Virginia in the
-               United States
-            -->
+          <!-- A city in West Virginia in the United States -->
           <_name>Morgantown</_name>
           <coordinates>39.629526 -79.955897</coordinates>
           <location>
@@ -51443,9 +47987,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in West Virginia in the
-               United States
-            -->
+          <!-- A city in West Virginia in the United States -->
           <_name>Parkersburg</_name>
           <coordinates>39.266742 -81.561514</coordinates>
           <location>
@@ -51457,10 +47999,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in West Virginia in the
-               United States
-            -->
-          <_name>Petersburg</_name>
+          <!-- A city in West Virginia in the United States -->
+          <_name msgctxt="City in West Virginia, United States">Petersburg</_name>
           <coordinates>38.992610 -79.123924</coordinates>
           <location>
             <name>Grant County Airport</name>
@@ -51469,9 +48009,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in West Virginia in the
-               United States
-            -->
+          <!-- A city in West Virginia in the United States -->
           <_name>Point Pleasant</_name>
           <coordinates>38.844525 -82.137089</coordinates>
           <location>
@@ -51481,10 +48019,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in West Virginia in the
-               United States
-            -->
-          <_name>Sutton</_name>
+          <!-- A city in West Virginia in the United States -->
+          <_name msgctxt="City in West Virginia, United States">Sutton</_name>
           <coordinates>38.664544 -80.709819</coordinates>
           <location>
             <name>Braxton County Airport</name>
@@ -51493,10 +48029,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in West Virginia in the
-               United States
-            -->
-          <_name>Wheeling</_name>
+          <!-- A city in West Virginia in the United States -->
+          <_name msgctxt="City in West Virginia, United States">Wheeling</_name>
           <coordinates>40.063962 -80.720915</coordinates>
           <location>
             <name>Wheeling Ohio County Airport</name>
@@ -51508,16 +48042,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
+        <!-- A state/province/territory in United States -->
         <_name>Wisconsin</_name>
         <fips-code>US55</fips-code>
         <tz-hint>America/Chicago</tz-hint>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Antigo</_name>
           <coordinates>45.140245 -89.152335</coordinates>
           <location>
@@ -51529,10 +48059,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
-          <_name>Appleton</_name>
+          <!-- A city in Wisconsin in the United States -->
+          <_name msgctxt="City in Wisconsin, United States">Appleton</_name>
           <coordinates>44.261931 -88.415385</coordinates>
           <location>
             <name>Appleton / Outagamie</name>
@@ -51543,10 +48071,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
-          <_name>Ashland</_name>
+          <!-- A city in Wisconsin in the United States -->
+          <_name msgctxt="City in Wisconsin, United States">Ashland</_name>
           <coordinates>46.592443 -90.883798</coordinates>
           <location>
             <name>Kennedy Memorial Airport</name>
@@ -51556,9 +48082,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Baraboo</_name>
           <coordinates>43.471094 -89.744291</coordinates>
           <location>
@@ -51569,9 +48093,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Boscobel</_name>
           <coordinates>43.134429 -90.705405</coordinates>
           <location>
@@ -51582,10 +48104,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
-          <_name>Burlington</_name>
+          <!-- A city in Wisconsin in the United States -->
+          <_name msgctxt="City in Wisconsin, United States">Burlington</_name>
           <coordinates>42.678073 -88.276203</coordinates>
           <location>
             <name>Burlington Municipal Airport</name>
@@ -51594,9 +48114,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Camp Douglas</_name>
           <coordinates>43.922467 -90.271519</coordinates>
           <location>
@@ -51607,10 +48125,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
-          <_name>Chicago</_name>
+          <!-- A city in Wisconsin in the United States -->
+          <_name msgctxt="City in Wisconsin, United States">Chicago</_name>
           <coordinates>42.586131 -87.824797</coordinates>
           <location>
             <name>Chicago / Waukegan, Waukegan Regional Airport</name>
@@ -51621,9 +48137,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Clintonville</_name>
           <coordinates>44.620535 -88.762323</coordinates>
           <location>
@@ -51634,9 +48148,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Eagle River</_name>
           <coordinates>45.917176 -89.244299</coordinates>
           <location>
@@ -51647,9 +48159,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Eau Claire</_name>
           <coordinates>44.811349 -91.498494</coordinates>
           <location>
@@ -51661,9 +48171,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Fond du Lac</_name>
           <coordinates>43.773045 -88.447051</coordinates>
           <location>
@@ -51675,9 +48183,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Green Bay</_name>
           <coordinates>44.519159 -88.019826</coordinates>
           <location>
@@ -51689,10 +48195,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
-          <_name>Hayward</_name>
+          <!-- A city in Wisconsin in the United States -->
+          <_name msgctxt="City in Wisconsin, United States">Hayward</_name>
           <coordinates>46.013007 -91.484621</coordinates>
           <location>
             <name>Hayward Municipal Airport</name>
@@ -51703,9 +48207,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Janesville</_name>
           <coordinates>42.682789 -89.018722</coordinates>
           <location>
@@ -51717,10 +48219,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
-          <_name>Juneau</_name>
+          <!-- A city in Wisconsin in the United States -->
+          <_name msgctxt="City in Wisconsin, United States">Juneau</_name>
           <coordinates>43.405550 -88.705104</coordinates>
           <location>
             <name>Dodge County Airport</name>
@@ -51731,9 +48231,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Kenosha</_name>
           <coordinates>42.584742 -87.821185</coordinates>
           <location>
@@ -51745,9 +48243,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>La Crosse</_name>
           <coordinates>43.801356 -91.239581</coordinates>
           <location>
@@ -51759,9 +48255,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Ladysmith</_name>
           <coordinates>45.463023 -91.104036</coordinates>
           <location>
@@ -51772,9 +48266,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Land O' Lakes</_name>
           <coordinates>46.161339 -89.218749</coordinates>
           <location>
@@ -51785,9 +48277,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Lone Rock</_name>
           <coordinates>43.183324 -90.197902</coordinates>
           <location>
@@ -51799,10 +48289,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
-          <_name>Madison</_name>
+          <!-- A city in Wisconsin in the United States -->
+          <_name msgctxt="City in Wisconsin, United States">Madison</_name>
           <coordinates>43.073052 -89.401230</coordinates>
           <location>
             <name>Dane County Regional-Truax Field</name>
@@ -51813,9 +48301,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Manitowoc</_name>
           <coordinates>44.088606 -87.657584</coordinates>
           <location>
@@ -51827,9 +48313,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Marshfield</_name>
           <coordinates>44.668852 -90.171799</coordinates>
           <location>
@@ -51841,10 +48325,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
-          <_name>Medford</_name>
+          <!-- A city in Wisconsin in the United States -->
+          <_name msgctxt="City in Wisconsin, United States">Medford</_name>
           <coordinates>45.138580 -90.340140</coordinates>
           <location>
             <name>Taylor County Airport</name>
@@ -51854,9 +48336,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Menomonie</_name>
           <coordinates>44.875518 -91.919342</coordinates>
           <location>
@@ -51866,9 +48346,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Merrill</_name>
           <coordinates>45.180522 -89.683459</coordinates>
           <location>
@@ -51879,9 +48357,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Milwaukee</_name>
           <coordinates>43.038902 -87.906474</coordinates>
           <location>
@@ -51900,9 +48376,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Minocqua</_name>
           <coordinates>45.871342 -89.710981</coordinates>
           <location>
@@ -51914,10 +48388,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
-          <_name>Monroe</_name>
+          <!-- A city in Wisconsin in the United States -->
+          <_name msgctxt="City in Wisconsin, United States">Monroe</_name>
           <coordinates>42.601119 -89.638453</coordinates>
           <location>
             <name>Monroe Municipal Airport</name>
@@ -51927,9 +48399,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Mosinee</_name>
           <coordinates>44.793023 -89.703178</coordinates>
           <location>
@@ -51941,9 +48411,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>New Richmond</_name>
           <coordinates>45.123021 -92.536586</coordinates>
           <location>
@@ -51954,9 +48422,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Osceola</_name>
           <coordinates>45.320520 -92.704930</coordinates>
           <location>
@@ -51967,9 +48433,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Oshkosh</_name>
           <coordinates>44.024706 -88.542614</coordinates>
           <location>
@@ -51981,9 +48445,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Phillips</_name>
           <coordinates>45.696626 -90.400430</coordinates>
           <location>
@@ -51995,9 +48457,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Prairie du Chien</_name>
           <coordinates>43.051651 -91.141240</coordinates>
           <location>
@@ -52008,9 +48468,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Racine</_name>
           <coordinates>42.726131 -87.782852</coordinates>
           <location>
@@ -52021,9 +48479,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Rhinelander</_name>
           <coordinates>45.636623 -89.412075</coordinates>
           <location>
@@ -52035,9 +48491,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Rice Lake</_name>
           <coordinates>45.506068 -91.738225</coordinates>
           <location>
@@ -52048,9 +48502,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Sheboygan</_name>
           <coordinates>43.750828 -87.714530</coordinates>
           <location>
@@ -52062,9 +48514,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Siren</_name>
           <coordinates>45.785782 -92.381028</coordinates>
           <location>
@@ -52075,10 +48525,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
-          <_name>Sparta</_name>
+          <!-- A city in Wisconsin in the United States -->
+          <_name msgctxt="City in Wisconsin, United States">Sparta</_name>
           <coordinates>43.944133 -90.812912</coordinates>
           <location>
             <name>Sparta / Fort McCoy Airport</name>
@@ -52088,9 +48536,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Stevens Point</_name>
           <coordinates>44.523579 -89.574563</coordinates>
           <location>
@@ -52101,9 +48547,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Sturgeon Bay</_name>
           <coordinates>44.834164 -87.377042</coordinates>
           <location>
@@ -52115,9 +48559,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Superior</_name>
           <coordinates>46.720774 -92.104080</coordinates>
           <location>
@@ -52129,9 +48571,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Tomahawk</_name>
           <coordinates>45.471079 -89.729859</coordinates>
           <location>
@@ -52141,10 +48581,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
-          <_name>Watertown</_name>
+          <!-- A city in Wisconsin in the United States -->
+          <_name msgctxt="City in Wisconsin, United States">Watertown</_name>
           <coordinates>43.194721 -88.728992</coordinates>
           <location>
             <name>Watertown</name>
@@ -52154,9 +48592,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Waukesha</_name>
           <coordinates>43.011678 -88.231481</coordinates>
           <location>
@@ -52168,9 +48604,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Waupaca</_name>
           <coordinates>44.358035 -89.085946</coordinates>
           <location>
@@ -52181,9 +48615,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Wausau</_name>
           <coordinates>44.959135 -89.630122</coordinates>
           <location>
@@ -52195,9 +48627,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Wautoma</_name>
           <coordinates>44.074700 -89.287897</coordinates>
           <location>
@@ -52207,9 +48637,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>West Bend</_name>
           <coordinates>43.425278 -88.183428</coordinates>
           <location>
@@ -52220,9 +48648,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Wisconsin Rapids</_name>
           <coordinates>44.383576 -89.817347</coordinates>
           <location>
@@ -52234,9 +48660,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wisconsin in the United
-               States
-            -->
+          <!-- A city in Wisconsin in the United States -->
           <_name>Woodruff</_name>
           <coordinates>45.896341 -89.699037</coordinates>
           <location>
@@ -52249,16 +48673,12 @@
         </city>
       </state>
       <state>
-        <!-- Translators: this is a state/province/territory in United
-             States
-          -->
-        <_name>Wyoming</_name>
+        <!-- A state/province/territory in United States -->
+        <_name msgctxt="State in United States">Wyoming</_name>
         <fips-code>US56</fips-code>
         <tz-hint>America/Denver</tz-hint>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
+          <!-- A city in Wyoming in the United States -->
           <_name>Big Piney</_name>
           <coordinates>42.538275 -110.114325</coordinates>
           <location>
@@ -52270,10 +48690,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
-          <_name>Bordeaux</_name>
+          <!-- A city in Wyoming in the United States -->
+          <_name msgctxt="City in Wyoming, United States">Bordeaux</_name>
           <coordinates>41.936081 -104.844691</coordinates>
           <location>
             <name>Bordeaux</name>
@@ -52282,10 +48700,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
-          <_name>Buffalo</_name>
+          <!-- A city in Wyoming in the United States -->
+          <_name msgctxt="City in Wyoming, United States">Buffalo</_name>
           <coordinates>44.348307 -106.698938</coordinates>
           <location>
             <name>Buffalo Johnson County Airport</name>
@@ -52294,9 +48710,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
+          <!-- A city in Wyoming in the United States -->
           <_name>Casper</_name>
           <coordinates>42.866632 -106.313081</coordinates>
           <location>
@@ -52308,9 +48722,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
+          <!-- A city in Wyoming in the United States -->
           <_name>Cheyenne</_name>
           <coordinates>41.139981 -104.820246</coordinates>
           <location>
@@ -52322,9 +48734,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
+          <!-- A city in Wyoming in the United States -->
           <_name>Cody</_name>
           <coordinates>44.526342 -109.056531</coordinates>
           <location>
@@ -52336,10 +48746,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
-          <_name>Douglas</_name>
+          <!-- A city in Wyoming in the United States -->
+          <_name msgctxt="City in Wyoming, United States">Douglas</_name>
           <coordinates>42.759690 -105.382207</coordinates>
           <location>
             <name>Converse County Airport</name>
@@ -52350,9 +48758,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
+          <!-- A city in Wyoming in the United States -->
           <_name>Evanston</_name>
           <coordinates>41.268279 -110.963237</coordinates>
           <location>
@@ -52364,9 +48770,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
+          <!-- A city in Wyoming in the United States -->
           <_name>Gillette</_name>
           <coordinates>44.291092 -105.502221</coordinates>
           <location>
@@ -52376,9 +48780,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
+          <!-- A city in Wyoming in the United States -->
           <_name>Greybull</_name>
           <coordinates>44.489124 -108.056213</coordinates>
           <location>
@@ -52388,10 +48790,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
-          <_name>Jackson</_name>
+          <!-- A city in Wyoming in the United States -->
+          <_name msgctxt="City in Wyoming, United States">Jackson</_name>
           <coordinates>43.479929 -110.762428</coordinates>
           <location>
             <name>Jackson Hole Airport</name>
@@ -52402,9 +48802,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
+          <!-- A city in Wyoming in the United States -->
           <_name>Lander</_name>
           <coordinates>42.833014 -108.730672</coordinates>
           <location>
@@ -52416,9 +48814,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
+          <!-- A city in Wyoming in the United States -->
           <_name>Laramie</_name>
           <coordinates>41.311367 -105.591101</coordinates>
           <location>
@@ -52430,9 +48826,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
+          <!-- A city in Wyoming in the United States -->
           <_name>Pinedale</_name>
           <coordinates>42.866610 -109.860986</coordinates>
           <location>
@@ -52442,9 +48836,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
+          <!-- A city in Wyoming in the United States -->
           <_name>Rawlins</_name>
           <coordinates>41.791070 -107.238663</coordinates>
           <location>
@@ -52456,9 +48848,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
+          <!-- A city in Wyoming in the United States -->
           <_name>Riverton</_name>
           <coordinates>43.024959 -108.380104</coordinates>
           <location>
@@ -52470,9 +48860,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
+          <!-- A city in Wyoming in the United States -->
           <_name>Rock Springs</_name>
           <coordinates>41.587464 -109.202904</coordinates>
           <location>
@@ -52484,9 +48872,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
+          <!-- A city in Wyoming in the United States -->
           <_name>Sheridan</_name>
           <coordinates>44.797194 -106.956179</coordinates>
           <location>
@@ -52498,9 +48884,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
+          <!-- A city in Wyoming in the United States -->
           <_name>Torrington</_name>
           <coordinates>42.062465 -104.184394</coordinates>
           <location>
@@ -52510,9 +48894,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
+          <!-- A city in Wyoming in the United States -->
           <_name>West Thumb</_name>
           <coordinates>44.415495 -110.575485</coordinates>
           <location>
@@ -52524,9 +48906,7 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
+          <!-- A city in Wyoming in the United States -->
           <_name>Worland</_name>
           <coordinates>44.016901 -107.955372</coordinates>
           <location>
@@ -52538,10 +48918,8 @@
           </location>
         </city>
         <city>
-          <!-- Translators: this is a city in Wyoming in the United
-               States
-            -->
-          <_name>Wyoming</_name>
+          <!-- A city in Wyoming in the United States -->
+          <_name msgctxt="City in Wyoming, United States">Wyoming</_name>
           <coordinates>41.477475 -105.636657</coordinates>
           <location>
             <name>Vedauwoo</name>

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Tue Nov 25 20:39:18 2008
@@ -50,7 +50,7 @@
 
 ### Locations.xml.in rebuild
 rebuild-locations: locationdb.sqlite update-locations.py
-	($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in
+	($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in.new
 
 locationdb.sqlite: build-locationdb.pl major-cities.txt sources/nsd_cccc.txt sources/POP_PLACES.txt sources/US_CONCISE.txt sources/geonames_dd_dms_date_*.txt city-fixups.pl station-fixups.pl
 	$(srcdir)/build-locationdb.pl

Modified: trunk/data/update-locations.py
==============================================================================
--- trunk/data/update-locations.py	(original)
+++ trunk/data/update-locations.py	Tue Nov 25 20:39:18 2008
@@ -148,6 +148,7 @@
         self.name = getChildContentByName(node, '_name')
         self.comment = getComment(node)
         self.obsoletes = [obs.firstChild.nodeValue for obs in getChildrenByName(node, 'obsoletes')]
+        self.dup_name = False
 
     def print_xml(self, indent):
         if self.name is not None or len(self.obsoletes):
@@ -155,7 +156,11 @@
             if self.comment is not None:
                 printComment(indent + '  ', self.comment)
             if self.name is not None:
-                print '%s  <_name>%s</_name>' % (indent, self.name)
+                if self.dup_name:
+                    msgctxt=' msgctxt="Timezone"'
+                else:
+                    msgctxt=''
+                print '%s  <_name%s>%s</_name>' % (indent, msgctxt, self.name)
             for obs in self.obsoletes:
                 print '%s  <obsoletes>%s</obsoletes>' % (indent, obs)
             print '%s</timezone>' % indent
@@ -166,6 +171,7 @@
     def __init__(self, parent, arg):
         self.parent = parent
         self.contents = []
+        self.dup_name = False
 
         if isinstance(arg, minidom.Element):
             self.name = getChildContentByName(arg, '_name')
@@ -217,6 +223,28 @@
         for item in self.contents:
             item.print_xml(indent + '  ')
 
+    def print_name(self, indent):
+        if self.dup_name:
+            msgctxt = ' msgctxt="%s' % self.__class__.__name__
+            if self.parent is not None:
+                msgctxt += ' in '
+                c = self.parent
+                while c is not None:
+                    if c is not self.parent:
+                        msgctxt += ', '
+                    # although it would be prettier to use c.in_name
+                    # here for countries, that would be bad because if
+                    # we changed the list of "the"-using countries,
+                    # that would then cause translations to get
+                    # fuzzified
+                    msgctxt += saxutils.escape(c.name)
+                    c = c.parent
+            msgctxt += '"'
+        else:
+            msgctxt = ''
+
+        print '%s  <_name%s>%s</_name>' % (indent, msgctxt, saxutils.escape(self.name))
+
     def station_prefixes(self):
         return reduce(set.__or__, [x.station_prefixes() for x in self.contents], set())
 
@@ -228,7 +256,7 @@
         print '%s<region>' % indent
         if self.comment is not None:
             printComment(indent + '  ', self.comment)
-        print '%s  <_name>%s</_name>' % (indent, saxutils.escape(self.name))
+        self.print_name(indent)
         LocBase.print_xml(self, indent)
         print '%s</region>' % indent
 
@@ -255,7 +283,7 @@
         print '%s<country>' % indent
         if self.comment is not None:
             printComment(indent + '  ', self.comment)
-        print '%s  <_name>%s</_name>' % (indent, saxutils.escape(self.name))
+        self.print_name(indent)
         if len(self.missing_stations):
             self.missing_stations.sort()
             comment = 'Could not find cities for the following weather stations:\n'
@@ -282,13 +310,13 @@
     def __init__(self, parent, elt):
         LocBase.__init__(self, parent, elt)
         if self.comment is None:
-            self.comment = 'Translators: this is a state/province/territory in %s' % self.parent.name
+            self.comment = 'A state/province/territory in %s' % self.parent.name
 
     def print_xml(self, indent):
         print '%s<state>' % indent
         if self.comment is not None:
             printComment(indent + '  ', self.comment)
-        print '%s  <_name>%s</_name>' % (indent, saxutils.escape(self.name))
+        self.print_name(indent)
         LocBase.print_xml(self, indent)
         print '%s</state>' % indent
 
@@ -326,12 +354,12 @@
                 country = self.parent
                 while not isinstance(country, Country):
                     country = country.parent
-                self.comment = 'Translators: this is the capital of %s' % country.in_name
+                self.comment = 'The capital of %s' % country.in_name
             elif self.parent.parent is not None:
-                self.comment = 'Translators: this is a city in %s in %s' % \
+                self.comment = 'A city in %s in %s' % \
                                (self.parent.name, self.parent.parent.in_name)
             else:
-                self.comment = 'Translators: this is a city in %s' % self.parent.in_name
+                self.comment = 'A city in %s' % self.parent.in_name
 
         print '%s<city>' % indent
         comment = self.comment or ''
@@ -344,7 +372,7 @@
             comment += '\n'.join(self.name_comment)
         if len(comment):
             printComment(indent + '  ', comment, True)
-        print '%s  <_name>%s</_name>' % (indent, saxutils.escape(self.name))
+        self.print_name(indent)
         print '%s  <coordinates>%s</coordinates>' % (indent, self.coordinates)
         for item in self.contents:
             item.print_xml(indent + '  ', self)
@@ -524,7 +552,7 @@
         city.name_comment.append('"%s" is the traditional English name.' % city.name)
     if local_short_name is not None:
         country = getFipsCountry(city)
-        city.name_comment.append('This is one of several cities in %s called "%s".' % (country.name, local_short_name))
+        city.name_comment.append('One of several cities in %s called "%s".' % (country.name, local_short_name))
     if script_name is not None:
         city.name_comment.append('The name is also written "%s".' % script_name)
     for lang in localnames:
@@ -731,6 +759,35 @@
                 continue
     city.parent.contents.append(city)
 
+# Find duplicate names
+names = {}
+
+def add_names(container):
+    if container.name in names:
+        names[container.name].append(container)
+    else:
+        names[container.name] = [container]
+    if not isinstance(container, City):
+        for c in container.contents:
+            add_names(c)
+
+for region in regions:
+    add_names(region)
+
+# timezone names can conflict with country/state names, but not with
+# each other
+for region in regions:
+    for country in region.contents:
+        for zone in country.timezones.zones:
+            if zone.name in names:
+                names[zone.name].append(zone)
+
+for name in names:
+    name_list = names[name]
+    if len(name_list) > 1:
+        for container in name_list:
+            container.dup_name = True
+
 # Note unknown weather stations
 for id in stations:
     for code in stations[id]:



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]