[libgweather] Updated Latvian translation.

From: Peteris Krisjanis <peterisk src gnome org>
To: commits-list gnome org
Cc:
Subject: [libgweather] Updated Latvian translation.
Date: Mon, 21 Mar 2011 22:31:24 +0000 (UTC)
commit b52bee53c8876e4ce5d8f4708383b734071eb802
Author: Rudolfs Mazurs <rudolfs mazurs gmail com>
Date:   Tue Mar 22 00:31:20 2011 +0200

    Updated Latvian translation.

 po-locations/lv.po | 2512 +++++++++++-----------------------------------------
 1 files changed, 529 insertions(+), 1983 deletions(-)
---
diff --git a/po-locations/lv.po b/po-locations/lv.po
index 63dce83..01afe54 100644
--- a/po-locations/lv.po
+++ b/po-locations/lv.po
@@ -3,52 +3,52 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
 # Raivis Dejus <orvils gmail com>, 2006, 2009.
+# Rudolfs <rudolfs mazurs gmail com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: locations.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-23 17:03+0000\n"
-"PO-Revision-Date: 2009-01-25 22:28+0200\n"
-"Last-Translator: Raivis Dejus <orvils gmail com>\n"
+"POT-Creation-Date: 2010-03-26 14:22+0000\n"
+"PO-Revision-Date: 2011-03-20 22:59+0200\n"
+"Last-Translator: Rudolfs <rudolfs mazurs gmail com>\n"
 "Language-Team: Latvian <locale laka lv>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+"X-Generator: Lokalize 1.1\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
 
 msgid "Africa"
 msgstr "Ä?frika"
 
 #
-#| msgid "Antarctica"
 msgctxt "Region"
 msgid "Antarctica"
 msgstr "Antarktika"
 
 msgid "Asia"
-msgstr "Asia"
+msgstr "Ä?zija"
 
 #. FIXME: rename this to Atlantic Ocean
-#| msgid "Atlantic"
 msgctxt "Region"
 msgid "Atlantic"
-msgstr "Atlantic"
+msgstr "Atlantijas okeÄ?ns"
 
 msgid "Australasia &amp; Oceania"
-msgstr "Australasia &amp; Oceania"
+msgstr "Australasia &amp; OkeÄ?nija"
 
 msgid "Central and South America"
-msgstr "Central and South America"
+msgstr "CentrÄ?lÄ? un Dienvidamerika"
 
 msgid "Europe"
 msgstr "Eiropa"
 
 msgid "Middle East"
-msgstr "Middle East"
+msgstr "Tuvie austrumi"
 
 msgid "North America"
-msgstr "North America"
+msgstr "ZiemeÄ¼amerika"
 
 #. AF - Afghanistan
 msgid "Afghanistan"
@@ -67,10 +67,9 @@ msgstr "AlÅ¾Ä«rija"
 #. of "Samoa".
 #.
 msgid "American Samoa"
-msgstr "AmerikÄ?Å?u Samoa"
+msgstr "Austrumsamoa"
 
 #. AD - Andorra
-#| msgid "Andover"
 msgid "Andorra"
 msgstr "Andora"
 
@@ -79,25 +78,24 @@ msgid "Angola"
 msgstr "Angola"
 
 #. AI - Anguilla, a British territory in the Caribbean
-#| msgid "Aurillac"
 msgid "Anguilla"
-msgstr "Anguila"
+msgstr "Angilja"
 
 #. AQ - Antarctica
-#| msgid "Antarctica"
 msgctxt "Country"
 msgid "Antarctica"
 msgstr "Antarktika"
 
 #. AG - Antigua and Barbuda
 msgid "Antigua and Barbuda"
-msgstr "Antigva un Barbudas"
+msgstr "Antigva un Barbuda"
 
 #. AR - Argentina
 msgid "Argentina"
-msgstr "Argentina"
+msgstr "ArgentÄ«na"
 
 #. AM - Armenia
+#. A city in Colombia
 msgid "Armenia"
 msgstr "ArmÄ?nija"
 
@@ -105,7 +103,7 @@ msgstr "ArmÄ?nija"
 #. constituent countries of the Kingdom of the Netherlands.
 #.
 msgid "Aruba"
-msgstr "Aurba"
+msgstr "Aruba"
 
 #. AU - Australia
 msgid "Australia"
@@ -121,11 +119,11 @@ msgstr "AzerbaidÅ¾Ä?na"
 
 #. BS - Bahamas
 msgid "Bahamas"
-msgstr "Bahamas"
+msgstr "Bahamu salas"
 
 #. BH - Bahrain
 msgid "Bahrain"
-msgstr "Bahrain"
+msgstr "Bahreina"
 
 #. BD - Bangladesh
 msgid "Bangladesh"
@@ -147,7 +145,7 @@ msgstr "BeÄ¼Ä£ija"
 
 #. BZ - Belize
 msgid "Belize"
-msgstr "Belize"
+msgstr "Beliza"
 
 #. BJ - Benin
 msgid "Benin"
@@ -157,10 +155,9 @@ msgstr "Benina"
 #. United States
 #.
 msgid "Bermuda"
-msgstr "Bermuda"
+msgstr "Bermudu salas"
 
 #. BT - Bhutan
-#| msgid "Butuan"
 msgid "Bhutan"
 msgstr "ButÄ?na"
 
@@ -169,13 +166,12 @@ msgid "Bolivia"
 msgstr "BolÄ«vija"
 
 #. BA - Bosnia and Herzegovina
-#| msgid "Bosnia-Herzegovina"
 msgid "Bosnia and Herzegovina"
-msgstr "Bosnija-Hercugovina"
+msgstr "Bosnija un Hercegovina"
 
 #. BW - Botswana
 msgid "Botswana"
-msgstr "Botsvana"
+msgstr "BotsvÄ?na"
 
 #. BR - Brazil
 msgid "Brazil"
@@ -185,13 +181,13 @@ msgstr "BrazÄ«lija"
 #. it sounds like.
 #.
 msgid "British Indian Ocean Territory"
-msgstr "Britu Indijas OkeÄ?na Teritorija"
+msgstr "Indijas okeÄ?na Britu teritorija"
 
 #. VG - British Virgin Islands, a British territory in the
 #. Caribbean
 #.
 msgid "British Virgin Islands"
-msgstr "Britu VirdÅ¾Ä«nu Salas"
+msgstr "Britu VirdÅ¾Ä«nu salas"
 
 #. BN - Brunei Darussalam
 msgid "Brunei"
@@ -203,15 +199,15 @@ msgstr "BulgÄ?rija"
 
 #. BF - Burkina Faso
 msgid "Burkina Faso"
-msgstr "Burkina Faso"
+msgstr "Burkinafaso"
 
 #. BI - Burundi
 msgid "Burundi"
-msgstr "BurundÄ«"
+msgstr "Burundija"
 
 #. KH - Cambodia
 msgid "Cambodia"
-msgstr "KambodÅ¾ija"
+msgstr "KambodÅ¾a"
 
 #. CM - Cameroon
 msgid "Cameroon"
@@ -223,11 +219,11 @@ msgstr "KanÄ?da"
 
 #. CV - Cape Verde
 msgid "Cape Verde"
-msgstr "Cape Verde"
+msgstr "Kaboverde"
 
 #. KY - Cayman Islands, a British territory in the Caribbean
 msgid "Cayman Islands"
-msgstr "Kaimanu Salas"
+msgstr "Kaimanu salas"
 
 #. CF - Central African Republic
 msgid "Central African Republic"
@@ -244,7 +240,6 @@ msgstr "Ä?Ä«le"
 #. CN - China. (The official ISO 3166 short English name does
 #. not include "The People's Republic of".)
 #.
-#| msgid "Chino"
 msgid "China"
 msgstr "Ä¶Ä«na"
 
@@ -253,15 +248,14 @@ msgstr "Ä¶Ä«na"
 #. of the same name.
 #.
 msgid "Christmas Island"
-msgstr "ZiemassvÄ?tku Sala"
+msgstr "ZiemsvÄ?tku sala"
 
 #. CC - Cocos (Keeling) Islands, a territory of Australia in
 #. the Indian Ocean. The "(Keeling)" is to distinguish them
 #. from other "Cocos Island"s, and is part of the official name.
 #.
-#| msgid "Cocos (Keeling) Island"
 msgid "Cocos (Keeling) Islands"
-msgstr "Kokosu (KÄ«linga) Salas"
+msgstr "Kokosu (KÄ«linga) salas"
 
 #. CO - Colombia
 msgid "Colombia"
@@ -269,12 +263,11 @@ msgstr "Kolumbija"
 
 #. KM - Comoros
 msgid "Comoros"
-msgstr "Comoros"
+msgstr "Komoru salas"
 
 #. CD - Democratic Republic of the Congo
-#| msgid "Congo, Republic of the"
 msgid "Congo, Democratic Republic of the"
-msgstr ""
+msgstr "Kongo DemokrÄ?tiskÄ? Republika"
 
 #. CG - Republic of the Congo. The official ISO 3166 short
 #. English name is simply "Congo"; we use the long name to
@@ -282,11 +275,11 @@ msgstr ""
 #. the Congo).
 #.
 msgid "Congo, Republic of the"
-msgstr "Congo, Republic of the"
+msgstr "Kongo Republika"
 
 #. CK - Cook Islands
 msgid "Cook Islands"
-msgstr "Kuka Salas"
+msgstr "Kuka salas"
 
 #. CR - Costa Rica
 msgid "Costa Rica"
@@ -309,19 +302,17 @@ msgid "Czech Republic"
 msgstr "Ä?ehija"
 
 #. CI - CÃ´te d'Ivoire
-#| msgid "Cote d'Ivoire"
 msgid "CÃ´te d'Ivoire"
-msgstr "Cote d'Ivoire"
+msgstr "KotdivuÄ?ra"
 
 #. DK - Denmark. The Danish name is "Danmark"
 msgid "Denmark"
 msgstr "DÄ?nija"
 
 #. DJ - Djibouti
-#| msgid "Djibouti"
 msgctxt "Country"
 msgid "Djibouti"
-msgstr "DÅ¾ibutÄ«"
+msgstr "DÅ¾ibutija"
 
 #. DM - Dominica, a Caribbean island nation, not to be confused
 #. with the Domincan Republic.
@@ -331,7 +322,7 @@ msgstr "Dominika"
 
 #. DO - Dominican Republic
 msgid "Dominican Republic"
-msgstr "DominikÄ?Å?u Republika"
+msgstr "DominikÄ?nas Republika"
 
 #. EC - Ecuador
 msgid "Ecuador"
@@ -343,16 +334,15 @@ msgstr "Ä?Ä£ipte"
 
 #. SV - El Salvador
 msgid "El Salvador"
-msgstr "Elsalvadora"
+msgstr "Salvadora"
 
 #. GQ - Equatorial Guinea
 msgid "Equatorial Guinea"
 msgstr "EkvatoriÄ?lÄ? Gvineja"
 
 #. ER - Eritrea
-#| msgid "Erieau"
 msgid "Eritrea"
-msgstr "Eriteja"
+msgstr "Eritreja"
 
 #. EE - Estonia
 msgid "Estonia"
@@ -368,19 +358,18 @@ msgstr "Etiopija"
 #. Malvinas". The parenthesized form is the compromise used by
 #. ISO and the UN.)
 #.
-#| msgid "Falkland Islands, Islas Malvinas"
 msgid "Falkland Islands (Malvinas)"
-msgstr "Folklendu salas"
+msgstr "Folklenda (Malvinu) salas"
 
 #. FO - Faroe Islands, an autonomous province of Denmark in the
 #. north Atlantic.
 #.
 msgid "Faroe Islands"
-msgstr "FarÄ?ru salas"
+msgstr "FÄ?ru salas"
 
 #. FJ - Fiji
 msgid "Fiji"
-msgstr "FidÅ¾Ä«"
+msgstr "FidÅ¾i"
 
 #. FI - Finland
 msgid "Finland"
@@ -394,34 +383,31 @@ msgstr "Francija"
 #. northern coast of South America.
 #.
 msgid "French Guiana"
-msgstr "FranÄ?u GviÄ?na"
+msgstr "Francijas GviÄ?na"
 
 #. PF - French Polynesia, a French territory in the South
 #. Pacific
 #.
 msgid "French Polynesia"
-msgstr "FranÄ?u PolinÄ?zija"
+msgstr "Francijas PolinÄ?zija"
 
 #. TF - French Southern Territories, a territory of France
 #. consisting of several mostly-uninhabited islands in the
 #. Indian Ocean. The French name is "Terres australes
 #. franÃ§aises".
 #.
-#| msgid "Northern Territory"
 msgid "French Southern Territories"
-msgstr "FranÄ?u Dienvidu Teritorijas"
+msgstr "Francijas DienvidjÅ«ru teritorija"
 
 #. GA - Gabon
 msgid "Gabon"
 msgstr "Gabona"
 
 #. GM - Gambia
-#| msgid "Zambia"
 msgid "Gambia"
 msgstr "Gambija"
 
 #. GE - Georgia (the country, not the US state)
-#| msgid "Georgia"
 msgctxt "Country"
 msgid "Georgia"
 msgstr "Gruzija"
@@ -437,7 +423,6 @@ msgstr "Gana"
 #. GI - Gibraltar, a British overseas territory on the southern
 #. tip of Spain.
 #.
-#| msgid "Gibraltar"
 msgctxt "Country"
 msgid "Gibraltar"
 msgstr "GibraltÄ?rs"
@@ -454,7 +439,7 @@ msgstr "Grenlande"
 
 #. GD - Grenada
 msgid "Grenada"
-msgstr "Grenada"
+msgstr "GrenÄ?da"
 
 #. GP - Guadeloupe, an overseas department of France in the
 #. Caribbean.
@@ -469,14 +454,13 @@ msgid "Guam"
 msgstr "Guama"
 
 #. GT - Guatemala
-#| msgid "Guatemala"
 msgctxt "Country"
 msgid "Guatemala"
 msgstr "Gvatemala"
 
 #. GG - The Bailiwick of Guernsey, a British Crown dependency
 msgid "Guernsey"
-msgstr "Guernsey"
+msgstr "GÄ?rnsija"
 
 #. GN - Guinea
 msgid "Guinea"
@@ -484,11 +468,11 @@ msgstr "Gvineja"
 
 #. GW - Guinea-Bissau
 msgid "Guinea-Bissau"
-msgstr "Gvineja-Bisau"
+msgstr "Gvineja-Bisava"
 
 #. GY - Guyana
 msgid "Guyana"
-msgstr "Gajana"
+msgstr "GajÄ?na"
 
 #. HT - Haiti
 msgid "Haiti"
@@ -510,7 +494,7 @@ msgstr "UngÄ?rija"
 
 #. IS - Iceland
 msgid "Iceland"
-msgstr "Islande"
+msgstr "Äªslande"
 
 #. IN - India
 msgid "India"
@@ -521,7 +505,6 @@ msgid "Indonesia"
 msgstr "IndonÄ?zija"
 
 #. IR - Islamic Republic of Iran
-#| msgid "Ifrane"
 msgid "Iran"
 msgstr "IrÄ?na"
 
@@ -535,7 +518,7 @@ msgstr "Äªrija"
 
 #. IM - Isle of Man, a British Crown dependency
 msgid "Isle of Man"
-msgstr "Isle of Man"
+msgstr "Mena"
 
 #. IL - Israel
 msgid "Israel"
@@ -555,13 +538,12 @@ msgstr "JapÄ?na"
 
 #. JE - The Bailiwick of Jersey, a British Crown dependency
 msgid "Jersey"
-msgstr "Jersey"
+msgstr "DÅ¾Ä?rsija"
 
 #. JO - Jordan
-#| msgid "Jordan"
 msgctxt "Country"
 msgid "Jordan"
-msgstr "JordÄ?na"
+msgstr "JordÄ?nija"
 
 #. KZ - Kazakhstan
 msgid "Kazakhstan"
@@ -569,21 +551,20 @@ msgstr "KazahstÄ?na"
 
 #. KE - Kenya
 msgid "Kenya"
-msgstr "Keinja"
+msgstr "Kenija"
 
 #. KI - Kiribati
 msgid "Kiribati"
 msgstr "Kiribati"
 
 #. KW - Kuwait
-#| msgid "Kuwait"
 msgctxt "Country"
 msgid "Kuwait"
 msgstr "Kuveita"
 
 #. KG - Kyrgyzstan
 msgid "Kyrgyzstan"
-msgstr "KirgiztÄ?na"
+msgstr "KirgizstÄ?na"
 
 #. LA - Lao People's Democratic Republic
 msgid "Laos"
@@ -594,7 +575,6 @@ msgid "Latvia"
 msgstr "Latvija"
 
 #. LB - Lebanon
-#| msgid "Lebanon"
 msgctxt "Country"
 msgid "Lebanon"
 msgstr "LibÄ?na"
@@ -604,7 +584,6 @@ msgid "Lesotho"
 msgstr "Lesoto"
 
 #. LR - Liberia
-#| msgid "Liberia"
 msgctxt "Country"
 msgid "Liberia"
 msgstr "LibÄ?rija"
@@ -614,7 +593,6 @@ msgid "Libya"
 msgstr "LÄ«bija"
 
 #. LI - Liechtenstien
-#| msgid "Winchester"
 msgid "Liechtenstein"
 msgstr "LihtenÅ¡teina"
 
@@ -623,7 +601,6 @@ msgid "Lithuania"
 msgstr "Lietuva"
 
 #. LU - Luxembourg
-#| msgid "Luxembourg"
 msgctxt "Country"
 msgid "Luxembourg"
 msgstr "Luksemburga"
@@ -633,10 +610,9 @@ msgstr "Luksemburga"
 #. used. The "u" spelling is currently slightly more popular in
 #. English.)
 #.
-#| msgid "Macau"
 msgctxt "Country"
 msgid "Macau"
-msgstr "Makau"
+msgstr "Makao"
 
 #. MK - The Former Yugoslav Republic of Macedonia
 msgid "Macedonia"
@@ -644,11 +620,11 @@ msgstr "MaÄ·edonija"
 
 #. MG - Madagascar
 msgid "Madagascar"
-msgstr "MadagaskÄ?ra"
+msgstr "Madagaskara"
 
 #. MW - Malawi
 msgid "Malawi"
-msgstr "MalavÄ«"
+msgstr "MalÄ?vija"
 
 #. MY - Malaysia
 msgid "Malaysia"
@@ -656,27 +632,26 @@ msgstr "Malaizija"
 
 #. MV - Maldives
 msgid "Maldives"
-msgstr "Maldivu salas"
+msgstr "MaldÄ«vija"
 
 #. ML - Mali
 msgid "Mali"
 msgstr "Mali"
 
 #. MT - Malta
-#| msgid "Malta"
 msgctxt "Country"
 msgid "Malta"
 msgstr "Malta"
 
 #. MH - Marshall Islands
 msgid "Marshall Islands"
-msgstr "MarÅ¡ala Salas"
+msgstr "MÄ?rÅ¡ala salas"
 
 #. MQ - Martinique, an overseas department of France in the
 #. Caribbean.
 #.
 msgid "Martinique"
-msgstr "Martinique"
+msgstr "Martinika"
 
 #. MR - Mauritania
 msgid "Mauritania"
@@ -684,10 +659,9 @@ msgstr "MauritÄ?nija"
 
 #. MU - Mauritius
 msgid "Mauritius"
-msgstr "Mauritius"
+msgstr "MaurÄ«cija"
 
 #. YT - Mayotte
-#| msgid "Mayo"
 msgid "Mayotte"
 msgstr "Majota"
 
@@ -697,14 +671,13 @@ msgstr "Meksika"
 
 #. FM - Federated States of Micronesia
 msgid "Micronesia, Federated States of"
-msgstr "Micronesia, Federated States of"
+msgstr "MikronÄ?zijas FederatÄ«vÄ?s Valstis"
 
 #. MD - Moldova
 msgid "Moldova"
-msgstr "MoldÄ?vija"
+msgstr "Moldova"
 
 #. MC - Monaco
-#| msgid "Moncton"
 msgctxt "Country"
 msgid "Monaco"
 msgstr "Monako"
@@ -714,18 +687,16 @@ msgid "Mongolia"
 msgstr "Mongolija"
 
 #. ME - Montenegro
-#| msgid "Montery"
 msgid "Montenegro"
 msgstr "Montenegro"
 
 #. MS - Montserrat, a British territory in the Caribbean.
-#| msgid "Monterrey"
 msgid "Montserrat"
-msgstr "Montserata"
+msgstr "Montserrata"
 
 #. MA - Morocco
 msgid "Morocco"
-msgstr "Morocco"
+msgstr "Maroka"
 
 #. MZ - Mozambique
 msgid "Mozambique"
@@ -736,7 +707,7 @@ msgstr "Mozambika"
 #. more Google hits in English)
 #.
 msgid "Myanmar"
-msgstr "Myanmar"
+msgstr "Mjanma"
 
 #. NA - Namibia
 msgid "Namibia"
@@ -759,7 +730,7 @@ msgstr "NÄ«derlande"
 #. Netherlands.
 #.
 msgid "Netherlands Antilles"
-msgstr "NÄ«derlandes Antilas"
+msgstr "NÄ«derlandes AntiÄ¼as"
 
 #. NC - New Caledonia, a French territory in the South Pacific.
 #. The French name is "Nouvelle-CalÃ©donie".
@@ -777,32 +748,31 @@ msgstr "Nikaragva"
 
 #. NE - Niger
 msgid "Niger"
-msgstr "Niger"
+msgstr "NigÄ?ra"
 
 #. NG - Nigeria
 msgid "Nigeria"
 msgstr "NigÄ?rija"
 
 #. NU - Niue
-#| msgid "Nice"
 msgid "Niue"
 msgstr "Niue"
 
 #. NF - Norfolk Island, a territory of Australia
 msgid "Norfolk Island"
-msgstr "Norfolkas salas"
+msgstr "Norfolkas sala"
 
 #. KP - The Democratic People's Republic of Korea, aka North
 #. Korea
 #.
 msgid "North Korea"
-msgstr "ZiemeÄ¼ Koreja"
+msgstr "ZiemeÄ¼koreja"
 
 #. MP - Northern Mariana Islands, a semi-independent territory
 #. of the United States in the western Pacific Ocean.
 #.
 msgid "Northern Mariana Islands"
-msgstr "Northern Mariana Islands"
+msgstr "ZiemeÄ¼u Marianas salas"
 
 #. NO - Norway
 msgid "Norway"
@@ -821,14 +791,12 @@ msgid "Palau"
 msgstr "Palau"
 
 #. PS - Occupied Palestinian Territory
-#| msgid "Australian Capital Territory"
 msgid "Palestinian Territory"
-msgstr "PalestÄ«nieÅ¡u Teritorija"
+msgstr "PalestÄ«na"
 
 #. PA - Panama. The local (Spanish) name is "PanamÃ¡". In common
 #. English usage (and in ISO 3166) it does not have the accent.
 #.
-#| msgid "PanamÃ¡"
 msgid "Panama"
 msgstr "Panama"
 
@@ -841,7 +809,6 @@ msgid "Paraguay"
 msgstr "Paragvaja"
 
 #. PE - Peru
-#| msgid "Peru"
 msgctxt "Country"
 msgid "Peru"
 msgstr "Peru"
@@ -851,7 +818,6 @@ msgid "Philippines"
 msgstr "FilipÄ«nas"
 
 #. PN - Pitcairn, a British territory in the South Pacific
-#| msgid "Pakistan"
 msgid "Pitcairn"
 msgstr "PitkÄ?rna"
 
@@ -867,7 +833,7 @@ msgstr "PortugÄ?le"
 #. Caribbean.
 #.
 msgid "Puerto Rico"
-msgstr "Puerto Rico"
+msgstr "Puertoriko"
 
 #. QA - Qatar
 msgid "Qatar"
@@ -888,90 +854,84 @@ msgstr "Ruanda"
 #. RE - RÃ©union, an overseas department of France in the Indian
 #. Ocean.
 #.
-#| msgid "Reunion"
 msgid "RÃ©union"
-msgstr "Reunion"
+msgstr "Reinjona"
 
 #. BL - Saint BarthÃ©lemy, an overseas territory of France in
 #. the Caribbean, formerly part of Guadeloupe.
 #.
-#| msgid "Gustavia, Saint Barthelemy"
 msgid "Saint BarthÃ©lemy"
-msgstr ""
+msgstr "SenbartelmÄ«nu"
 
 #. SH - Saint Helena, a British territory in the South Atlantic
 msgid "Saint Helena"
-msgstr "Saint Helena"
+msgstr "Sv.HelÄ?nas sala"
 
 #. KN - Saint Kitts and Nevis
 msgid "Saint Kitts and Nevis"
-msgstr "Saint Kitts and Nevis"
+msgstr "Sentkitsa un Nevisa"
 
 #. LC - Saint Lucia
 msgid "Saint Lucia"
-msgstr "Saint Lucia"
+msgstr "SentlÅ«sija"
 
 #. MF - Saint Martin, the French half of the island of Saint
 #. Martin / Sint Maarten. (The Dutch half is considered part of
 #. the Netherlands Antilles.)
 #.
-#| msgid "Saint Maarten"
 msgid "Saint Martin"
-msgstr ""
+msgstr "SenmartÄ?na"
 
 #. PM - Saint Pierre and Miquelon, a French territory in North
 #. America (off the coast of Newfoundland). The French name is
 #. "Saint-Pierre-et-Miquelon".
 #.
 msgid "Saint Pierre and Miquelon"
-msgstr "Saint Pierre and Miquelon"
+msgstr "SenpjÄ?ra un Mikelona"
 
 #. VC - Saint Vincent and the Grenadines
 msgid "Saint Vincent and the Grenadines"
-msgstr "Saint Vincent and the Grenadines"
+msgstr "Sentvinsenta un GrenadÄ«nas"
 
 #. WS - Samoa, an independent nation not to be confused with
 #. "American Samoa"
 #.
 msgid "Samoa"
-msgstr "Samoa"
+msgstr "Rietumsamoa"
 
 #. SM - San Marino
-#| msgid "San Marcos"
 msgctxt "Country"
 msgid "San Marino"
-msgstr "San MarÄ«no"
+msgstr "SanmarÄ«no"
 
 #. ST - Sao Tome and Principe. The local (Portuguese) name is
 #. "SÃ£o TomÃ© and PrÃncipe". The official ISO 3166 short English
 #. name does not have the accents.
 #.
 msgid "Sao Tome and Principe"
-msgstr "Sao Tome and Principe"
+msgstr "Santome un Prinsipi"
 
 #. SA - Saudi Arabia
 msgid "Saudi Arabia"
-msgstr "Saudi ArÄ?bija"
+msgstr "SaÅ«da ArÄ?bija"
 
 #. SN - Senegal
 msgid "Senegal"
 msgstr "SenegÄ?la"
 
 #. RS - Serbia
-#| msgid "Sebha"
 msgid "Serbia"
 msgstr "Serbija"
 
 #. SC - Seychelles
 msgid "Seychelles"
-msgstr "SeiÅ¡elas"
+msgstr "SeiÅ¡elu salas"
 
 #. SL - Sierra Leone
 msgid "Sierra Leone"
-msgstr "Sjerra Leone"
+msgstr "Sjerraleone"
 
 #. SG - Singapore
-#| msgid "Singapore"
 msgctxt "Country"
 msgid "Singapore"
 msgstr "SingapÅ«ra"
@@ -986,7 +946,7 @@ msgstr "SlovÄ?nija"
 
 #. SB - Solomon Islands
 msgid "Solomon Islands"
-msgstr "Slomona Salas"
+msgstr "ZÄ?lamana salas"
 
 #. SO - Somalia
 msgid "Somalia"
@@ -999,13 +959,12 @@ msgstr "DienvidÄ?frika"
 #. GS - South Georgia and the South Sandwich Islands, a British
 #. territory in the South Atlantic.
 #.
-#| msgid "South Georgia and the Islands"
 msgid "South Georgia and the South Sandwich Islands"
-msgstr ""
+msgstr "DienviddÅ¾ordÅ¾ija un DienvidsendviÄ?u salas"
 
 #. KR - The Republic of Korea, aka South Korea
 msgid "South Korea"
-msgstr "Dienvid Koreja"
+msgstr "Dienvidkoreja"
 
 #. ES - Spain
 msgid "Spain"
@@ -1013,7 +972,7 @@ msgstr "SpÄ?nija"
 
 #. LK - Sri Lanka
 msgid "Sri Lanka"
-msgstr "Å ri Lanka"
+msgstr "Å rilanka"
 
 #. SD - Sudan
 msgid "Sudan"
@@ -1028,7 +987,7 @@ msgstr "Surinama"
 #. internationally.
 #.
 msgid "Svalbard and Jan Mayen"
-msgstr ""
+msgstr "SvalbÄ?ras arhipelÄ?gs un Jana Majena sala"
 
 #. SZ - Swaziland
 msgid "Swaziland"
@@ -1065,16 +1024,14 @@ msgid "Thailand"
 msgstr "Taizeme"
 
 #. TL - Timor-Leste (formerly known as "East Timor")
-#| msgid "Trieste"
 msgid "Timor-Leste"
-msgstr "Timor-Leste"
+msgstr "Austrumtimora"
 
 #. TG - Togo
 msgid "Togo"
 msgstr "Togo"
 
 #. TK - Tokelau, a territory of New Zealand
-#| msgid "Tela"
 msgid "Tokelau"
 msgstr "Tokelau"
 
@@ -1084,7 +1041,7 @@ msgstr "Tonga"
 
 #. TT - Trinidad and Tobago
 msgid "Trinidad and Tobago"
-msgstr "Trinidadas un Tobago"
+msgstr "TrinidÄ?da un TobÄ?go"
 
 #. TN - Tunisia
 msgid "Tunisia"
@@ -1096,13 +1053,13 @@ msgstr "Turcija"
 
 #. TM - Turkmenistan
 msgid "Turkmenistan"
-msgstr "TurkmÄ?nija"
+msgstr "TurkmenistÄ?na"
 
 #. TC - Turks and Caicos Islands, a British territory in the
 #. Caribbean
 #.
 msgid "Turks and Caicos Islands"
-msgstr "Turku un Kaikosu Salas"
+msgstr "TÄ?rksas un Kaikosas salas"
 
 #. TV - Tuvalu
 msgid "Tuvalu"
@@ -1118,11 +1075,11 @@ msgstr "Ukraina"
 
 #. AE - United Arab Emirates
 msgid "United Arab Emirates"
-msgstr "Apvienotie ArÄ?bu ErimÄ?ti"
+msgstr "Apvienotie ArÄ?bu EmirÄ?ti"
 
 #. GB - United Kingdom
 msgid "United Kingdom"
-msgstr "ApvietotÄ?s Karalistes"
+msgstr "LielbritÄ?nija"
 
 #. US - United States, aka United States of America
 msgid "United States"
@@ -1133,14 +1090,13 @@ msgstr "Amerikas SavienotÄ?s Valstis"
 #. Pacific.
 #.
 msgid "United States Minor Outlying Islands"
-msgstr "Amerikas Savienoto Valstu mazÄ?s pieguÄ¼oÅ¡Ä?s salas"
+msgstr "ASV MazÄ?s AizjÅ«ras salas"
 
 #. VI - United States Virgin Islands, a territory of the United
 #. States in the Caribbean
 #.
-#| msgid "United States Minor Outlying Islands"
 msgid "United States Virgin Islands"
-msgstr "Savienoto Valstu VirdÅ¾inu Salas"
+msgstr "ASV VirdÅ¾Ä«nas"
 
 #. UY - Uruguay
 msgid "Uruguay"
@@ -1155,9 +1111,8 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #. VA - Holy See (Vatican City State)
-#| msgid "Ocean City"
 msgid "Vatican City"
-msgstr "VatikÄ?ns"
+msgstr "VatikÄ?ns (SvÄ?tais KrÄ?sls)"
 
 #. VE - Venezuela
 msgid "Venezuela"
@@ -1174,11 +1129,11 @@ msgstr "Vjetnama"
 #. Pacific
 #.
 msgid "Wallis and Futuna"
-msgstr "Volisa salas un Futuna"
+msgstr "Volisa un Futunas salas"
 
 #. EH - Western Sahara, a disputed territory in western Africa
 msgid "Western Sahara"
-msgstr "Western Sahara"
+msgstr "RietumsahÄ?ra"
 
 #. YE - Yemen
 msgid "Yemen"
@@ -1190,12 +1145,11 @@ msgstr "Zambija"
 
 #. ZW - Zimbabwe
 msgid "Zimbabwe"
-msgstr "Zimbabwe"
+msgstr "Zimbabve"
 
 #. AX - Ã?land Islands, an autonomous province of Finland
-#| msgid "Sand Island"
 msgid "Ã?land Islands"
-msgstr "Ä?landu salas"
+msgstr "Olandes salas"
 
 #. The time zone used in the western half of the Democratic
 #. Republic of the Congo. The string is only used in places
@@ -1203,9 +1157,8 @@ msgstr "Ä?landu salas"
 #. clear from context. FIXME: is there an official name for
 #. this zone?
 #.
-#| msgid "Chester County"
 msgid "Western Congo"
-msgstr ""
+msgstr "Rietumu Kongo"
 
 #. The time zone used in the eastern half of the Democratic
 #. Republic of the Congo. The string is only used in places
@@ -1213,9 +1166,8 @@ msgstr ""
 #. clear from context. FIXME: is there an official name for
 #. this zone?
 #.
-#| msgid "East London"
 msgid "Eastern Congo"
-msgstr ""
+msgstr "Austrumu Kongo"
 
 #. An American research station in Antarctica, which keeps
 #. the same time as mainland Chile. The string is only used
@@ -1223,114 +1175,101 @@ msgstr ""
 #. context.
 #.
 msgid "Palmer Station (Chile Time)"
-msgstr ""
+msgstr "Palmer stacija (Ä?Ä«les laiks)"
 
 #. A British research station in Antarctica. The string is
 #. only used in places where "Antarctica" is already clear
 #. from context.
 #.
-#| msgid "Rochester Coast Guard Light Station"
 msgid "Rothera Research Station"
-msgstr ""
+msgstr "Rothera izpÄ?tes stacija"
 
 #. A Japanese research station in Antarctica. The string is
 #. only used in places where "Antarctica" is already clear
 #. from context.
 #.
-#| msgid "College Station"
 msgid "Showa Station"
-msgstr ""
+msgstr "Showa stacija"
 
 #. An Australian research station in Antarctica. The string
 #. is only used in places where "Antarctica" is already
 #. clear from context.
 #.
-#| msgid "College Station"
 msgid "Mawson Station"
-msgstr ""
+msgstr "Mawson stacija"
 
 #. A Russian research station in Antarctica. The string is
 #. only used in places where "Antarctica" is already clear
 #. from context.
 #.
-#| msgid "Coast Guard Station"
 msgid "Vostok Station"
-msgstr ""
+msgstr "Vostok stacija"
 
 #. An Australian research station in Antarctica. The string
 #. is only used in places where "Antarctica" is already
 #. clear from context.
 #.
-#| msgid "Naval Air Station"
 msgid "Davis Station"
-msgstr ""
+msgstr "Davis stacija"
 
 #. 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.
 #.
-#| msgid "Western Australia"
 msgid "Casey Station (Western Australia Time)"
-msgstr ""
+msgstr "Casey stacija (Austrumu AustrÄ?lijas laiks)"
 
 #. A French research station in Antarctica. The string is
 #. only used in places where "Antarctica" is already clear
 #. from context.
 #.
-#| msgid "College Station"
 msgid "Dumont d'Urville Station"
-msgstr ""
+msgstr "Dumont d'Urville stacija"
 
 #. 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.
 #.
 msgid "McMurdo Station (New Zealand Time)"
-msgstr ""
+msgstr "McMurdo stacija (JaunzÄ?landes laiks)"
 
 #. 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.
 #.
-#| msgid "Amundsen-Scott South Pole Station"
 msgid "Amundsen-Scott South Pole Station (New Zealand Time)"
-msgstr ""
+msgstr "Amundsen-Scott dienvidu polÄ?rÄ? stacija (JaunzÄ?landes laiks)"
 
 #. The time zone used in the eastern half of Kazakhstan.
 #. FIXME: is there an official name for this zone?
 #.
-#| msgid "Kazakhstan"
 msgid "Eastern Kazakhstan"
-msgstr "AustrumkazahstÄ?na"
+msgstr "Austrumu KazahstÄ?na"
 
 #. The time zone used in the western half of Kazakhstan.
 #. FIXME: is there an official name for this zone?
 #.
-#| msgid "Kazakhstan"
 msgid "Western Kazakhstan"
-msgstr ""
+msgstr "Rietumu KazahstÄ?na"
 
 #. The time zone used in the eastern part of Mongolia.
 #. FIXME: Is there an official name for this zone?
 #.
-#| msgid "Inner Mongolia"
 msgid "Eastern Mongolia"
-msgstr ""
+msgstr "Austrumu Mongolija"
 
 #. The time zone used in the western part of Mongolia.
 #. FIXME: Is there an official name for this zone?
 #.
-#| msgid "Inner Mongolia"
 msgid "Western Mongolia"
-msgstr ""
+msgstr "Rietumu Mongolija"
 
 #. The time zone used in the central part of Mongolia.
 #. FIXME: Is there an official name for this zone?
 #.
-#| msgid "Inner Mongolia"
 msgid "Central Mongolia"
-msgstr ""
+msgstr "Vidus Mongolija"
 
 #. The timezone around Danmarkshavn station in Greenland.
 #. The string is only used in places where "Greenland" is
@@ -1343,23 +1282,20 @@ msgstr "Danmarkshavn"
 #. seem to point towards calling the area "Western
 #. Greenland" rathern than just "Greenland".
 #.
-#| msgid "Western Island"
 msgid "Western Greenland"
-msgstr ""
+msgstr "Rietumu Grenlandes"
 
 #. The timezone around Scoresbysund / Ittoqqortoormiit on
 #. the east coast of Greenland.
 #.
-#| msgid "Greenland"
 msgid "Eastern Greenland"
-msgstr ""
+msgstr "Austrumu Grenlandes"
 
 #. The timezone at the Thule US Air Force Base on the west
 #. coast of Greenland.
 #.
-#| msgid "Thule A. B."
 msgid "Thule AFB"
-msgstr ""
+msgstr "Thule AFB"
 
 #. The time zone used on the east coast of Canada, in
 #. Bermuda, and on many Caribbean islands. In
@@ -1367,17 +1303,15 @@ msgstr ""
 #. l'Atlantique". The string is only used in places where a
 #. country is already clear from the context.
 #.
-#| msgid "Atlantic City"
 msgid "Atlantic Time"
-msgstr ""
+msgstr "Atlantijas laiks"
 
 #. The time zone used in Western Australia. The string is
 #. only used in places where "Australia" is already clear
 #. from context.
 #.
-#| msgid "Western Head"
 msgid "Western Time"
-msgstr ""
+msgstr "Rietumu laiks"
 
 #. The commonly-used name for an unofficial time zone used
 #. in part of southwestern Australia. The string is only
@@ -1385,16 +1319,15 @@ msgstr ""
 #. context.
 #.
 msgid "Central Western Time"
-msgstr ""
+msgstr "CentrÄ?lais rietumu laiks"
 
 #. 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.
 #.
-#| msgid "Central and South America"
 msgid "Central Time (South Australia)"
-msgstr ""
+msgstr "CentrÄ?lais laiks (DienvidaustrÄ?lija)"
 
 #. The time zone used in Central Australia. This string is
 #. specifically for the time zone as implemented in
@@ -1404,7 +1337,7 @@ msgstr ""
 #. places where "Australia" is already clear from context.
 #.
 msgid "Central Time (Yancowinna, NSW)"
-msgstr ""
+msgstr "CentrÄ?lais laiks (Yancowinna, NSW)"
 
 #. The time zone used in Central Australia. This string is
 #. specifically for the time zone as implemented in the
@@ -1412,9 +1345,8 @@ msgstr ""
 #. string is only used in places where "Australia" is
 #. already clear from context.
 #.
-#| msgid "Northern Territory"
 msgid "Central Time (Northern Territory)"
-msgstr ""
+msgstr "CentrÄ?lais laiks (ZiemeÄ¼u teritorija)"
 
 #. The time zone used in Eastern Australia. This string is
 #. specifically for the time zone as implemented in the
@@ -1422,14 +1354,13 @@ msgstr ""
 #. "Australia" is already clear from context.
 #.
 msgid "Eastern Time (Tasmania)"
-msgstr ""
+msgstr "Austrumu laiks (TasmÄ?nija)"
 
 #. 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.
 #.
-#| msgid "East Timor"
 msgid "Eastern Time (Victoria)"
 msgstr ""
 
@@ -1438,7 +1369,6 @@ msgstr ""
 #. state of New South Wales, and is only used in places
 #. where "Australia" is already clear from context.
 #.
-#| msgid "New South Wales"
 msgid "Eastern Time (New South Wales)"
 msgstr ""
 
@@ -1455,7 +1385,6 @@ msgstr ""
 #. coast of Australia. This string is only used in places
 #. where "Australia" is already clear from context.
 #.
-#| msgid "Rhode Island"
 msgid "Lord Howe Island"
 msgstr ""
 
@@ -1464,7 +1393,6 @@ msgstr ""
 #. Tahiti). This string is only used in places where
 #. "French Polynesia" is already clear from context.
 #.
-#| msgid "Saint Simon Island"
 msgid "Tahiti / Society Islands"
 msgstr ""
 
@@ -1472,7 +1400,6 @@ msgstr ""
 #. French Polynesia. This string is only used in places
 #. where "French Polynesia" is already clear from context.
 #.
-#| msgid "Marshall Islands"
 msgid "Marquesas Islands"
 msgstr "MarÅ¡ala Salas"
 
@@ -1480,14 +1407,12 @@ msgstr "MarÅ¡ala Salas"
 #. French Polynesia. This string is only used in places
 #. where "French Polynesia" is already clear from context.
 #.
-#| msgid "Grenadier Island"
 msgid "Gambier Islands"
 msgstr ""
 
 #. The timezone on the western islands of Indonesia. The
 #. name in Indonesian is "Waktu Indonesia Bagian Barat".
 #.
-#| msgid "Western Island"
 msgid "Western Indonesia Time"
 msgstr ""
 
@@ -1507,7 +1432,6 @@ msgstr ""
 #. main island groups of Kiribati. This string is only used
 #. in places where "Kiribati" is already clear from context.
 #.
-#| msgid "Brier Island"
 msgid "Gilbert Islands"
 msgstr ""
 
@@ -1515,7 +1439,6 @@ msgstr ""
 #. main island groups of Kiribati. This string is only used
 #. in places where "Kiribati" is already clear from context.
 #.
-#| msgid "Rhode Island"
 msgid "Phoenix Islands"
 msgstr ""
 
@@ -1523,7 +1446,6 @@ msgstr ""
 #. island groups of Kiribati. This string is only used in
 #. places where "Kiribati" is already clear from context.
 #.
-#| msgid "Piney Island"
 msgid "Line Islands"
 msgstr ""
 
@@ -1550,14 +1472,12 @@ msgstr ""
 #. there a better name for this? "Mainland" seems odd in
 #. reference to an island nation...
 #.
-#| msgid "New Zealand"
 msgid "Mainland New Zealand"
 msgstr "JaunzÄ?lande"
 
 #. This refers to the time zone in the Chatham Islands of
 #. New Zealand.
 #.
-#| msgid "Canary Islands"
 msgid "Chatham Islands"
 msgstr ""
 
@@ -1593,7 +1513,6 @@ msgstr "Wake Island"
 #. details. This string is only used in places where
 #. "Brazil" is already clear from context.
 #.
-#| msgid "Location 1"
 msgid "Tocantins"
 msgstr ""
 
@@ -1602,7 +1521,6 @@ msgstr ""
 #. details. This string is only used in places where
 #. "Brazil" is already clear from context.
 #.
-#| msgid "Bafia"
 msgctxt "Timezone"
 msgid "Bahia"
 msgstr "Bafia"
@@ -1621,7 +1539,6 @@ msgstr ""
 #. details. This string is only used in places where
 #. "Brazil" is already clear from context.
 #.
-#| msgid "Romania"
 msgctxt "Timezone"
 msgid "Roraima"
 msgstr "RumÄ?nija"
@@ -1640,7 +1557,6 @@ msgstr ""
 #. details. This string is only used in places where
 #. "Brazil" is already clear from context.
 #.
-#| msgid "Matamoros"
 msgctxt "Timezone"
 msgid "Mato Grosso"
 msgstr ""
@@ -1651,7 +1567,6 @@ msgstr ""
 #. used in places where "Brazil" is already clear from
 #. context.
 #.
-#| msgid "West Atlanta"
 msgid "West Amazonas"
 msgstr ""
 
@@ -1678,7 +1593,6 @@ msgstr ""
 #. used in places where "Brazil" is already clear from
 #. context.
 #.
-#| msgid "Pastaza/RÃo Amazonas"
 msgid "East Amazonas"
 msgstr ""
 
@@ -1704,7 +1618,6 @@ msgstr ""
 #. details. This string is only used in places where
 #. "Brazil" is already clear from context.
 #.
-#| msgid "Pensacola"
 msgctxt "Timezone"
 msgid "Pernambuco"
 msgstr ""
@@ -1714,7 +1627,6 @@ msgstr ""
 #. details. This string is only used in places where
 #. "Brazil" is already clear from context.
 #.
-#| msgid "Accra"
 msgctxt "Timezone"
 msgid "Acre"
 msgstr "Akra"
@@ -1737,14 +1649,12 @@ msgstr "Akra"
 #. Paulo). This string is only used in places where
 #. "Brazil" is already clear from context.
 #.
-#| msgid "BrasÃlia"
 msgid "BrasÃlia Time"
 msgstr ""
 
 #. This refers to the time zone for mainland Chile (as
 #. opposed to the time zone for Easter Island).
 #.
-#| msgid "Malad City"
 msgid "Mainland Chile"
 msgstr ""
 
@@ -1752,19 +1662,16 @@ msgstr ""
 #. string is only used in places where "Chile" is already
 #. understood from context.
 #.
-#| msgid "Barter Island"
 msgid "Easter Island"
 msgstr ""
 
 #. This refers to the time zone for mainland Ecuador (as
 #. opposed to the time zone for the Galapagos Islands).
 #.
-#| msgid "Ecuador"
 msgid "Mainland Ecuador"
 msgstr ""
 
 #. The time zone for the Galapagos Islands.
-#| msgid "Baleares Islands"
 msgid "Galapagos Islands"
 msgstr ""
 
@@ -1784,7 +1691,6 @@ msgstr ""
 #. is only used in places where "Portugal" is already
 #. understood from context.
 #.
-#| msgid "Arorae"
 msgid "Azores"
 msgstr "Azoru salas"
 
@@ -1792,14 +1698,12 @@ msgstr "Azoru salas"
 #. of Madeira. The string is only used in places where
 #. "Portugal" is already understood from context.
 #.
-#| msgid "Madera"
 msgid "Madeira"
 msgstr "Madeira"
 
 #. This refers to the time zone for mainland Portugal (as
 #. opposed to the time zone for the Azores).
 #.
-#| msgid "Portugal"
 msgid "Mainland Portugal"
 msgstr "PortugÄ?le"
 
@@ -1808,7 +1712,6 @@ msgstr "PortugÄ?le"
 #. "Ð?Ð°Ð»Ð¸Ð½Ð¸Ð½Ð³Ñ?Ð°Ð´Ñ?ÐºÐ¾Ðµ Ð²Ñ?ÐµÐ¼Ñ?". This string is only used in
 #. places where "Russia" is already clear from context.
 #.
-#| msgid "Kaliningrad"
 msgid "Kaliningrad Time"
 msgstr ""
 
@@ -1817,7 +1720,6 @@ msgstr ""
 #. "Ð?Ð¾Ñ?ÐºÐ¾Ð²Ñ?ÐºÐ¾Ðµ Ð²Ñ?ÐµÐ¼Ñ?". This string is only used in places
 #. where "Russia" is already clear from context.
 #.
-#| msgid "Moscow"
 msgid "Moscow Time"
 msgstr ""
 
@@ -1827,7 +1729,6 @@ msgstr ""
 #. used in places where "Russia" is already clear from
 #. context.
 #.
-#| msgid "Samara"
 msgid "Samara Time"
 msgstr ""
 
@@ -1836,7 +1737,6 @@ msgstr ""
 #. "Ð?ÐºÐ°Ñ?ÐµÑ?Ð¸Ð½Ð±Ñ?Ñ?Ð³Ñ?ÐºÐ¾Ðµ Ð²Ñ?ÐµÐ¼Ñ?". This string is only used in
 #. places where "Russia" is already clear from context.
 #.
-#| msgid "Ekaterinburg"
 msgid "Yekaterinburg Time"
 msgstr ""
 
@@ -1846,7 +1746,6 @@ msgstr ""
 #. used in places where "Russia" is already clear from
 #. context.
 #.
-#| msgid "Omsk"
 msgid "Omsk Time"
 msgstr "Omska"
 
@@ -1855,7 +1754,6 @@ msgstr "Omska"
 #. "Ð?Ñ?Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ñ?ÐºÐ¾Ðµ Ð²Ñ?ÐµÐ¼Ñ?". This string is only used in places
 #. where "Russia" is already clear from context.
 #.
-#| msgid "Krasnoyarsk"
 msgid "Krasnoyarsk Time"
 msgstr ""
 
@@ -1864,7 +1762,6 @@ msgstr ""
 #. name is "Ð?Ñ?ÐºÑ?Ñ?Ñ?ÐºÐ¾Ðµ Ð²Ñ?ÐµÐ¼Ñ?". This string is only used in
 #. places where "Russia" is already clear from context.
 #.
-#| msgid "Irkutsk"
 msgid "Irkutsk Time"
 msgstr ""
 
@@ -1873,7 +1770,6 @@ msgstr ""
 #. name is "Ð¯ÐºÑ?Ñ?Ñ?ÐºÐ¾Ðµ Ð²Ñ?ÐµÐ¼Ñ?". This string is only used in
 #. places where "Russia" is already clear from context.
 #.
-#| msgid "Yakutsk"
 msgid "Yakutsk Time"
 msgstr ""
 
@@ -1882,7 +1778,6 @@ msgstr ""
 #. "Ð?Ð»Ð°Ð´Ð¸Ð²Ð¾Ñ?Ñ?Ð¾ÐºÑ?ÐºÐ¾Ðµ Ð²Ñ?ÐµÐ¼Ñ?". This string is only used in
 #. places where "Russia" is already clear from context.
 #.
-#| msgid "Vladivostok"
 msgid "Vladivostok Time"
 msgstr ""
 
@@ -1891,7 +1786,6 @@ msgstr ""
 #. "Ð?Ð°Ð³Ð°Ð´Ð°Ð½Ñ?ÐºÐ¾Ðµ Ð²Ñ?ÐµÐ¼Ñ?". This string is only used in places
 #. where "Russia" is already clear from context.
 #.
-#| msgid "Magadan"
 msgid "Magadan Time"
 msgstr ""
 
@@ -1913,7 +1807,6 @@ msgstr "Canary Islands"
 #. This refers to the time zone for mainland Spain (as
 #. opposed to the time zone for the Canary Islands).
 #.
-#| msgid "Marina di Ginosa"
 msgid "Mainland Spain"
 msgstr ""
 
@@ -1931,7 +1824,6 @@ msgstr ""
 #. where "US", "Canada" or "Mexico" is already clear from
 #. the context.
 #.
-#| msgid "Pacific City State"
 msgid "Pacific Time"
 msgstr "KlusÄ? okeÄ?na laiks"
 
@@ -1942,7 +1834,6 @@ msgstr "KlusÄ? okeÄ?na laiks"
 #. string is only used in places where "US", "Canada" or
 #. "Mexico" is already clear from the context.
 #.
-#| msgid "Mountain Home"
 msgid "Mountain Time"
 msgstr ""
 
@@ -1961,7 +1852,6 @@ msgstr ""
 #. "US", "Canada" or "Mexico" is already clear from the
 #. context.
 #.
-#| msgid "Centralia"
 msgid "Central Time"
 msgstr ""
 
@@ -1979,7 +1869,6 @@ msgstr ""
 #. "Heure de l'Est". The string is only used in places
 #. where "US" or "Canada" is already clear from the context.
 #.
-#| msgid "East Timor"
 msgid "Eastern Time"
 msgstr ""
 
@@ -2004,7 +1893,6 @@ msgstr ""
 #. Newfoundland. In French-speaking parts of Canada it is
 #. called "Heure de Terre-Neuve".
 #.
-#| msgid "Newfoundland"
 msgid "Newfoundland Time"
 msgstr ""
 
@@ -2032,7 +1920,6 @@ msgstr ""
 #. United States. The string is only used in places where
 #. "United States" is already clear from context.
 #.
-#| msgid "Alaska"
 msgid "Alaska Time"
 msgstr "AÄ¼askas laiks"
 
@@ -2067,10 +1954,9 @@ msgstr "South Australia"
 
 #. A state/province/territory in Australia
 msgid "Tasmania"
-msgstr "Tasmania"
+msgstr "TasmÄ?nija"
 
 #. A state/province/territory in Australia
-#| msgid "Victoria"
 msgctxt "State in Australia"
 msgid "Victoria"
 msgstr ""
@@ -2082,7 +1968,6 @@ msgstr "Western Australia"
 #. A state in Belgium. local name (nl): Antwerpen. local name
 #. (fr): Anvers. local name (de): Antwerpen.
 #.
-#| msgid "Antwerp"
 msgctxt "State in Belgium"
 msgid "Antwerp"
 msgstr "Antverpene"
@@ -2096,7 +1981,6 @@ msgid "Brussels, Flemish and Walloon Brabant"
 msgstr "Brussels, Flemish and Walloon Brabant"
 
 #. A state/province/territory in Belgium
-#| msgid "East Flanders"
 msgid "East-Flanders"
 msgstr ""
 
@@ -2121,7 +2005,6 @@ msgid "LiÃ¨ge"
 msgstr "LiÃ¨ge"
 
 #. A state/province/territory in Belgium
-#| msgid "Luxembourg"
 msgctxt "State in Belgium"
 msgid "Luxembourg"
 msgstr "Luksemburga"
@@ -2138,34 +2021,28 @@ msgid "West-Flanders"
 msgstr "West-Flanders"
 
 #. A state/province/territory in Brazil
-#| msgid "Accra"
 msgctxt "State in Brazil"
 msgid "Acre"
 msgstr "Akra"
 
 #. A state/province/territory in Brazil
-#| msgid "Algona"
 msgid "Alagoas"
 msgstr "Algona"
 
 #. A state/province/territory in Brazil
-#| msgid "Amapala"
 msgid "AmapÃ¡"
 msgstr "Amapala"
 
 #. A state/province/territory in Brazil
-#| msgid "Arizona"
 msgid "Amazonas"
 msgstr ""
 
 #. A state/province/territory in Brazil
-#| msgid "Bafia"
 msgctxt "State in Brazil"
 msgid "Bahia"
 msgstr "Bafia"
 
 #. A state/province/territory in Brazil
-#| msgid "Clear"
 msgid "CearÃ¡"
 msgstr ""
 
@@ -2175,22 +2052,18 @@ msgid "Distrito Federal"
 msgstr ""
 
 #. A state/province/territory in Brazil
-#| msgid "Porto Santo"
 msgid "EspÃrito Santo"
 msgstr ""
 
 #. A state/province/territory in Brazil
-#| msgid "Gobabis"
 msgid "GoiÃ¡s"
 msgstr "Gobabis"
 
 #. A state/province/territory in Brazil
-#| msgid "Marathon"
 msgid "MaranhÃ£o"
 msgstr ""
 
 #. A state/province/territory in Brazil
-#| msgid "Matamoros"
 msgctxt "State in Brazil"
 msgid "Mato Grosso"
 msgstr ""
@@ -2201,59 +2074,48 @@ msgid "Mato Grosso do Sul"
 msgstr ""
 
 #. A state/province/territory in Brazil
-#| msgid "Piedras Negras"
 msgid "Minas Gerais"
 msgstr ""
 
 #. A state/province/territory in Brazil
-#| msgid "ParanaguÃ¡"
 msgid "ParanÃ¡"
 msgstr ""
 
 #. A state/province/territory in Brazil
-#| msgid "ParnaÃba"
 msgid "ParaÃba"
 msgstr ""
 
 #. A state/province/territory in Brazil
-#| msgid "MarabÃ¡"
 msgid "ParÃ¡"
 msgstr ""
 
 #. A state/province/territory in Brazil
-#| msgid "Pensacola"
 msgctxt "State in Brazil"
 msgid "Pernambuco"
 msgstr ""
 
 #. A state/province/territory in Brazil
-#| msgid "Pau"
 msgid "PiauÃ"
 msgstr ""
 
 #. A state/province/territory in Brazil
-#| msgid "Airport del Norte"
 msgid "Rio Grande do Norte"
 msgstr ""
 
 #. A state/province/territory in Brazil
-#| msgid "RÃo Grande"
 msgid "Rio Grande do Sul"
 msgstr ""
 
 #. A state/province/territory in Brazil
-#| msgid "Rio de Janeiro"
 msgctxt "State in Brazil"
 msgid "Rio de Janeiro"
 msgstr ""
 
 #. A state/province/territory in Brazil
-#| msgid "Romania"
 msgid "RondÃ´nia"
 msgstr ""
 
 #. A state/province/territory in Brazil
-#| msgid "Romania"
 msgctxt "State in Brazil"
 msgid "Roraima"
 msgstr "RumÄ?nija"
@@ -2263,18 +2125,15 @@ msgid "Santa Catarina"
 msgstr "Santa Catarina"
 
 #. A state/province/territory in Brazil
-#| msgid "Selfridge"
 msgid "Sergipe"
 msgstr ""
 
 #. A state/province/territory in Brazil
-#| msgid "SÃ£o Paulo"
 msgctxt "State in Brazil"
 msgid "SÃ£o Paulo"
 msgstr ""
 
 #. A state/province/territory in Brazil
-#| msgid "Tatoi"
 msgid "Tocantis"
 msgstr ""
 
@@ -2295,7 +2154,6 @@ msgid "New Brunswick"
 msgstr "New Brunswick"
 
 #. A state/province/territory in Canada
-#| msgid "Newfoundland"
 msgid "Newfoundland and Labrador"
 msgstr ""
 
@@ -2312,7 +2170,6 @@ msgid "Nunavut"
 msgstr "Nunavut"
 
 #. A state/province/territory in Canada
-#| msgid "Ontario"
 msgctxt "State in Canada"
 msgid "Ontario"
 msgstr "Ontario"
@@ -2322,7 +2179,6 @@ msgid "Prince Edward Island"
 msgstr "Prince Edward Island"
 
 #. A state/province/territory in Canada
-#| msgid "Quebec"
 msgctxt "State in Canada"
 msgid "Quebec"
 msgstr "Kvebeka"
@@ -2340,13 +2196,11 @@ msgid "Anhui"
 msgstr "Anhui"
 
 #. A state/province/territory in China
-#| msgid "Beijing"
 msgctxt "State in China"
 msgid "Beijing"
 msgstr "Pekina"
 
 #. A state/province/territory in China
-#| msgid "Chongqing"
 msgctxt "State in China"
 msgid "Chongqing"
 msgstr ""
@@ -2380,12 +2234,10 @@ msgid "Heilongjiang"
 msgstr "Heilongjiang"
 
 #. A state/province/territory in China
-#| msgid "Hunan"
 msgid "Henan"
 msgstr ""
 
 #. A state/province/territory in China
-#| msgid "Hue"
 msgid "Hubei"
 msgstr ""
 
@@ -2398,7 +2250,6 @@ msgid "Inner Mongolia"
 msgstr "IekÅ¡Ä?js Mongolija"
 
 #. A state/province/territory in China
-#| msgid "Gansu"
 msgid "Jiangsu"
 msgstr ""
 
@@ -2415,18 +2266,15 @@ msgid "Shaanxi"
 msgstr "Shaanxi"
 
 #. A state/province/territory in China
-#| msgid "Shantong"
 msgid "Shandong"
 msgstr ""
 
 #. A state/province/territory in China
-#| msgid "Shanghai"
 msgctxt "State in China"
 msgid "Shanghai"
 msgstr ""
 
 #. A state/province/territory in China
-#| msgid "Shaanxi"
 msgid "Shanxi"
 msgstr ""
 
@@ -2435,7 +2283,6 @@ msgid "Sichuan"
 msgstr ""
 
 #. A state/province/territory in China
-#| msgid "Tianjin"
 msgctxt "State in China"
 msgid "Tianjin"
 msgstr ""
@@ -2464,7 +2311,6 @@ msgid "Bavaria"
 msgstr ""
 
 #. A state/province/territory in Germany
-#| msgid "Berlin"
 msgctxt "State in Germany"
 msgid "Berlin"
 msgstr ""
@@ -2474,13 +2320,11 @@ msgid "Brandenburg"
 msgstr ""
 
 #. A state/province/territory in Germany
-#| msgid "Bremen"
 msgctxt "State in Germany"
 msgid "Bremen"
 msgstr ""
 
 #. A state/province/territory in Germany
-#| msgid "Hamburg"
 msgctxt "State in Germany"
 msgid "Hamburg"
 msgstr ""
@@ -2550,45 +2394,37 @@ msgid "Thuringia"
 msgstr "Thuringia"
 
 #. A state/province/territory in Mexico
-#| msgid "Aguascalientes"
 msgctxt "State in Mexico"
 msgid "Aguascalientes"
 msgstr "Aguaskalientesa"
 
 #. A state/province/territory in Mexico
-#| msgid "California"
 msgid "Baja California"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "California"
 msgid "Baja California Sur"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Campeche"
 msgctxt "State in Mexico"
 msgid "Campeche"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Chipata"
 msgid "Chiapas"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Chihuahua"
 msgctxt "State in Mexico"
 msgid "Chihuahua"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Cahul"
 msgid "Coahuila"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Colima"
 msgctxt "State in Mexico"
 msgid "Colima"
 msgstr "Colima"
@@ -2599,124 +2435,101 @@ msgid "Distrito Federal"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Durango"
 msgctxt "State in Mexico"
 msgid "Durango"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Guanaja"
 msgid "Guanajuato"
 msgstr "Guanaja"
 
 #. A state/province/territory in Mexico
-#| msgid "Queretaro"
 msgid "Guerrero"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Hilo"
 msgid "Hidalgo"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Basco"
 msgid "Jalisco"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Michigan"
 msgid "MichoacÃ¡n"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Melo"
 msgid "Morelos"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Mexico"
 msgid "MÃ©xico"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Nyeri"
 msgid "Nayarit"
 msgstr "Nyeri"
 
 #. A state/province/territory in Mexico
-#| msgid "Nuevo Laredo"
 msgid "Nuevo LeÃ³n"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Oaxaca"
 msgctxt "State in Mexico"
 msgid "Oaxaca"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Puebla"
 msgctxt "State in Mexico"
 msgid "Puebla"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Queretaro"
 msgctxt "State in Mexico"
 msgid "QuerÃ©taro"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Quintero Santiago"
 msgid "Quintana Roo"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "San Luis de PotosÃ"
 msgctxt "State in Mexico"
 msgid "San Luis PotosÃ"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Sindal"
 msgid "Sinaloa"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Sonora"
 msgctxt "State in Mexico"
 msgid "Sonora"
 msgstr "Sonora"
 
 #. A state/province/territory in Mexico
-#| msgid "Tabas"
 msgid "Tabasco"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Taipa"
 msgid "Tamaulipas"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Tacloban"
 msgid "Tlaxcala"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Veracruz"
 msgctxt "State in Mexico"
 msgid "Veracruz"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "TucumÃ¡n"
 msgid "YucatÃ¡n"
 msgstr ""
 
 #. A state/province/territory in Mexico
-#| msgid "Zacatecas"
 msgctxt "State in Mexico"
 msgid "Zacatecas"
 msgstr ""
@@ -2794,7 +2607,6 @@ msgid "Florida"
 msgstr "Florida"
 
 #. A state/province/territory in United States
-#| msgid "Georgia"
 msgctxt "State in United States"
 msgid "Georgia"
 msgstr "Gruzija"
@@ -2812,7 +2624,6 @@ msgid "Illinois"
 msgstr "Illinois"
 
 #. A state/province/territory in United States
-#| msgid "Indiana"
 msgctxt "State in United States"
 msgid "Indiana"
 msgstr ""
@@ -2830,7 +2641,6 @@ msgid "Kentucky"
 msgstr "Kentucky"
 
 #. A state/province/territory in United States
-#| msgid "Lousiana"
 msgid "Louisiana"
 msgstr ""
 
@@ -2887,7 +2697,6 @@ msgid "New Mexico"
 msgstr "New Mexico"
 
 #. A state/province/territory in United States
-#| msgid "New York"
 msgctxt "State in United States"
 msgid "New York"
 msgstr ""
@@ -2949,7 +2758,6 @@ msgid "Virginia"
 msgstr "VirdÅ¾Ä«nija"
 
 #. A state/province/territory in United States
-#| msgid "Washington"
 msgctxt "State in United States"
 msgid "Washington"
 msgstr ""
@@ -2963,7 +2771,6 @@ msgid "Wisconsin"
 msgstr "Wisconsin"
 
 #. A state/province/territory in United States
-#| msgid "Wyoming"
 msgctxt "State in United States"
 msgid "Wyoming"
 msgstr ""
@@ -2994,7 +2801,6 @@ msgstr "AdrÄ?ra"
 #. "Algiers" is the traditional English name.
 #. The local name in French is "Alger".
 #.
-#| msgid "Angers"
 msgid "Algiers"
 msgstr ""
 
@@ -3015,7 +2821,6 @@ msgid "Bejaia"
 msgstr "Bejaia"
 
 #. A city in Algeria
-#| msgid "Brisbane"
 msgid "Berriane"
 msgstr ""
 
@@ -3024,7 +2829,6 @@ msgid "Biskra"
 msgstr "Biskra"
 
 #. A city in Algeria
-#| msgid "Bou-Saada"
 msgid "Bou Saada"
 msgstr ""
 
@@ -3037,7 +2841,6 @@ msgid "Constantine"
 msgstr "Constantine"
 
 #. A city in Algeria
-#| msgid "Dar-El-Beida"
 msgid "Dar el Beida"
 msgstr ""
 
@@ -3054,17 +2857,14 @@ msgid "Ghardaia"
 msgstr "Ghardaia"
 
 #. A city in Algeria
-#| msgid "Hassi-Messaoud"
 msgid "Hassi Messaoud"
 msgstr ""
 
 #. A city in Algeria
-#| msgid "In Amenas"
 msgid "I-n-Amenas"
 msgstr ""
 
 #. A city in Algeria
-#| msgid "Salalah"
 msgid "I-n-Salah"
 msgstr ""
 
@@ -3073,7 +2873,6 @@ msgid "Illizi"
 msgstr "Illizi"
 
 #. A city in Algeria
-#| msgid "Kiel"
 msgid "Jijel"
 msgstr ""
 
@@ -3082,7 +2881,6 @@ msgid "Laghouat"
 msgstr "Laghouat"
 
 #. A city in Algeria
-#| msgid "Masirah"
 msgid "Mascara"
 msgstr ""
 
@@ -3099,7 +2897,6 @@ msgid "Setif"
 msgstr "Setif"
 
 #. A city in Algeria
-#| msgid "Simra"
 msgid "Sidi Amrane"
 msgstr ""
 
@@ -3108,7 +2905,6 @@ msgid "Sidi Bel Abbes"
 msgstr ""
 
 #. A city in Algeria
-#| msgid "Tamanrasset/Aguenna"
 msgid "Tamanrasset"
 msgstr ""
 
@@ -3129,7 +2925,6 @@ msgid "Tindouf"
 msgstr "Tindouf"
 
 #. A city in Algeria
-#| msgid "Tlemcen Zenata"
 msgid "Tlemcen"
 msgstr ""
 
@@ -3141,22 +2936,15 @@ msgstr "Touggourt"
 msgid "Pago Pago"
 msgstr "Pago Pago"
 
-#. The capital of Angola
-msgid "Luanda"
-msgstr "Luanda"
-
 #. The capital of Anguilla
-#| msgid "The Dalles"
 msgid "The Valley"
 msgstr ""
 
 #. A city in Antigua and Barbuda
-#| msgid "Pincher Creek"
 msgid "Fitches Creek"
 msgstr ""
 
 #. The capital of Antigua and Barbuda
-#| msgid "Saint John"
 msgctxt "City in Antigua and Barbuda"
 msgid "Saint John's"
 msgstr ""
@@ -3174,7 +2962,6 @@ msgid "Corrientes"
 msgstr "Corrientes"
 
 #. A city in Argentina
-#| msgid "CÃ³rdoba"
 msgctxt "City in Argentina"
 msgid "CÃ³rdoba"
 msgstr ""
@@ -3192,7 +2979,6 @@ msgid "Formosa"
 msgstr "Formosa"
 
 #. A city in Argentina
-#| msgid "Mar Del Plata"
 msgid "Mar del Plata"
 msgstr ""
 
@@ -3201,7 +2987,6 @@ msgid "Mendoza"
 msgstr "Mendoza"
 
 #. A city in Argentina
-#| msgid "Neuquen"
 msgid "NeuquÃ©n"
 msgstr ""
 
@@ -3210,12 +2995,10 @@ msgid "Posadas"
 msgstr "Posadas"
 
 #. A city in Argentina
-#| msgid "IguazÃº"
 msgid "Puerto IguazÃº"
 msgstr ""
 
 #. A city in Argentina
-#| msgid "Reconquista, SF"
 msgid "Reconquista"
 msgstr ""
 
@@ -3240,21 +3023,15 @@ msgid "Salta"
 msgstr "Salta"
 
 #. A city in Argentina
-#| msgid "San Carlos"
 msgid "San Carlos de Bariloche"
 msgstr ""
 
 #. A city in Argentina
-#| msgid "San Fernando"
 msgctxt "City in Argentina"
 msgid "San Fernando"
 msgstr ""
 
 #. A city in Argentina
-msgid "San Miguel de TucumÃ¡n"
-msgstr ""
-
-#. A city in Argentina
 msgid "San Salvador de Jujuy"
 msgstr ""
 
@@ -3267,12 +3044,10 @@ msgid "Yerevan"
 msgstr "Yerevan"
 
 #. A city in Aruba
-#| msgid "Camiri"
 msgid "Camacuri"
 msgstr ""
 
 #. The capital of Aruba
-#| msgid "Kristianstad"
 msgid "Oranjestad"
 msgstr ""
 
@@ -3293,7 +3068,6 @@ msgid "Broome"
 msgstr "Broome"
 
 #. A city in Western Australia in Australia
-#| msgid "Bullsbrook Pearce"
 msgid "Bullsbrook"
 msgstr ""
 
@@ -3318,23 +3092,19 @@ msgid "Dubbo"
 msgstr "Dubbo"
 
 #. A city in New South Wales in Australia
-#| msgid "Fort Sill"
 msgid "Forest Hill"
 msgstr ""
 
 #. A city in Tasmania in Australia
-#| msgid "Hobart"
 msgctxt "City in Tasmania, Australia"
 msgid "Hobart"
 msgstr ""
 
 #. A city in Western Australia in Australia
-#| msgid "Kalgoorlie Boulder"
 msgid "Kalgoorlie"
 msgstr ""
 
 #. A city in Northern Territory in Australia
-#| msgid "Pathein"
 msgid "Katherine"
 msgstr ""
 
@@ -3343,7 +3113,6 @@ msgid "Kununurra"
 msgstr "Kununurra"
 
 #. A city in Victoria in Australia
-#| msgid "Lar"
 msgid "Lara"
 msgstr ""
 
@@ -3352,12 +3121,10 @@ msgid "Launceston"
 msgstr "Launceston"
 
 #. A city in Western Australia in Australia
-#| msgid "Learmouth"
 msgid "Learmonth"
 msgstr ""
 
 #. A city in Victoria in Australia
-#| msgid "Melbourne"
 msgctxt "City in Victoria, Australia"
 msgid "Melbourne"
 msgstr ""
@@ -3371,7 +3138,6 @@ msgid "Perth"
 msgstr "Perth"
 
 #. A city in New South Wales in Australia
-#| msgid "Richmond"
 msgctxt "City in New South Wales, Australia"
 msgid "Richmond"
 msgstr ""
@@ -3381,12 +3147,10 @@ msgid "Rockhampton"
 msgstr "Rockhampton"
 
 #. A city in Western Australia in Australia
-#| msgid "Peterborough"
 msgid "Shellborough"
 msgstr ""
 
 #. A city in New South Wales in Australia
-#| msgid "Sydney"
 msgctxt "City in New South Wales, Australia"
 msgid "Sydney"
 msgstr ""
@@ -3434,7 +3198,6 @@ msgid "Salzburg"
 msgstr "Salzburg"
 
 #. A city in Austria
-#| msgid "Heringsdorf"
 msgid "Teesdorf"
 msgstr ""
 
@@ -3469,18 +3232,15 @@ msgid "Baku"
 msgstr "Baku"
 
 #. A city in Azerbaijan
-#| msgid "Gyanca"
 msgid "Ganca"
 msgstr ""
 
 #. A city in the Bahamas
-#| msgid "Freeport"
 msgctxt "City in Bahamas"
 msgid "Freeport"
 msgstr ""
 
 #. A city in the Bahamas
-#| msgid "Georgetown"
 msgctxt "City in Bahamas"
 msgid "Georgetown"
 msgstr ""
@@ -3492,7 +3252,6 @@ msgstr "Nassau"
 #. A city in Bahrain.
 #. The name is also written "Ø§Ù?ØØ¯".
 #.
-#| msgid "Al Udeid"
 msgid "Al Hadd"
 msgstr ""
 
@@ -3500,14 +3259,12 @@ msgstr ""
 #. "Manama" is the traditional English name.
 #. The local name in Arabic is "Al Manamah / Ø§Ù?Ù?Ù?Ø§Ù?Ø©".
 #.
-#| msgid "Myanmar"
 msgid "Manama"
 msgstr ""
 
 #. A city in Bangladesh.
 #. The local name in Bengali is "à¦?à¦?à§?à¦?à¦?à§?à¦°à¦¾à¦®".
 #.
-#| msgid "Chittagong Patenga"
 msgid "Chittagong"
 msgstr ""
 
@@ -3518,33 +3275,27 @@ msgid "Dhaka"
 msgstr "Dhaka"
 
 #. A city in Bangladesh
-#| msgid "Sholapur"
 msgid "Solpur"
 msgstr ""
 
 #. The capital of Barbados
-#| msgid "Bridgetown City"
 msgid "Bridgetown"
 msgstr ""
 
 #. A city in Barbados
-#| msgid "Parana"
 msgid "Paragon"
 msgstr ""
 
 #. A city in Belarus
-#| msgid "Brest"
 msgctxt "City in Belarus"
 msgid "Brest"
 msgstr ""
 
 #. A city in Belarus
-#| msgid "Gomel'"
 msgid "Homyel'"
 msgstr ""
 
 #. A city in Belarus
-#| msgid "Huron"
 msgid "Hrodna"
 msgstr ""
 
@@ -3553,7 +3304,6 @@ msgid "Minsk"
 msgstr "Minsk"
 
 #. A city in Belarus
-#| msgid "Vitebsk"
 msgid "Vitsyebsk"
 msgstr ""
 
@@ -3561,7 +3311,6 @@ msgstr ""
 #. "Antwerp" is the traditional English name.
 #. The local name is "Antwerpen".
 #.
-#| msgid "Antwerp"
 msgctxt "City in Antwerp, Belgium"
 msgid "Antwerp"
 msgstr "Antverpene"
@@ -3573,7 +3322,6 @@ msgid "Beauvechain"
 msgstr "Beauvechain"
 
 #. A city in LiÃ¨ge in Belgium
-#| msgid "Bizerte"
 msgid "Bierset"
 msgstr ""
 
@@ -3582,7 +3330,6 @@ msgstr ""
 #. The local name in French is "Bruxelles".
 #. The local name in Dutch is "Brussel".
 #.
-#| msgid "Russell"
 msgid "Brussels"
 msgstr ""
 
@@ -3599,12 +3346,10 @@ msgid "Florennes"
 msgstr "Florennes"
 
 #. A city in Hainaut in Belgium
-#| msgid "Bossembele"
 msgid "Gosselies"
 msgstr ""
 
 #. A city in Limburg in Belgium
-#| msgid "Kleine Brogel"
 msgid "Kleine-Brogel"
 msgstr ""
 
@@ -3613,7 +3358,6 @@ msgid "Koksijde"
 msgstr "Koksijde"
 
 #. A city in West-Flanders in Belgium
-#| msgid "Ostend"
 msgid "Oostende"
 msgstr ""
 
@@ -3624,7 +3368,6 @@ msgid "Schaffen"
 msgstr "Schaffen"
 
 #. A city in Belize
-#| msgid "Elizabeth City"
 msgid "Belize City"
 msgstr ""
 
@@ -3633,18 +3376,15 @@ msgid "Cotonou"
 msgstr "Cotonou"
 
 #. The capital of Benin
-#| msgid "Provo"
 msgid "Porto-Novo"
 msgstr ""
 
 #. The capital of Bermuda
-#| msgid "Hamilton"
 msgctxt "City in Bermuda"
 msgid "Hamilton"
 msgstr ""
 
 #. A city in Bermuda
-#| msgid "St. George"
 msgctxt "City in Bermuda"
 msgid "Saint George"
 msgstr ""
@@ -3662,13 +3402,11 @@ msgid "Cochabamba"
 msgstr "Cochabamba"
 
 #. A city in Bolivia
-#| msgid "ConcepciÃ³n"
 msgctxt "City in Bolivia"
 msgid "ConcepciÃ³n"
 msgstr ""
 
 #. The capital of Bolivia
-#| msgid "La Paz"
 msgctxt "City in Bolivia"
 msgid "La Paz"
 msgstr ""
@@ -3698,7 +3436,6 @@ msgid "Riberalta"
 msgstr "Riberalta"
 
 #. A city in Bolivia
-#| msgid "Robore"
 msgid "RoborÃ©"
 msgstr ""
 
@@ -3711,7 +3448,6 @@ msgid "San Borja"
 msgstr "San Borja"
 
 #. A city in Bolivia
-#| msgid "San Ignacio De Velasco"
 msgid "San Ignacio de Velasco"
 msgstr ""
 
@@ -3722,12 +3458,10 @@ msgstr "San JoaquÃn"
 #. A city in Bolivia.
 #. One of several cities in Bolivia called "San JosÃ©".
 #.
-#| msgid "San Jose De Chiquitos"
 msgid "San JosÃ© de Chiquitos"
 msgstr ""
 
 #. A city in Bolivia
-#| msgid "Santa Ana/El Palmar"
 msgid "Santa Ana de Yacuma"
 msgstr ""
 
@@ -3744,7 +3478,6 @@ msgid "Tarija"
 msgstr "Tarija"
 
 #. A city in Bolivia
-#| msgid "Trinidad"
 msgctxt "City in Bolivia"
 msgid "Trinidad"
 msgstr ""
@@ -3754,7 +3487,6 @@ msgid "Villamontes"
 msgstr "Villamontes"
 
 #. A city in Bolivia
-#| msgid "Viru-Viru"
 msgid "Viro Viro"
 msgstr ""
 
@@ -3779,7 +3511,6 @@ msgid "Francistown"
 msgstr "Francistown"
 
 #. The capital of Botswana
-#| msgid "Gabon"
 msgid "Gaborone"
 msgstr ""
 
@@ -3796,7 +3527,6 @@ msgid "Letlhakane"
 msgstr "Letlhakane"
 
 #. A city in Botswana
-#| msgid "Lorain"
 msgid "Lokerane"
 msgstr ""
 
@@ -3805,17 +3535,14 @@ msgid "Maun"
 msgstr "Maun"
 
 #. A city in Botswana
-#| msgid "Kochi"
 msgid "Mochudi"
 msgstr ""
 
 #. A city in Botswana
-#| msgid "Selebi Phikwe"
 msgid "Selebi-Phikwe"
 msgstr ""
 
 #. A city in Botswana
-#| msgid "Tsabong"
 msgid "Tshabong"
 msgstr ""
 
@@ -3988,7 +3715,6 @@ msgid "MossorÃ³"
 msgstr "MossorÃ³"
 
 #. A city in Rio Grande do Norte in Brazil
-#| msgid "Natal"
 msgctxt "City in Rio Grande do Norte, Brazil"
 msgid "Natal"
 msgstr ""
@@ -3998,7 +3724,6 @@ msgid "Oiapoque"
 msgstr "Oiapoque"
 
 #. A city in SÃ£o Paulo in Brazil
-#| msgid "Palmer"
 msgid "Palmeiras"
 msgstr ""
 
@@ -4019,12 +3744,10 @@ msgid "Petrolina"
 msgstr "Petrolina"
 
 #. A city in SÃ£o Paulo in Brazil
-#| msgid "Pirassununga"
 msgid "PiraÃ§ununga"
 msgstr ""
 
 #. A city in ParÃ¡ in Brazil
-#| msgid "La Grande"
 msgid "Piri Grande"
 msgstr ""
 
@@ -4045,12 +3768,10 @@ msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
 #. A city in Bahia in Brazil
-#| msgid "Porto Seguro"
 msgid "PÃ´rto Seguro"
 msgstr ""
 
 #. A city in RondÃ´nia in Brazil
-#| msgid "Porto Velho"
 msgid "PÃ´rto Velho"
 msgstr ""
 
@@ -4063,7 +3784,6 @@ msgid "Rio Branco"
 msgstr "Rio Branco"
 
 #. A city in Rio de Janeiro in Brazil
-#| msgid "Rio de Janeiro"
 msgctxt "City in Rio de Janeiro, Brazil"
 msgid "Rio de Janeiro"
 msgstr ""
@@ -4073,7 +3793,6 @@ msgid "Salvador"
 msgstr "Salvador"
 
 #. A city in Rio Grande do Sul in Brazil
-#| msgid "Santa Maria"
 msgctxt "City in Rio Grande do Sul, Brazil"
 msgid "Santa Maria"
 msgstr "Santa Maria"
@@ -4091,7 +3810,6 @@ msgid "SÃ£o FÃ©lix"
 msgstr ""
 
 #. A city in Amazonas in Brazil
-#| msgid "SÃ£o Carlos"
 msgid "SÃ£o Gabriel"
 msgstr ""
 
@@ -4104,7 +3822,6 @@ msgid "SÃ£o LuÃs"
 msgstr "SÃ£o LuÃs"
 
 #. A city in SÃ£o Paulo in Brazil
-#| msgid "SÃ£o Paulo"
 msgctxt "City in SÃ£o Paulo, Brazil"
 msgid "SÃ£o Paulo"
 msgstr ""
@@ -4162,7 +3879,6 @@ msgid "Road Town"
 msgstr ""
 
 #. A city in the British Virgin Islands
-#| msgid "Three Hills"
 msgid "The Mill"
 msgstr ""
 
@@ -4175,7 +3891,6 @@ msgid "Burgas"
 msgstr "Burgas"
 
 #. A city in Bulgaria
-#| msgid "Gorna Oryahovitza"
 msgid "Gorna Oryakhovitsa"
 msgstr ""
 
@@ -4210,12 +3925,10 @@ msgid "Phnom Penh"
 msgstr ""
 
 #. A city in Cambodia
-#| msgid "Siemreap"
 msgid "Siemreab"
 msgstr ""
 
 #. A city in Cameroon
-#| msgid "Douglas"
 msgid "Douala"
 msgstr ""
 
@@ -4244,12 +3957,10 @@ msgid "Aklavik"
 msgstr "Aklavika"
 
 #. A city in British Columbia in Canada
-#| msgid "Gimli Harbour"
 msgid "Allison Harbour"
 msgstr ""
 
 #. A city in British Columbia in Canada
-#| msgid "Clut Lake"
 msgid "Alta Lake"
 msgstr ""
 
@@ -4274,12 +3985,10 @@ msgid "Bagotville"
 msgstr "Bagotville"
 
 #. A city in Quebec in Canada
-#| msgid "Baie Comeau"
 msgid "Baie-Comeau"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Sainte Catherine"
 msgid "Baie-Sainte-Catherine"
 msgstr ""
 
@@ -4292,7 +4001,6 @@ msgid "Baker Lake"
 msgstr "Baker Lake"
 
 #. A city in British Columbia in Canada
-#| msgid "Brandon"
 msgid "Baldonnel"
 msgstr ""
 
@@ -4309,12 +4017,10 @@ msgid "Bathurst"
 msgstr "Bathurst"
 
 #. A city in Nova Scotia in Canada
-#| msgid "St. Lawrence"
 msgid "Bay Saint Lawrence"
 msgstr ""
 
 #. A city in Ontario in Canada
-#| msgid "Ardmore"
 msgid "Beardmore"
 msgstr ""
 
@@ -4323,17 +4029,14 @@ msgid "Beauceville"
 msgstr "Beauceville"
 
 #. A city in Quebec in Canada
-#| msgid "Beaufort"
 msgid "Beauport"
 msgstr ""
 
 #. A city in Nova Scotia in Canada
-#| msgid "Bar Harbor"
 msgid "Beaver Harbour"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Bedford"
 msgctxt "City in Quebec, Canada"
 msgid "Bedford"
 msgstr ""
@@ -4343,7 +4046,6 @@ msgid "Bella Coola"
 msgstr "Bella Coola"
 
 #. A city in Quebec in Canada
-#| msgid "Berlin"
 msgid "Bellin"
 msgstr ""
 
@@ -4356,7 +4058,6 @@ msgid "Bergen"
 msgstr "Bergen"
 
 #. A city in Quebec in Canada
-#| msgid "Blanc Sablon"
 msgid "Blanc-Sablon"
 msgstr ""
 
@@ -4365,7 +4066,6 @@ msgid "Blue River"
 msgstr "Blue River"
 
 #. A city in British Columbia in Canada
-#| msgid "Batman"
 msgid "Boat Basin"
 msgstr ""
 
@@ -4394,7 +4094,6 @@ msgid "Buffalo Narrows"
 msgstr "Buffalo Narrows"
 
 #. A city in Ontario in Canada
-#| msgid "Burlington"
 msgctxt "City in Ontario, Canada"
 msgid "Burlington"
 msgstr ""
@@ -4408,7 +4107,6 @@ msgid "Burwash Landing"
 msgstr "Burwash Landing"
 
 #. A city in Nova Scotia in Canada
-#| msgid "New Caledonia"
 msgid "Caledonia"
 msgstr ""
 
@@ -4425,27 +4123,22 @@ msgid "Campbell River"
 msgstr "Campbell River"
 
 #. A city in Nova Scotia in Canada
-#| msgid "Cairns"
 msgid "Canso"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Canton"
 msgid "Canton-BÃ©gin"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Cap Chat CS"
 msgid "Cap-Chat"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Capo Mele"
 msgid "Cap-aux-Meules"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Whale Cove"
 msgid "Cape Cove"
 msgstr ""
 
@@ -4474,7 +4167,6 @@ msgid "Caribou Island"
 msgstr "Caribou Island"
 
 #. A city in Yukon Territory in Canada
-#| msgid "Carmacks CS"
 msgid "Carmacks"
 msgstr ""
 
@@ -4491,7 +4183,6 @@ msgid "Castlegar"
 msgstr "Castlegar"
 
 #. A city in Ontario in Canada
-#| msgid "Central Park"
 msgid "Central Patricia"
 msgstr ""
 
@@ -4508,7 +4199,6 @@ msgid "Chesterfield Inlet"
 msgstr "Chesterfield Inlet"
 
 #. A city in Quebec in Canada
-#| msgid "Chibougamau-Chapais"
 msgid "Chibougamau"
 msgstr ""
 
@@ -4517,7 +4207,6 @@ msgid "Churchill"
 msgstr "Churchill"
 
 #. A city in Nova Scotia in Canada
-#| msgid "Cheticamp"
 msgid "ChÃ©ticamp"
 msgstr ""
 
@@ -4526,7 +4215,6 @@ msgid "Claresholm"
 msgstr "Claresholm"
 
 #. A city in British Columbia in Canada
-#| msgid "Clinton"
 msgctxt "City in British Columbia, Canada"
 msgid "Clinton"
 msgstr ""
@@ -4556,7 +4244,6 @@ msgid "Comox"
 msgstr "Comox"
 
 #. A city in Ontario in Canada
-#| msgid "Coupeville"
 msgid "Coppell"
 msgstr ""
 
@@ -4573,7 +4260,6 @@ msgid "Cranbrook"
 msgstr "Cranbrook"
 
 #. A city in British Columbia in Canada
-#| msgid "Creston"
 msgctxt "City in British Columbia, Canada"
 msgid "Creston"
 msgstr ""
@@ -4595,17 +4281,14 @@ msgid "Deer Lake"
 msgstr "Deer Lake"
 
 #. A city in Ontario in Canada
-#| msgid "Delhi CS"
 msgid "Delhi"
 msgstr ""
 
 #. A city in Nova Scotia in Canada
-#| msgid "Kirkwall"
 msgid "Dingwall"
 msgstr ""
 
 #. A city in New Brunswick in Canada
-#| msgid "Copper Harbor"
 msgid "Dipper Harbour"
 msgstr ""
 
@@ -4614,7 +4297,6 @@ msgid "Drumheller"
 msgstr "Drumheller"
 
 #. A city in Ontario in Canada
-#| msgid "Dryden"
 msgctxt "City in Ontario, Canada"
 msgid "Dryden"
 msgstr ""
@@ -4628,12 +4310,10 @@ msgid "Earlton"
 msgstr "Earlton"
 
 #. A city in Saskatchewan in Canada
-#| msgid "East Flanders"
 msgid "East Poplar"
 msgstr ""
 
 #. A city in Saskatchewan in Canada
-#| msgid "Easton"
 msgid "Eastend"
 msgstr ""
 
@@ -4650,7 +4330,6 @@ msgid "Elliot Lake"
 msgstr "Elliot Lake"
 
 #. A city in Prince Edward Island in Canada
-#| msgid "Elmira"
 msgctxt "City in Prince Edward Island, Canada"
 msgid "Elmira"
 msgstr ""
@@ -4664,7 +4343,6 @@ msgid "Englee"
 msgstr "Englee"
 
 #. A city in Nunavut in Canada
-#| msgid "Ennadai Lake"
 msgid "Ennadai"
 msgstr ""
 
@@ -4673,7 +4351,6 @@ msgid "Erieau"
 msgstr "Erieau"
 
 #. A city in British Columbia in Canada
-#| msgid "Esquimalt Harbour"
 msgid "Esquimalt"
 msgstr ""
 
@@ -4686,13 +4363,11 @@ msgid "Esther"
 msgstr "Esther"
 
 #. A city in Nunavut in Canada
-#| msgid "Eureka"
 msgctxt "City in Nunavut, Canada"
 msgid "Eureka"
 msgstr "Eureka"
 
 #. A city in Newfoundland and Labrador in Canada
-#| msgid "Mobile Point"
 msgid "Ferolle Point"
 msgstr ""
 
@@ -4709,7 +4384,6 @@ msgid "Fort Good Hope"
 msgstr "Fort Good Hope"
 
 #. A city in British Columbia in Canada
-#| msgid "Fort Drum"
 msgid "Fort Grahame"
 msgstr ""
 
@@ -4730,21 +4404,14 @@ msgid "Fort Simpson"
 msgstr "Fort Simpson"
 
 #. A city in Northwest Territories in Canada
-#| msgid "Fort Smith"
 msgctxt "City in Northwest Territories, Canada"
 msgid "Fort Smith"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Fort Rucker"
 msgid "Fort-Rupert"
 msgstr ""
 
-#. A city in Quebec in Canada
-#| msgid "Cold Bay"
-msgid "Fox Bay"
-msgstr ""
-
 #. A city in New Brunswick in Canada
 msgid "Fredericton"
 msgstr "Fredericton"
@@ -4754,7 +4421,6 @@ msgid "Front of Escott"
 msgstr ""
 
 #. A city in British Columbia in Canada
-#| msgid "Garoua"
 msgid "Gabriola"
 msgstr ""
 
@@ -4767,7 +4433,6 @@ msgid "Gander"
 msgstr "Gander"
 
 #. A city in Quebec in Canada
-#| msgid "Gaspe"
 msgid "GaspÃ©"
 msgstr ""
 
@@ -4808,13 +4473,11 @@ msgid "Gore Bay"
 msgstr "Gore Bay"
 
 #. A city in Manitoba in Canada
-#| msgid "Grand Rapids"
 msgctxt "City in Manitoba, Canada"
 msgid "Grand Rapids"
 msgstr ""
 
 #. A city in Nova Scotia in Canada
-#| msgid "Grand Etang"
 msgid "Grand-Etang"
 msgstr ""
 
@@ -4823,7 +4486,6 @@ msgid "Grande Prairie"
 msgstr "Grande Prairie"
 
 #. A city in Nova Scotia in Canada
-#| msgid "Greenwood"
 msgctxt "City in Nova Scotia, Canada"
 msgid "Greenwood"
 msgstr ""
@@ -4841,28 +4503,23 @@ msgid "Hall Beach"
 msgstr "Hall Beach"
 
 #. A city in Ontario in Canada
-#| msgid "Howell"
 msgid "Hallowell"
 msgstr ""
 
 #. A city in Ontario in Canada
-#| msgid "Hamilton"
 msgctxt "City in Ontario, Canada"
 msgid "Hamilton"
 msgstr ""
 
 #. A city in Newfoundland and Labrador in Canada
-#| msgid "Harbor Beach"
 msgid "Harbour Breton"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Benton Harbor"
 msgid "Harrington Harbour"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Saint-Pierre"
 msgid "Havre-Saint-Pierre"
 msgstr ""
 
@@ -4871,13 +4528,11 @@ msgid "Hay River"
 msgstr "Hay River"
 
 #. A city in Newfoundland and Labrador in Canada
-#| msgid "Hebron"
 msgctxt "City in Newfoundland and Labrador, Canada"
 msgid "Hebron"
 msgstr ""
 
 #. A city in Ontario in Canada
-#| msgid "Byron Bay"
 msgid "Heron Bay"
 msgstr ""
 
@@ -4886,12 +4541,10 @@ msgid "High Level"
 msgstr "High Level"
 
 #. A city in British Columbia in Canada
-#| msgid "Holberg"
 msgid "Hollyburn"
 msgstr ""
 
 #. A city in Northwest Territories in Canada
-#| msgid "Coleman"
 msgid "Holman"
 msgstr ""
 
@@ -4908,7 +4561,6 @@ msgid "Igloolik"
 msgstr "Igloolik"
 
 #. A city in Quebec in Canada
-#| msgid "Inujuak"
 msgid "Inoucdjouac"
 msgstr ""
 
@@ -4925,23 +4577,19 @@ msgid "Island Lake"
 msgstr "Island Lake"
 
 #. A city in Quebec in Canada
-#| msgid "Inuvik"
 msgid "Ivugivik"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Valcartier"
 msgid "Jacques-Cartier"
 msgstr ""
 
 #. A city in Alberta in Canada
-#| msgid "Jasper"
 msgctxt "City in Alberta, Canada"
 msgid "Jasper"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Jonquiere"
 msgid "JonquiÃ¨re"
 msgstr ""
 
@@ -4970,18 +4618,15 @@ msgid "Kindersley"
 msgstr "Kindersley"
 
 #. A city in Ontario in Canada
-#| msgid "Kingston"
 msgctxt "City in Ontario, Canada"
 msgid "Kingston"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Kota"
 msgid "Koartac"
 msgstr ""
 
 #. A city in Nunavut in Canada
-#| msgid "Kuparuk"
 msgid "Kugaaruk"
 msgstr ""
 
@@ -4994,12 +4639,10 @@ msgid "Kuujjuaq"
 msgstr "Kuujjuaq"
 
 #. A city in Quebec in Canada
-#| msgid "Saint-Yan"
 msgid "L'Anse-Saint-Jean"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "L'Assomption"
 msgid "L'Ascension"
 msgstr ""
 
@@ -5024,7 +4667,6 @@ msgid "Lac La Biche"
 msgstr "Lac La Biche"
 
 #. A city in British Columbia in Canada
-#| msgid "Lesquin"
 msgid "Lasqueti"
 msgstr ""
 
@@ -5033,7 +4675,6 @@ msgid "Leader"
 msgstr "Leader"
 
 #. A city in Quebec in Canada
-#| msgid "Healy River"
 msgid "Leaf River"
 msgstr ""
 
@@ -5046,29 +4687,24 @@ msgid "Lethbridge"
 msgstr "Lethbridge"
 
 #. A city in British Columbia in Canada
-#| msgid "Grande Prairie"
 msgid "Little Prairie"
 msgstr ""
 
 #. A city in Nova Scotia in Canada
-#| msgid "Liverpool"
 msgctxt "City in Nova Scotia, Canada"
 msgid "Liverpool"
 msgstr ""
 
 #. A city in Saskatchewan in Canada
-#| msgid "Lloydminister"
 msgid "Lloydminster"
 msgstr ""
 
 #. A city in Ontario in Canada
-#| msgid "London"
 msgctxt "City in Ontario, Canada"
 msgid "London"
 msgstr "Londona"
 
 #. A city in Quebec in Canada
-#| msgid "Longue Point De Mingan"
 msgid "Longue-Pointe-de-Mingan"
 msgstr ""
 
@@ -5088,10 +4724,6 @@ msgstr "Lytton"
 msgid "Makkovik"
 msgstr "Makkovik"
 
-#. A city in British Columbia in Canada
-msgid "Malahat"
-msgstr "Malahat"
-
 #. A city in Quebec in Canada
 msgid "Maniwaki"
 msgstr "Maniwaki"
@@ -5101,7 +4733,6 @@ msgid "Maple Creek"
 msgstr "Maple Creek"
 
 #. A city in Quebec in Canada
-#| msgid "Maribor"
 msgid "Maricourt"
 msgstr ""
 
@@ -5118,7 +4749,6 @@ msgid "Mayo"
 msgstr "Mayo"
 
 #. A city in British Columbia in Canada
-#| msgid "Red Lake"
 msgid "McLeod Lake"
 msgstr ""
 
@@ -5131,12 +4761,10 @@ msgid "Medicine Hat"
 msgstr "Medicine Hat"
 
 #. A city in Saskatchewan in Canada
-#| msgid "Belfort"
 msgid "Melfort"
 msgstr ""
 
 #. A city in Manitoba in Canada
-#| msgid "Miami"
 msgctxt "City in Manitoba, Canada"
 msgid "Miami"
 msgstr ""
@@ -5150,17 +4778,14 @@ msgid "Moncton"
 msgstr "Moncton"
 
 #. A city in Quebec in Canada
-#| msgid "Monida"
 msgid "Mont-Apica"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Mont Joli"
 msgid "Mont-Joli"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Montana"
 msgid "Montmagny"
 msgstr ""
 
@@ -5183,17 +4808,14 @@ msgid "Mount Forest"
 msgstr "Mount Forest"
 
 #. A city in Newfoundland and Labrador in Canada
-#| msgid "Mount Pleasant"
 msgid "Mount Pearl Park"
 msgstr ""
 
 #. A city in Ontario in Canada
-#| msgid "Muskoka"
 msgid "Muskoka Falls"
 msgstr ""
 
 #. A city in Northwest Territories in Canada
-#| msgid "Chanute"
 msgid "Nahanni Butte"
 msgstr ""
 
@@ -5210,17 +4832,14 @@ msgid "Nanaimo"
 msgstr "Nanaimo"
 
 #. A city in British Columbia in Canada
-#| msgid "Goose Bay"
 msgid "Nanoose Bay"
 msgstr ""
 
 #. A city in Ontario in Canada
-#| msgid "Nantucket"
 msgid "Nanticoke"
 msgstr ""
 
 #. A city in British Columbia in Canada
-#| msgid "Natal"
 msgctxt "City in British Columbia, Canada"
 msgid "Natal"
 msgstr ""
@@ -5230,7 +4849,6 @@ msgid "Natashquan"
 msgstr "Natashquan"
 
 #. A city in Newfoundland and Labrador in Canada
-#| msgid "Bernard Harbour"
 msgid "Neddy Harbour"
 msgstr ""
 
@@ -5267,7 +4885,6 @@ msgid "North Bay"
 msgstr "North Bay"
 
 #. A city in British Columbia in Canada
-#| msgid "Kamloops"
 msgid "North Kamloops"
 msgstr ""
 
@@ -5284,12 +4901,10 @@ msgid "Nouveau-Comptoir"
 msgstr ""
 
 #. A city in Newfoundland and Labrador in Canada
-#| msgid "Noatak"
 msgid "Nutak"
 msgstr ""
 
 #. A city in British Columbia in Canada
-#| msgid "Glens Falls"
 msgid "Ocean Falls"
 msgstr ""
 
@@ -5357,16 +4972,11 @@ msgstr "Pitt Meadows"
 msgid "Pond Inlet"
 msgstr "Pond Inlet"
 
-#. A city in Ontario in Canada
-msgid "Port Colborne"
-msgstr "Port Colborne"
-
 #. A city in British Columbia in Canada
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
 #. A city in British Columbia in Canada
-#| msgid "Fort Simpson"
 msgid "Port Simpson"
 msgstr ""
 
@@ -5375,12 +4985,10 @@ msgid "Port Weller"
 msgstr "Port Weller"
 
 #. A city in Quebec in Canada
-#| msgid "Port Menier"
 msgid "Port-Menier"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Poteau"
 msgid "Portneuf"
 msgstr ""
 
@@ -5405,13 +5013,11 @@ msgid "Prince Rupert"
 msgstr "Prince Rupert"
 
 #. A city in British Columbia in Canada
-#| msgid "Princeton"
 msgctxt "City in British Columbia, Canada"
 msgid "Princeton"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Povungnituq"
 msgid "Puvirnituq"
 msgstr ""
 
@@ -5422,13 +5028,11 @@ msgstr ""
 #. A city in Quebec in Canada.
 #. The local name in French is "QuÃ©bec".
 #.
-#| msgid "Quebec"
 msgctxt "City in Quebec, Canada"
 msgid "Quebec"
 msgstr "Kvebeka"
 
 #. A city in British Columbia in Canada
-#| msgid "Charlotte"
 msgid "Queen Charlotte"
 msgstr ""
 
@@ -5437,7 +5041,6 @@ msgid "Quesnel"
 msgstr "Quesnel"
 
 #. A city in Quebec in Canada
-#| msgid "Madison"
 msgid "Radisson"
 msgstr ""
 
@@ -5470,12 +5073,10 @@ msgid "Revelstoke"
 msgstr "Revelstoke"
 
 #. A city in Quebec in Canada
-#| msgid "Riviere Du Loup"
 msgid "RiviÃ¨re-du-Loup"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Iles-De-La-Madelein"
 msgid "RiviÃ¨re-la-Madeleine"
 msgstr ""
 
@@ -5492,17 +5093,14 @@ msgid "Rocky Mountain House"
 msgstr "Rocky Mountain House"
 
 #. A city in British Columbia in Canada
-#| msgid "Rocky Mount"
 msgid "Rocky Point"
 msgstr ""
 
 #. A city in Saskatchewan in Canada
-#| msgid "Robstown"
 msgid "Rosetown"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Rouen"
 msgid "Rouyn"
 msgstr ""
 
@@ -5515,7 +5113,6 @@ msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
 #. A city in Ontario in Canada
-#| msgid "Sainte Catherine"
 msgid "Saint Catharines"
 msgstr ""
 
@@ -5524,7 +5121,6 @@ msgid "Saint John"
 msgstr "Saint John"
 
 #. A city in Newfoundland and Labrador in Canada
-#| msgid "Saint John"
 msgctxt "City in Newfoundland and Labrador, Canada"
 msgid "Saint John's"
 msgstr ""
@@ -5534,47 +5130,38 @@ msgid "Saint Leonard"
 msgstr "Saint Leonard"
 
 #. A city in New Brunswick in Canada
-#| msgid "St. Stephen"
 msgid "Saint Stephen"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "St Anicet"
 msgid "Saint-Anicet"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Saint-Girons"
 msgid "Saint-Chrysostome"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Saint-Yan"
 msgid "Saint-Fabien"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Saint-Louis"
 msgid "Saint-FranÃ§ois"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Saint-Denis / Gillot"
 msgid "Saint-Henri-de-Taillon"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Saint-Yan"
 msgid "Saint-Jean"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Saint John"
 msgid "Saint-Joachim"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "St Jovite"
 msgid "Saint-Jovite"
 msgstr ""
 
@@ -5599,7 +5186,6 @@ msgid "Saskatoon"
 msgstr "Saskatoon"
 
 #. A city in Ontario in Canada
-#| msgid "Sault Ste Marie"
 msgid "Sault Sainte Marie"
 msgstr ""
 
@@ -5608,27 +5194,22 @@ msgid "Schefferville"
 msgstr "Schefferville"
 
 #. A city in Alberta in Canada
-#| msgid "Seeb"
 msgid "Seebe"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Leeville"
 msgid "Senneville"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Sept-Iles"
 msgid "Sept-Ã?les"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Shawinigan CS"
 msgid "Shawinigan"
 msgstr ""
 
 #. A city in Nova Scotia in Canada
-#| msgid "Sachs Harbour"
 msgid "Sheet Harbour"
 msgstr ""
 
@@ -5653,44 +5234,36 @@ msgid "Smithers"
 msgstr "Smithers"
 
 #. A city in Yukon Territory in Canada
-#| msgid "Saga"
 msgid "Snag"
 msgstr ""
 
 #. A city in Saskatchewan in Canada
-#| msgid "Southend"
 msgctxt "City in Saskatchewan, Canada"
 msgid "Southend"
 msgstr ""
 
 #. A city in Alberta in Canada
-#| msgid "Prairie River"
 msgid "Spirit River"
 msgstr ""
 
 #. A city in Saskatchewan in Canada
-#| msgid "Sparwood"
 msgid "Spiritwood"
 msgstr ""
 
 #. A city in British Columbia in Canada
-#| msgid "Squamish Airport"
 msgid "Squamish"
 msgstr ""
 
 #. A city in British Columbia in Canada
-#| msgid "St. Stephen"
 msgid "Stephen"
 msgstr ""
 
 #. A city in Newfoundland and Labrador in Canada
-#| msgid "Stephenville"
 msgctxt "City in Newfoundland and Labrador, Canada"
 msgid "Stephenville"
 msgstr ""
 
 #. A city in British Columbia in Canada
-#| msgid "Stevens Point"
 msgid "Steveston"
 msgstr ""
 
@@ -5699,7 +5272,6 @@ msgid "Stewart"
 msgstr "Stewart"
 
 #. A city in Quebec in Canada
-#| msgid "Shoreham"
 msgid "Stoneham"
 msgstr ""
 
@@ -5728,13 +5300,11 @@ msgid "Swift Current"
 msgstr "Swift Current"
 
 #. A city in Nova Scotia in Canada
-#| msgid "Sydney"
 msgctxt "City in Nova Scotia, Canada"
 msgid "Sydney"
 msgstr ""
 
 #. A city in Nunavut in Canada
-#| msgid "Taoyuan"
 msgid "Taloyoak"
 msgstr ""
 
@@ -5755,7 +5325,6 @@ msgid "The Pas"
 msgstr "The Pas"
 
 #. A city in Manitoba in Canada
-#| msgid "Thomson"
 msgid "Thompson"
 msgstr ""
 
@@ -5776,7 +5345,6 @@ msgid "Timmins"
 msgstr "Timmins"
 
 #. A city in Ontario in Canada
-#| msgid "Tororo"
 msgid "Tobermory"
 msgstr ""
 
@@ -5789,18 +5357,15 @@ msgid "Toronto"
 msgstr "Toronto"
 
 #. A city in British Columbia in Canada
-#| msgid "Rock Hill"
 msgid "Tow Hill"
 msgstr ""
 
 #. A city in Ontario in Canada
-#| msgid "Trenton"
 msgctxt "City in Ontario, Canada"
 msgid "Trenton"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Trois Rivieres"
 msgid "Trois-RiviÃ¨res"
 msgstr ""
 
@@ -5813,7 +5378,6 @@ msgid "Tuktoyaktuk"
 msgstr "Tuktoyaktuk"
 
 #. A city in Northwest Territories in Canada
-#| msgid "Kununurra"
 msgid "Tununuk"
 msgstr ""
 
@@ -5830,22 +5394,18 @@ msgid "Uranium City"
 msgstr "Uranium City"
 
 #. A city in Saskatchewan in Canada
-#| msgid "Valcartier"
 msgid "Val Marie"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Val D'Or"
 msgid "Val-d'Or"
 msgstr ""
 
 #. A city in Quebec in Canada
-#| msgid "Valcartier Airport"
 msgid "Valcartier Station"
 msgstr ""
 
 #. A city in British Columbia in Canada
-#| msgid "Vancouver"
 msgctxt "City in British Columbia, Canada"
 msgid "Vancouver"
 msgstr ""
@@ -5859,13 +5419,11 @@ msgid "Vegreville"
 msgstr "Vegreville"
 
 #. A city in British Columbia in Canada
-#| msgid "Vernon"
 msgctxt "City in British Columbia, Canada"
 msgid "Vernon"
 msgstr ""
 
 #. A city in British Columbia in Canada
-#| msgid "Victoria"
 msgctxt "City in British Columbia, Canada"
 msgid "Victoria"
 msgstr ""
@@ -5875,12 +5433,10 @@ msgid "Victoria Beach"
 msgstr "Victoria Beach"
 
 #. A city in Newfoundland and Labrador in Canada
-#| msgid "Waukesha"
 msgid "Wabush"
 msgstr ""
 
 #. A city in Ontario in Canada
-#| msgid "Waterloo"
 msgctxt "City in Ontario, Canada"
 msgid "Waterloo"
 msgstr ""
@@ -5898,7 +5454,6 @@ msgid "Wawa"
 msgstr "Wawa"
 
 #. A city in Nova Scotia in Canada
-#| msgid "Newport"
 msgid "Westport"
 msgstr ""
 
@@ -5919,7 +5474,6 @@ msgid "Whitecourt"
 msgstr "Whitecourt"
 
 #. A city in Ontario in Canada
-#| msgid "Wichita Falls"
 msgid "Whitefish Falls"
 msgstr ""
 
@@ -5944,7 +5498,6 @@ msgid "Winnipeg"
 msgstr "Winnipeg"
 
 #. A city in British Columbia in Canada
-#| msgid "Inner Harbor"
 msgid "Winter Harbour"
 msgstr ""
 
@@ -5965,23 +5518,19 @@ msgid "Yorkton"
 msgstr "Yorkton"
 
 #. A city in Cape Verde
-#| msgid "Perugia"
 msgid "PreguiÃ§a"
 msgstr ""
 
 #. The capital of the Cayman Islands
-#| msgid "Georgetown"
 msgctxt "City in Cayman Islands"
 msgid "George Town"
 msgstr ""
 
 #. A city in the Cayman Islands
-#| msgid "Knoxville"
 msgid "Knob Hill"
 msgstr ""
 
 #. A city in the Cayman Islands
-#| msgid "Red Earth"
 msgid "Red Bay Estate"
 msgstr ""
 
@@ -6002,7 +5551,6 @@ msgid "Moundou"
 msgstr "Moundou"
 
 #. The capital of Chad
-#| msgid "Ndjamena"
 msgid "N'Djamena"
 msgstr ""
 
@@ -6023,13 +5571,11 @@ msgid "Balmaceda"
 msgstr "Balmaceda"
 
 #. A city in Chile
-#| msgid "ConcepciÃ³n"
 msgctxt "City in Chile"
 msgid "ConcepciÃ³n"
 msgstr ""
 
 #. A city in Chile
-#| msgid "Santa Rosa"
 msgid "Hanga Roa"
 msgstr ""
 
@@ -6050,12 +5596,10 @@ msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
 #. A city in Chile
-#| msgid "Santa Teresa"
 msgid "Santa Teresa de Lo Ovalle"
 msgstr ""
 
 #. The capital of Chile
-#| msgid "Santiago"
 msgctxt "City in Chile"
 msgid "Santiago"
 msgstr ""
@@ -6065,7 +5609,6 @@ msgid "Temuco"
 msgstr "Temuco"
 
 #. The capital of China
-#| msgid "Beijing"
 msgctxt "City in Beijing, China"
 msgid "Beijing"
 msgstr "Pekina"
@@ -6091,7 +5634,6 @@ msgstr "Chengdu"
 #. A city in Chongqing in China.
 #. The name is also written "é??åº?".
 #.
-#| msgid "Chongqing"
 msgctxt "City in Chongqing, China"
 msgid "Chongqing"
 msgstr ""
@@ -6179,7 +5721,6 @@ msgstr "Sanya"
 #. A city in Shanghai in China.
 #. The name is also written "ä¸?æµ·".
 #.
-#| msgid "Shanghai"
 msgctxt "City in Shanghai, China"
 msgid "Shanghai"
 msgstr ""
@@ -6191,7 +5732,6 @@ msgstr "Shantou"
 #. A city in Liaoning in China.
 #. The name is also written "æ²?é?³".
 #.
-#| msgid "Shinyanga"
 msgid "Shenyang"
 msgstr ""
 
@@ -6208,7 +5748,6 @@ msgstr "Taiyuan"
 #. A city in Tianjin in China.
 #. The name is also written "å¤©æ´¥".
 #.
-#| msgid "Tianjin"
 msgctxt "City in Tianjin, China"
 msgid "Tianjin"
 msgstr ""
@@ -6216,7 +5755,6 @@ msgstr ""
 #. A city in Xinjiang in China.
 #. The name is also written "ä¹?é²?æ?¨é½?".
 #.
-#| msgid "Orumieh"
 msgid "Urumqi"
 msgstr ""
 
@@ -6229,7 +5767,6 @@ msgstr "Wuhan"
 #. A city in Shaanxi in China.
 #. The name is also written "è¥¿å®?".
 #.
-#| msgid "Xi'An"
 msgid "Xi'an"
 msgstr ""
 
@@ -6246,22 +5783,18 @@ msgid "Zhengzhou"
 msgstr "Zhengzhou"
 
 #. A city in Christmas Island
-#| msgid "Orumieh"
 msgid "Drumsite"
 msgstr ""
 
 #. The capital of Christmas Island
-#| msgid "Elfin Cove"
 msgid "Flying Fish Cove"
 msgstr ""
 
 #. A city in the Cocos (Keeling) Islands
-#| msgid "Arctic Village"
 msgid "Bantam Village"
 msgstr ""
 
 #. A city in Colombia
-#| msgid "Barnaul"
 msgid "Barranquilla"
 msgstr ""
 
@@ -6270,17 +5803,14 @@ msgid "BogotÃ¡"
 msgstr ""
 
 #. A city in Colombia
-#| msgid "Jacareacanga"
 msgid "Bucaramanga"
 msgstr ""
 
 #. A city in Colombia
-#| msgid "Calvi"
 msgid "Cali"
 msgstr ""
 
 #. A city in Colombia
-#| msgid "Catania"
 msgid "Cartagena"
 msgstr ""
 
@@ -6289,42 +5819,87 @@ msgid "CÃºcuta"
 msgstr ""
 
 #. A city in Colombia
-#| msgid "Lichinga"
+msgid "IbaguÃ©"
+msgstr ""
+
+#. A city in Colombia
+#, fuzzy
+#| msgid "Wales"
+msgid "Ipiales"
+msgstr "Wales"
+
+#. A city in Colombia
 msgid "Leticia"
 msgstr ""
 
 #. A city in Colombia
-#| msgid "Peoria"
+#, fuzzy
+#| msgid "Meriden"
+msgid "MedellÃn"
+msgstr "Meriden"
+
+#. A city in Colombia
+#, fuzzy
+#| msgid "Montserrat"
+msgid "Monteria"
+msgstr "Montserata"
+
+#. A city in Colombia
+#, fuzzy
+#| msgid "Pasco"
+msgid "Pasto"
+msgstr "Pasco"
+
+#. A city in Colombia
 msgid "Pereira"
 msgstr ""
 
 #. A city in Colombia
-#| msgid "Rio de Janeiro"
+msgid "PopayÃ¡n"
+msgstr ""
+
+#. A city in Colombia
+msgid "QuibdÃ³"
+msgstr ""
+
+#. A city in Colombia
+#, fuzzy
+#| msgid "Rafha"
+msgid "Riohacha"
+msgstr "Rafha"
+
+#. A city in Colombia
 msgid "Rionegro"
 msgstr ""
 
 #. A city in Colombia
-#| msgid "San Pedro"
 msgid "San AndrÃ©s"
 msgstr ""
 
+#. A city in Colombia
+#, fuzzy
+#| msgctxt "City in Rio Grande do Sul, Brazil"
+#| msgid "Santa Maria"
+msgid "Santa Marta"
+msgstr "Santa Maria"
+
+#. A city in Colombia
+msgid "Villavicencio"
+msgstr ""
+
 #. A city in Comoros
-#| msgid "Mali"
 msgid "MbalÃ©ni"
 msgstr ""
 
 #. The capital of Comoros
-#| msgid "Corona"
 msgid "Moroni"
 msgstr ""
 
 #. The capital of the Democratic Republic of the Congo
-#| msgid "Kansas"
 msgid "Kinshasa"
 msgstr ""
 
 #. The capital of the Republic of the Congo
-#| msgid "Brazil"
 msgid "Brazzaville"
 msgstr ""
 
@@ -6333,17 +5908,14 @@ msgid "Pointe-Noire"
 msgstr "Pointe-Noire"
 
 #. The capital of the Cook Islands
-#| msgid "Arua"
 msgid "Avarua"
 msgstr ""
 
 #. A city in Costa Rica
-#| msgid "Acajutla"
 msgid "Alajuela"
 msgstr ""
 
 #. A city in Costa Rica
-#| msgid "Liberia"
 msgctxt "City in Costa Rica"
 msgid "Liberia"
 msgstr "LibÄ?rija"
@@ -6357,12 +5929,10 @@ msgid "Puerto LimÃ³n"
 msgstr "Puerto LimÃ³n"
 
 #. The capital of Costa Rica
-#| msgid "San Jose"
 msgid "San JosÃ©"
 msgstr ""
 
 #. A city in Croatia
-#| msgid "Bole"
 msgid "Bol"
 msgstr ""
 
@@ -6371,12 +5941,10 @@ msgid "Dubrovnik"
 msgstr "Dubrovnik"
 
 #. A city in Croatia
-#| msgid "Kunovice"
 msgid "Jelovice"
 msgstr ""
 
 #. A city in Croatia
-#| msgid "Lima"
 msgid "LiÅ¡ka"
 msgstr ""
 
@@ -6401,17 +5969,14 @@ msgid "Zagreb"
 msgstr "Zagreb"
 
 #. A city in Cuba
-#| msgid "Camaguey"
 msgid "CamagÃ¼ey"
 msgstr ""
 
 #. A city in Cuba
-#| msgid "Cienfuegos, Las Villas"
 msgid "Cienfuegos"
 msgstr ""
 
 #. A city in Cuba
-#| msgid "GuantÃ¡namo, Oriente"
 msgid "GuantÃ¡namo"
 msgstr ""
 
@@ -6419,28 +5984,23 @@ msgstr ""
 #. "Havana" is the traditional English name.
 #. The local name in Spanish is "La Habana".
 #.
-#| msgid "Hana"
 msgid "Havana"
 msgstr ""
 
 #. A city in Cuba
-#| msgid "Holguin"
 msgid "HolguÃn"
 msgstr ""
 
 #. A city in Cuba
-#| msgid "Manzanillo"
 msgctxt "City in Cuba"
 msgid "Manzanillo"
 msgstr "Manzanillo"
 
 #. A city in Cuba
-#| msgid "Mactan"
 msgid "Matanzas"
 msgstr ""
 
 #. A city in Cuba
-#| msgid "Santiago De Cuba, Oriente"
 msgid "Santiago de Cuba"
 msgstr ""
 
@@ -6449,12 +6009,10 @@ msgid "Akrotiri"
 msgstr "Akrotiri"
 
 #. A city in Cyprus
-#| msgid "Larnaka"
 msgid "Larnaca"
 msgstr ""
 
 #. The capital of Cyprus
-#| msgid "Nicoya"
 msgid "Nicosia"
 msgstr ""
 
@@ -6463,7 +6021,6 @@ msgid "Paphos"
 msgstr "Paphos"
 
 #. A city in Cyprus
-#| msgid "Tabou"
 msgid "Tymbou"
 msgstr ""
 
@@ -6472,7 +6029,6 @@ msgid "Brno"
 msgstr "Brno"
 
 #. A city in the Czech Republic
-#| msgid "Holesov"
 msgid "HoleÅ¡ov"
 msgstr ""
 
@@ -6523,7 +6079,6 @@ msgid "Kastrup"
 msgstr "Kastrup"
 
 #. A city in Denmark
-#| msgid "Shelby"
 msgid "Mejlby"
 msgstr ""
 
@@ -6536,12 +6091,10 @@ msgid "Roskilde"
 msgstr "Roskilde"
 
 #. A city in Denmark
-#| msgid "Rennes"
 msgid "RÃ¸nne"
 msgstr ""
 
 #. A city in Denmark
-#| msgid "Vojens/Skrydstrup"
 msgid "Skrydstrup"
 msgstr ""
 
@@ -6550,33 +6103,27 @@ msgid "Sottrupskov"
 msgstr ""
 
 #. A city in Denmark
-#| msgid "Kastrup"
 msgid "Tirstrup"
 msgstr ""
 
 #. A city in Denmark
-#| msgid "Karup"
 msgid "Vamdrup"
 msgstr ""
 
 #. A city in Denmark
-#| msgid "Aalborg"
 msgid "Ã?lborg"
 msgstr ""
 
 #. The capital of Djibouti
-#| msgid "Djibouti"
 msgctxt "City in Djibouti"
 msgid "Djibouti"
 msgstr "DÅ¾ibutÄ«"
 
 #. A city in Dominica
-#| msgid "Marion"
 msgid "Marigot"
 msgstr ""
 
 #. The capital of Dominica
-#| msgid "Roseau"
 msgctxt "City in Dominica"
 msgid "Roseau"
 msgstr ""
@@ -6598,7 +6145,6 @@ msgid "Mancha Nueva"
 msgstr ""
 
 #. A city in the Dominican Republic
-#| msgid "Patna"
 msgid "Pantanal"
 msgstr ""
 
@@ -6607,18 +6153,15 @@ msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
 #. A city in the Dominican Republic
-#| msgid "Santiago"
 msgctxt "City in Dominican Republic"
 msgid "Santiago"
 msgstr ""
 
 #. The capital of the Dominican Republic
-#| msgid "Sto. Domingo"
 msgid "Santo Domingo"
 msgstr ""
 
 #. A city in Ecuador
-#| msgid "Guaymas"
 msgid "Guayaquil"
 msgstr ""
 
@@ -6631,22 +6174,18 @@ msgid "Manta"
 msgstr "Manta"
 
 #. The capital of Ecuador
-#| msgid "Iquitos"
 msgid "Quito"
 msgstr ""
 
 #. A city in Egypt
-#| msgid "El Arish"
 msgid "Al 'Arish"
 msgstr ""
 
 #. A city in Egypt
-#| msgid "Ghardaia"
 msgid "Al Ghardaqah"
 msgstr ""
 
 #. A city in Egypt
-#| msgid "Alabat"
 msgid "Al Qabuti"
 msgstr ""
 
@@ -6654,13 +6193,11 @@ msgstr ""
 #. "Alexandria" is the traditional English name.
 #. The local name in Arabic is "Al Iskandariyah".
 #.
-#| msgid "Alexandria"
 msgctxt "City in Egypt"
 msgid "Alexandria"
 msgstr "Aleksandrija"
 
 #. A city in Egypt
-#| msgid "Asswan"
 msgid "Aswan"
 msgstr ""
 
@@ -6672,7 +6209,6 @@ msgstr "Asyut"
 #. "Cairo" is the traditional English name.
 #. The local name in Arabic is "Al Qahirah".
 #.
-#| msgid "Cairo"
 msgctxt "City in Egypt"
 msgid "Cairo"
 msgstr "Kaira"
@@ -6685,12 +6221,10 @@ msgid "Luxor"
 msgstr "Luxor"
 
 #. A city in Egypt
-#| msgid "Mersa Matruh"
 msgid "Marsa Matruh"
 msgstr ""
 
 #. A city in Egypt
-#| msgid "Sharm El Sheikhintl"
 msgid "Sharm ash Shaykh"
 msgstr ""
 
@@ -6699,22 +6233,18 @@ msgid "Taba"
 msgstr "Taba"
 
 #. A city in El Salvador
-#| msgid "Calapan"
 msgid "Comalapa"
 msgstr ""
 
 #. A city in El Salvador
-#| msgid "Inongo"
 msgid "Ilopango"
 msgstr ""
 
 #. The capital of El Salvador
-#| msgid "Salvador"
 msgid "San Salvador"
 msgstr ""
 
 #. The capital of Equatorial Guinea
-#| msgid "Malta"
 msgid "Malabo"
 msgstr ""
 
@@ -6739,30 +6269,18 @@ msgid "Tartu"
 msgstr "Tartu"
 
 #. The capital of the Falkland Islands (Malvinas)
-#| msgid "Stanley"
 msgctxt "City in Falkland Islands (Malvinas)"
 msgid "Stanley"
 msgstr ""
 
 #. A city in the Faroe Islands
-#| msgid "VÃ¡gar/SÃ¸rvÃ¡gur"
 msgid "SÃ¸rvÃ¡gur"
 msgstr ""
 
 #. The capital of the Faroe Islands
-#| msgid "Tshane"
 msgid "TÃ³rshavn"
 msgstr ""
 
-#. A city in Fiji
-msgid "Nausori"
-msgstr "Nausori"
-
-#. The capital of Fiji
-#| msgid "Suceava"
-msgid "Suva"
-msgstr ""
-
 #. A city in Finland
 msgid "EnontekiÃ¶"
 msgstr "EnontekiÃ¶"
@@ -6844,12 +6362,10 @@ msgid "Savonlinna"
 msgstr "Savonlinna"
 
 #. A city in Finland
-#| msgid "SeinÃ¤joki-Ilmajoki"
 msgid "SeinÃ¤joki"
 msgstr ""
 
 #. A city in Finland
-#| msgid "Campeche"
 msgid "Tampere"
 msgstr ""
 
@@ -6869,6 +6385,14 @@ msgstr "Utti"
 msgid "Vaasa"
 msgstr "Vaasa"
 
+#. A city in Finland.
+#. The local name in Swedish is "Vanda".
+#.
+#, fuzzy
+#| msgid "Varna"
+msgid "Vantaa"
+msgstr "Varna"
+
 #. A city in Finland
 msgid "Varkaus"
 msgstr "Varkaus"
@@ -6878,7 +6402,6 @@ msgid "Abbeville"
 msgstr "Abevila"
 
 #. A city in France
-#| msgid "Ancona"
 msgid "Acon"
 msgstr ""
 
@@ -6925,12 +6448,10 @@ msgid "Bergerac"
 msgstr "Bergerac"
 
 #. A city in France
-#| msgid "Barrie"
 msgid "Biarritz"
 msgstr ""
 
 #. A city in France
-#| msgid "Bordeaux"
 msgctxt "City in France"
 msgid "Bordeaux"
 msgstr "Bordo"
@@ -6940,13 +6461,11 @@ msgid "Bourges"
 msgstr "Bourges"
 
 #. A city in France
-#| msgid "Brest"
 msgctxt "City in France"
 msgid "Brest"
 msgstr ""
 
 #. A city in France
-#| msgid "Barrie"
 msgid "Brive"
 msgstr ""
 
@@ -7017,7 +6536,6 @@ msgid "Colmar"
 msgstr "Colmar"
 
 #. A city in France
-#| msgid "Charmeil"
 msgid "Creil"
 msgstr ""
 
@@ -7038,7 +6556,6 @@ msgid "Dole"
 msgstr "Dole"
 
 #. A city in France
-#| msgid "Colmar"
 msgid "Dollemard"
 msgstr ""
 
@@ -7055,11 +6572,6 @@ msgid "HyÃ¨res"
 msgstr "HyÃ¨res"
 
 #. A city in France
-#| msgid "HÃ¶rsching"
-msgid "HÃ©singue"
-msgstr ""
-
-#. A city in France
 msgid "Istres"
 msgstr "Istres"
 
@@ -7080,7 +6592,6 @@ msgid "Le Mans"
 msgstr "Le Mans"
 
 #. A city in France
-#| msgid "Le Luc"
 msgid "Le Puy"
 msgstr ""
 
@@ -7117,7 +6628,6 @@ msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
 #. A city in France
-#| msgid "Montauk"
 msgid "Montgauch"
 msgstr ""
 
@@ -7130,6 +6640,12 @@ msgid "MontÃ©limar"
 msgstr "MontÃ©limar"
 
 #. A city in France
+#, fuzzy
+#| msgid "Toulouse"
+msgid "Mulhouse"
+msgstr "Toulouse"
+
+#. A city in France
 msgid "MÃ¢con"
 msgstr "MÃ¢con"
 
@@ -7158,7 +6674,6 @@ msgid "NÃ®mes"
 msgstr "NÃ®mes"
 
 #. A city in France
-#| msgid "Orange"
 msgctxt "City in France"
 msgid "Orange"
 msgstr "OranÅ¾a"
@@ -7168,7 +6683,6 @@ msgid "OrlÃ©ans"
 msgstr "OrlÃ©ans"
 
 #. The capital of France
-#| msgid "Paris"
 msgctxt "City in France"
 msgid "Paris"
 msgstr "ParÄ«ze"
@@ -7182,7 +6696,6 @@ msgid "Perpignan"
 msgstr "Perpignan"
 
 #. A city in France
-#| msgid "Nogales"
 msgid "Poggiale"
 msgstr ""
 
@@ -7207,7 +6720,6 @@ msgid "Rodez"
 msgstr "Rodez"
 
 #. A city in France
-#| msgid "Romania"
 msgid "Romorantin"
 msgstr ""
 
@@ -7228,7 +6740,6 @@ msgid "Saint-Yan"
 msgstr "Saint-Yan"
 
 #. A city in France
-#| msgid "Salmon"
 msgid "Salon"
 msgstr ""
 
@@ -7249,7 +6760,6 @@ msgid "Tours"
 msgstr "Tours"
 
 #. A city in France
-#| msgid "MÃ©rignac"
 msgid "Trignac"
 msgstr ""
 
@@ -7258,12 +6768,10 @@ msgid "Troyes"
 msgstr "Troyes"
 
 #. A city in France
-#| msgid "Saguache"
 msgid "Veauche"
 msgstr ""
 
 #. A city in France
-#| msgid "Vichy"
 msgctxt "City in France"
 msgid "Vichy"
 msgstr ""
@@ -7277,17 +6785,14 @@ msgid "Ã?vreux"
 msgstr "Ã?vreux"
 
 #. The capital of French Guiana
-#| msgid "Cheyenne"
 msgid "Cayenne"
 msgstr ""
 
 #. The capital of French Polynesia
-#| msgid "Palestine"
 msgid "Papeete"
 msgstr ""
 
 #. A city in Gabon
-#| msgid "Frenchville"
 msgid "Franceville"
 msgstr ""
 
@@ -7300,12 +6805,10 @@ msgid "Port-Gentil"
 msgstr "Port-Gentil"
 
 #. The capital of Gambia
-#| msgid "Barnaul"
 msgid "Banjul"
 msgstr ""
 
 #. A city in Lower Saxony in Germany
-#| msgid "Auch"
 msgid "Achum"
 msgstr ""
 
@@ -7318,12 +6821,10 @@ msgid "Augsburg"
 msgstr "Augsburg"
 
 #. A city in North Rhine-Westphalia in Germany
-#| msgid "Barnaul"
 msgid "Baal"
 msgstr ""
 
 #. The capital of Germany
-#| msgid "Berlin"
 msgctxt "City in Berlin, Germany"
 msgid "Berlin"
 msgstr "BerlÄ«ne"
@@ -7333,7 +6834,6 @@ msgid "Bindersleben"
 msgstr "Bindersleben"
 
 #. A city in North Rhine-Westphalia in Germany
-#| msgid "Bron"
 msgid "Bonn"
 msgstr "Bonna"
 
@@ -7342,12 +6842,10 @@ msgid "Braunschweig"
 msgstr "Braunschweig"
 
 #. A city in North Rhine-Westphalia in Germany
-#| msgid "Frederick"
 msgid "Bredeck"
 msgstr ""
 
 #. A city in Bremen in Germany
-#| msgid "Bremen"
 msgctxt "City in Bremen, Germany"
 msgid "Bremen"
 msgstr "BrÄ?mene"
@@ -7361,12 +6859,10 @@ msgid "Celle"
 msgstr "Celle"
 
 #. A city in Baden-WÃ¼rttemberg in Germany
-#| msgid "Donaueschingen-Villingen"
 msgid "Donaueschingen"
 msgstr ""
 
 #. A city in Bavaria in Germany
-#| msgid "Dortmund"
 msgid "DorfgmÃ¼nd"
 msgstr ""
 
@@ -7387,7 +6883,6 @@ msgid "FaÃ?berg"
 msgstr "FaÃ?berg"
 
 #. A city in Hesse in Germany
-#| msgid "Frankfort"
 msgid "Frankfurt"
 msgstr "Frankfurte"
 
@@ -7408,7 +6903,6 @@ msgid "Hahn"
 msgstr "Hahn"
 
 #. A city in Hamburg in Germany
-#| msgid "Hamburg"
 msgctxt "City in Hamburg, Germany"
 msgid "Hamburg"
 msgstr "Hamburga"
@@ -7438,7 +6932,6 @@ msgid "Kalkar"
 msgstr "Kalkar"
 
 #. A city in North Rhine-Westphalia in Germany
-#| msgid "Kalkar"
 msgid "Kalkum"
 msgstr ""
 
@@ -7451,7 +6944,6 @@ msgid "Kassel"
 msgstr "Kassel"
 
 #. A city in Bavaria in Germany
-#| msgid "Karachi"
 msgid "Katterbach"
 msgstr ""
 
@@ -7460,7 +6952,6 @@ msgid "Kiel"
 msgstr "Kiel"
 
 #. A city in North Rhine-Westphalia in Germany
-#| msgid "Keetmanshoop"
 msgid "Klemenshof"
 msgstr ""
 
@@ -7469,7 +6960,6 @@ msgid "Laage"
 msgstr "Laage"
 
 #. A city in Bavaria in Germany
-#| msgid "Lechfeld"
 msgid "Lager Lechfeld"
 msgstr ""
 
@@ -7478,7 +6968,6 @@ msgid "Lahr"
 msgstr "Lahr"
 
 #. A city in Bavaria in Germany
-#| msgid "Sandberg"
 msgid "Landsberg"
 msgstr ""
 
@@ -7491,7 +6980,6 @@ msgid "Leipzig"
 msgstr "Leipzig"
 
 #. A city in Rhineland-Palatinate in Germany
-#| msgid "Lechfeld"
 msgid "Liebenscheid"
 msgstr ""
 
@@ -7511,7 +6999,6 @@ msgid "MÃ¶nchengladbach"
 msgstr "MÃ¶nchengladbach"
 
 #. A city in North Rhine-Westphalia in Germany
-#| msgid "Manchester"
 msgid "MÃ¼nster"
 msgstr "Minstere"
 
@@ -7545,7 +7032,6 @@ msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
 #. A city in North Rhine-Westphalia in Germany
-#| msgid "Fairborn"
 msgid "Paderborn"
 msgstr ""
 
@@ -7570,7 +7056,6 @@ msgid "Schleswig"
 msgstr "Schleswig"
 
 #. A city in Mecklenburg-Western Pomerania in Germany
-#| msgid "Heringsdorf"
 msgid "Seebad Heringsdorf"
 msgstr ""
 
@@ -7579,7 +7064,6 @@ msgid "Spangdahlem"
 msgstr "Spangdahlem"
 
 #. A city in Baden-WÃ¼rttemberg in Germany
-#| msgid "Stuttgart"
 msgctxt "City in Baden-WÃ¼rttemberg, Germany"
 msgid "Stuttgart"
 msgstr "Å tutgarte"
@@ -7589,12 +7073,10 @@ msgid "Trollenhagen"
 msgstr "Trollenhagen"
 
 #. A city in Schleswig-Holstein in Germany
-#| msgid "Bluefield"
 msgid "Ulstrupfeld"
 msgstr ""
 
 #. A city in Schleswig-Holstein in Germany
-#| msgid "Torrance"
 msgid "Vorrade"
 msgstr ""
 
@@ -7627,18 +7109,15 @@ msgid "Accra"
 msgstr "Akra"
 
 #. The capital of Gibraltar
-#| msgid "Gibraltar"
 msgctxt "City in Gibraltar"
 msgid "Gibraltar"
 msgstr "GibraltÄ?rs"
 
 #. A city in Greece
-#| msgid "Alexandroupoli"
 msgid "AlexandroÃºpolis"
 msgstr ""
 
 #. A city in Greece
-#| msgid "Andravida"
 msgid "AndravÃda"
 msgstr ""
 
@@ -7650,47 +7129,39 @@ msgstr ""
 #. "Athens" is the traditional English name.
 #. The local name in Greek is "AthÃna / Î?Î¸Î®Î½Î±".
 #.
-#| msgid "Athens"
 msgctxt "City in Greece"
 msgid "Athens"
 msgstr "AtÄ?nas"
 
 #. A city in Greece
-#| msgid "Chrysoupoli"
 msgid "ChrysoÃºpolis"
 msgstr ""
 
 #. A city in Greece.
 #. The name is also written "Î§Î¯Î¿Ï?".
 #.
-#| msgid "Chios"
 msgid "ChÃos"
 msgstr ""
 
 #. A city in Greece
-#| msgid "Elefsina"
 msgid "ElefsÃs"
 msgstr ""
 
 #. A city in Greece
-#| msgid "Heraklion"
 msgid "IrÃ¡kleion"
 msgstr ""
 
 #. A city in Greece.
 #. The name is also written "Î?Î±Î»Î±Î¼Î¬Ï?Î±".
 #.
-#| msgid "Kalamata"
 msgid "KalamÃ¡ta"
 msgstr ""
 
 #. A city in Greece
-#| msgid "Marion"
 msgid "KarpÃ¡sion"
 msgstr ""
 
 #. A city in Greece
-#| msgid "Kastoria"
 msgid "KatomÃ©rion"
 msgstr ""
 
@@ -7699,93 +7170,76 @@ msgid "Kos"
 msgstr "Kos"
 
 #. A city in Greece
-#| msgid "Kozani"
 msgid "KozÃ¡ni"
 msgstr ""
 
 #. A city in Greece
-#| msgid "Karpathos"
 msgid "KÃ¡rpathos"
 msgstr ""
 
 #. A city in Greece.
 #. The name is also written "Î?ÎÏ?ÎºÏ?Ï?Î±".
 #.
-#| msgid "Kerkyra"
 msgid "KÃ©rkyra"
 msgstr ""
 
 #. A city in Greece.
 #. The name is also written "Î?Ï?Î¸Î·Ï?Î±".
 #.
-#| msgid "Kithira"
 msgid "KÃ½thira"
 msgstr ""
 
 #. A city in Greece
-#| msgid "Larissa"
 msgid "LÃ¡risa"
 msgstr ""
 
 #. A city in Greece
-#| msgid "Montrose"
 msgid "MonÃ³lithos"
 msgstr ""
 
 #. A city in Greece
-#| msgid "Mytilene"
 msgid "MytilÃni"
 msgstr ""
 
 #. A city in Greece.
 #. The name is also written "Î?Ï?ÎºÎ¿Î½Î¿Ï?".
 #.
-#| msgid "Mikonos"
 msgid "MÃ½konos"
 msgstr ""
 
 #. A city in Greece
-#| msgid "Naxos"
 msgid "NÃ¡xos"
 msgstr ""
 
 #. A city in Greece
-#| msgid "Parsons"
 msgid "ParadeÃsion"
 msgstr ""
 
 #. A city in Greece
-#| msgid "Paros"
 msgid "PÃ¡ros"
 msgstr ""
 
 #. A city in Greece
-#| msgid "Skiathos"
 msgid "SkÃathos"
 msgstr ""
 
 #. A city in Greece
-#| msgid "Souda"
 msgid "SoÃºda"
 msgstr ""
 
 #. A city in Greece
-#| msgid "Samos"
 msgid "SÃ¡mos"
 msgstr ""
 
 #. A city in Greece
-#| msgid "Tanagra"
 msgid "TanÃ¡gra"
 msgstr ""
 
 #. A city in Greece
-#| msgid "Thessaloniki"
 msgid "ThessalonÃki"
 msgstr ""
 
 #. A city in Greece
-#| msgid "Zakinthos"
 msgid "ZÃ¡kynthos"
 msgstr ""
 
@@ -7794,7 +7248,6 @@ msgid "Ã?no SÃros"
 msgstr ""
 
 #. A city in Greece
-#| msgid "Araxos"
 msgid "Ã?raxos"
 msgstr ""
 
@@ -7805,7 +7258,6 @@ msgstr ""
 #. A city in Greenland.
 #. The local name in Kalaallisut is "Uummannaq".
 #.
-#| msgid "Dumas"
 msgid "Dundas"
 msgstr ""
 
@@ -7822,12 +7274,10 @@ msgstr ""
 #. A city in Greenland.
 #. The local name in Kalaallisut is "Ilulissat".
 #.
-#| msgid "Danmarkshavn"
 msgid "Jakobshavn"
 msgstr ""
 
 #. A city in Greenland
-#| msgid "Kulusuk Lufthavn"
 msgid "Kulusuk"
 msgstr ""
 
@@ -7836,32 +7286,26 @@ msgid "Narsarsuaq"
 msgstr "Narsarsuaq"
 
 #. A city in Greenland
-#| msgid "Sdr Stroemfjord"
 msgid "SÃ¸ndre StrÃ¸mfjord"
 msgstr ""
 
 #. A city in Grenada
-#| msgid "Baraboo"
 msgid "Bamboo"
 msgstr ""
 
 #. The capital of Grenada
-#| msgid "St. George"
 msgid "Saint George's"
 msgstr ""
 
 #. The capital of Guadeloupe
-#| msgid "Barre"
 msgid "Basse-Terre"
 msgstr ""
 
 #. A city in Guadeloupe
-#| msgid "Les Milles"
 msgid "Les Abymes"
 msgstr ""
 
 #. A city in Guam
-#| msgid "Posadas"
 msgid "Asatdas"
 msgstr ""
 
@@ -7870,7 +7314,6 @@ msgid "HagÃ¥tÃ±a"
 msgstr ""
 
 #. The capital of Guatemala
-#| msgid "Guatemala"
 msgctxt "City in Guatemala"
 msgid "Guatemala"
 msgstr "Gvatemala"
@@ -7884,7 +7327,6 @@ msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
 #. A city in Guatemala
-#| msgid "Porto Santo"
 msgid "Puerto San JosÃ©"
 msgstr ""
 
@@ -7897,26 +7339,28 @@ msgid "Tikal"
 msgstr "Tikal"
 
 #. A city in Guernsey
-#| msgid "Hawthorne"
 msgid "Hautnez"
 msgstr ""
 
 #. The capital of Guernsey
-#| msgid "Saint Gedeon"
 msgid "Saint Peter Port"
 msgstr ""
 
 #. The capital of Guinea
-#| msgid "Coventry"
 msgid "Conakry"
 msgstr ""
 
 #. The capital of Guyana
-#| msgid "Georgetown"
 msgctxt "City in Guyana"
 msgid "Georgetown"
 msgstr "DÅ¾ordÅ¾tauna"
 
+#. Capital of Haiti
+#, fuzzy
+#| msgid "Fort Providence"
+msgid "Port-au-Prince"
+msgstr "Fort Providence"
+
 #. A city in Honduras
 msgid "Amapala"
 msgstr "Amapala"
@@ -7926,7 +7370,6 @@ msgid "Catacamas"
 msgstr "Catacamas"
 
 #. A city in Honduras
-#| msgid "Choluteca"
 msgid "Ciudad Choluteca"
 msgstr ""
 
@@ -7947,7 +7390,6 @@ msgid "La Esperanza"
 msgstr "La Esperanza"
 
 #. A city in Honduras
-#| msgid "Mesa"
 msgid "La Mesa"
 msgstr ""
 
@@ -7956,12 +7398,10 @@ msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
 #. A city in Honduras
-#| msgid "Roatan"
 msgid "RoatÃ¡n"
 msgstr ""
 
 #. A city in Honduras
-#| msgid "Santa Rosa De CopÃ¡n"
 msgid "Santa Rosa de CopÃ¡n"
 msgstr ""
 
@@ -7978,7 +7418,6 @@ msgid "Yoro"
 msgstr "Yoro"
 
 #. A city in Hong Kong
-#| msgid "Kloten"
 msgid "Kowloon"
 msgstr ""
 
@@ -7991,17 +7430,14 @@ msgid "Debrecen"
 msgstr "Debrecen"
 
 #. A city in Hungary
-#| msgid "Kecskemet"
 msgid "KecskemÃ©t"
 msgstr ""
 
 #. A city in Hungary
-#| msgid "Papa"
 msgid "PÃ¡pa"
 msgstr ""
 
 #. A city in Hungary
-#| msgid "Pecos"
 msgid "PÃ©cs"
 msgstr ""
 
@@ -8030,64 +7466,193 @@ msgid "Ytri-NjarÃ°vÃk"
 msgstr ""
 
 #. A city in India
+#. the local name in Bengali is "à¦?à¦?à¦°à¦¤à¦²à¦¾/AgortÃ´la"
+#, fuzzy
+#| msgid "Amapala"
+msgid "Agartala"
+msgstr "Amapala"
+
+#. A city in India
+#. the local name in Hindi is "à¤?à¤?à¤°à¤¾"
+#.
+#, fuzzy
+#| msgid "Arad"
+msgid "Agra"
+msgstr "Arad"
+
+#. A city in India
 msgid "Ahmadabad"
 msgstr "Ahmadabada"
 
 #. A city in India
+#. the local name in Hindi is "à¤?à¤²à¤¾à¤¹à¤¾à¤¬à¤¾à¤¦"
+#, fuzzy
+#| msgid "Ahmadabad"
+msgid "Allahabad"
+msgstr "Ahmadabada"
+
+#. A city in India
+#. the local name in Punjabi is "à¨?à©°à¨®à©?à¨°à¨¿à¨¤à¨¸à¨°"
+#.
 msgid "Amritsar"
 msgstr "Amritsar"
 
+#. A city in India
+#. the local name in Marathi is "à¤?à¤°à¤?à¤?à¤¾à¤¬à¤¾à¤¦"
+#, fuzzy
+#| msgid "Ahmadabad"
+msgid "Aurangabad"
+msgstr "Ahmadabada"
+
+#. A city in India
+#, fuzzy
+#| msgid "Bangor"
+msgid "Bagdogra"
+msgstr "Bangor"
+
+#. A city in India - local airport
+#. "Bengaluru" is the new name
+#.
+#, fuzzy
+#| msgid "Bangor"
+msgid "Bangalore"
+msgstr "Bangor"
+
 #. A city in India.
 #. "Benares" is the traditional English name.
 #. The local name is "Varanasi".
 #. The local name in Hindi is "à¤µà¤¾à¤°à¤¾à¤£à¤¸à¥?".
 #.
-#| msgid "Belarus"
 msgid "Benares"
 msgstr ""
 
+#. A city in India
+#. the local name in Gujrati is "àªàª¾àªµàª¨àª?àª°"
+#. the local name in Hindi is "à¤à¤¾à¤µà¤¨à¤?à¤°"
+#, fuzzy
+#| msgid "Bangor"
+msgid "Bhavnagar"
+msgstr "Bangor"
+
 #. A city in India.
-#. "Bombay" is the traditional English name.
-#. The local name in Marathi is "Mumbai /  à¤®à¥?à¤?à¤¬à¤?".
+#. The local name in Hindi is "à¤à¥?à¤ªà¤¾à¤²".
 #.
-#| msgid "Bowman"
-msgid "Bombay"
-msgstr "Bombeja"
+#, fuzzy
+#| msgid "Bishop"
+msgid "Bhopal"
+msgstr "Bishop"
 
 #. A city in India.
-#. "Calcutta" is the traditional English name.
-#. The local name in Bengali is "Kolkata /  à¦?à¦²à¦?à¦¾à¦¤à¦¾".
+#. The local name in Oriya is "à¬à?à¬¬à?à¬¨à¬¶à?à¬¬à¬°".
+#.
+#, fuzzy
+#| msgid "Changsha"
+msgid "Bhubaneshwar"
+msgstr "Changsha"
+
+#. A city in India.
+#, fuzzy
+#| msgid "Bhutan"
+msgid "Bhuj"
+msgstr "ButÄ?na"
+
+#. A union territory in India.
+#. The local name in Hindi is "à¤?à¤£à¥?à¤¡à¥?à¤?à¤¢à¤¼ / à¤?à¤?à¤¡à¥?à¤?à¤¢à¤¼"
+#. The local name in Punjabi is "à¨?à©°à¨¡à©?à¨?à©?à©?à¨¹"
+#, fuzzy
+#| msgid "Chinandega"
+msgid "Chandigarh"
+msgstr "Chinandega"
+
+#. A city in India.
+#. "Madras" is the traditional English name.
+#. The local name in Tamil is "Chennai / à®?à¯?à®©à¯?à®©à¯?".
+#.
+#, fuzzy
+#| msgid "China"
+msgid "Chennai"
+msgstr "Ä¶Ä«na"
+
+#. A city in India.
+#. The local name in Tamil is "à®?à¯?à®¯à®®à¯?à®ªà¯?à®¤à¯?à®¤à¯?à®°à¯?".
 #.
-#| msgid "Calcutta/Dum Dum"
-msgid "Calcutta"
-msgstr "Kalkuta"
+#, fuzzy
+#| msgid "Colmar"
+msgid "Coimbatore"
+msgstr "Colmar"
+
+#. A city in India
+#. also known as Dehra Doon
+#. the local name in Hindi is "à¤¦à¥?à¤¹à¤°à¤¾à¤¦à¥?à¤¨"
+#, fuzzy
+#| msgid "Dhahran"
+msgid "Dehradun"
+msgstr "Dhahran"
+
+#. A city in India
+msgid "Dibrugarh"
+msgstr ""
+
+#. A city in India
+#. the local name in Hindi is "à¤¦à¥?à¤®à¤¾à¤ªà¥?à¤°"
+#, fuzzy
+#| msgid "Dinard"
+msgid "Dimapur"
+msgstr "Dinard"
 
 #. A city in India
 msgid "Hyderabad"
 msgstr "Hyderabad"
 
 #. A city in India
-#| msgid "Jabalpur"
 msgid "Jaipur"
 msgstr ""
 
 #. A city in India.
+#. The local name in Dogri is "à¤?à¤®à¥?à¤®à¥?"
+#, fuzzy
+#| msgid "Namur"
+msgid "Jammu"
+msgstr "Namur"
+
+#. A city in India.
+#. The old name is "Cochin"
+#. A city in Japan
+msgid "Kochi"
+msgstr "Kochi"
+
+#. A city in India.
+#. "Calcutta" is the traditional English name.
+#. The local name in Bengali is "Kolkata /  à¦?à¦²à¦?à¦¾à¦¤à¦¾".
+#.
+#, fuzzy
+#| msgid "Kalkar"
+msgid "Kolkata"
+msgstr "Kalkar"
+
+#. A city in India.
+#. The local name in Hindi is "à¤²à¥?à¤¹"
+#, fuzzy
+#| msgid "Lesotho"
+msgid "Leh"
+msgstr "Lesoto"
+
+#. A city in India.
 #. The local name in Hindi is "à¤²à¤?à¤¨à¤?".
 #.
-#| msgid "Lucknow/Amausi"
 msgid "Lucknow"
 msgstr ""
 
 #. A city in India.
-#. "Madras" is the traditional English name.
-#. The local name in Tamil is "Chennai / à®?à¯?à®©à¯?à®©à¯?".
+#. "Bombay" is the traditional English name.
+#. The local name in Marathi is "Mumbai /  à¤®à¥?à¤?à¤¬à¤?".
 #.
-#| msgid "Madera"
-msgid "Madras"
-msgstr ""
+#, fuzzy
+#| msgid "Dubai"
+msgid "Mumbai"
+msgstr "Dubai"
 
 #. A city in India
-#| msgid "Namur"
 msgid "Nagpur"
 msgstr ""
 
@@ -8096,7 +7661,6 @@ msgstr ""
 #. The local name in Panjabi is "à¨¨à¨µà©?à¨? à¨¦à¨¿à©±à¨²à©?".
 #. The local name in Hindi is "à¤¨à¤? à¤¦à¤¿à¤²à¥?à¤²à¥?".
 #.
-#| msgid "New Delhi/Palam"
 msgid "New Delhi"
 msgstr ""
 
@@ -8104,6 +7668,27 @@ msgstr ""
 msgid "Patna"
 msgstr "Patna"
 
+#. A city in India
+#, fuzzy
+#| msgid "Ponce"
+msgid "Pune"
+msgstr "Ponce"
+
+#. A city in India.
+#. The local name in Hindi is "à¤¶à¤¿à¤®à¤²à¤¾"
+#, fuzzy
+#| msgid "Shiraz"
+msgid "Shimla"
+msgstr "Shiraz"
+
+#. A city in India.
+#. The local name in Dogri is "à¤¶à¥?à¤°à¥?à¤¨à¤?à¤°"
+#. The local name in Urdu is "Ø´Ø±Û?Ù?Ú¯Ø±"
+#, fuzzy
+#| msgid "Iringa"
+msgid "Srinagar"
+msgstr "Iringa"
+
 #. A city in India.
 #. The local name in Malayalam is "à´¤à´¿à´°àµ?à´µà´¨à´¨àµ?à´¤à´ªàµ?à´°à´?".
 #.
@@ -8113,37 +7698,26 @@ msgstr "Thiruvananthapuram"
 #. A city in India.
 #. The local name in Tamil is "à®¤à®¿à®°à¯?à®?à¯?à®?à®¿à®°à®¾à®ªà¯?à®ªà®³à¯?à®³à®¿".
 #.
-#| msgid "Tiruchchirapalli"
 msgid "Tiruchchirappalli"
 msgstr ""
 
 #. The capital of Indonesia
-#| msgid "Yakataga"
 msgid "Jakarta"
 msgstr ""
 
 #. A city in Indonesia
-#| msgid "Manassas"
 msgid "Makassar"
 msgstr ""
 
 #. A city in Indonesia
-#| msgid "Mankato"
-msgid "Manado"
-msgstr ""
-
-#. A city in Indonesia
-#| msgid "Meridian"
 msgid "Medan"
 msgstr ""
 
 #. A city in Indonesia
-#| msgid "Palanga"
 msgid "Palembang"
 msgstr ""
 
 #. A city in Indonesia
-#| msgid "Peru"
 msgid "Pekanbaru"
 msgstr ""
 
@@ -8170,7 +7744,6 @@ msgstr "Aghajari"
 #. A city in Iran.
 #. The name is also written "Ø§Ù?Ù?Ø§Ø²".
 #.
-#| msgid "Ahwaz"
 msgid "Ahvaz"
 msgstr ""
 
@@ -8183,28 +7756,24 @@ msgstr "Ardabil"
 #. A city in Iran.
 #. The name is also written "Ø¨Ù?Ø¯Ø± Ø¹Ø¨Ø§Ø³".
 #.
-#| msgid "Bandarabbass"
 msgid "Bandar 'Abbas"
 msgstr ""
 
 #. A city in Iran.
 #. The name is also written "Ø¨Ù?Ø¯Ø± Ø¨Ù?Ø´Ù?Ø±".
 #.
-#| msgid "Bandar Lengeh"
 msgid "Bandar-e Bushehr"
 msgstr ""
 
 #. A city in Iran.
 #. The name is also written "Ø¨Ù?Ø¯Ø± Ù?Ù?Ú¯Ù?".
 #.
-#| msgid "Bandar Lengeh"
 msgid "Bandar-e Lengeh"
 msgstr ""
 
 #. A city in Iran.
 #. The name is also written "Ø¨Ù?Ø¯Ø± Ù?Ø§Ù?Ø´Ù?Ø±".
 #.
-#| msgid "Bandar Mahshahr/Mahshahr"
 msgid "Bandar-e Mahshahr"
 msgstr ""
 
@@ -8215,14 +7784,12 @@ msgstr "Birjand"
 #. A city in Iran.
 #. The name is also written "Ú?Ø§Ù? Ø¨Ù?Ø§Ø±".
 #.
-#| msgid "Chahbahar"
 msgid "Chah Bahar"
 msgstr ""
 
 #. A city in Iran.
 #. The name is also written "Ø¯Ù?Ø±Ø³ØªØ§Ù?".
 #.
-#| msgid "Dayton"
 msgid "Dayrestan"
 msgstr ""
 
@@ -8273,7 +7840,6 @@ msgstr "Iranshahr"
 #. A city in Iran.
 #. The name is also written "Ù?Ø±Ø¬".
 #.
-#| msgid "Kariba"
 msgid "Karaj"
 msgstr ""
 
@@ -8292,14 +7858,12 @@ msgstr "Kermanshah"
 #. A city in Iran.
 #. The name is also written "Ø®Ø±Ù? Ø¢Ø¨Ø§Ø¯".
 #.
-#| msgid "Khorram Abad"
 msgid "Khorramabad"
 msgstr ""
 
 #. A city in Iran.
 #. The name is also written "Ù?Ù?Ø´".
 #.
-#| msgid "Bisha"
 msgid "Kish"
 msgstr ""
 
@@ -8316,28 +7880,24 @@ msgstr "Mashhad"
 #. A city in Iran.
 #. The name is also written "Ù?Ø³Ø¬Ø¯ Ø³Ù?Û?Ù?Ø§Ù?".
 #.
-#| msgid "Masjed-Soleyman"
 msgid "Masjed Soleyman"
 msgstr ""
 
 #. A city in Iran.
 #. The name is also written "Ù?Ù? Ø´Ù?Ø±".
 #.
-#| msgid "Noshahr"
 msgid "Now Shahr"
 msgstr ""
 
 #. A city in Iran.
 #. The name is also written "Ø§Ø±Ù?Ù?Û?Ù?".
 #.
-#| msgid "Orumieh"
 msgid "Orumiyeh"
 msgstr ""
 
 #. A city in Iran.
 #. The name is also written "Ù?Ø²Ù?Û?Ù?".
 #.
-#| msgid "Ghazvin"
 msgid "Qazvin"
 msgstr ""
 
@@ -8352,7 +7912,6 @@ msgstr "Sabzevar"
 #. A city in Iran.
 #. The name is also written "Ø³Ø®Øª Ø³Ø±".
 #.
-#| msgid "Satu Mare"
 msgid "Sakht Sar"
 msgstr ""
 
@@ -8379,7 +7938,6 @@ msgstr ""
 #. A city in Iran.
 #. The name is also written "Ø´Ù?Ø± Ù?Ø±Ø¯".
 #.
-#| msgid "Shahre-Kord"
 msgid "Shahr-e Kord"
 msgstr ""
 
@@ -8402,7 +7960,6 @@ msgstr "Tabriz"
 #. The capital of Iran.
 #. The name is also written "ØªÙ?Ø±Ø§Ù?".
 #.
-#| msgid "Trang"
 msgid "Tehran"
 msgstr ""
 
@@ -8421,7 +7978,6 @@ msgstr "Zabol"
 #. A city in Iran.
 #. The name is also written "Ø²Ø§Ù?Ø¯Ø§Ù? (Ú©Ù?)".
 #.
-#| msgid "Zahedan"
 msgid "Zahedan-e (Yek)"
 msgstr ""
 
@@ -8434,7 +7990,6 @@ msgstr "Cork"
 #. The capital of Ireland.
 #. The local name in Irish is "Baile Ã?tha Cliath".
 #.
-#| msgid "Dublin"
 msgctxt "City in Ireland"
 msgid "Dublin"
 msgstr ""
@@ -8442,12 +7997,10 @@ msgstr ""
 #. A city in Ireland.
 #. The local name in Irish is "DÃºn Laoghaire".
 #.
-#| msgid "Tulear"
 msgid "Dunleary"
 msgstr ""
 
 #. A city in Ireland
-#| msgid "Solenzara"
 msgid "Glentavraun"
 msgstr ""
 
@@ -8458,23 +8011,19 @@ msgid "Shannon"
 msgstr "Shannon"
 
 #. The capital of the Isle of Man
-#| msgid "Douglas"
 msgctxt "City in Isle of Man"
 msgid "Douglas"
 msgstr ""
 
 #. A city in the Isle of Man
-#| msgid "Rockaway"
 msgid "Ronaldsway"
 msgstr ""
 
 #. A city in Israel
-#| msgid "Eilat"
 msgid "Elat"
 msgstr ""
 
 #. A city in Israel
-#| msgid "Mananjary"
 msgid "Mahanayim"
 msgstr ""
 
@@ -8487,7 +8036,6 @@ msgid "Ramot Remez"
 msgstr ""
 
 #. A city in Israel
-#| msgid "Shannon"
 msgid "Shizzafon"
 msgstr ""
 
@@ -8508,17 +8056,14 @@ msgid "Aviano"
 msgstr "Aviano"
 
 #. A city in Italy
-#| msgid "Barin"
 msgid "Bari"
 msgstr ""
 
 #. A city in Italy
-#| msgid "Beaumont"
 msgid "Bergamo"
 msgstr ""
 
 #. A city in Italy
-#| msgid "Blagnac"
 msgid "Bologna"
 msgstr ""
 
@@ -8527,7 +8072,6 @@ msgid "Bolzano"
 msgstr "Bolzano"
 
 #. A city in Italy
-#| msgid "Bria"
 msgid "Brescia"
 msgstr ""
 
@@ -8540,7 +8084,6 @@ msgid "Brindisi"
 msgstr "Brindisi"
 
 #. A city in Italy
-#| msgid "Cagliari/Elmas"
 msgid "Cagliari"
 msgstr ""
 
@@ -8549,7 +8092,6 @@ msgid "Capri"
 msgstr "Capri"
 
 #. A city in Italy
-#| msgid "Canefield"
 msgid "Case Arfel"
 msgstr ""
 
@@ -8566,7 +8108,6 @@ msgid "Crotone"
 msgstr "Crotone"
 
 #. A city in Italy
-#| msgid "Cleburne"
 msgid "Cuneo"
 msgstr ""
 
@@ -8586,13 +8127,11 @@ msgstr "Ferrara"
 #. "Florence" is the traditional English name.
 #. The local name in Italian is "Firenze".
 #.
-#| msgid "Florence"
 msgctxt "City in Italy"
 msgid "Florence"
 msgstr ""
 
 #. A city in Italy
-#| msgid "Forli"
 msgid "ForlÃ¬"
 msgstr ""
 
@@ -8604,12 +8143,10 @@ msgstr "Frosinone"
 #. "Genoa" is the traditional English name.
 #. The local name in Italian is "Genova".
 #.
-#| msgid "Gagnoa"
 msgid "Genoa"
 msgstr ""
 
 #. A city in Italy
-#| msgid "Tingo Maria"
 msgid "Ginosa Marina"
 msgstr ""
 
@@ -8630,12 +8167,10 @@ msgid "Grottaglie"
 msgstr "Grottaglie"
 
 #. A city in Italy
-#| msgid "Islas Del Cisne"
 msgid "Isola del Cantone"
 msgstr ""
 
 #. A city in Italy
-#| msgid "Laughlin"
 msgid "Laigueglia"
 msgstr ""
 
@@ -8659,12 +8194,10 @@ msgstr "Messina"
 #. "Milan" is the traditional English name.
 #. The local name in Italian is "Milano".
 #.
-#| msgid "Midland"
 msgid "Milan"
 msgstr ""
 
 #. A city in Italy
-#| msgid "Marino di Ravenna"
 msgid "Molino di Ancona"
 msgstr ""
 
@@ -8672,18 +8205,15 @@ msgstr ""
 #. "Naples" is the traditional English name.
 #. The local name in Italian is "Napoli".
 #.
-#| msgid "Naples"
 msgctxt "City in Italy"
 msgid "Naples"
 msgstr ""
 
 #. A city in Italy
-#| msgid "Olivia"
 msgid "Olbia"
 msgstr ""
 
 #. A city in Italy
-#| msgid "Pala"
 msgid "Palazzo"
 msgstr ""
 
@@ -8716,7 +8246,6 @@ msgid "Piacenza"
 msgstr "Piacenza"
 
 #. A city in Italy
-#| msgid "Bisha"
 msgid "Pisa"
 msgstr ""
 
@@ -8725,17 +8254,14 @@ msgid "Pontecagnano"
 msgstr "Pontecagnano"
 
 #. A city in Italy
-#| msgid "Pratica Di Mare"
 msgid "Pratica di Mare"
 msgstr ""
 
 #. A city in Italy
-#| msgid "Reggio Calabria"
 msgid "Reggio di Calabria"
 msgstr ""
 
 #. A city in Italy
-#| msgid "Regina"
 msgid "Resia"
 msgstr ""
 
@@ -8751,7 +8277,6 @@ msgstr "Rimini"
 #. "Rome" is the traditional English name.
 #. The local name in Italian is "Roma".
 #.
-#| msgid "Rome"
 msgctxt "City in Italy"
 msgid "Rome"
 msgstr ""
@@ -8761,12 +8286,10 @@ msgid "Ronchi dei Legionari"
 msgstr "Ronchi dei Legionari"
 
 #. A city in Italy
-#| msgid "Salina"
 msgid "Salignano"
 msgstr ""
 
 #. A city in Italy
-#| msgid "San Antonio"
 msgid "San StÃ¨fano"
 msgstr ""
 
@@ -8775,12 +8298,10 @@ msgid "Sant'Eufemia Lamezia"
 msgstr ""
 
 #. A city in Italy
-#| msgid "Seminole"
 msgid "Sporminore"
 msgstr ""
 
 #. A city in Italy
-#| msgid "Jamaica"
 msgid "Tamaricciola"
 msgstr ""
 
@@ -8789,7 +8310,6 @@ msgid "Tarvisio"
 msgstr "Tarvisio"
 
 #. A city in Italy
-#| msgid "Uruapan"
 msgid "Trapani"
 msgstr ""
 
@@ -8798,7 +8318,6 @@ msgid "Trevico"
 msgstr "Trevico"
 
 #. A city in Italy
-#| msgid "Trevico"
 msgid "Treviso"
 msgstr ""
 
@@ -8810,7 +8329,6 @@ msgstr "Trieste"
 #. "Turin" is the traditional English name.
 #. The local name is "Torino".
 #.
-#| msgid "Turaif"
 msgid "Turin"
 msgstr ""
 
@@ -8822,7 +8340,6 @@ msgid "Venice"
 msgstr "Venice"
 
 #. A city in Italy
-#| msgid "Vernal"
 msgid "Verona"
 msgstr ""
 
@@ -8835,7 +8352,6 @@ msgid "Ã?rbatax"
 msgstr ""
 
 #. The capital of Jamaica
-#| msgid "Kingston"
 msgctxt "City in Jamaica"
 msgid "Kingston"
 msgstr ""
@@ -8849,7 +8365,6 @@ msgid "Akita"
 msgstr "Akita"
 
 #. A city in Japan
-#| msgid "Amami"
 msgid "Ami"
 msgstr ""
 
@@ -8858,17 +8373,14 @@ msgid "Aomori"
 msgstr "Aomori"
 
 #. A city in Japan
-#| msgid "Asahikawa Ab"
 msgid "Asahikawa"
 msgstr ""
 
 #. A city in Japan
-#| msgid "Ashiya Ab"
 msgid "Ashiya"
 msgstr ""
 
 #. A city in Japan
-#| msgid "Chios"
 msgid "Chitose"
 msgstr ""
 
@@ -8877,7 +8389,6 @@ msgid "Chofu"
 msgstr "Chofu"
 
 #. A city in Japan
-#| msgid "Fujian"
 msgid "Fuji"
 msgstr ""
 
@@ -8890,12 +8401,10 @@ msgid "Fukuoka"
 msgstr "Fukuoka"
 
 #. A city in Japan
-#| msgid "Futenma"
 msgid "Futemma"
 msgstr ""
 
 #. A city in Japan
-#| msgid "Gifu Ab"
 msgid "Gifu"
 msgstr ""
 
@@ -8908,7 +8417,6 @@ msgid "Hamamatsu"
 msgstr "Hamamatsu"
 
 #. A city in Japan
-#| msgid "Hamadan"
 msgid "Hamanaka"
 msgstr ""
 
@@ -8921,17 +8429,14 @@ msgid "Hiroshima"
 msgstr "Hiroshima"
 
 #. A city in Japan
-#| msgid "Hof"
 msgid "Hofu"
 msgstr ""
 
 #. A city in Japan
-#| msgid "Ishigakijima"
 msgid "Ishigaki"
 msgstr ""
 
 #. A city in Japan
-#| msgid "Iwami"
 msgid "Iwakuni"
 msgstr ""
 
@@ -8940,12 +8445,10 @@ msgid "Izumo"
 msgstr "Izumo"
 
 #. A city in Japan
-#| msgid "Canada"
 msgid "Janado"
 msgstr ""
 
 #. A city in Japan
-#| msgid "Kaduna"
 msgid "Kadena"
 msgstr ""
 
@@ -8954,17 +8457,14 @@ msgid "Kagoshima"
 msgstr "Kagoshima"
 
 #. A city in Japan
-#| msgid "Kasama"
 msgid "Kanayama"
 msgstr ""
 
 #. A city in Japan
-#| msgid "Kano"
 msgid "Kanoya"
 msgstr ""
 
 #. A city in Japan
-#| msgid "Kashi"
 msgid "Kashoji"
 msgstr ""
 
@@ -8973,16 +8473,10 @@ msgid "Kitakyushu"
 msgstr "Kitakyushu"
 
 #. A city in Japan
-msgid "Kochi"
-msgstr "Kochi"
-
-#. A city in Japan
-#| msgid "Komatsu Ab"
 msgid "Komatsu"
 msgstr ""
 
 #. A city in Japan
-#| msgid "Komatsujima Ab"
 msgid "Komatsushima"
 msgstr ""
 
@@ -8991,16 +8485,10 @@ msgid "Kumamoto"
 msgstr "Kumamoto"
 
 #. A city in Japan
-#| msgid "Kigali"
-msgid "Kunigami"
-msgstr ""
-
-#. A city in Japan
 msgid "Kushiro"
 msgstr "Kushiro"
 
 #. A city in Japan
-#| msgid "Matsuyama"
 msgid "Matsubara"
 msgstr ""
 
@@ -9009,7 +8497,6 @@ msgid "Matsumoto"
 msgstr "Matsumoto"
 
 #. A city in Japan
-#| msgid "Matsushima Ab"
 msgid "Matsushima"
 msgstr ""
 
@@ -9022,22 +8509,18 @@ msgid "Memambetsu"
 msgstr "Memambetsu"
 
 #. A city in Japan
-#| msgid "Mikonos"
 msgid "Mihonoseki"
 msgstr ""
 
 #. A city in Japan
-#| msgid "Miami"
 msgid "Minami"
 msgstr ""
 
 #. A city in Japan
-#| msgid "Misawa Ab"
 msgid "Misawa"
 msgstr ""
 
 #. A city in Japan
-#| msgid "Milton"
 msgid "Mito"
 msgstr ""
 
@@ -9062,7 +8545,6 @@ msgid "Naha"
 msgstr "Naha"
 
 #. A city in Japan
-#| msgid "Nakashibetsu"
 msgid "Naka-shibetsu"
 msgstr ""
 
@@ -9075,12 +8557,10 @@ msgid "Obihiro"
 msgstr "Obihiro"
 
 #. A city in Japan
-#| msgid "Odiham"
 msgid "Odaira"
 msgstr ""
 
 #. A city in Japan
-#| msgid "Osaka"
 msgid "Odaka"
 msgstr ""
 
@@ -9093,7 +8573,6 @@ msgid "Ofunakoshi"
 msgstr ""
 
 #. A city in Japan
-#| msgid "Omaha"
 msgid "Ogimachiya"
 msgstr ""
 
@@ -9102,7 +8581,6 @@ msgid "Oita"
 msgstr "Oita"
 
 #. A city in Japan
-#| msgid "Oita"
 msgid "Okata"
 msgstr ""
 
@@ -9119,7 +8597,6 @@ msgid "Osaka"
 msgstr "Osaka"
 
 #. A city in Japan
-#| msgid "Ozuki Ab"
 msgid "Ozuki"
 msgstr ""
 
@@ -9128,12 +8605,10 @@ msgid "Saga"
 msgstr "Saga"
 
 #. A city in Japan
-#| msgid "Sanliurfa"
 msgid "Sanrizuka"
 msgstr ""
 
 #. A city in Japan
-#| msgid "Sanandaj"
 msgid "Sawada"
 msgstr ""
 
@@ -9142,7 +8617,6 @@ msgid "Sendai"
 msgstr "Sendai"
 
 #. A city in Japan
-#| msgid "Shilo"
 msgid "Shiroi"
 msgstr ""
 
@@ -9151,12 +8625,10 @@ msgid "Takamatsu"
 msgstr "Takamatsu"
 
 #. A city in Japan
-#| msgid "Takamatsu"
 msgid "Takatsu"
 msgstr ""
 
 #. A city in Japan
-#| msgid "Tateyama Ab"
 msgid "Tateyama"
 msgstr ""
 
@@ -9173,17 +8645,14 @@ msgid "Toyama"
 msgstr "Toyama"
 
 #. A city in Japan
-#| msgid "Tokat"
 msgid "Toyooka"
 msgstr ""
 
 #. A city in Japan
-#| msgid "Tsuiki Ab"
 msgid "Tsuiki"
 msgstr ""
 
 #. A city in Japan
-#| msgid "Ushuaia"
 msgid "Ushuku"
 msgstr ""
 
@@ -9196,7 +8665,6 @@ msgid "Yamagata"
 msgstr "Yamagata"
 
 #. A city in Japan
-#| msgid "Yamaguchi Ube"
 msgid "Yamaguchi"
 msgstr ""
 
@@ -9205,32 +8673,26 @@ msgid "Yao"
 msgstr "Yao"
 
 #. A city in Japan
-#| msgid "Yoko"
 msgid "Yokota"
 msgstr ""
 
 #. A city in Japan
-#| msgid "Shinyanga"
 msgid "Yoshinaga"
 msgstr ""
 
 #. A city in Jersey
-#| msgid "La Ronge"
 msgid "La Hougue"
 msgstr ""
 
 #. The capital of Jersey
-#| msgid "Saint Helena"
 msgid "Saint Helier"
 msgstr ""
 
 #. A city in Jordan
-#| msgid "Aqaba"
 msgid "Al 'Aqabah"
 msgstr ""
 
 #. A city in Jordan
-#| msgid "Al Baha"
 msgid "Al Jizah"
 msgstr ""
 
@@ -9248,7 +8710,6 @@ msgstr "Almaty"
 #. A city in Kazakhstan.
 #. The local name in Russian is "Aktau".
 #.
-#| msgid "Aktau"
 msgid "Aqtau"
 msgstr ""
 
@@ -9265,28 +8726,24 @@ msgstr "Astana"
 #. A city in Kazakhstan.
 #. The local name in Russian is "Ural'sk".
 #.
-#| msgid "Oran"
 msgid "Oral"
 msgstr "OrÄ?ls"
 
 #. A city in Kazakhstan.
 #. The local name in Russian is "Karaganda".
 #.
-#| msgid "Karaganda"
 msgid "Qaraghandy"
 msgstr ""
 
 #. A city in Kazakhstan.
 #. The local name in Russian is "Kostanay".
 #.
-#| msgid "Kostanay"
 msgid "Qostanay"
 msgstr ""
 
 #. A city in Kazakhstan.
 #. The local name in Russian is "Kyzylorda".
 #.
-#| msgid "Kzyl-Orda"
 msgid "Qyzylorda"
 msgstr ""
 
@@ -9311,7 +8768,6 @@ msgid "Nairobi"
 msgstr "Nairobi"
 
 #. A city in Kiribati
-#| msgid "London"
 msgctxt "City in Kiribati"
 msgid "London"
 msgstr ""
@@ -9320,7 +8776,6 @@ msgstr ""
 #. "Kuwait" is the traditional English name.
 #. The local name in Arabic is "Al Kuwayt / Ø§Ù?Ù?Ù?Ù?Øª".
 #.
-#| msgid "Kuwait"
 msgctxt "City in Kuwait"
 msgid "Kuwait"
 msgstr ""
@@ -9341,7 +8796,6 @@ msgid "LiepÄ?ja"
 msgstr "LiepÄ?ja"
 
 #. The capital of Latvia
-#| msgid "Riga"
 msgid "RÄ«ga"
 msgstr ""
 
@@ -9353,12 +8807,10 @@ msgid "Beirut"
 msgstr "Beirut"
 
 #. A city in Libya
-#| msgid "Benina"
 msgid "Baninah"
 msgstr ""
 
 #. A city in Libya
-#| msgid "Sebha"
 msgid "Sabha"
 msgstr ""
 
@@ -9370,7 +8822,6 @@ msgid "Tripoli"
 msgstr "Tripoli"
 
 #. The capital of Liechtenstein
-#| msgid "Valdez"
 msgid "Vaduz"
 msgstr ""
 
@@ -9391,7 +8842,6 @@ msgid "Å iauliai"
 msgstr "Å iauliai"
 
 #. The capital of Luxembourg
-#| msgid "Luxembourg"
 msgctxt "City in Luxembourg"
 msgid "Luxembourg"
 msgstr ""
@@ -9399,7 +8849,6 @@ msgstr ""
 #. The capital of Macau.
 #. The local name in Chinese is "Aomen / æ¾³é?¨".
 #.
-#| msgid "Macau"
 msgctxt "City in Macau"
 msgid "Macau"
 msgstr ""
@@ -9415,22 +8864,18 @@ msgid "Ohrid"
 msgstr "Ohrid"
 
 #. The capital of Macedonia
-#| msgid "Sokode"
 msgid "Skopje"
 msgstr ""
 
 #. A city in Madagascar
-#| msgid "Ankeny"
 msgid "Ankarena"
 msgstr ""
 
 #. The capital of Madagascar
-#| msgid "Antananarivo / Ivato"
 msgid "Antananarivo"
 msgstr ""
 
 #. A city in Madagascar
-#| msgid "Antsirabe"
 msgid "Antsiranana"
 msgstr ""
 
@@ -9439,17 +8884,14 @@ msgid "Fasenina-Ampasy"
 msgstr ""
 
 #. A city in Madagascar
-#| msgid "Majunga"
 msgid "Mahajanga"
 msgstr ""
 
 #. A city in Madagascar
-#| msgid "Tasmania"
 msgid "Toamasina"
 msgstr ""
 
 #. A city in Madagascar
-#| msgid "Bolzano"
 msgid "Tolanaro"
 msgstr ""
 
@@ -9458,23 +8900,19 @@ msgid "Bintulu"
 msgstr "Bintulu"
 
 #. A city in Malaysia
-#| msgid "Georgetown"
 msgctxt "City in Malaysia"
 msgid "George Town"
 msgstr ""
 
 #. A city in Malaysia
-#| msgid "Johore Bharu/Senai"
 msgid "Johor Bahru"
 msgstr ""
 
 #. A city in Malaysia
-#| msgid "Kaltag"
 msgid "Klang"
 msgstr ""
 
 #. A city in Malaysia
-#| msgid "Kota Bharu"
 msgid "Kota Baharu"
 msgstr ""
 
@@ -9483,12 +8921,10 @@ msgid "Kota Kinabalu"
 msgstr "Kota Kinabalu"
 
 #. A city in Malaysia
-#| msgid "Kashi"
 msgid "Kuah"
 msgstr ""
 
 #. The capital of Malaysia
-#| msgid "Kolhapur"
 msgid "Kuala Lumpur"
 msgstr ""
 
@@ -9505,7 +8941,6 @@ msgid "Kudat"
 msgstr "Kudat"
 
 #. A city in Malaysia
-#| msgid "Menaka"
 msgid "Melaka"
 msgstr ""
 
@@ -9534,7 +8969,6 @@ msgid "Tawau"
 msgstr "Tawau"
 
 #. A city in Malaysia
-#| msgid "Victoria"
 msgctxt "City in Malaysia"
 msgid "Victoria"
 msgstr ""
@@ -9551,17 +8985,14 @@ msgid "Luqa"
 msgstr "Luqa"
 
 #. The capital of Malta
-#| msgid "Vallenar"
 msgid "Valletta"
 msgstr ""
 
 #. The capital of the Marshall Islands
-#| msgid "Marion"
 msgid "Majuro"
 msgstr ""
 
 #. The capital of Martinique
-#| msgid "Fort Reliance"
 msgid "Fort-de-France"
 msgstr ""
 
@@ -9578,17 +9009,14 @@ msgid "Nouakchott"
 msgstr "Nouakchott"
 
 #. A city in Mauritius
-#| msgid "Alliance"
 msgid "Plaisance"
 msgstr ""
 
 #. The capital of Mauritius
-#| msgid "St Louis"
 msgid "Port Louis"
 msgstr ""
 
 #. A city in Mauritius
-#| msgid "Maturin"
 msgid "Port Mathurin"
 msgstr ""
 
@@ -9597,7 +9025,6 @@ msgid "Dzaoudzi"
 msgstr ""
 
 #. The capital of Mayotte
-#| msgid "Moundou"
 msgid "Mamoudzou"
 msgstr ""
 
@@ -9606,13 +9033,11 @@ msgid "Acapulco"
 msgstr "Akapulko"
 
 #. A city in Aguascalientes in Mexico
-#| msgid "Aguascalientes"
 msgctxt "City in Aguascalientes, Mexico"
 msgid "Aguascalientes"
 msgstr ""
 
 #. A city in Campeche in Mexico
-#| msgid "Campeche"
 msgctxt "City in Campeche, Mexico"
 msgid "Campeche"
 msgstr ""
@@ -9622,7 +9047,6 @@ msgid "CancÃºn"
 msgstr "CancÃºn"
 
 #. A city in Campeche in Mexico
-#| msgid "Camden"
 msgid "Carmen"
 msgstr ""
 
@@ -9631,12 +9055,10 @@ msgid "Chetumal"
 msgstr "Chetumal"
 
 #. A city in YucatÃ¡n in Mexico
-#| msgid "Chichen-ItzÃ¡"
 msgid "ChichÃ©n-ItzÃ¡"
 msgstr ""
 
 #. A city in Chihuahua in Mexico
-#| msgid "Chihuahua"
 msgctxt "City in Chihuahua, Mexico"
 msgid "Chihuahua"
 msgstr ""
@@ -9656,7 +9078,6 @@ msgid "Ciudad Victoria"
 msgstr "Ciudad Victoria"
 
 #. A city in Colima in Mexico
-#| msgid "Colima"
 msgctxt "City in Colima, Mexico"
 msgid "Colima"
 msgstr ""
@@ -9674,13 +9095,11 @@ msgid "CuliacÃ¡n"
 msgstr "CuliacÃ¡n"
 
 #. A city in Durango in Mexico
-#| msgid "Durango"
 msgctxt "City in Durango, Mexico"
 msgid "Durango"
 msgstr ""
 
 #. A city in Oaxaca in Mexico
-#| msgid "El Monte"
 msgid "El Zapote"
 msgstr ""
 
@@ -9705,7 +9124,6 @@ msgid "Ixtepec"
 msgstr "Ixtepec"
 
 #. A city in Baja California Sur in Mexico
-#| msgid "La Paz"
 msgctxt "City in Baja California Sur, Mexico"
 msgid "La Paz"
 msgstr ""
@@ -9715,7 +9133,6 @@ msgid "Laguna Tepic"
 msgstr ""
 
 #. A city in Guanajuato in Mexico
-#| msgid "TorreÃ³n"
 msgctxt "City in Guanajuato, Mexico"
 msgid "LeÃ³n"
 msgstr ""
@@ -9729,7 +9146,6 @@ msgid "Los Mochis"
 msgstr "Los Mochis"
 
 #. A city in Colima in Mexico
-#| msgid "Manzanillo"
 msgctxt "City in Colima, Mexico"
 msgid "Manzanillo"
 msgstr ""
@@ -9770,7 +9186,6 @@ msgid "Morelia"
 msgstr "Morelia"
 
 #. A city in YucatÃ¡n in Mexico
-#| msgid "MÃ©rida"
 msgctxt "City in YucatÃ¡n, Mexico"
 msgid "MÃ©rida"
 msgstr ""
@@ -9780,7 +9195,6 @@ msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
 #. A city in Oaxaca in Mexico
-#| msgid "Oaxaca"
 msgctxt "City in Oaxaca, Mexico"
 msgid "Oaxaca"
 msgstr ""
@@ -9792,12 +9206,10 @@ msgstr "Piedras Negras"
 #. A city in Veracruz in Mexico.
 #. One of several cities in Mexico called "Poza Rica".
 #.
-#| msgid "Poza Rica"
 msgid "Poza Rica de Hidalgo"
 msgstr ""
 
 #. A city in Puebla in Mexico
-#| msgid "Puebla"
 msgctxt "City in Puebla, Mexico"
 msgid "Puebla"
 msgstr ""
@@ -9811,7 +9223,6 @@ msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
 #. A city in QuerÃ©taro in Mexico
-#| msgid "Queretaro"
 msgctxt "City in QuerÃ©taro, Mexico"
 msgid "QuerÃ©taro"
 msgstr ""
@@ -9829,7 +9240,6 @@ msgid "San JosÃ© del Cabo"
 msgstr "San JosÃ© del Cabo"
 
 #. A city in San Luis PotosÃ in Mexico
-#| msgid "San Luis de PotosÃ"
 msgctxt "City in San Luis PotosÃ, Mexico"
 msgid "San Luis PotosÃ"
 msgstr ""
@@ -9855,7 +9265,6 @@ msgid "TorreÃ³n"
 msgstr "TorreÃ³n"
 
 #. A city in Chiapas in Mexico
-#| msgid "Tulsa"
 msgid "Tuxtla"
 msgstr ""
 
@@ -9864,7 +9273,6 @@ msgid "Uruapan"
 msgstr "Uruapan"
 
 #. A city in Veracruz in Mexico
-#| msgid "Veracruz"
 msgctxt "City in Veracruz, Mexico"
 msgid "Veracruz"
 msgstr ""
@@ -9874,13 +9282,11 @@ msgid "Villahermosa"
 msgstr "Villahermosa"
 
 #. A city in Zacatecas in Mexico
-#| msgid "Zacatecas"
 msgctxt "City in Zacatecas, Mexico"
 msgid "Zacatecas"
 msgstr ""
 
 #. The capital of the Federated States of Micronesia
-#| msgid "Balikesir"
 msgid "Palikir"
 msgstr ""
 
@@ -9889,7 +9295,6 @@ msgid "ChiÅ?inÄ?u"
 msgstr "ChiÅ?inÄ?u"
 
 #. The capital of Monaco
-#| msgid "Moncton"
 msgctxt "City in Monaco"
 msgid "Monaco"
 msgstr "Monako"
@@ -9897,7 +9302,6 @@ msgstr "Monako"
 #. The capital of Mongolia.
 #. The name is also written "Ð£Ð»Ð°Ð°Ð½Ð±Ð°Ð°Ñ?Ð°Ñ?".
 #.
-#| msgid "Ulan-Bator"
 msgid "Ulaanbaatar"
 msgstr ""
 
@@ -9918,11 +9322,6 @@ msgid "Al Hoceima"
 msgstr "AlhoÄ?eima"
 
 #. A city in Morocco
-msgid "Casablanca"
-msgstr "Casablanca"
-
-#. A city in Morocco
-#| msgid "Flores"
 msgid "Fes"
 msgstr ""
 
@@ -9939,12 +9338,10 @@ msgid "Nador"
 msgstr "Nador"
 
 #. A city in Morocco
-#| msgid "Nouasseur"
 msgid "Nouaseur"
 msgstr ""
 
 #. A city in Morocco
-#| msgid "Ouarzazate"
 msgid "Ouarzazat"
 msgstr ""
 
@@ -9953,7 +9350,6 @@ msgid "Oujda"
 msgstr "Oujda"
 
 #. The capital of Morocco
-#| msgid "Alabat"
 msgid "Rabat"
 msgstr ""
 
@@ -9961,12 +9357,10 @@ msgstr ""
 #. "Tangier" is the traditional English name.
 #. The local name is "Tanger".
 #.
-#| msgid "Tanagra"
 msgid "Tangier"
 msgstr ""
 
 #. A city in Morocco
-#| msgid "Taoyuan"
 msgid "Tetouan"
 msgstr ""
 
@@ -9979,15 +9373,10 @@ msgid "Chimoio"
 msgstr "Chimoio"
 
 #. A city in Mozambique
-msgid "Inhambane"
-msgstr "Inhambane"
-
-#. A city in Mozambique
 msgid "Lichinga"
 msgstr "Lichinga"
 
 #. The capital of Mozambique
-#| msgid "Matsumoto"
 msgid "Maputo"
 msgstr ""
 
@@ -10003,23 +9392,13 @@ msgstr "Pemba"
 msgid "Quelimane"
 msgstr "Quelimane"
 
-#. A city in Mozambique
-msgid "Tete"
-msgstr "Tete"
-
 #. The capital of Myanmar.
 #. "Rangoon" is the traditional English name.
 #. The local name in Burmese is "Yangon".
 #.
-#| msgid "Angoon"
 msgid "Rangoon"
 msgstr ""
 
-#. The capital of Namibia
-#| msgid "Winder"
-msgid "Windhoek"
-msgstr ""
-
 #. The capital of Nepal.
 #. The local name in Nepali is "à¤?à¤¾à¤ à¤®à¤¾à¤¡à¥?à¤?".
 #.
@@ -10043,7 +9422,6 @@ msgid "Eindhoven"
 msgstr "Eindhoven"
 
 #. A city in the Netherlands
-#| msgid "Gilmer"
 msgid "Gilze"
 msgstr ""
 
@@ -10060,7 +9438,6 @@ msgid "Maastricht"
 msgstr "Maastricht"
 
 #. A city in the Netherlands
-#| msgid "Vlieland"
 msgid "Oost-Vlieland"
 msgstr ""
 
@@ -10068,16 +9445,10 @@ msgstr ""
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#. A city in the Netherlands
-#| msgid "Utrecht/Soesterberg"
-msgid "Soesterberg"
-msgstr ""
-
 #. The capital of the Netherlands.
 #. "The Hague" is the traditional English name.
 #. The local name in Dutch is "'s-Gravenhage".
 #.
-#| msgid "Terre Haute"
 msgid "The Hague"
 msgstr ""
 
@@ -10094,12 +9465,10 @@ msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
 #. A city in the Netherlands Antilles
-#| msgid "Rennes"
 msgid "Benners"
 msgstr ""
 
 #. A city in the Netherlands Antilles
-#| msgid "Cape May"
 msgid "Cupe Coy"
 msgstr ""
 
@@ -10108,17 +9477,14 @@ msgid "Dorp Nikiboko"
 msgstr ""
 
 #. A city in the Netherlands Antilles
-#| msgid "Gao"
 msgid "Gato"
 msgstr ""
 
 #. A city in New Caledonia
-#| msgid "Karonga"
 msgid "Karenga"
 msgstr ""
 
 #. The capital of New Caledonia
-#| msgid "Houma"
 msgid "NoumÃ©a"
 msgstr ""
 
@@ -10151,7 +9517,6 @@ msgid "Juigalpa"
 msgstr "Juigalpa"
 
 #. The capital of Nicaragua
-#| msgid "Manaus"
 msgid "Managua"
 msgstr ""
 
@@ -10168,7 +9533,6 @@ msgid "Agadez"
 msgstr "Agadeza"
 
 #. The capital of Niger
-#| msgid "Niamey-Aero"
 msgid "Niamey"
 msgstr ""
 
@@ -10176,12 +9540,7 @@ msgstr ""
 msgid "Zinder"
 msgstr "Zinder"
 
-#. A city in Nigeria
-msgid "Ibadan"
-msgstr "Ibadan"
-
-#. A city in Nigeria
-#| msgid "Beja"
+#. A city in Lagos Nigeria
 msgid "Ikeja"
 msgstr ""
 
@@ -10202,18 +9561,15 @@ msgid "Port Harcourt"
 msgstr "Port Harcourt"
 
 #. The capital of Niue
-#| msgid "Al-Jouf"
 msgid "Alofi"
 msgstr ""
 
 #. A city in Norfolk Island
-#| msgid "Kingston"
 msgctxt "City in Norfolk Island"
 msgid "Kingston"
 msgstr ""
 
 #. A city in the Northern Mariana Islands
-#| msgid "Calapan"
 msgid "Chalan Kanoa"
 msgstr ""
 
@@ -10222,7 +9578,6 @@ msgid "Alta"
 msgstr "Alta"
 
 #. A city in Norway
-#| msgid "Berlevag"
 msgid "BerlevÃ¥g"
 msgstr ""
 
@@ -10231,17 +9586,14 @@ msgid "BodÃ¸"
 msgstr "BodÃ¸"
 
 #. A city in Norway
-#| msgid "Bole"
 msgid "Bolle"
 msgstr ""
 
 #. A city in Norway
-#| msgid "Bole"
 msgid "BoltÃ¥sen"
 msgstr ""
 
 #. A city in Norway
-#| msgid "BrÃ¸nnÃ¸ysund/BrÃ¸nnÃ¸y"
 msgid "BrÃ¸nnÃ¸ysund"
 msgstr ""
 
@@ -10250,7 +9602,6 @@ msgid "BÃ¥tsfjord"
 msgstr "BÃ¥tsfjord"
 
 #. A city in Norway
-#| msgid "Salem"
 msgid "Dalem"
 msgstr ""
 
@@ -10259,7 +9610,6 @@ msgid "Djupdalen"
 msgstr ""
 
 #. A city in Norway
-#| msgid "Elko"
 msgid "Eldskog"
 msgstr ""
 
@@ -10268,12 +9618,10 @@ msgid "Fagernes"
 msgstr "Fagernes"
 
 #. A city in Norway
-#| msgid "Kirkenes"
 msgid "Fiskenes"
 msgstr ""
 
 #. A city in Norway
-#| msgid "Vlieland"
 msgid "Flesland"
 msgstr ""
 
@@ -10298,17 +9646,14 @@ msgid "Hasvik"
 msgstr "Hasvik"
 
 #. A city in Norway
-#| msgid "Hadsund"
 msgid "Haugesund"
 msgstr ""
 
 #. A city in Norway
-#| msgid "Ho"
 msgid "Holm"
 msgstr ""
 
 #. A city in Norway
-#| msgid "HonningsvÃ¥g/Valan"
 msgid "HonningsvÃ¥g"
 msgstr ""
 
@@ -10317,26 +9662,18 @@ msgid "Kirkenes"
 msgstr "Kirkenes"
 
 #. A city in Norway
-#| msgid "Kemi"
 msgid "Kjevik"
 msgstr ""
 
 #. A city in Norway
-#| msgid "Kristianstad"
 msgid "Kristiansund"
 msgstr ""
 
 #. A city in Norway
-#| msgid "Fagernes"
-msgid "Langenes"
-msgstr ""
-
-#. A city in Norway
 msgid "Mehamn"
 msgstr "Mehamn"
 
 #. A city in Norway
-#| msgid "Golden"
 msgid "Molde"
 msgstr ""
 
@@ -10357,7 +9694,6 @@ msgid "Notodden"
 msgstr "Notodden"
 
 #. A city in Norway
-#| msgid "Oseberg A"
 msgid "Oseberg"
 msgstr ""
 
@@ -10374,12 +9710,10 @@ msgid "RÃ¸ros"
 msgstr "RÃ¸ros"
 
 #. A city in Norway
-#| msgid "RÃ¸rvik/Ryum"
 msgid "RÃ¸rvik"
 msgstr ""
 
 #. A city in Norway
-#| msgid "Russell"
 msgid "RÃ¸ssvoll"
 msgstr ""
 
@@ -10388,27 +9722,22 @@ msgid "RÃ¸st"
 msgstr "RÃ¸st"
 
 #. A city in Norway
-#| msgid "Sandakan"
 msgid "Sandane"
 msgstr ""
 
 #. A city in Norway
-#| msgid "Saghez"
 msgid "Skagen"
 msgstr ""
 
 #. A city in Norway
-#| msgid "Siren"
 msgid "Skien"
 msgstr ""
 
 #. A city in Norway
-#| msgid "Yola"
 msgid "Sola"
 msgstr ""
 
 #. A city in Norway
-#| msgid "Atoka"
 msgid "Stokka"
 msgstr ""
 
@@ -10417,7 +9746,6 @@ msgid "Svartnes"
 msgstr "Svartnes"
 
 #. A city in Norway
-#| msgid "SvolvÃ¦r/Helle"
 msgid "SvolvÃ¦r"
 msgstr ""
 
@@ -10430,7 +9758,12 @@ msgid "Torp"
 msgstr "Torp"
 
 #. A city in Norway
-#| msgid "Trondheim/Vaernes"
+#, fuzzy
+#| msgid "Troyes"
+msgid "TromsÃ¸"
+msgstr "Troyes"
+
+#. A city in Norway
 msgid "Trondheim"
 msgstr ""
 
@@ -10439,12 +9772,10 @@ msgid "VadsÃ¸"
 msgstr "VadsÃ¸"
 
 #. A city in Norway
-#| msgid "Ny-Ã?lesund"
 msgid "Ã?lesund"
 msgstr ""
 
 #. A city in Norway
-#| msgid "Ã?rland"
 msgid "Ã?rsta"
 msgstr ""
 
@@ -10456,7 +9787,6 @@ msgstr ""
 #. "Muscat" is the traditional English name.
 #. The local name in Arabic is "Masqat".
 #.
-#| msgid "Muscatine"
 msgid "Muscat"
 msgstr ""
 
@@ -10481,12 +9811,10 @@ msgid "Nawabshah"
 msgstr "Nawabshah"
 
 #. The capital of Palau
-#| msgid "Tororo"
 msgid "Koror"
 msgstr ""
 
 #. The capital of Palau
-#| msgid "Meeker"
 msgid "Melekeok"
 msgstr ""
 
@@ -10507,14 +9835,9 @@ msgid "Tocumen"
 msgstr "Tocumen"
 
 #. The capital of Papua New Guinea
-#| msgid "Moresby"
 msgid "Port Moresby"
 msgstr ""
 
-#. A city in Papua New Guinea
-msgid "Wewak"
-msgstr "Wewak"
-
 #. The capital of Paraguay
 msgid "AsunciÃ³n"
 msgstr "AsunciÃ³n"
@@ -10524,7 +9847,6 @@ msgid "Colonia FÃ©lix de Azara"
 msgstr ""
 
 #. A city in Peru
-#| msgid "Andahuayla"
 msgid "Andahuaylas"
 msgstr ""
 
@@ -10537,15 +9859,10 @@ msgid "Ayacucho"
 msgstr "Ayacucho"
 
 #. A city in Peru
-msgid "Cajamarca"
-msgstr "Cajamarca"
-
-#. A city in Peru
 msgid "Chiclayo"
 msgstr "Chiclayo"
 
 #. A city in Peru
-#| msgid "Cuzco"
 msgid "Cusco"
 msgstr ""
 
@@ -10554,16 +9871,10 @@ msgid "Iquitos"
 msgstr "Iquitos"
 
 #. A city in Peru
-#| msgid "Juanjui"
-msgid "JuanjuÃ"
-msgstr ""
-
-#. A city in Peru
 msgid "Juliaca"
 msgstr "Juliaca"
 
 #. The capital of Peru
-#| msgid "Lima"
 msgctxt "City in Peru"
 msgid "Lima"
 msgstr "Lima"
@@ -10593,11 +9904,6 @@ msgid "Tarapoto"
 msgstr "Tarapoto"
 
 #. A city in Peru
-#| msgid "Tingo Maria"
-msgid "Tingo MarÃa"
-msgstr ""
-
-#. A city in Peru
 msgid "Trujillo"
 msgstr "Trujillo"
 
@@ -10605,12 +9911,7 @@ msgstr "Trujillo"
 msgid "Tumbes"
 msgstr "Tumbes"
 
-#. A city in Peru
-msgid "Yurimaguas"
-msgstr "Yurimaguas"
-
 #. A city in the Philippines
-#| msgid "Los Angeles"
 msgid "Angeles"
 msgstr ""
 
@@ -10631,17 +9932,14 @@ msgid "Masbate"
 msgstr "Masbate"
 
 #. A city in the Philippines
-#| msgid "Mildura"
 msgid "Pildira"
 msgstr ""
 
 #. A city in the Philippines
-#| msgid "Subic Bay"
 msgid "Subic"
 msgstr ""
 
 #. A city in the Philippines
-#| msgid "Zamboanga"
 msgid "Zamboanga City"
 msgstr ""
 
@@ -10662,7 +9960,6 @@ msgid "PoznaÅ?"
 msgstr "PoznaÅ?"
 
 #. A city in Poland
-#| msgid "RzeszÃ³w-Jasionka"
 msgid "RzeszÃ³w"
 msgstr ""
 
@@ -10674,26 +9971,23 @@ msgstr "Szczecin"
 #. "Warsaw" is the traditional English name.
 #. The local name in Polish is "Warszawa".
 #.
-#| msgid "Warsaw"
 msgctxt "City in Poland"
 msgid "Warsaw"
 msgstr ""
 
 #. A city in Poland
-#| msgid "Warsaw"
-msgid "Warszawa"
-msgstr ""
-
-#. A city in Poland
 msgid "WrocÅ?aw"
 msgstr "WrocÅ?aw"
 
+#. A city in Poland
+msgid "Å?Ã³dÅº"
+msgstr ""
+
 #. A city in Portugal
 msgid "Beja"
 msgstr "Beja"
 
 #. A city in Portugal
-#| msgid "Cape Blanco"
 msgid "Castelo Branco"
 msgstr ""
 
@@ -10702,7 +9996,6 @@ msgid "Faro"
 msgstr "Faro"
 
 #. A city in Portugal
-#| msgid "Florida"
 msgid "Flor da Rosa"
 msgstr ""
 
@@ -10734,7 +10027,6 @@ msgid "Ponta Delgada"
 msgstr "Ponta Delgada"
 
 #. A city in Portugal
-#| msgid "Loreto"
 msgid "Porto"
 msgstr ""
 
@@ -10745,7 +10037,6 @@ msgstr "Porto Santo"
 #. A city in Portugal.
 #. One of several cities in Portugal called "Santa Cruz".
 #.
-#| msgid "Santa Cruz Harbor"
 msgid "Santa Cruz das Flores"
 msgstr ""
 
@@ -10812,7 +10103,6 @@ msgid "IaÅ?i"
 msgstr "IaÅ?i"
 
 #. A city in Romania
-#| msgid "Mihail Kogalniceanu"
 msgid "Mihail KogÄ?lniceanu"
 msgstr ""
 
@@ -10859,28 +10149,24 @@ msgstr "Adlera"
 #. A city in Russia.
 #. The local name in Russian is "Ð?Ð½Ð°Ð´Ñ?Ñ?Ñ?".
 #.
-#| msgid "Anadyr"
 msgid "Anadyr'"
 msgstr ""
 
 #. A city in Russia.
 #. The local name in Russian is "Ð?Ð½Ð°Ð¿Ð°".
 #.
-#| msgid "Andapa"
 msgid "Anapa"
 msgstr ""
 
 #. A city in Russia.
 #. The local name in Russian is "Ð?Ñ?Ñ?Ð°Ð½Ð³ÐµÐ»Ñ?Ñ?Ðº".
 #.
-#| msgid "Arkhangel'Sk"
 msgid "Arkhangel'sk"
 msgstr ""
 
 #. A city in Russia.
 #. The local name in Russian is "Ð?Ñ?Ñ?Ñ?Ð°Ñ?Ð°Ð½Ñ?".
 #.
-#| msgid "Astrakhan"
 msgid "Astrakhan'"
 msgstr ""
 
@@ -10893,21 +10179,18 @@ msgstr "Barnaul"
 #. A city in Russia.
 #. The local name in Russian is "Ð?Ñ?Ð°Ñ?Ðº".
 #.
-#| msgid "Brjansk"
 msgid "Bratsk"
 msgstr ""
 
 #. A city in Russia.
 #. The local name in Russian is "Ð?Ñ?Ñ?Ð½Ñ?Ðº".
 #.
-#| msgid "Brjansk"
 msgid "Bryansk"
 msgstr ""
 
 #. A city in Russia.
 #. The local name in Russian is "Ð§ÐµÐ»Ñ?Ð±Ð¸Ð½Ñ?Ðº".
 #.
-#| msgid "Chelyabinsk-Balandino"
 msgid "Chelyabinsk"
 msgstr ""
 
@@ -10920,14 +10203,12 @@ msgstr "Chita"
 #. A city in Russia.
 #. The local name in Russian is "Ð§Ñ?Ð»Ñ?Ð¼Ð°Ð½".
 #.
-#| msgid "Cul'Man"
 msgid "Chul'man"
 msgstr ""
 
 #. A city in Russia.
 #. The local name in Russian is "ÐÐ½Ð³ÐµÐ»Ñ?Ñ?".
 #.
-#| msgid "Angers"
 msgid "Engel's"
 msgstr ""
 
@@ -10964,7 +10245,6 @@ msgstr "Khabarovsk"
 #. A city in Russia.
 #. The local name in Russian is "Ð¥Ð°Ð½Ñ?Ñ?-Ð?Ð°Ð½Ñ?Ð¸Ð¹Ñ?Ðº".
 #.
-#| msgid "Hanty-Mansijsk"
 msgid "Khanty-Mansiysk"
 msgstr ""
 
@@ -10975,6 +10255,14 @@ msgid "Krasnodar"
 msgstr "Krasnodar"
 
 #. A city in Russia.
+#. The local name in Russian is "Ð?Ñ?Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ñ?Ðº".
+#.
+#, fuzzy
+#| msgid "Krasnodar"
+msgid "Krasnoyarsk"
+msgstr "Krasnodar"
+
+#. A city in Russia.
 #. The local name in Russian is "Ð?Ð°Ð³Ð°Ð´Ð°Ð½".
 #.
 msgid "Magadan"
@@ -10983,14 +10271,12 @@ msgstr "Magadan"
 #. A city in Russia.
 #. The local name in Russian is "Ð?Ð¸Ð½ÐµÑ?Ð°Ð»Ñ?Ð½Ñ?Ðµ Ð?Ð¾Ð´Ñ?".
 #.
-#| msgid "Mineral'Nye Vody"
 msgid "Mineral'nyye Vody"
 msgstr ""
 
 #. A city in Russia.
 #. The local name in Russian is "Ð?Ð¸Ñ?Ð½Ñ?Ð¹".
 #.
-#| msgid "Mirny"
 msgid "Mirnyy"
 msgstr ""
 
@@ -10998,7 +10284,6 @@ msgstr ""
 #. "Moscow" is the traditional English name.
 #. The local name in Russian is "Moskva / Ð?Ð¾Ñ?ÐºÐ²Ð°".
 #.
-#| msgid "Moscow"
 msgctxt "City in Russia"
 msgid "Moscow"
 msgstr ""
@@ -11012,7 +10297,6 @@ msgstr "Murmansk"
 #. A city in Russia.
 #. The local name in Russian is "Ð?Ð°Ð»Ñ?Ñ?Ð¸Ðº".
 #.
-#| msgid "Nalchik"
 msgid "Nal'chik"
 msgstr ""
 
@@ -11061,14 +10345,12 @@ msgstr "Perm'"
 #. A city in Russia.
 #. The local name in Russian is "Ð?ÐµÑ?Ñ?Ð¾Ð¿Ð°Ð²Ð»Ð¾Ð²Ñ?Ðº-Ð?Ð°Ð¼Ñ?Ð°Ñ?Ñ?ÐºÐ¸Ð¹".
 #.
-#| msgid "Petrozavodsk"
 msgid "Petropavlovsk"
 msgstr ""
 
 #. A city in Russia.
 #. The local name in Russian is "Ð Ð¾Ñ?Ñ?Ð¾Ð²-Ð½Ð°-Ð?Ð¾Ð½Ñ?".
 #.
-#| msgid "Rostock"
 msgid "Rostov"
 msgstr ""
 
@@ -11077,7 +10359,6 @@ msgstr ""
 #. The local name in Russian is "Sankt-Peterburg /
 #. Ð¡Ð°Ð½ÐºÑ?-Ð?ÐµÑ?ÐµÑ?Ð±Ñ?Ñ?Ð³".
 #.
-#| msgid "St Petersburg"
 msgid "Saint Petersburg"
 msgstr ""
 
@@ -11094,7 +10375,6 @@ msgstr "Saratov"
 #. A city in Russia.
 #. The local name in Russian is "Ð¡Ñ?Ð°Ð²Ñ?Ð¾Ð¿Ð¾Ð»Ñ?".
 #.
-#| msgid "Stavropol"
 msgid "Stavropol'"
 msgstr ""
 
@@ -11119,6 +10399,12 @@ msgid "Tiksi"
 msgstr "Tiksi"
 
 #. A city in Russia
+#, fuzzy
+#| msgid "Tocumen"
+msgid "Tyumen"
+msgstr "Tocumen"
+
+#. A city in Russia
 msgid "Udachnyy"
 msgstr ""
 
@@ -11127,7 +10413,6 @@ msgid "Ufa"
 msgstr "Ufa"
 
 #. A city in Russia
-#| msgid "Ulyanovsk"
 msgid "Ul'yanovsk"
 msgstr ""
 
@@ -11136,7 +10421,6 @@ msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
 #. A city in Russia
-#| msgid "Velikie Luki"
 msgid "Velikiye Luki"
 msgstr ""
 
@@ -11149,7 +10433,6 @@ msgid "Volgograd"
 msgstr "Volgograd"
 
 #. A city in Russia
-#| msgid "Voronez"
 msgid "Voronezh"
 msgstr ""
 
@@ -11158,7 +10441,6 @@ msgid "Yakutsk"
 msgstr "Yakutsk"
 
 #. A city in Russia
-#| msgid "Ekaterinburg"
 msgid "Yekaterinburg"
 msgstr ""
 
@@ -11167,24 +10449,20 @@ msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
 #. The capital of RÃ©union
-#| msgid "Saint-Quentin"
 msgid "Saint-Denis"
 msgstr ""
 
 #. A city in RÃ©union
-#| msgid "Saint-Pierre"
 msgctxt "City in RÃ©union"
 msgid "Saint-Pierre"
 msgstr ""
 
 #. A city in Saint Helena
-#| msgid "Georgetown"
 msgctxt "City in Saint Helena"
 msgid "Georgetown"
 msgstr ""
 
 #. The capital of Saint Kitts and Nevis
-#| msgid "Barre"
 msgid "Basseterre"
 msgstr ""
 
@@ -11193,18 +10471,15 @@ msgid "Golden Rock"
 msgstr "Golden Rock"
 
 #. A city in Saint Kitts and Nevis
-#| msgid "Newcastle"
 msgctxt "City in Saint Kitts and Nevis"
 msgid "Newcastle"
 msgstr ""
 
 #. The capital of Saint Lucia
-#| msgid "Chartres"
 msgid "Castries"
 msgstr ""
 
 #. A city in Saint Lucia
-#| msgid "Point Salines"
 msgid "Pointe Sable"
 msgstr ""
 
@@ -11213,7 +10488,6 @@ msgid "Vigie"
 msgstr "Vigie"
 
 #. The capital of Saint Pierre and Miquelon
-#| msgid "Saint-Pierre"
 msgctxt "City in Saint Pierre and Miquelon"
 msgid "Saint-Pierre"
 msgstr ""
@@ -11223,23 +10497,19 @@ msgid "Arnos Vale"
 msgstr "Arnos Vale"
 
 #. The capital of Saint Vincent and the Grenadines
-#| msgid "Kingston"
 msgid "Kingstown"
 msgstr ""
 
 #. The capital of Samoa
-#| msgid "Asia"
 msgid "Apia"
 msgstr ""
 
 #. The capital of San Marino
-#| msgid "San Marcos"
 msgctxt "City in San Marino"
 msgid "San Marino"
 msgstr "San MarÄ«no"
 
 #. A city in Saudi Arabia
-#| msgid "Arar"
 msgid "'Ar'ar"
 msgstr ""
 
@@ -11252,12 +10522,10 @@ msgid "Ad Dalfa'ah"
 msgstr ""
 
 #. A city in Saudi Arabia
-#| msgid "Dammam"
 msgid "Ad Dammam"
 msgstr ""
 
 #. A city in Saudi Arabia
-#| msgid "Al Ain"
 msgid "Al 'Aqiq"
 msgstr ""
 
@@ -11266,17 +10534,14 @@ msgid "Al Qaysumah"
 msgstr "Alkuaisumaha"
 
 #. A city in Saudi Arabia
-#| msgid "Al Qaysumah"
 msgid "Al Qurayyat"
 msgstr ""
 
 #. A city in Saudi Arabia
-#| msgid "Al Baha"
 msgid "Al Wajh"
 msgstr ""
 
 #. A city in Saudi Arabia
-#| msgid "Al Qaysumah"
 msgid "Al Wuday'ah"
 msgstr ""
 
@@ -11285,7 +10550,6 @@ msgid "Ar Ruqayyiqah"
 msgstr ""
 
 #. A city in Saudi Arabia
-#| msgid "Taif"
 msgid "At Ta'if"
 msgstr ""
 
@@ -11297,22 +10561,18 @@ msgid "Dhahran"
 msgstr "Dhahran"
 
 #. A city in Saudi Arabia
-#| msgid "Hail"
 msgid "Ha'il"
 msgstr ""
 
 #. A city in Saudi Arabia
-#| msgid "Jeddah"
 msgid "Jiddah"
 msgstr ""
 
 #. A city in Saudi Arabia
-#| msgid "Gizan"
 msgid "Jizan"
 msgstr ""
 
 #. A city in Saudi Arabia
-#| msgid "Khamis Mushait"
 msgid "Khamis Mushayt"
 msgstr ""
 
@@ -11324,7 +10584,6 @@ msgstr ""
 #. "Mecca" is the traditional English name.
 #. The local name in Arabic is "Makkah".
 #.
-#| msgid "Malacca"
 msgid "Mecca"
 msgstr ""
 
@@ -11332,7 +10591,6 @@ msgstr ""
 #. "Medina" is the traditional English name.
 #. The local name in Arabic is "Al Madinah al Munawwarah".
 #.
-#| msgid "Mena"
 msgid "Medina"
 msgstr ""
 
@@ -11345,7 +10603,6 @@ msgid "Qal'at Bishah"
 msgstr ""
 
 #. A city in Saudi Arabia
-#| msgid "Nara"
 msgid "Qara"
 msgstr ""
 
@@ -11365,12 +10622,10 @@ msgid "Tabuk"
 msgstr "Tabuk"
 
 #. A city in Saudi Arabia
-#| msgid "Tekamah"
 msgid "Tamrah"
 msgstr ""
 
 #. A city in Saudi Arabia
-#| msgid "Turaif"
 msgid "Turayf"
 msgstr ""
 
@@ -11383,7 +10638,6 @@ msgid "Boukot Ouolof"
 msgstr ""
 
 #. The capital of Senegal
-#| msgid "Dhaka"
 msgid "Dakar"
 msgstr ""
 
@@ -11415,23 +10669,19 @@ msgid "VrÅ¡ac"
 msgstr "VrÅ¡ac"
 
 #. A city in Serbia
-#| msgid "Melun"
 msgid "Zemun"
 msgstr ""
 
 #. A city in the Seychelles
-#| msgid "Cascade Locks"
 msgid "Cascade"
 msgstr "KaskÄ?de"
 
 #. The capital of the Seychelles
-#| msgid "Victoria"
 msgctxt "City in Seychelles"
 msgid "Victoria"
 msgstr ""
 
 #. The capital of Sierra Leone
-#| msgid "Greytown"
 msgid "Freetown"
 msgstr ""
 
@@ -11440,7 +10690,6 @@ msgid "Lungi"
 msgstr "Lungi"
 
 #. The capital of Singapore
-#| msgid "Singapore"
 msgctxt "City in Singapore"
 msgid "Singapore"
 msgstr "SingapÅ«ra"
@@ -11454,7 +10703,6 @@ msgid "DolnÃ½ HriÄ?ov"
 msgstr "DolnÃ½ HriÄ?ov"
 
 #. A city in Slovakia
-#| msgid "Kamenica Nad Cirochou"
 msgid "Kamenica nad Cirochou"
 msgstr ""
 
@@ -11475,7 +10723,6 @@ msgid "PieÅ¡Å¥any"
 msgstr "PieÅ¡Å¥any"
 
 #. A city in Slovakia
-#| msgid "Portland"
 msgid "Poprad"
 msgstr ""
 
@@ -11500,22 +10747,18 @@ msgid "PortoroÅ¾"
 msgstr "PortoroÅ¾"
 
 #. The capital of the Solomon Islands
-#| msgid "Honduras"
 msgid "Honiara"
 msgstr ""
 
 #. A city in South Africa
-#| msgid "Grootfontein"
 msgid "Bloemfontein"
 msgstr ""
 
 #. A city in South Africa
-#| msgid "Cape Young"
 msgid "Cape Town"
 msgstr ""
 
 #. A city in South Africa
-#| msgid "Durant"
 msgid "Durban"
 msgstr ""
 
@@ -11540,18 +10783,10 @@ msgid "Pretoria"
 msgstr "Pretoria"
 
 #. A city in South Africa
-msgid "Rustenburg"
-msgstr "Rustenburg"
-
-#. A city in South Africa
 msgid "Springs"
 msgstr "Springs"
 
 #. A city in South Africa
-msgid "Standerton"
-msgstr "Standerton"
-
-#. A city in South Africa
 msgid "Upington"
 msgstr "Upington"
 
@@ -11560,7 +10795,6 @@ msgid "Vereeniging"
 msgstr "Vereeniging"
 
 #. A city in South Korea
-#| msgid "Chungju"
 msgid "Ch'ongju"
 msgstr ""
 
@@ -11569,42 +10803,27 @@ msgid "Cheju"
 msgstr "Cheju"
 
 #. A city in South Korea
-#| msgid "Incheon"
 msgid "Inch'on"
 msgstr ""
 
 #. A city in South Korea
-#| msgid "Kunsan Ab"
 msgid "Kunsan"
 msgstr ""
 
 #. A city in South Korea.
 #. The name is also written "ì?¤ì?°".
 #.
-#| msgid "Oman"
 msgid "Osan"
 msgstr ""
 
 #. A city in South Korea
-#| msgid "Pohang Ab"
-msgid "P'ohang"
-msgstr ""
-
-#. A city in South Korea
-#| msgid "Pyongtaek Ab"
 msgid "P'yongt'aek"
 msgstr ""
 
 #. A city in South Korea
-#| msgid "Pula"
 msgid "Pusan"
 msgstr ""
 
-#. A city in South Korea
-#| msgid "Sach'On Ab"
-msgid "Sach'on"
-msgstr ""
-
 #. The capital of South Korea.
 #. "Seoul" is the traditional English name.
 #. The local name in Korean is "Soul".
@@ -11617,12 +10836,10 @@ msgid "Taegu"
 msgstr "Taegu"
 
 #. A city in Spain
-#| msgid "Arua"
 msgid "A CoruÃ±a"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Anchialos"
 msgid "Agoncillo"
 msgstr ""
 
@@ -11631,27 +10848,22 @@ msgid "Alcantarilla"
 msgstr "Alkantalilla"
 
 #. A city in Spain
-#| msgid "Alice"
 msgid "Alicante"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Alameda"
 msgid "AlmerÃa"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Aurillac"
 msgid "Armilla"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Antigo"
 msgid "Atogo"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Asturias/AvilÃ©s"
 msgid "AvilÃ©s"
 msgstr ""
 
@@ -11660,23 +10872,19 @@ msgid "Barajas"
 msgstr "Barajas"
 
 #. A city in Spain
-#| msgid "Barcelona"
 msgctxt "City in Spain"
 msgid "Barcelona"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Bilma"
 msgid "Bilbao"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Colmenar Viejo (FAMET)"
 msgid "Colmenar Viejo"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Cordova"
 msgid "Corcovados"
 msgstr ""
 
@@ -11685,28 +10893,23 @@ msgid "Cuatro Vientos"
 msgstr "Cuatro Vientos"
 
 #. A city in Spain
-#| msgid "CÃ³rdoba"
 msgctxt "City in Spain"
 msgid "CÃ³rdoba"
 msgstr ""
 
 #. A city in Spain
-#| msgid "El Borma"
 msgid "El Matorral"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Funter Bay"
 msgid "FuenterrabÃa"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Gan"
 msgid "Gando"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Corona"
 msgid "Gerona"
 msgstr ""
 
@@ -11715,38 +10918,31 @@ msgid "Getafe"
 msgstr "Getafe"
 
 #. A city in Spain
-#| msgid "Grenada"
 msgid "Granada"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Gilmer"
 msgid "GÃ¼ime"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Iba"
 msgid "Ibiza"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Jerome"
 msgid "Jerez"
 msgstr ""
 
 #. A city in Spain
-#| msgid "TorreÃ³n"
 msgctxt "City in Spain"
 msgid "LeÃ³n"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Los Alamos"
 msgid "Los BaldÃos"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Los Alamos"
 msgid "Los Llanos"
 msgstr ""
 
@@ -11755,7 +10951,6 @@ msgid "Madrid"
 msgstr "Madrid"
 
 #. A city in Spain
-#| msgid "Man"
 msgid "MahÃ³n"
 msgstr ""
 
@@ -11764,7 +10959,6 @@ msgid "Melilla"
 msgstr "Melilla"
 
 #. A city in Spain
-#| msgid "MossorÃ³"
 msgid "MorÃ³n"
 msgstr ""
 
@@ -11773,12 +10967,10 @@ msgid "MÃ¡laga"
 msgstr "MÃ¡laga"
 
 #. A city in Spain
-#| msgid "LoÅ¡inj"
 msgid "NoÃ¡in"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Pala"
 msgid "Palma"
 msgstr ""
 
@@ -11795,7 +10987,6 @@ msgid "Sabadell"
 msgstr "Sabadell"
 
 #. A city in Spain
-#| msgid "Slana"
 msgid "Salamanca"
 msgstr ""
 
@@ -11804,54 +10995,44 @@ msgid "San Javier"
 msgstr "San Javier"
 
 #. A city in Spain
-#| msgid "San Carlos"
 msgid "San Pablo"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Santa Ynez"
 msgid "Santander"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Santiago"
 msgctxt "City in Spain"
 msgid "Santiago"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Badajoz/Talavera la Real"
 msgid "Talavera la Real"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Tamatave"
 msgid "Tamaduste"
 msgstr ""
 
 #. A city in Spain
-#| msgid "TorrejÃ³n"
 msgid "TorrejÃ³n del Rey"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Valencia"
 msgctxt "City in Spain"
 msgid "Valencia"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Vigan"
 msgid "Vigo"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Villaguay"
 msgid "Villanubla"
 msgstr ""
 
 #. A city in Spain
-#| msgid "Vitoria"
 msgid "Vitoria-Gasteiz"
 msgstr ""
 
@@ -11860,12 +11041,10 @@ msgid "Zaragoza"
 msgstr "Zaragoza"
 
 #. The capital of Sri Lanka
-#| msgid "Colombia"
 msgid "Colombo"
 msgstr ""
 
 #. A city in Sri Lanka
-#| msgid "Katunayake"
 msgid "Katunayaka"
 msgstr ""
 
@@ -11881,7 +11060,6 @@ msgid "Khartoum"
 msgstr "Khartoum"
 
 #. The capital of Suriname
-#| msgid "Parma"
 msgid "Paramaribo"
 msgstr ""
 
@@ -11890,12 +11068,10 @@ msgid "Zanderij"
 msgstr "Zanderij"
 
 #. The capital of Svalbard and Jan Mayen
-#| msgid "Linguere"
 msgid "Longyearbyen"
 msgstr ""
 
 #. The capital of Swaziland
-#| msgid "Lakemba"
 msgid "Lobamba"
 msgstr ""
 
@@ -11904,7 +11080,6 @@ msgid "Manzini"
 msgstr "Manzini"
 
 #. The capital of Swaziland
-#| msgid "Masbate"
 msgid "Mbabane"
 msgstr ""
 
@@ -11917,7 +11092,6 @@ msgid "GÃ¤llivare"
 msgstr "GÃ¤llivare"
 
 #. A city in Sweden
-#| msgid "Gothenburg"
 msgid "GÃ¶teborg"
 msgstr ""
 
@@ -11974,7 +11148,6 @@ msgid "NorrkÃ¶ping"
 msgstr "NorrkÃ¶ping"
 
 #. A city in Sweden
-#| msgid "NorrkÃ¶ping"
 msgid "NykÃ¶ping"
 msgstr ""
 
@@ -11995,7 +11168,6 @@ msgid "Stockholm"
 msgstr "Stockholm"
 
 #. A city in Sweden
-#| msgid "Sindal"
 msgid "Sundsvall"
 msgstr ""
 
@@ -12031,6 +11203,12 @@ msgstr "Ã?rebro"
 msgid "Ã?rnskÃ¶ldsvik"
 msgstr "Ã?rnskÃ¶ldsvik"
 
+#. A city in Switzerland
+#, fuzzy
+#| msgid "Kassel"
+msgid "Basel"
+msgstr "Kassel"
+
 #. The capital of Switzerland
 msgid "Bern"
 msgstr "Bern"
@@ -12055,7 +11233,6 @@ msgid "NeuchÃ¢tel"
 msgstr "NeuchÃ¢tel"
 
 #. A city in Switzerland
-#| msgid "Saint Gedeon"
 msgid "Sankt Gallen"
 msgstr ""
 
@@ -12064,12 +11241,14 @@ msgid "Sion"
 msgstr "Sion"
 
 #. A city in Switzerland
-#| msgid "Zurich"
+msgid "St. Moritz"
+msgstr ""
+
+#. A city in Switzerland
 msgid "ZÃ¼rich"
 msgstr ""
 
 #. A city in Syria
-#| msgid "Kamishli"
 msgid "Al Qamishli"
 msgstr ""
 
@@ -12095,29 +11274,32 @@ msgstr ""
 #. "Latakia" is the traditional English name.
 #. The local name in Arabic is "Al Ladhiqiyah".
 #.
-#| msgid "Lattakia"
 msgid "Latakia"
 msgstr ""
 
 #. A city in Taiwan.
-#. The name is also written "é«?é??å·¿".
+#. The name is also written "é«?é??".
 #.
-#| msgid "Kaohsiung"
-msgid "Kao-hsiung-shih"
-msgstr ""
+#, fuzzy
+#| msgid "Kuching"
+msgid "Kaohsiung"
+msgstr "Kuching"
 
-#. A city in Taiwan.
-#. The name is also written "å??é ?".
+#. The capital of Taiwan.
+#. The name is also written "è?ºå??".
 #.
-#| msgid "Austin"
-msgid "Pu-ting"
-msgstr ""
+#, fuzzy
+#| msgid "Taipa"
+msgid "Taipei"
+msgstr "Taipa"
 
-#. The capital of Taiwan.
-#. The name is also written "è?ºå??å¸?".
+#. A city in Taiwan.
+#. The name is also written "å??é ?".
 #.
-msgid "T'ai-pei Shih"
-msgstr ""
+#, fuzzy
+#| msgid "Taiyuan"
+msgid "Taoyuan"
+msgstr "Taiyuan"
 
 #. The capital of Tajikistan
 msgid "Dushanbe"
@@ -12132,7 +11314,6 @@ msgid "Bukoba"
 msgstr "Bukoba"
 
 #. The capital of Tanzania
-#| msgid "Dar Es Salaam"
 msgid "Dar es Salaam"
 msgstr ""
 
@@ -12181,7 +11362,6 @@ msgid "Tabora"
 msgstr "Tabora"
 
 #. A city in Tanzania
-#| msgid "Manitoba"
 msgid "Zanzibar"
 msgstr ""
 
@@ -12265,7 +11445,6 @@ msgid "Niamtougou"
 msgstr "Niamtougou"
 
 #. A city in Tonga
-#| msgid "Fua'Amotu"
 msgid "Fua'amotu"
 msgstr ""
 
@@ -12274,17 +11453,14 @@ msgid "Nuku'alofa"
 msgstr ""
 
 #. A city in Trinidad and Tobago
-#| msgid "Concord"
 msgid "Bon Accord"
 msgstr ""
 
 #. A city in Trinidad and Tobago
-#| msgid "Paros"
 msgid "Piarco"
 msgstr ""
 
 #. The capital of Trinidad and Tobago
-#| msgid "Porto Santo"
 msgid "Port-of-Spain"
 msgstr ""
 
@@ -12317,7 +11493,6 @@ msgid "Kairouan"
 msgstr "Kairouan"
 
 #. A city in Tunisia
-#| msgid "Mostar"
 msgid "Monastir"
 msgstr ""
 
@@ -12330,7 +11505,6 @@ msgid "Remada"
 msgstr "Remada"
 
 #. A city in Tunisia
-#| msgid "Sofia"
 msgid "Sfax"
 msgstr ""
 
@@ -12343,17 +11517,14 @@ msgid "Tozeur"
 msgstr "Tozeur"
 
 #. The capital of Tunisia
-#| msgid "Tunisia"
 msgid "Tunis"
 msgstr ""
 
 #. A city in Turkey
-#| msgid "Agana"
 msgid "Adana"
 msgstr ""
 
 #. The capital of Turkey
-#| msgid "Anadyr"
 msgid "Ankara"
 msgstr ""
 
@@ -12374,7 +11545,6 @@ msgid "Bodrum"
 msgstr "Bodrum"
 
 #. A city in Turkey
-#| msgid "Bauru"
 msgid "Burdur"
 msgstr ""
 
@@ -12387,7 +11557,6 @@ msgid "Corlu"
 msgstr "Corlu"
 
 #. A city in Turkey
-#| msgid "Dalian"
 msgid "Dalaman"
 msgstr ""
 
@@ -12420,12 +11589,10 @@ msgid "Kars"
 msgstr "Kars"
 
 #. A city in Turkey
-#| msgid "Kaiser"
 msgid "Kayseri"
 msgstr ""
 
 #. A city in Turkey
-#| msgid "Islay"
 msgid "Kislakoy"
 msgstr ""
 
@@ -12434,7 +11601,6 @@ msgid "Konya"
 msgstr "Konya"
 
 #. A city in Turkey
-#| msgid "Malta"
 msgid "Malatya"
 msgstr ""
 
@@ -12451,7 +11617,6 @@ msgid "Samsun"
 msgstr "Samsun"
 
 #. A city in Turkey
-#| msgid "Tela"
 msgid "Tepetarla"
 msgstr ""
 
@@ -12487,17 +11652,14 @@ msgid "Kabale"
 msgstr "Kabale"
 
 #. The capital of Uganda
-#| msgid "Kavala"
 msgid "Kampala"
 msgstr ""
 
 #. A city in Ukraine
-#| msgid "Boryspil"
 msgid "Boryspil'"
 msgstr ""
 
 #. A city in Ukraine
-#| msgid "Chicago"
 msgid "Chagor"
 msgstr ""
 
@@ -12510,7 +11672,6 @@ msgid "Donets'k"
 msgstr "Donets'k"
 
 #. A city in Ukraine
-#| msgid "Hostomel"
 msgid "Hostomel'"
 msgstr ""
 
@@ -12534,17 +11695,14 @@ msgid "Kryvyy Rih"
 msgstr ""
 
 #. A city in Ukraine
-#| msgid "L'Viv"
 msgid "L'viv"
 msgstr ""
 
 #. A city in Ukraine
-#| msgid "Monroe"
 msgid "Mokroye"
 msgstr ""
 
 #. A city in Ukraine
-#| msgid "Mykolaiv"
 msgid "Mykolayiv"
 msgstr ""
 
@@ -12561,7 +11719,6 @@ msgid "Simferopol'"
 msgstr "Simferopol'"
 
 #. A city in Ukraine
-#| msgid "Tela"
 msgid "Telichka"
 msgstr ""
 
@@ -12577,12 +11734,10 @@ msgid "Abu Dhabi"
 msgstr "AbudabÄ«"
 
 #. A city in the United Arab Emirates
-#| msgid "Al Ain"
 msgid "Al 'Ayn"
 msgstr ""
 
 #. A city in the United Arab Emirates
-#| msgid "Fujairah"
 msgid "Al Fujayrah"
 msgstr ""
 
@@ -12594,7 +11749,6 @@ msgid "Dubai"
 msgstr "Dubai"
 
 #. A city in the United Arab Emirates
-#| msgid "Ras Al Khaimah"
 msgid "Ra's al Khaymah"
 msgstr ""
 
@@ -12606,20 +11760,17 @@ msgid "Sharjah"
 msgstr "Sharjah"
 
 #. A city in Scotland in the United Kingdom
-#| msgid "Aberdeen"
 msgctxt "City in Scotland, United Kingdom"
 msgid "Aberdeen"
 msgstr "AberdÄ«na"
 
 #. A city in Northern Ireland in the United Kingdom
-#| msgid "Belfast/City"
 msgid "Belfast"
 msgstr ""
 
 #. A city in East and South East England in the United
 #. Kingdom
 #.
-#| msgid "Benson"
 msgctxt "City in East and South East England, United Kingdom"
 msgid "Benson"
 msgstr ""
@@ -12631,7 +11782,6 @@ msgid "Biggin Hill"
 msgstr "Biggin Hill"
 
 #. A city in Midlands in the United Kingdom
-#| msgid "Birmingham"
 msgctxt "City in Midlands, United Kingdom"
 msgid "Birmingham"
 msgstr ""
@@ -12643,7 +11793,6 @@ msgstr "Blackpool"
 #. A city in South and South West England in the United
 #. Kingdom
 #.
-#| msgid "Boscobel"
 msgid "Boscombe"
 msgstr ""
 
@@ -12668,27 +11817,23 @@ msgstr "Brize Norton"
 #. A city in South and South West England in the United
 #. Kingdom
 #.
-#| msgid "Butte"
 msgid "Butes"
 msgstr ""
 
 #. A city in East and South East England in the United
 #. Kingdom
 #.
-#| msgid "Cambridge"
 msgctxt "City in East and South East England, United Kingdom"
 msgid "Cambridge"
 msgstr ""
 
 #. A city in Scotland in the United Kingdom
-#| msgid "Jamestown"
 msgid "Campbeltown"
 msgstr ""
 
 #. A city in Wales in the United Kingdom.
 #. The local name in Welsh is "Caerdydd".
 #.
-#| msgid "Cardiff"
 msgctxt "City in Wales, United Kingdom"
 msgid "Cardiff"
 msgstr ""
@@ -12698,12 +11843,12 @@ msgid "Carlisle"
 msgstr "Carlisle"
 
 #. A city in Midlands in the United Kingdom
+#, fuzzy
 #| msgid "Bennington"
-msgid "Castle Donnington"
-msgstr ""
+msgid "Castle Donington"
+msgstr "Bennington"
 
 #. A city in North West England in the United Kingdom
-#| msgid "Charleston"
 msgid "Church Fenton"
 msgstr ""
 
@@ -12712,7 +11857,6 @@ msgid "Coningsby"
 msgstr "Coningsby"
 
 #. A city in Midlands in the United Kingdom
-#| msgid "Claremore"
 msgid "Cottesmore"
 msgstr ""
 
@@ -12741,7 +11885,6 @@ msgid "Edinburgh"
 msgstr "Edinburgh"
 
 #. A city in Northern Ireland in the United Kingdom
-#| msgid "Clinton"
 msgid "Eglinton"
 msgstr ""
 
@@ -12752,7 +11895,6 @@ msgid "Exeter"
 msgstr "Exeter"
 
 #. A city in the United Kingdom
-#| msgid "Fairborn"
 msgid "Fairford"
 msgstr ""
 
@@ -12765,18 +11907,15 @@ msgstr "Farnborough"
 #. A city in South and South West England in the United
 #. Kingdom
 #.
-#| msgid "Fulton"
 msgid "Filton"
 msgstr ""
 
 #. A city in Scotland in the United Kingdom
-#| msgid "Glasgow"
 msgctxt "City in Scotland, United Kingdom"
 msgid "Glasgow"
 msgstr ""
 
 #. A city in Scotland in the United Kingdom
-#| msgid "Farmingdale"
 msgid "Gramisdale"
 msgstr ""
 
@@ -12787,7 +11926,6 @@ msgstr "Hawarden"
 #. A city in South and South West England in the United
 #. Kingdom
 #.
-#| msgid "Pellston"
 msgid "Helston"
 msgstr ""
 
@@ -12810,7 +11948,6 @@ msgid "Kinloss"
 msgstr "Kinloss"
 
 #. A city in Scotland in the United Kingdom
-#| msgid "Sintra"
 msgid "Kintra"
 msgstr ""
 
@@ -12819,14 +11956,12 @@ msgid "Kirkwall"
 msgstr "Kirkwall"
 
 #. A city in North West England in the United Kingdom
-#| msgid "Farmington"
 msgid "Kirmington"
 msgstr ""
 
 #. A city in East and South East England in the United
 #. Kingdom
 #.
-#| msgid "Lakefront"
 msgid "Lakenheath"
 msgstr ""
 
@@ -12835,7 +11970,6 @@ msgid "Leeds"
 msgstr "Leeds"
 
 #. A city in North West England in the United Kingdom
-#| msgid "Leeming"
 msgid "Leeming Bar"
 msgstr ""
 
@@ -12844,18 +11978,15 @@ msgid "Leuchars"
 msgstr "Leuchars"
 
 #. A city in North West England in the United Kingdom
-#| msgid "Linton-on-Ouse"
 msgid "Linton upon Ouse"
 msgstr ""
 
 #. A city in North West England in the United Kingdom
-#| msgid "Liverpool"
 msgctxt "City in North West England, United Kingdom"
 msgid "Liverpool"
 msgstr ""
 
 #. The capital of the United Kingdom
-#| msgid "London"
 msgctxt "City in East and South East England, United Kingdom"
 msgid "London"
 msgstr ""
@@ -12883,7 +12014,6 @@ msgid "Lyneham"
 msgstr "Lyneham"
 
 #. A city in North West England in the United Kingdom
-#| msgid "Manchester"
 msgctxt "City in North West England, United Kingdom"
 msgid "Manchester"
 msgstr ""
@@ -12913,12 +12043,10 @@ msgid "Mildenhall"
 msgstr "Mildenhall"
 
 #. A city in Scotland in the United Kingdom
-#| msgid "Moses Lake"
 msgid "Mossbank"
 msgstr ""
 
 #. A city in North East England in the United Kingdom
-#| msgid "Newcastle"
 msgctxt "City in North East England, United Kingdom"
 msgid "Newcastle"
 msgstr ""
@@ -12948,7 +12076,6 @@ msgstr "Pembrey"
 #. A city in South and South West England in the United
 #. Kingdom
 #.
-#| msgid "Plymouth"
 msgctxt "City in South and South West England, United Kingdom"
 msgid "Plymouth"
 msgstr ""
@@ -12958,17 +12085,9 @@ msgid "Prestwick"
 msgstr "Prestwick"
 
 #. A city in Wales in the United Kingdom
-#| msgid "St Athan"
 msgid "Saint Athan"
 msgstr ""
 
-#. A city in South and South West England in the United
-#. Kingdom
-#.
-#| msgid "St Mawgan"
-msgid "Saint Mawgan"
-msgstr ""
-
 #. A city in North West England in the United Kingdom
 msgid "Shawbury"
 msgstr "Shawbury"
@@ -12976,7 +12095,6 @@ msgstr "Shawbury"
 #. A city in East and South East England in the United
 #. Kingdom
 #.
-#| msgid "Shoreham"
 msgid "Shoreham-by-Sea"
 msgstr ""
 
@@ -12989,7 +12107,6 @@ msgstr "Southampton"
 #. A city in East and South East England in the United
 #. Kingdom
 #.
-#| msgid "Southend"
 msgctxt "City in East and South East England, United Kingdom"
 msgid "Southend"
 msgstr ""
@@ -12997,19 +12114,16 @@ msgstr ""
 #. A city in East and South East England in the United
 #. Kingdom
 #.
-#| msgid "Santa Monica"
 msgid "Stansted Mountfitchet"
 msgstr ""
 
 #. A city in South and South West England in the United
 #. Kingdom
 #.
-#| msgid "Standerton"
 msgid "Staverton"
 msgstr ""
 
 #. A city in North East England in the United Kingdom
-#| msgid "Stockton"
 msgctxt "City in North East England, United Kingdom"
 msgid "Stockton"
 msgstr ""
@@ -13047,7 +12161,6 @@ msgid "Wattisham"
 msgstr "Wattisham"
 
 #. A city in Scotland in the United Kingdom
-#| msgid "Wink"
 msgid "Wick"
 msgstr ""
 
@@ -13064,7 +12177,6 @@ msgid "Yeovilton"
 msgstr "Yeovilton"
 
 #. A city in South Dakota in the United States
-#| msgid "Aberdeen"
 msgctxt "City in South Dakota, United States"
 msgid "Aberdeen"
 msgstr "AberdÄ«na"
@@ -13082,12 +12194,10 @@ msgid "Ada"
 msgstr "Ada"
 
 #. A city in Alaska in the United States
-#| msgid "Ada"
 msgid "Adak"
 msgstr ""
 
 #. A city in North Carolina in the United States
-#| msgid "Asheville"
 msgid "Adamsville"
 msgstr ""
 
@@ -13108,13 +12218,11 @@ msgid "Aitkin"
 msgstr "Aitkina"
 
 #. A city in Colorado in the United States
-#| msgid "Akron"
 msgctxt "City in Colorado, United States"
 msgid "Akron"
 msgstr ""
 
 #. A city in Ohio in the United States
-#| msgid "Akron"
 msgctxt "City in Ohio, United States"
 msgid "Akron"
 msgstr "Akrona"
@@ -13132,13 +12240,11 @@ msgid "Alamosa"
 msgstr "Alamosa"
 
 #. A city in Georgia in the United States
-#| msgid "Albany"
 msgctxt "City in Georgia, United States"
 msgid "Albany"
 msgstr "AlbÄ?nija"
 
 #. A city in New York in the United States
-#| msgid "Albany"
 msgctxt "City in New York, United States"
 msgid "Albany"
 msgstr "AlbÄ?nija"
@@ -13152,7 +12258,6 @@ msgid "Albert Lea"
 msgstr "Albertleasa"
 
 #. A city in Alabama in the United States
-#| msgid "Abbeville"
 msgid "Albertville"
 msgstr ""
 
@@ -13169,19 +12274,16 @@ msgid "Alexander City"
 msgstr "Aleksanda pilsÄ?ta"
 
 #. A city in Louisiana in the United States
-#| msgid "Alexandria"
 msgctxt "City in Louisiana, United States"
 msgid "Alexandria"
 msgstr "Aleksandrija"
 
 #. A city in Minnesota in the United States
-#| msgid "Alexandria"
 msgctxt "City in Minnesota, United States"
 msgid "Alexandria"
 msgstr "Aleksandrija"
 
 #. A city in Virginia in the United States
-#| msgid "Alexandria"
 msgctxt "City in Virginia, United States"
 msgid "Alexandria"
 msgstr "Aleksandrija"
@@ -13199,13 +12301,11 @@ msgid "Alliance"
 msgstr "Alliance"
 
 #. A city in Georgia in the United States
-#| msgid "Alma"
 msgctxt "City in Georgia, United States"
 msgid "Alma"
 msgstr "Alma"
 
 #. A city in Michigan in the United States
-#| msgid "Alma"
 msgctxt "City in Michigan, United States"
 msgid "Alma"
 msgstr "Alma"
@@ -13215,13 +12315,11 @@ msgid "Alpena"
 msgstr "Alpena"
 
 #. A city in Alaska in the United States
-#| msgid "Alpine"
 msgctxt "City in Alaska, United States"
 msgid "Alpine"
 msgstr ""
 
 #. A city in Texas in the United States
-#| msgid "Alpine"
 msgctxt "City in Texas, United States"
 msgid "Alpine"
 msgstr ""
@@ -13263,7 +12361,6 @@ msgid "Ames"
 msgstr "Ames"
 
 #. A city in California in the United States
-#| msgid "Ensheim"
 msgid "Anaheim"
 msgstr ""
 
@@ -13280,13 +12377,11 @@ msgid "Andalusia"
 msgstr "Andalusia"
 
 #. A city in Indiana in the United States
-#| msgid "Anderson"
 msgctxt "City in Indiana, United States"
 msgid "Anderson"
 msgstr ""
 
 #. A city in South Carolina in the United States
-#| msgid "Anderson"
 msgctxt "City in South Carolina, United States"
 msgid "Anderson"
 msgstr ""
@@ -13300,7 +12395,6 @@ msgid "Andrews"
 msgstr "Andrews"
 
 #. A city in Minnesota in the United States
-#| msgid "Pond Inlet"
 msgid "Angle Inlet"
 msgstr ""
 
@@ -13349,13 +12443,11 @@ msgid "Apalachicola"
 msgstr "Apalachicola"
 
 #. A city in Minnesota in the United States
-#| msgid "Appleton"
 msgctxt "City in Minnesota, United States"
 msgid "Appleton"
 msgstr ""
 
 #. A city in Wisconsin in the United States
-#| msgid "Appleton"
 msgctxt "City in Wisconsin, United States"
 msgid "Appleton"
 msgstr ""
@@ -13373,18 +12465,15 @@ msgid "Ardmore"
 msgstr "Ardmore"
 
 #. A city in Arkansas in the United States
-#| msgid "Philadelphia"
 msgid "Arkadelphia"
 msgstr ""
 
 #. A city in Texas in the United States
-#| msgid "Arlington"
 msgctxt "City in Texas, United States"
 msgid "Arlington"
 msgstr ""
 
 #. A city in Washington in the United States
-#| msgid "Arlington"
 msgctxt "City in Washington, United States"
 msgid "Arlington"
 msgstr ""
@@ -13394,7 +12483,6 @@ msgid "Artesia"
 msgstr "Artesia"
 
 #. A city in Colorado in the United States
-#| msgid "Arad"
 msgid "Arvada"
 msgstr ""
 
@@ -13407,19 +12495,16 @@ msgid "Asheville"
 msgstr "Asheville"
 
 #. A city in Virginia in the United States
-#| msgid "Ashland"
 msgctxt "City in Virginia, United States"
 msgid "Ashland"
 msgstr ""
 
 #. A city in Wisconsin in the United States
-#| msgid "Ashland"
 msgctxt "City in Wisconsin, United States"
 msgid "Ashland"
 msgstr ""
 
 #. A city in Ohio in the United States
-#| msgid "Ashtabulta"
 msgid "Ashtabula"
 msgstr ""
 
@@ -13432,7 +12517,6 @@ msgid "Astoria"
 msgstr "Astoria"
 
 #. A city in Georgia in the United States
-#| msgid "Athens"
 msgctxt "City in Georgia, United States"
 msgid "Athens"
 msgstr ""
@@ -13442,7 +12526,6 @@ msgid "Atlanta"
 msgstr "Atlanta"
 
 #. A city in Iowa in the United States
-#| msgid "Atlantic"
 msgctxt "City in Iowa, United States"
 msgid "Atlantic"
 msgstr ""
@@ -13456,19 +12539,16 @@ msgid "Atoka"
 msgstr "Atoka"
 
 #. A city in Alabama in the United States
-#| msgid "Auburn"
 msgctxt "City in Alabama, United States"
 msgid "Auburn"
 msgstr ""
 
 #. A city in California in the United States
-#| msgid "Auburn"
 msgctxt "City in California, United States"
 msgid "Auburn"
 msgstr ""
 
 #. A city in Maine in the United States
-#| msgid "Auburn"
 msgctxt "City in Maine, United States"
 msgid "Auburn"
 msgstr ""
@@ -13478,49 +12558,41 @@ msgid "Audubon"
 msgstr "Audubon"
 
 #. A city in Georgia in the United States
-#| msgid "Augusta"
 msgctxt "City in Georgia, United States"
 msgid "Augusta"
 msgstr ""
 
 #. A city in Maine in the United States
-#| msgid "Augusta"
 msgctxt "City in Maine, United States"
 msgid "Augusta"
 msgstr ""
 
 #. A city in Colorado in the United States
-#| msgid "Aurora"
 msgctxt "City in Colorado, United States"
 msgid "Aurora"
 msgstr ""
 
 #. A city in Illinois in the United States
-#| msgid "Aurora"
 msgctxt "City in Illinois, United States"
 msgid "Aurora"
 msgstr ""
 
 #. A city in Nebraska in the United States
-#| msgid "Aurora"
 msgctxt "City in Nebraska, United States"
 msgid "Aurora"
 msgstr ""
 
 #. A city in Oregon in the United States
-#| msgid "Aurora"
 msgctxt "City in Oregon, United States"
 msgid "Aurora"
 msgstr ""
 
 #. A city in Minnesota in the United States
-#| msgid "Austin"
 msgctxt "City in Minnesota, United States"
 msgid "Austin"
 msgstr ""
 
 #. A city in Texas in the United States
-#| msgid "Austin"
 msgctxt "City in Texas, United States"
 msgid "Austin"
 msgstr ""
@@ -13570,7 +12642,6 @@ msgid "Barre"
 msgstr "Barre"
 
 #. A city in Georgia in the United States
-#| msgid "Barre"
 msgid "Barretts"
 msgstr ""
 
@@ -13611,13 +12682,11 @@ msgid "Beatrice"
 msgstr "Beatrice"
 
 #. A city in North Carolina in the United States
-#| msgid "Beaufort"
 msgctxt "City in North Carolina, United States"
 msgid "Beaufort"
 msgstr ""
 
 #. A city in South Carolina in the United States
-#| msgid "Beaufort"
 msgctxt "City in South Carolina, United States"
 msgid "Beaufort"
 msgstr ""
@@ -13635,7 +12704,6 @@ msgid "Beckley"
 msgstr "Beckley"
 
 #. A city in Massachusetts in the United States
-#| msgid "Bedford"
 msgctxt "City in Massachusetts, United States"
 msgid "Bedford"
 msgstr ""
@@ -13657,7 +12725,6 @@ msgid "Bellingham"
 msgstr "Bellingham"
 
 #. A city in New Jersey in the United States
-#| msgid "Belarus"
 msgid "Belmar"
 msgstr ""
 
@@ -13670,7 +12737,6 @@ msgid "Bennington"
 msgstr "Bennington"
 
 #. A city in Minnesota in the United States
-#| msgid "Benson"
 msgctxt "City in Minnesota, United States"
 msgid "Benson"
 msgstr ""
@@ -13684,12 +12750,10 @@ msgid "Bentonville"
 msgstr "Bentonville"
 
 #. A city in California in the United States
-#| msgid "Beckley"
 msgid "Berkeley"
 msgstr ""
 
 #. A city in New Hampshire in the United States
-#| msgid "Berlin"
 msgctxt "City in New Hampshire, United States"
 msgid "Berlin"
 msgstr ""
@@ -13739,7 +12803,6 @@ msgid "Birchwood"
 msgstr "Birchwood"
 
 #. A city in Alabama in the United States
-#| msgid "Birmingham"
 msgctxt "City in Alabama, United States"
 msgid "Birmingham"
 msgstr ""
@@ -13753,28 +12816,23 @@ msgid "Bismarck"
 msgstr "Bismarck"
 
 #. A city in Montana in the United States
-#| msgid "Eagle"
 msgid "Black Eagle"
 msgstr ""
 
 #. A city in New York in the United States
-#| msgid "Back River"
 msgid "Black River"
 msgstr ""
 
 #. A city in Virginia in the United States
-#| msgid "Clarksburg"
 msgid "Blacksburg"
 msgstr ""
 
 #. A city in Illinois in the United States
-#| msgid "Bloomington"
 msgctxt "City in Illinois, United States"
 msgid "Bloomington"
 msgstr ""
 
 #. A city in Indiana in the United States
-#| msgid "Bloomington"
 msgctxt "City in Indiana, United States"
 msgid "Bloomington"
 msgstr ""
@@ -13804,13 +12862,11 @@ msgid "Boise"
 msgstr "Boise"
 
 #. A city in Iowa in the United States
-#| msgid "Boone"
 msgctxt "City in Iowa, United States"
 msgid "Boone"
 msgstr ""
 
 #. A city in North Carolina in the United States
-#| msgid "Boone"
 msgctxt "City in North Carolina, United States"
 msgid "Boone"
 msgstr ""
@@ -13820,7 +12876,6 @@ msgid "Boothville"
 msgstr "Boothville"
 
 #. A city in Wyoming in the United States
-#| msgid "Bordeaux"
 msgctxt "City in Wyoming, United States"
 msgid "Bordeaux"
 msgstr "Bordo"
@@ -13846,7 +12901,6 @@ msgid "Bowman"
 msgstr "Bowman"
 
 #. A city in South Dakota in the United States
-#| msgid "Border"
 msgid "Box Elder"
 msgstr ""
 
@@ -13859,7 +12913,6 @@ msgid "Bradford"
 msgstr "Bradford"
 
 #. A city in Texas in the United States
-#| msgid "Arad"
 msgid "Brady"
 msgstr ""
 
@@ -13884,13 +12937,11 @@ msgid "Broken Bow"
 msgstr "Broken Bow"
 
 #. A city in Oregon in the United States
-#| msgid "Brookings"
 msgctxt "City in Oregon, United States"
 msgid "Brookings"
 msgstr ""
 
 #. A city in South Dakota in the United States
-#| msgid "Brookings"
 msgctxt "City in South Dakota, United States"
 msgid "Brookings"
 msgstr ""
@@ -13916,13 +12967,11 @@ msgid "Brownwood"
 msgstr "Brownwood"
 
 #. A city in Georgia in the United States
-#| msgid "Brunswick"
 msgctxt "City in Georgia, United States"
 msgid "Brunswick"
 msgstr ""
 
 #. A city in Maine in the United States
-#| msgid "Brunswick"
 msgctxt "City in Maine, United States"
 msgid "Brunswick"
 msgstr ""
@@ -13940,25 +12989,21 @@ msgid "Buckland"
 msgstr "Buckland"
 
 #. A city in Minnesota in the United States
-#| msgid "Buffalo"
 msgctxt "City in Minnesota, United States"
 msgid "Buffalo"
 msgstr "Bufalo"
 
 #. A city in New York in the United States
-#| msgid "Buffalo"
 msgctxt "City in New York, United States"
 msgid "Buffalo"
 msgstr "Bufalo"
 
 #. A city in South Dakota in the United States
-#| msgid "Buffalo"
 msgctxt "City in South Dakota, United States"
 msgid "Buffalo"
 msgstr "Bufalo"
 
 #. A city in Wyoming in the United States
-#| msgid "Buffalo"
 msgctxt "City in Wyoming, United States"
 msgid "Buffalo"
 msgstr "Bufalo"
@@ -13976,37 +13021,31 @@ msgid "Burley"
 msgstr "Burley"
 
 #. A city in Colorado in the United States
-#| msgid "Burlington"
 msgctxt "City in Colorado, United States"
 msgid "Burlington"
 msgstr ""
 
 #. A city in Iowa in the United States
-#| msgid "Burlington"
 msgctxt "City in Iowa, United States"
 msgid "Burlington"
 msgstr ""
 
 #. A city in North Carolina in the United States
-#| msgid "Burlington"
 msgctxt "City in North Carolina, United States"
 msgid "Burlington"
 msgstr ""
 
 #. A city in Vermont in the United States
-#| msgid "Burlington"
 msgctxt "City in Vermont, United States"
 msgid "Burlington"
 msgstr ""
 
 #. A city in Washington in the United States
-#| msgid "Burlington"
 msgctxt "City in Washington, United States"
 msgid "Burlington"
 msgstr ""
 
 #. A city in Wisconsin in the United States
-#| msgid "Burlington"
 msgctxt "City in Wisconsin, United States"
 msgid "Burlington"
 msgstr ""
@@ -14020,7 +13059,6 @@ msgid "Burns"
 msgstr "Burns"
 
 #. A city in Pennsylvania in the United States
-#| msgid "Boulmer"
 msgid "Butler"
 msgstr ""
 
@@ -14037,25 +13075,21 @@ msgid "Cahokia"
 msgstr "Cahokia"
 
 #. A city in Illinois in the United States
-#| msgid "Cairo"
 msgctxt "City in Illinois, United States"
 msgid "Cairo"
 msgstr ""
 
 #. A city in Idaho in the United States
-#| msgid "Caldwell"
 msgctxt "City in Idaho, United States"
 msgid "Caldwell"
 msgstr ""
 
 #. A city in New Jersey in the United States
-#| msgid "Caldwell"
 msgctxt "City in New Jersey, United States"
 msgid "Caldwell"
 msgstr ""
 
 #. A city in Texas in the United States
-#| msgid "Caldwell"
 msgctxt "City in Texas, United States"
 msgid "Caldwell"
 msgstr ""
@@ -14065,13 +13099,11 @@ msgid "Camarillo"
 msgstr "Camarillo"
 
 #. A city in Massachusetts in the United States
-#| msgid "Cambridge"
 msgctxt "City in Massachusetts, United States"
 msgid "Cambridge"
 msgstr ""
 
 #. A city in Minnesota in the United States
-#| msgid "Cambridge"
 msgctxt "City in Minnesota, United States"
 msgid "Cambridge"
 msgstr ""
@@ -14081,7 +13113,6 @@ msgid "Camden"
 msgstr "Camden"
 
 #. A city in Wisconsin in the United States
-#| msgid "Douglas"
 msgid "Camp Douglas"
 msgstr ""
 
@@ -14101,16 +13132,11 @@ msgstr "KanÄ?dieÅ¡u"
 msgid "Canton"
 msgstr "Canton"
 
-#. A city in Alaska in the United States
-msgid "Cantwell"
-msgstr "Cantwell"
-
 #. A city in Florida in the United States
 msgid "Cape Canaveral"
 msgstr "Cape Canaveral"
 
 #. A city in Florida in the United States
-#| msgid "Cape Canaveral"
 msgid "Cape Coral"
 msgstr ""
 
@@ -14123,7 +13149,6 @@ msgid "Carbondale"
 msgstr "Carbondale"
 
 #. A city in Colorado in the United States
-#| msgid "Cardiff"
 msgctxt "City in Colorado, United States"
 msgid "Cardiff"
 msgstr ""
@@ -14133,13 +13158,11 @@ msgid "Caribou"
 msgstr "Caribou"
 
 #. A city in California in the United States
-#| msgid "Carlsbad"
 msgctxt "City in California, United States"
 msgid "Carlsbad"
 msgstr ""
 
 #. A city in New Mexico in the United States
-#| msgid "Carlsbad"
 msgctxt "City in New Mexico, United States"
 msgid "Carlsbad"
 msgstr ""
@@ -14149,7 +13172,6 @@ msgid "Carmi"
 msgstr "Carmi"
 
 #. A city in Michigan in the United States
-#| msgid "Cairo"
 msgid "Caro"
 msgstr ""
 
@@ -14158,7 +13180,6 @@ msgid "Carroll"
 msgstr "Carroll"
 
 #. A city in Texas in the United States
-#| msgid "Carroll"
 msgid "Carrollton"
 msgstr ""
 
@@ -14182,10 +13203,6 @@ msgstr "Cedar City"
 msgid "Cedar Rapids"
 msgstr "Cedar Rapids"
 
-#. A city in Alaska in the United States
-msgid "Central"
-msgstr "Central"
-
 #. A city in Illinois in the United States
 msgid "Centralia"
 msgstr "Centralia"
@@ -14211,18 +13228,15 @@ msgid "Champaign"
 msgstr "Champaign"
 
 #. A city in Alaska in the United States
-#| msgid "Chandler"
 msgid "Chandalar"
 msgstr ""
 
 #. A city in Arizona in the United States
-#| msgid "Chandler"
 msgctxt "City in Arizona, United States"
 msgid "Chandler"
 msgstr ""
 
 #. A city in Oklahoma in the United States
-#| msgid "Chandler"
 msgctxt "City in Oklahoma, United States"
 msgid "Chandler"
 msgstr ""
@@ -14244,13 +13258,11 @@ msgid "Charles City"
 msgstr "Charles City"
 
 #. A city in South Carolina in the United States
-#| msgid "Charleston"
 msgctxt "City in South Carolina, United States"
 msgid "Charleston"
 msgstr ""
 
 #. A city in West Virginia in the United States
-#| msgid "Charleston"
 msgctxt "City in West Virginia, United States"
 msgid "Charleston"
 msgstr ""
@@ -14260,13 +13272,11 @@ msgid "Charlevoix"
 msgstr "Charlevoix"
 
 #. A city in Michigan in the United States
-#| msgid "Charlotte"
 msgctxt "City in Michigan, United States"
 msgid "Charlotte"
 msgstr ""
 
 #. A city in North Carolina in the United States
-#| msgid "Charlotte"
 msgctxt "City in North Carolina, United States"
 msgid "Charlotte"
 msgstr ""
@@ -14288,7 +13298,6 @@ msgid "Cheboygan"
 msgstr "Cheboygan"
 
 #. A city in Iowa in the United States
-#| msgid "Sherbrooke"
 msgid "Cherokee"
 msgstr "Ä?erokÄ«"
 
@@ -14297,7 +13306,6 @@ msgid "Chesapeake"
 msgstr "Chesapeake"
 
 #. A city in Missouri in the United States
-#| msgid "Chesterfield Inlet"
 msgid "Chesterfield"
 msgstr ""
 
@@ -14330,7 +13338,6 @@ msgid "Childress"
 msgstr "Childress"
 
 #. A city in Arizona in the United States
-#| msgid "Childress"
 msgid "Childs"
 msgstr ""
 
@@ -14351,17 +13358,14 @@ msgid "Chino"
 msgstr "Chino"
 
 #. A city in Alaska in the United States
-#| msgid "Chania"
 msgid "Chisana"
 msgstr ""
 
 #. A city in Alaska in the United States
-#| msgid "Chichijima"
 msgid "Chistochina"
 msgstr ""
 
 #. A city in California in the United States
-#| msgid "Chulitna"
 msgid "Chula Vista"
 msgstr ""
 
@@ -14390,13 +13394,11 @@ msgid "Clarksburg"
 msgstr "Clarksburg"
 
 #. A city in Tennessee in the United States
-#| msgid "Clarksville"
 msgctxt "City in Tennessee, United States"
 msgid "Clarksville"
 msgstr ""
 
 #. A city in Texas in the United States
-#| msgid "Clarksville"
 msgctxt "City in Texas, United States"
 msgid "Clarksville"
 msgstr ""
@@ -14426,19 +13428,16 @@ msgid "Clines Corners"
 msgstr "Clines Corners"
 
 #. A city in Iowa in the United States
-#| msgid "Clinton"
 msgctxt "City in Iowa, United States"
 msgid "Clinton"
 msgstr ""
 
 #. A city in North Carolina in the United States
-#| msgid "Clinton"
 msgctxt "City in North Carolina, United States"
 msgid "Clinton"
 msgstr ""
 
 #. A city in Oklahoma in the United States
-#| msgid "Clinton"
 msgctxt "City in Oklahoma, United States"
 msgid "Clinton"
 msgstr ""
@@ -14456,7 +13455,6 @@ msgid "Clovis"
 msgstr "Clovis"
 
 #. A city in Florida in the United States
-#| msgid "Cooma"
 msgid "Cocoa"
 msgstr ""
 
@@ -14489,61 +13487,51 @@ msgid "Colorado Springs"
 msgstr "Colorado Springs"
 
 #. A city in Missouri in the United States
-#| msgid "Columbia"
 msgctxt "City in Missouri, United States"
 msgid "Columbia"
 msgstr ""
 
 #. A city in South Carolina in the United States
-#| msgid "Columbia"
 msgctxt "City in South Carolina, United States"
 msgid "Columbia"
 msgstr ""
 
 #. A city in Georgia in the United States
-#| msgid "Columbus"
 msgctxt "City in Georgia, United States"
 msgid "Columbus"
 msgstr ""
 
 #. A city in Indiana in the United States
-#| msgid "Columbus"
 msgctxt "City in Indiana, United States"
 msgid "Columbus"
 msgstr ""
 
 #. A city in Mississippi in the United States
-#| msgid "Columbus"
 msgctxt "City in Mississippi, United States"
 msgid "Columbus"
 msgstr ""
 
 #. A city in Nebraska in the United States
-#| msgid "Columbus"
 msgctxt "City in Nebraska, United States"
 msgid "Columbus"
 msgstr ""
 
 #. A city in Ohio in the United States
-#| msgid "Columbus"
 msgctxt "City in Ohio, United States"
 msgid "Columbus"
 msgstr ""
 
 #. A city in California in the United States
-#| msgid "Concord"
 msgctxt "City in California, United States"
 msgid "Concord"
 msgstr ""
 
 #. A city in New Hampshire in the United States
-#| msgid "Concord"
 msgctxt "City in New Hampshire, United States"
 msgid "Concord"
 msgstr ""
 
 #. A city in North Carolina in the United States
-#| msgid "Concord"
 msgctxt "City in North Carolina, United States"
 msgid "Concord"
 msgstr ""
@@ -14569,13 +13557,11 @@ msgid "Cordova"
 msgstr "Cordova"
 
 #. A city in California in the United States
-#| msgid "Corona"
 msgctxt "City in California, United States"
 msgid "Corona"
 msgstr ""
 
 #. A city in New Mexico in the United States
-#| msgid "Corona"
 msgctxt "City in New Mexico, United States"
 msgid "Corona"
 msgstr ""
@@ -14597,7 +13583,6 @@ msgid "Corvallis"
 msgstr "Corvallis"
 
 #. A city in California in the United States
-#| msgid "Costa Rica"
 msgid "Costa Mesa"
 msgstr ""
 
@@ -14622,7 +13607,6 @@ msgid "Crescent City"
 msgstr "Crescent City"
 
 #. A city in Iowa in the United States
-#| msgid "Creston"
 msgctxt "City in Iowa, United States"
 msgid "Creston"
 msgstr ""
@@ -14664,7 +13648,6 @@ msgid "Currituck"
 msgstr "Currituck"
 
 #. A city in Oklahoma in the United States
-#| msgid "Kuching"
 msgid "Cushing"
 msgstr ""
 
@@ -14681,7 +13664,6 @@ msgid "Daggett"
 msgstr "Daggett"
 
 #. A city in Alabama in the United States
-#| msgid "Danville"
 msgid "Daleville"
 msgstr ""
 
@@ -14694,17 +13676,14 @@ msgid "Dallas"
 msgstr "Dallas"
 
 #. A city in Georgia in the United States
-#| msgid "Dayton"
 msgid "Dalton"
 msgstr ""
 
 #. A city in California in the United States
-#| msgid "Bay City"
 msgid "Daly City"
 msgstr ""
 
 #. A city in South Carolina in the United States
-#| msgid "Caldwell"
 msgid "Dalzell"
 msgstr ""
 
@@ -14717,13 +13696,11 @@ msgid "Dansville"
 msgstr "Dansville"
 
 #. A city in Illinois in the United States
-#| msgid "Danville"
 msgctxt "City in Illinois, United States"
 msgid "Danville"
 msgstr ""
 
 #. A city in Virginia in the United States
-#| msgid "Danville"
 msgctxt "City in Virginia, United States"
 msgid "Danville"
 msgstr ""
@@ -14749,12 +13726,10 @@ msgid "De Queen"
 msgstr "De Queen"
 
 #. A city in Illinois in the United States
-#| msgid "De Kalb"
 msgid "DeKalb"
 msgstr ""
 
 #. A city in Louisiana in the United States
-#| msgid "De Ridder"
 msgid "DeRidder"
 msgstr ""
 
@@ -14763,19 +13738,16 @@ msgid "Deadhorse"
 msgstr "Deadhorse"
 
 #. A city in Alabama in the United States
-#| msgid "Decatur"
 msgctxt "City in Alabama, United States"
 msgid "Decatur"
 msgstr ""
 
 #. A city in Illinois in the United States
-#| msgid "Decatur"
 msgctxt "City in Illinois, United States"
 msgid "Decatur"
 msgstr ""
 
 #. A city in Texas in the United States
-#| msgid "Decatur"
 msgctxt "City in Texas, United States"
 msgid "Decatur"
 msgstr ""
@@ -14788,10 +13760,6 @@ msgstr "Decorah"
 msgid "Deer Park"
 msgstr "Deer Park"
 
-#. A city in Alaska in the United States
-msgid "Deering"
-msgstr "Deering"
-
 #. A city in Ohio in the United States
 msgid "Defiance"
 msgstr "Defiance"
@@ -14869,19 +13837,16 @@ msgid "Dothan"
 msgstr "Dothan"
 
 #. A city in Arizona in the United States
-#| msgid "Douglas"
 msgctxt "City in Arizona, United States"
 msgid "Douglas"
 msgstr ""
 
 #. A city in Georgia in the United States
-#| msgid "Douglas"
 msgctxt "City in Georgia, United States"
 msgid "Douglas"
 msgstr ""
 
 #. A city in Wyoming in the United States
-#| msgid "Douglas"
 msgctxt "City in Wyoming, United States"
 msgid "Douglas"
 msgstr ""
@@ -14899,7 +13864,6 @@ msgid "Drummond"
 msgstr "Drummond"
 
 #. A city in Texas in the United States
-#| msgid "Dryden"
 msgctxt "City in Texas, United States"
 msgid "Dryden"
 msgstr ""
@@ -14909,13 +13873,11 @@ msgid "Du Bois"
 msgstr "Du Bois"
 
 #. A city in Georgia in the United States
-#| msgid "Dublin"
 msgctxt "City in Georgia, United States"
 msgid "Dublin"
 msgstr ""
 
 #. A city in Virginia in the United States
-#| msgid "Dublin"
 msgctxt "City in Virginia, United States"
 msgid "Dublin"
 msgstr ""
@@ -14941,7 +13903,6 @@ msgid "Dunkirk"
 msgstr "Dunkirk"
 
 #. A city in Colorado in the United States
-#| msgid "Durango"
 msgctxt "City in Colorado, United States"
 msgid "Durango"
 msgstr ""
@@ -14959,13 +13920,11 @@ msgid "Dyersburg"
 msgstr "Dyersburg"
 
 #. A city in Alaska in the United States
-#| msgid "Eagle"
 msgctxt "City in Alaska, United States"
 msgid "Eagle"
 msgstr ""
 
 #. A city in Colorado in the United States
-#| msgid "Eagle"
 msgctxt "City in Colorado, United States"
 msgid "Eagle"
 msgstr ""
@@ -15003,7 +13962,6 @@ msgid "Edinburg"
 msgstr "Edinburg"
 
 #. A city in California in the United States
-#| msgid "Edwards AFB"
 msgid "Edwards"
 msgstr ""
 
@@ -15032,12 +13990,10 @@ msgid "El Paso"
 msgstr "El Paso"
 
 #. A city in Oklahoma in the United States
-#| msgid "El Centro"
 msgid "El Reno"
 msgstr ""
 
 #. A city in Colorado in the United States
-#| msgid "Elberton"
 msgid "Elbert"
 msgstr ""
 
@@ -15046,7 +14002,6 @@ msgid "Elfin Cove"
 msgstr "Elfin Cove"
 
 #. A city in New Jersey in the United States
-#| msgid "Elizabethtown"
 msgid "Elizabeth"
 msgstr ""
 
@@ -15059,13 +14014,11 @@ msgid "Elizabethtown"
 msgstr "Elizabethtown"
 
 #. A city in Indiana in the United States
-#| msgid "Elkhart"
 msgctxt "City in Indiana, United States"
 msgid "Elkhart"
 msgstr ""
 
 #. A city in Kansas in the United States
-#| msgid "Elkhart"
 msgctxt "City in Kansas, United States"
 msgid "Elkhart"
 msgstr ""
@@ -15083,24 +14036,20 @@ msgid "Ellensburg"
 msgstr "Ellensburg"
 
 #. A city in New York in the United States
-#| msgid "Elmira"
 msgctxt "City in New York, United States"
 msgid "Elmira"
 msgstr ""
 
 #. A city in Kansas in the United States
-#| msgid "Glenwood"
 msgid "Elwood"
 msgstr ""
 
 #. A city in Minnesota in the United States
-#| msgid "Ely"
 msgctxt "City in Minnesota, United States"
 msgid "Ely"
 msgstr ""
 
 #. A city in Nevada in the United States
-#| msgid "Ely"
 msgctxt "City in Nevada, United States"
 msgid "Ely"
 msgstr ""
@@ -15118,13 +14067,11 @@ msgid "Emmonak"
 msgstr "Emmonak"
 
 #. A city in Kansas in the United States
-#| msgid "Emporia"
 msgctxt "City in Kansas, United States"
 msgid "Emporia"
 msgstr ""
 
 #. A city in Virginia in the United States
-#| msgid "Emporia"
 msgctxt "City in Virginia, United States"
 msgid "Emporia"
 msgstr ""
@@ -15150,7 +14097,6 @@ msgid "Escanaba"
 msgstr "Escanaba"
 
 #. A city in California in the United States
-#| msgid "Puerto Escondido"
 msgid "Escondido"
 msgstr ""
 
@@ -15163,13 +14109,11 @@ msgid "Eugene"
 msgstr "Eugene"
 
 #. A city in Nevada in the United States
-#| msgid "Eureka"
 msgctxt "City in Nevada, United States"
 msgid "Eureka"
 msgstr ""
 
 #. A city in Alaska in the United States
-#| msgid "Eureka Sound"
 msgid "Eureka Roadhouse"
 msgstr ""
 
@@ -15202,19 +14146,16 @@ msgid "Fairchild"
 msgstr "Fairchild"
 
 #. A city in California in the United States
-#| msgid "Fairfield"
 msgctxt "City in California, United States"
 msgid "Fairfield"
 msgstr ""
 
 #. A city in Illinois in the United States
-#| msgid "Fairfield"
 msgctxt "City in Illinois, United States"
 msgid "Fairfield"
 msgstr ""
 
 #. A city in Iowa in the United States
-#| msgid "Fairfield"
 msgctxt "City in Iowa, United States"
 msgid "Fairfield"
 msgstr ""
@@ -15252,13 +14193,11 @@ msgid "Farmingdale"
 msgstr "Farmingdale"
 
 #. A city in Missouri in the United States
-#| msgid "Farmington"
 msgctxt "City in Missouri, United States"
 msgid "Farmington"
 msgstr ""
 
 #. A city in New Mexico in the United States
-#| msgid "Farmington"
 msgctxt "City in New Mexico, United States"
 msgid "Farmington"
 msgstr ""
@@ -15268,13 +14207,11 @@ msgid "Farmville"
 msgstr "Farmville"
 
 #. A city in Arkansas in the United States
-#| msgid "Fayetteville"
 msgctxt "City in Arkansas, United States"
 msgid "Fayetteville"
 msgstr ""
 
 #. A city in North Carolina in the United States
-#| msgid "Fayetteville"
 msgctxt "City in North Carolina, United States"
 msgid "Fayetteville"
 msgstr ""
@@ -15308,18 +14245,15 @@ msgid "Flora"
 msgstr "Flora"
 
 #. A city in South Carolina in the United States
-#| msgid "Florence"
 msgctxt "City in South Carolina, United States"
 msgid "Florence"
 msgstr ""
 
 #. A city in Wisconsin in the United States
-#| msgid "Fond Du Lac"
 msgid "Fond du Lac"
 msgstr ""
 
 #. A city in California in the United States
-#| msgid "Montana"
 msgid "Fontana"
 msgstr ""
 
@@ -15332,7 +14266,6 @@ msgid "Fort Carson"
 msgstr "Fort Carson"
 
 #. A city in Colorado in the United States
-#| msgid "Fort Carson"
 msgid "Fort Collins"
 msgstr ""
 
@@ -15361,12 +14294,10 @@ msgid "Fort Pierce"
 msgstr "Fort Pierce"
 
 #. A city in Louisiana in the United States
-#| msgid "Fort Portal"
 msgid "Fort Polk"
 msgstr ""
 
 #. A city in Arkansas in the United States
-#| msgid "Fort Smith"
 msgctxt "City in Arkansas, United States"
 msgid "Fort Smith"
 msgstr ""
@@ -15376,7 +14307,6 @@ msgid "Fort Stockton"
 msgstr "Fort Stockton"
 
 #. A city in Florida in the United States
-#| msgid "Daytona Beach"
 msgid "Fort Walton Beach"
 msgstr ""
 
@@ -15397,43 +14327,36 @@ msgid "Fosston"
 msgstr "Fosston"
 
 #. A city in Kentucky in the United States
-#| msgid "Frankfort"
 msgctxt "City in Kentucky, United States"
 msgid "Frankfort"
 msgstr ""
 
 #. A city in Michigan in the United States
-#| msgid "Frankfort"
 msgctxt "City in Michigan, United States"
 msgid "Frankfort"
 msgstr ""
 
 #. A city in North Carolina in the United States
-#| msgid "Franklin"
 msgctxt "City in North Carolina, United States"
 msgid "Franklin"
 msgstr ""
 
 #. A city in Pennsylvania in the United States
-#| msgid "Franklin"
 msgctxt "City in Pennsylvania, United States"
 msgid "Franklin"
 msgstr ""
 
 #. A city in Virginia in the United States
-#| msgid "Franklin"
 msgctxt "City in Virginia, United States"
 msgid "Franklin"
 msgstr ""
 
 #. A city in Maryland in the United States
-#| msgid "Frederick"
 msgctxt "City in Maryland, United States"
 msgid "Frederick"
 msgstr ""
 
 #. A city in Oklahoma in the United States
-#| msgid "Frederick"
 msgctxt "City in Oklahoma, United States"
 msgid "Frederick"
 msgstr ""
@@ -15443,19 +14366,16 @@ msgid "Fredericksburg"
 msgstr "Fredericksburg"
 
 #. A city in Illinois in the United States
-#| msgid "Freeport"
 msgctxt "City in Illinois, United States"
 msgid "Freeport"
 msgstr ""
 
 #. A city in California in the United States
-#| msgid "Fremont"
 msgctxt "City in California, United States"
 msgid "Fremont"
 msgstr ""
 
 #. A city in Nebraska in the United States
-#| msgid "Fremont"
 msgctxt "City in Nebraska, United States"
 msgid "Fremont"
 msgstr ""
@@ -15493,19 +14413,16 @@ msgid "Gage"
 msgstr "Gage"
 
 #. A city in Florida in the United States
-#| msgid "Gainesville"
 msgctxt "City in Florida, United States"
 msgid "Gainesville"
 msgstr ""
 
 #. A city in Georgia in the United States
-#| msgid "Gainesville"
 msgctxt "City in Georgia, United States"
 msgid "Gainesville"
 msgstr ""
 
 #. A city in Texas in the United States
-#| msgid "Gainesville"
 msgctxt "City in Texas, United States"
 msgid "Gainesville"
 msgstr ""
@@ -15535,24 +14452,20 @@ msgid "Gambell"
 msgstr "Gambell"
 
 #. A city in Kansas in the United States
-#| msgid "Garden City"
 msgctxt "City in Kansas, United States"
 msgid "Garden City"
 msgstr ""
 
 #. A city in Louisiana in the United States
-#| msgid "Garden City"
 msgctxt "City in Louisiana, United States"
 msgid "Garden City"
 msgstr ""
 
 #. A city in California in the United States
-#| msgid "Garden Creek"
 msgid "Garden Grove"
 msgstr ""
 
 #. A city in Texas in the United States
-#| msgid "Hartland"
 msgid "Garland"
 msgstr ""
 
@@ -15577,13 +14490,11 @@ msgid "Gaylord"
 msgstr "Gaylord"
 
 #. A city in Delaware in the United States
-#| msgid "Georgetown"
 msgctxt "City in Delaware, United States"
 msgid "Georgetown"
 msgstr ""
 
 #. A city in Texas in the United States
-#| msgid "Georgetown"
 msgctxt "City in Texas, United States"
 msgid "Georgetown"
 msgstr ""
@@ -15593,7 +14504,6 @@ msgid "Giddings"
 msgstr "Giddings"
 
 #. A city in Arizona in the United States
-#| msgid "Gilmer"
 msgid "Gilbert"
 msgstr ""
 
@@ -15606,13 +14516,11 @@ msgid "Gilmer"
 msgstr "Gilmer"
 
 #. A city in Kentucky in the United States
-#| msgid "Glasgow"
 msgctxt "City in Kentucky, United States"
 msgid "Glasgow"
 msgstr ""
 
 #. A city in Montana in the United States
-#| msgid "Glasgow"
 msgctxt "City in Montana, United States"
 msgid "Glasgow"
 msgstr ""
@@ -15622,13 +14530,11 @@ msgid "Glencoe"
 msgstr "Glencoe"
 
 #. A city in Arizona in the United States
-#| msgid "Glendale"
 msgctxt "City in Arizona, United States"
 msgid "Glendale"
 msgstr ""
 
 #. A city in California in the United States
-#| msgid "Glendale"
 msgctxt "City in California, United States"
 msgid "Glendale"
 msgstr ""
@@ -15649,26 +14555,19 @@ msgstr "Glenvuda"
 msgid "Goldsboro"
 msgstr "Goldsboro"
 
-#. A city in Alaska in the United States
-msgid "Golovin"
-msgstr "Golovin"
-
 #. A city in Kansas in the United States
 msgid "Goodland"
 msgstr "Goodland"
 
 #. A city in Arizona in the United States
-#| msgid "Gondar"
 msgid "Goodyear"
 msgstr ""
 
 #. A city in Louisiana in the United States
-#| msgid "Hooks Airport"
 msgid "Goosport"
 msgstr ""
 
 #. A city in New Hampshire in the United States
-#| msgid "Graham"
 msgid "Gorham"
 msgstr ""
 
@@ -15677,7 +14576,6 @@ msgid "Goshen"
 msgstr "Goshen"
 
 #. A city in Illinois in the United States
-#| msgid "Groton"
 msgid "Grafton"
 msgstr ""
 
@@ -15718,13 +14616,11 @@ msgid "Grand Prairie"
 msgstr "Grand Prairie"
 
 #. A city in Michigan in the United States
-#| msgid "Grand Rapids"
 msgctxt "City in Michigan, United States"
 msgid "Grand Rapids"
 msgstr ""
 
 #. A city in Minnesota in the United States
-#| msgid "Grand Rapids"
 msgctxt "City in Minnesota, United States"
 msgid "Grand Rapids"
 msgstr ""
@@ -15738,7 +14634,6 @@ msgid "Grants"
 msgstr "Grants"
 
 #. A city in Michigan in the United States
-#| msgid "Graying"
 msgid "Grayling"
 msgstr ""
 
@@ -15754,54 +14649,42 @@ msgstr "Great Falls"
 msgid "Green Bay"
 msgstr "Green Bay"
 
-#. A city in Utah in the United States
-msgid "Green River"
-msgstr "Green River"
-
 #. A city in Georgia in the United States
-#| msgid "Greensboro"
 msgctxt "City in Georgia, United States"
 msgid "Greensboro"
 msgstr ""
 
 #. A city in North Carolina in the United States
-#| msgid "Greensboro"
 msgctxt "City in North Carolina, United States"
 msgid "Greensboro"
 msgstr ""
 
 #. A city in Maine in the United States
-#| msgid "Greenville"
 msgctxt "City in Maine, United States"
 msgid "Greenville"
 msgstr ""
 
 #. A city in Mississippi in the United States
-#| msgid "Greenville"
 msgctxt "City in Mississippi, United States"
 msgid "Greenville"
 msgstr ""
 
 #. A city in South Carolina in the United States
-#| msgid "Greenville"
 msgctxt "City in South Carolina, United States"
 msgid "Greenville"
 msgstr ""
 
 #. A city in Texas in the United States
-#| msgid "Greenville"
 msgctxt "City in Texas, United States"
 msgid "Greenville"
 msgstr ""
 
 #. A city in Mississippi in the United States
-#| msgid "Greenwood"
 msgctxt "City in Mississippi, United States"
 msgid "Greenwood"
 msgstr ""
 
 #. A city in South Carolina in the United States
-#| msgid "Greenwood"
 msgctxt "City in South Carolina, United States"
 msgid "Greenwood"
 msgstr ""
@@ -15851,7 +14734,6 @@ msgid "Hagerstown"
 msgstr "Hagerstown"
 
 #. A city in Idaho in the United States
-#| msgid "Hail"
 msgid "Hailey"
 msgstr ""
 
@@ -15860,7 +14742,6 @@ msgid "Haines"
 msgstr "Haines"
 
 #. A city in Alabama in the United States
-#| msgid "Charleville"
 msgid "Haleyville"
 msgstr ""
 
@@ -15869,7 +14750,6 @@ msgid "Hallock"
 msgstr "Hallock"
 
 #. A city in Ohio in the United States
-#| msgid "Hamilton"
 msgctxt "City in Ohio, United States"
 msgid "Hamilton"
 msgstr ""
@@ -15887,13 +14767,11 @@ msgid "Hancock"
 msgstr "Hancock"
 
 #. A city in California in the United States
-#| msgid "Hanford"
 msgctxt "City in California, United States"
 msgid "Hanford"
 msgstr ""
 
 #. A city in Washington in the United States
-#| msgid "Hanford"
 msgctxt "City in Washington, United States"
 msgid "Hanford"
 msgstr ""
@@ -15915,13 +14793,11 @@ msgid "Harlingen"
 msgstr "Harlingen"
 
 #. A city in Illinois in the United States
-#| msgid "Harrisburg"
 msgctxt "City in Illinois, United States"
 msgid "Harrisburg"
 msgstr ""
 
 #. A city in Pennsylvania in the United States
-#| msgid "Harrisburg"
 msgctxt "City in Pennsylvania, United States"
 msgid "Harrisburg"
 msgstr ""
@@ -15947,7 +14823,6 @@ msgid "Hattiesburg"
 msgstr "Hattiesburg"
 
 #. A city in North Carolina in the United States
-#| msgid "Hallock"
 msgid "Havelock"
 msgstr ""
 
@@ -15968,19 +14843,16 @@ msgid "Hays"
 msgstr "Hays"
 
 #. A city in California in the United States
-#| msgid "Hayward"
 msgctxt "City in California, United States"
 msgid "Hayward"
 msgstr ""
 
 #. A city in Wisconsin in the United States
-#| msgid "Hayward"
 msgctxt "City in Wisconsin, United States"
 msgid "Hayward"
 msgstr ""
 
 #. A city in Alaska in the United States
-#| msgid "Hail"
 msgid "Healy"
 msgstr ""
 
@@ -15993,7 +14865,6 @@ msgid "Hebbronville"
 msgstr "Hebbronville"
 
 #. A city in Nebraska in the United States
-#| msgid "Hebron"
 msgctxt "City in Nebraska, United States"
 msgid "Hebron"
 msgstr ""
@@ -16003,13 +14874,11 @@ msgid "Helena"
 msgstr "Helena"
 
 #. A city in Kentucky in the United States
-#| msgid "Henderson"
 msgctxt "City in Kentucky, United States"
 msgid "Henderson"
 msgstr ""
 
 #. A city in Nevada in the United States
-#| msgid "Henderson"
 msgctxt "City in Nevada, United States"
 msgid "Henderson"
 msgstr ""
@@ -16023,7 +14892,6 @@ msgid "Hettinger"
 msgstr "Hettinger"
 
 #. A city in Florida in the United States
-#| msgid "Hall Beach"
 msgid "Hialeah"
 msgstr ""
 
@@ -16036,7 +14904,6 @@ msgid "Hickory"
 msgstr "Hickory"
 
 #. A city in Louisiana in the United States
-#| msgid "Hickam"
 msgid "Hicks"
 msgstr ""
 
@@ -16061,7 +14928,6 @@ msgid "Hilo"
 msgstr "Hilo"
 
 #. A city in South Carolina in the United States
-#| msgid "Hilton Head"
 msgid "Hilton Head Island"
 msgstr ""
 
@@ -16070,7 +14936,6 @@ msgid "Hinesville"
 msgstr "Hinesville"
 
 #. A city in Oklahoma in the United States
-#| msgid "Hobart"
 msgctxt "City in Oklahoma, United States"
 msgid "Hobart"
 msgstr ""
@@ -16084,7 +14949,6 @@ msgid "Hoffman"
 msgstr "Hoffman"
 
 #. A city in Nebraska in the United States
-#| msgid "Holberg"
 msgid "Holdrege"
 msgstr ""
 
@@ -16101,7 +14965,6 @@ msgid "Homer"
 msgstr "Homer"
 
 #. A city in Florida in the United States
-#| msgid "Homestead AFB"
 msgid "Homestead"
 msgstr ""
 
@@ -16126,13 +14989,11 @@ msgid "Hoquiam"
 msgstr "Hoquiam"
 
 #. A city in Arkansas in the United States
-#| msgid "Hot Springs"
 msgctxt "City in Arkansas, United States"
 msgid "Hot Springs"
 msgstr ""
 
 #. A city in Virginia in the United States
-#| msgid "Hot Springs"
 msgctxt "City in Virginia, United States"
 msgid "Hot Springs"
 msgstr ""
@@ -16166,13 +15027,11 @@ msgid "Huntington Beach"
 msgstr "Huntington Beach"
 
 #. A city in Alabama in the United States
-#| msgid "Huntsville"
 msgctxt "City in Alabama, United States"
 msgid "Huntsville"
 msgstr ""
 
 #. A city in Texas in the United States
-#| msgid "Huntsville"
 msgctxt "City in Texas, United States"
 msgid "Huntsville"
 msgstr ""
@@ -16186,13 +15045,11 @@ msgid "Huslia"
 msgstr "Huslia"
 
 #. A city in Kansas in the United States
-#| msgid "Hutchinson"
 msgctxt "City in Kansas, United States"
 msgid "Hutchinson"
 msgstr ""
 
 #. A city in Minnesota in the United States
-#| msgid "Hutchinson"
 msgctxt "City in Minnesota, United States"
 msgid "Hutchinson"
 msgstr ""
@@ -16206,7 +15063,6 @@ msgid "Hydaburg"
 msgstr "Hydaburg"
 
 #. A city in Oklahoma in the United States
-#| msgid "Israel"
 msgid "Idabel"
 msgstr ""
 
@@ -16215,13 +15071,11 @@ msgid "Idaho Falls"
 msgstr "Idaho Falls"
 
 #. A city in California in the United States
-#| msgid "Imperial"
 msgctxt "City in California, United States"
 msgid "Imperial"
 msgstr ""
 
 #. A city in Nebraska in the United States
-#| msgid "Imperial"
 msgctxt "City in Nebraska, United States"
 msgid "Imperial"
 msgstr ""
@@ -16235,7 +15089,6 @@ msgid "Independence"
 msgstr "Independence"
 
 #. A city in Pennsylvania in the United States
-#| msgid "Indiana"
 msgctxt "City in Pennsylvania, United States"
 msgid "Indiana"
 msgstr ""
@@ -16245,12 +15098,10 @@ msgid "Indianapolis"
 msgstr "Indianapolis"
 
 #. A city in Pennsylvania in the United States
-#| msgid "Indiana"
 msgid "Indiantown"
 msgstr ""
 
 #. A city in California in the United States
-#| msgid "Glenwood"
 msgid "Inglewood"
 msgstr ""
 
@@ -16279,12 +15130,10 @@ msgid "Ironwood"
 msgstr "Ironwood"
 
 #. A city in California in the United States
-#| msgid "Ifrane"
 msgid "Irvine"
 msgstr ""
 
 #. A city in Texas in the United States
-#| msgid "Iringa"
 msgid "Irving"
 msgstr ""
 
@@ -16297,61 +15146,51 @@ msgid "Ithaca"
 msgstr "Ithaca"
 
 #. A city in Kentucky in the United States
-#| msgid "Jackson"
 msgctxt "City in Kentucky, United States"
 msgid "Jackson"
 msgstr ""
 
 #. A city in Michigan in the United States
-#| msgid "Jackson"
 msgctxt "City in Michigan, United States"
 msgid "Jackson"
 msgstr ""
 
 #. A city in Minnesota in the United States
-#| msgid "Jackson"
 msgctxt "City in Minnesota, United States"
 msgid "Jackson"
 msgstr ""
 
 #. A city in Mississippi in the United States
-#| msgid "Jackson"
 msgctxt "City in Mississippi, United States"
 msgid "Jackson"
 msgstr ""
 
 #. A city in Tennessee in the United States
-#| msgid "Jackson"
 msgctxt "City in Tennessee, United States"
 msgid "Jackson"
 msgstr ""
 
 #. A city in Wyoming in the United States
-#| msgid "Jackson"
 msgctxt "City in Wyoming, United States"
 msgid "Jackson"
 msgstr ""
 
 #. A city in Florida in the United States
-#| msgid "Jacksonville"
 msgctxt "City in Florida, United States"
 msgid "Jacksonville"
 msgstr ""
 
 #. A city in Illinois in the United States
-#| msgid "Jacksonville"
 msgctxt "City in Illinois, United States"
 msgid "Jacksonville"
 msgstr ""
 
 #. A city in North Carolina in the United States
-#| msgid "Jacksonville"
 msgctxt "City in North Carolina, United States"
 msgid "Jacksonville"
 msgstr ""
 
 #. A city in Texas in the United States
-#| msgid "Jacksonville"
 msgctxt "City in Texas, United States"
 msgid "Jacksonville"
 msgstr ""
@@ -16361,13 +15200,11 @@ msgid "Jaffrey"
 msgstr "Jaffrey"
 
 #. A city in New York in the United States
-#| msgid "Jamestown"
 msgctxt "City in New York, United States"
 msgid "Jamestown"
 msgstr "DÅ¾eimstauna"
 
 #. A city in North Dakota in the United States
-#| msgid "Jamestown"
 msgctxt "City in North Dakota, United States"
 msgid "Jamestown"
 msgstr "DÅ¾eimstauna"
@@ -16377,7 +15214,6 @@ msgid "Janesville"
 msgstr "Janesville"
 
 #. A city in Texas in the United States
-#| msgid "Jasper"
 msgctxt "City in Texas, United States"
 msgid "Jasper"
 msgstr ""
@@ -16395,7 +15231,6 @@ msgid "Jerome"
 msgstr "Jerome"
 
 #. A city in New Jersey in the United States
-#| msgid "Traverse City"
 msgid "Jersey City"
 msgstr ""
 
@@ -16416,13 +15251,11 @@ msgid "Joplin"
 msgstr "Joplin"
 
 #. A city in Montana in the United States
-#| msgid "Jordan"
 msgctxt "City in Montana, United States"
 msgid "Jordan"
 msgstr "JordÄ?na"
 
 #. A city in New Jersey in the United States
-#| msgid "Clewiston"
 msgid "Juliustown"
 msgstr ""
 
@@ -16431,18 +15264,15 @@ msgid "Junction"
 msgstr "Junction"
 
 #. A city in Kansas in the United States
-#| msgid "Junction"
 msgid "Junction City"
 msgstr ""
 
 #. A city in Alaska in the United States
-#| msgid "Juneau"
 msgctxt "City in Alaska, United States"
 msgid "Juneau"
 msgstr ""
 
 #. A city in Wisconsin in the United States
-#| msgid "Juneau"
 msgctxt "City in Wisconsin, United States"
 msgid "Juneau"
 msgstr ""
@@ -16452,7 +15282,6 @@ msgid "Kahului"
 msgstr "Kahului"
 
 #. A city in Hawaii in the United States
-#| msgid "Kaikoura"
 msgid "Kailua"
 msgstr ""
 
@@ -16465,7 +15294,6 @@ msgid "Kake"
 msgstr "Kake"
 
 #. A city in Alaska in the United States
-#| msgid "Makkovik"
 msgid "Kaktovik"
 msgstr ""
 
@@ -16486,19 +15314,16 @@ msgid "Kankakee"
 msgstr "Kankakee"
 
 #. A city in Kansas in the United States
-#| msgid "Kansas City"
 msgctxt "City in Kansas, United States"
 msgid "Kansas City"
 msgstr "Kanzasa PilsÄ?ta"
 
 #. A city in Missouri in the United States
-#| msgid "Kansas City"
 msgctxt "City in Missouri, United States"
 msgid "Kansas City"
 msgstr "Kanzasa PilsÄ?ta"
 
 #. A city in Hawaii in the United States
-#| msgid "Ratmalana"
 msgid "Kaumalapau"
 msgstr ""
 
@@ -16571,7 +15396,6 @@ msgid "Kingman"
 msgstr "Kingman"
 
 #. A city in Tennessee in the United States
-#| msgid "Kingston"
 msgid "Kingsport"
 msgstr ""
 
@@ -16580,7 +15404,6 @@ msgid "Kingsville"
 msgstr "Kingsville"
 
 #. A city in Michigan in the United States
-#| msgid "Kinloss"
 msgid "Kinross"
 msgstr ""
 
@@ -16589,7 +15412,6 @@ msgid "Kinston"
 msgstr "Kinston"
 
 #. A city in Alaska in the United States
-#| msgid "Kindu"
 msgid "Kipnuk"
 msgstr ""
 
@@ -16610,18 +15432,15 @@ msgid "Klawock"
 msgstr "Klawock"
 
 #. A city in Missouri in the United States
-#| msgid "Wooster"
 msgid "Knob Noster"
 msgstr ""
 
 #. A city in Iowa in the United States
-#| msgid "Knoxville"
 msgctxt "City in Iowa, United States"
 msgid "Knoxville"
 msgstr ""
 
 #. A city in Tennessee in the United States
-#| msgid "Knoxville"
 msgctxt "City in Tennessee, United States"
 msgid "Knoxville"
 msgstr ""
@@ -16642,12 +15461,7 @@ msgstr "Kotzebue"
 msgid "Koyuk"
 msgstr "Koyuk"
 
-#. A city in Colorado in the United States
-msgid "Kremmling"
-msgstr "Kremmling"
-
 #. A city in Alaska in the United States
-#| msgid "Kuantan"
 msgid "Kustatan"
 msgstr ""
 
@@ -16660,13 +15474,11 @@ msgid "La Grande"
 msgstr "La Grande"
 
 #. A city in Georgia in the United States
-#| msgid "La Grange"
 msgctxt "City in Georgia, United States"
 msgid "La Grange"
 msgstr ""
 
 #. A city in Texas in the United States
-#| msgid "La Grange"
 msgctxt "City in Texas, United States"
 msgid "La Grange"
 msgstr ""
@@ -16680,7 +15492,6 @@ msgid "La Verne"
 msgstr "La Verne"
 
 #. A city in Colorado in the United States
-#| msgid "Las Vegas"
 msgid "La Veta"
 msgstr ""
 
@@ -16697,13 +15508,11 @@ msgid "Ladysmith"
 msgstr "Ladysmith"
 
 #. A city in Indiana in the United States
-#| msgid "Lafayette"
 msgctxt "City in Indiana, United States"
 msgid "Lafayette"
 msgstr ""
 
 #. A city in Louisiana in the United States
-#| msgid "Lafayette"
 msgctxt "City in Louisiana, United States"
 msgid "Lafayette"
 msgstr ""
@@ -16717,7 +15526,6 @@ msgid "Lake Charles"
 msgstr "Lake Charles"
 
 #. A city in Alaska in the United States
-#| msgid "Minchumina"
 msgid "Lake Minchumina"
 msgstr ""
 
@@ -16726,7 +15534,6 @@ msgid "Lakeland"
 msgstr "Lakeland"
 
 #. A city in Utah in the United States
-#| msgid "Lakeview"
 msgid "Lakeside"
 msgstr ""
 
@@ -16735,7 +15542,6 @@ msgid "Lakeview"
 msgstr "Lakeview"
 
 #. A city in Colorado in the United States
-#| msgid "Tacoma-Lakewood"
 msgid "Lakewood"
 msgstr ""
 
@@ -16752,25 +15558,21 @@ msgid "Lamoni"
 msgstr "Lamoni"
 
 #. A city in California in the United States
-#| msgid "Lancaster"
 msgctxt "City in California, United States"
 msgid "Lancaster"
 msgstr ""
 
 #. A city in Ohio in the United States
-#| msgid "Lancaster"
 msgctxt "City in Ohio, United States"
 msgid "Lancaster"
 msgstr ""
 
 #. A city in Pennsylvania in the United States
-#| msgid "Lancaster"
 msgctxt "City in Pennsylvania, United States"
 msgid "Lancaster"
 msgstr ""
 
 #. A city in Texas in the United States
-#| msgid "Lancaster"
 msgctxt "City in Texas, United States"
 msgid "Lancaster"
 msgstr ""
@@ -16800,13 +15602,11 @@ msgid "Las Cruces"
 msgstr "Las Cruces"
 
 #. A city in Nevada in the United States
-#| msgid "Las Vegas"
 msgctxt "City in Nevada, United States"
 msgid "Las Vegas"
 msgstr "Las Vegasa"
 
 #. A city in New Mexico in the United States
-#| msgid "Las Vegas"
 msgctxt "City in New Mexico, United States"
 msgid "Las Vegas"
 msgstr "Las Vegasa"
@@ -16816,25 +15616,21 @@ msgid "Latrobe"
 msgstr "Latrobe"
 
 #. A city in Kansas in the United States
-#| msgid "Lawrence"
 msgctxt "City in Kansas, United States"
 msgid "Lawrence"
 msgstr ""
 
 #. A city in Massachusetts in the United States
-#| msgid "Lawrence"
 msgctxt "City in Massachusetts, United States"
 msgid "Lawrence"
 msgstr ""
 
 #. A city in Georgia in the United States
-#| msgid "Lawrenceville"
 msgctxt "City in Georgia, United States"
 msgid "Lawrenceville"
 msgstr ""
 
 #. A city in Illinois in the United States
-#| msgid "Lawrenceville"
 msgctxt "City in Illinois, United States"
 msgid "Lawrenceville"
 msgstr ""
@@ -16852,19 +15648,16 @@ msgid "Leadville"
 msgstr "Leadville"
 
 #. A city in New Hampshire in the United States
-#| msgid "Lebanon"
 msgctxt "City in New Hampshire, United States"
 msgid "Lebanon"
 msgstr "LibÄ?na"
 
 #. A city in Florida in the United States
-#| msgid "Leesburg"
 msgctxt "City in Florida, United States"
 msgid "Leesburg"
 msgstr ""
 
 #. A city in Virginia in the United States
-#| msgid "Leesburg"
 msgctxt "City in Virginia, United States"
 msgid "Leesburg"
 msgstr ""
@@ -16890,19 +15683,16 @@ msgid "Lewistown"
 msgstr "Lewistown"
 
 #. A city in Kentucky in the United States
-#| msgid "Lexington"
 msgctxt "City in Kentucky, United States"
 msgid "Lexington"
 msgstr ""
 
 #. A city in Nebraska in the United States
-#| msgid "Lexington"
 msgctxt "City in Nebraska, United States"
 msgid "Lexington"
 msgstr ""
 
 #. A city in North Carolina in the United States
-#| msgid "Lexington"
 msgctxt "City in North Carolina, United States"
 msgid "Lexington"
 msgstr ""
@@ -16916,13 +15706,11 @@ msgid "Lihue"
 msgstr "Lihue"
 
 #. A city in Ohio in the United States
-#| msgid "Lima"
 msgctxt "City in Ohio, United States"
 msgid "Lima"
 msgstr "Lima"
 
 #. A city in Alaska in the United States
-#| msgid "The Villages"
 msgid "Lime Village"
 msgstr ""
 
@@ -16931,29 +15719,21 @@ msgid "Limon"
 msgstr "Limon"
 
 #. A city in Illinois in the United States
-#| msgid "Lincoln"
 msgctxt "City in Illinois, United States"
 msgid "Lincoln"
 msgstr ""
 
 #. A city in Nebraska in the United States
-#| msgid "Lincoln"
 msgctxt "City in Nebraska, United States"
 msgid "Lincoln"
 msgstr ""
 
-#. A city in North Carolina in the United States
-msgid "Lincolnton"
-msgstr "Lincolnton"
-
 #. A city in Illinois in the United States
-#| msgid "Litchfield"
 msgctxt "City in Illinois, United States"
 msgid "Litchfield"
 msgstr ""
 
 #. A city in Minnesota in the United States
-#| msgid "Litchfield"
 msgctxt "City in Minnesota, United States"
 msgid "Litchfield"
 msgstr ""
@@ -16963,7 +15743,6 @@ msgid "Little Falls"
 msgstr "Little Falls"
 
 #. A city in Arkansas in the United States
-#| msgid "Little Rock AFB"
 msgid "Little Rock"
 msgstr ""
 
@@ -16976,7 +15755,6 @@ msgid "Livingston"
 msgstr "Livingston"
 
 #. A city in Michigan in the United States
-#| msgid "Laconia"
 msgid "Livonia"
 msgstr ""
 
@@ -16993,7 +15771,6 @@ msgid "Lompoc"
 msgstr "Lompoc"
 
 #. A city in Kentucky in the United States
-#| msgid "London"
 msgctxt "City in Kentucky, United States"
 msgid "London"
 msgstr "Londona"
@@ -17043,13 +15820,11 @@ msgid "Lovelock"
 msgstr "Lovelock"
 
 #. A city in Idaho in the United States
-#| msgid "Lowell"
 msgctxt "City in Idaho, United States"
 msgid "Lowell"
 msgstr ""
 
 #. A city in Massachusetts in the United States
-#| msgid "Lowell"
 msgctxt "City in Massachusetts, United States"
 msgid "Lowell"
 msgstr ""
@@ -17079,7 +15854,6 @@ msgid "Lynchburg"
 msgstr "Lynchburg"
 
 #. A city in Michigan in the United States
-#| msgid "Macinac Island"
 msgid "Mackinac Island"
 msgstr ""
 
@@ -17096,19 +15870,16 @@ msgid "Madera"
 msgstr "Madera"
 
 #. A city in Minnesota in the United States
-#| msgid "Madison"
 msgctxt "City in Minnesota, United States"
 msgid "Madison"
 msgstr ""
 
 #. A city in Wisconsin in the United States
-#| msgid "Madison"
 msgctxt "City in Wisconsin, United States"
 msgid "Madison"
 msgstr ""
 
 #. A city in Idaho in the United States
-#| msgid "Malta"
 msgctxt "City in Idaho, United States"
 msgid "Malta"
 msgstr "Malta"
@@ -17118,7 +15889,6 @@ msgid "Manassas"
 msgstr "Manassas"
 
 #. A city in New Hampshire in the United States
-#| msgid "Manchester"
 msgctxt "City in New Hampshire, United States"
 msgid "Manchester"
 msgstr ""
@@ -17152,7 +15922,6 @@ msgid "Mansfield"
 msgstr "Mansfield"
 
 #. A city in North Carolina in the United States
-#| msgid "Mankato"
 msgid "Manteo"
 msgstr ""
 
@@ -17177,19 +15946,16 @@ msgid "Marietta"
 msgstr "Marietta"
 
 #. A city in Illinois in the United States
-#| msgid "Marion"
 msgctxt "City in Illinois, United States"
 msgid "Marion"
 msgstr ""
 
 #. A city in Ohio in the United States
-#| msgid "Marion"
 msgctxt "City in Ohio, United States"
 msgid "Marion"
 msgstr ""
 
 #. A city in Virginia in the United States
-#| msgid "Marion"
 msgctxt "City in Virginia, United States"
 msgid "Marion"
 msgstr ""
@@ -17199,13 +15965,11 @@ msgid "Marquette"
 msgstr "Marquette"
 
 #. A city in Michigan in the United States
-#| msgid "Marshall"
 msgctxt "City in Michigan, United States"
 msgid "Marshall"
 msgstr ""
 
 #. A city in Minnesota in the United States
-#| msgid "Marshall"
 msgctxt "City in Minnesota, United States"
 msgid "Marshall"
 msgstr ""
@@ -17227,13 +15991,11 @@ msgid "Martinsville"
 msgstr "Martinsville"
 
 #. A city in California in the United States
-#| msgid "Marysville"
 msgctxt "City in California, United States"
 msgid "Marysville"
 msgstr ""
 
 #. A city in Michigan in the United States
-#| msgid "Marysville"
 msgctxt "City in Michigan, United States"
 msgid "Marysville"
 msgstr ""
@@ -17291,7 +16053,6 @@ msgid "McGrath"
 msgstr "McGrath"
 
 #. A city in Minnesota in the United States
-#| msgid "Mc Gregor"
 msgid "McGregor"
 msgstr ""
 
@@ -17300,7 +16061,6 @@ msgid "McKinley Park"
 msgstr "McKinley Park"
 
 #. A city in Texas in the United States
-#| msgid "Mc Kinney"
 msgid "McKinney"
 msgstr ""
 
@@ -17317,13 +16077,11 @@ msgid "Meadville"
 msgstr "Meadville"
 
 #. A city in Oregon in the United States
-#| msgid "Medford"
 msgctxt "City in Oregon, United States"
 msgid "Medford"
 msgstr ""
 
 #. A city in Wisconsin in the United States
-#| msgid "Medford"
 msgctxt "City in Wisconsin, United States"
 msgid "Medford"
 msgstr ""
@@ -17341,7 +16099,6 @@ msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
 #. A city in Florida in the United States
-#| msgid "Melbourne"
 msgctxt "City in Florida, United States"
 msgid "Melbourne"
 msgstr ""
@@ -17403,13 +16160,11 @@ msgid "Metropolis"
 msgstr "Metropolis"
 
 #. A city in Florida in the United States
-#| msgid "Miami"
 msgctxt "City in Florida, United States"
 msgid "Miami"
 msgstr ""
 
 #. A city in Kentucky in the United States
-#| msgid "Hillsboro"
 msgid "Middlesboro"
 msgstr ""
 
@@ -17418,7 +16173,6 @@ msgid "Midland"
 msgstr "Midland"
 
 #. A city in Texas in the United States
-#| msgid "Midland"
 msgid "Midlothian"
 msgstr ""
 
@@ -17491,30 +16245,25 @@ msgid "Modesto"
 msgstr "Modesto"
 
 #. A city in Illinois in the United States
-#| msgid "Mosinee"
 msgid "Moline"
 msgstr ""
 
 #. A city in Louisiana in the United States
-#| msgid "Monroe"
 msgctxt "City in Louisiana, United States"
 msgid "Monroe"
 msgstr ""
 
 #. A city in Michigan in the United States
-#| msgid "Monroe"
 msgctxt "City in Michigan, United States"
 msgid "Monroe"
 msgstr ""
 
 #. A city in North Carolina in the United States
-#| msgid "Monroe"
 msgctxt "City in North Carolina, United States"
 msgid "Monroe"
 msgstr ""
 
 #. A city in Wisconsin in the United States
-#| msgid "Monroe"
 msgctxt "City in Wisconsin, United States"
 msgid "Monroe"
 msgstr ""
@@ -17532,43 +16281,31 @@ msgid "Monterey"
 msgstr "Monterey"
 
 #. A city in Minnesota in the United States
-#| msgid "Montevideo"
 msgctxt "City in Minnesota, United States"
 msgid "Montevideo"
 msgstr ""
 
 #. A city in Alabama in the United States
-#| msgid "Montgomery"
 msgctxt "City in Alabama, United States"
 msgid "Montgomery"
 msgstr ""
 
 #. A city in New York in the United States
-#| msgid "Montgomery"
 msgctxt "City in New York, United States"
 msgid "Montgomery"
 msgstr ""
 
 #. A city in Arkansas in the United States
-#| msgid "Monticello"
 msgctxt "City in Arkansas, United States"
 msgid "Monticello"
 msgstr ""
 
 #. A city in Iowa in the United States
-#| msgid "Monticello"
 msgctxt "City in Iowa, United States"
 msgid "Monticello"
 msgstr ""
 
-#. A city in Kentucky in the United States
-#| msgid "Monticello"
-msgctxt "City in Kentucky, United States"
-msgid "Monticello"
-msgstr ""
-
 #. A city in New York in the United States
-#| msgid "Monticello"
 msgctxt "City in New York, United States"
 msgid "Monticello"
 msgstr ""
@@ -17598,13 +16335,11 @@ msgid "Moriarty"
 msgstr "Moriarty"
 
 #. A city in Illinois in the United States
-#| msgid "Morris"
 msgctxt "City in Illinois, United States"
 msgid "Morris"
 msgstr ""
 
 #. A city in Minnesota in the United States
-#| msgid "Morris"
 msgctxt "City in Minnesota, United States"
 msgid "Morris"
 msgstr ""
@@ -17618,7 +16353,6 @@ msgid "Morrisville"
 msgstr "Morrisville"
 
 #. A city in Idaho in the United States
-#| msgid "Moscow"
 msgctxt "City in Idaho, United States"
 msgid "Moscow"
 msgstr ""
@@ -17652,19 +16386,16 @@ msgid "Mount Ida"
 msgstr "Mount Ida"
 
 #. A city in Iowa in the United States
-#| msgid "Mount Pleasant"
 msgctxt "City in Iowa, United States"
 msgid "Mount Pleasant"
 msgstr ""
 
 #. A city in Michigan in the United States
-#| msgid "Mount Pleasant"
 msgctxt "City in Michigan, United States"
 msgid "Mount Pleasant"
 msgstr ""
 
 #. A city in Texas in the United States
-#| msgid "Mount Pleasant"
 msgctxt "City in Texas, United States"
 msgid "Mount Pleasant"
 msgstr ""
@@ -17686,13 +16417,11 @@ msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
 #. A city in Arkansas in the United States
-#| msgid "Mountain Home"
 msgctxt "City in Arkansas, United States"
 msgid "Mountain Home"
 msgstr ""
 
 #. A city in Idaho in the United States
-#| msgid "Mountain Home"
 msgctxt "City in Idaho, United States"
 msgid "Mountain Home"
 msgstr ""
@@ -17702,7 +16431,6 @@ msgid "Mountain View"
 msgstr "Mountain View"
 
 #. A city in Kentucky in the United States
-#| msgid "Mildura"
 msgid "Muldraugh"
 msgstr ""
 
@@ -17715,7 +16443,6 @@ msgid "Muncie"
 msgstr "Muncie"
 
 #. A city in Michigan in the United States
-#| msgid "Kunming"
 msgid "Munising"
 msgstr ""
 
@@ -17756,12 +16483,10 @@ msgid "Napa"
 msgstr "Napa"
 
 #. A city in Illinois in the United States
-#| msgid "Waterville"
 msgid "Naperville"
 msgstr ""
 
 #. A city in Florida in the United States
-#| msgid "Naples"
 msgctxt "City in Florida, United States"
 msgid "Naples"
 msgstr ""
@@ -17807,7 +16532,6 @@ msgid "New Braunfels"
 msgstr "New Braunfels"
 
 #. A city in Pennsylvania in the United States
-#| msgid "New Castles"
 msgid "New Castle"
 msgstr ""
 
@@ -17831,13 +16555,7 @@ msgstr "New Philadelphia"
 msgid "New Richmond"
 msgstr "New Richmond"
 
-#. A city in Rhode Island in the United States
-#| msgid "Shoreham"
-msgid "New Shoreham"
-msgstr ""
-
 #. A city in Florida in the United States
-#| msgid "Newport Beach"
 msgid "New Smyrna Beach"
 msgstr ""
 
@@ -17846,19 +16564,16 @@ msgid "New Ulm"
 msgstr "New Ulm"
 
 #. A city in New York in the United States
-#| msgid "New York"
 msgctxt "City in New York, United States"
 msgid "New York"
 msgstr ""
 
 #. A city in New Jersey in the United States
-#| msgid "Newark"
 msgctxt "City in New Jersey, United States"
 msgid "Newark"
 msgstr ""
 
 #. A city in Ohio in the United States
-#| msgid "Newark"
 msgctxt "City in Ohio, United States"
 msgid "Newark"
 msgstr ""
@@ -17872,7 +16587,6 @@ msgid "Newburgh"
 msgstr "Newburgh"
 
 #. A city in Alaska in the United States
-#| msgid "Newhall"
 msgid "Newhalen"
 msgstr ""
 
@@ -17885,19 +16599,16 @@ msgid "Newnan"
 msgstr "Newnan"
 
 #. A city in Arkansas in the United States
-#| msgid "Newport"
 msgctxt "City in Arkansas, United States"
 msgid "Newport"
 msgstr ""
 
 #. A city in Oregon in the United States
-#| msgid "Newport"
 msgctxt "City in Oregon, United States"
 msgid "Newport"
 msgstr ""
 
 #. A city in Rhode Island in the United States
-#| msgid "Newport"
 msgctxt "City in Rhode Island, United States"
 msgid "Newport"
 msgstr ""
@@ -17927,13 +16638,11 @@ msgid "Nome"
 msgstr "Nome"
 
 #. A city in Nebraska in the United States
-#| msgid "Norfolk"
 msgctxt "City in Nebraska, United States"
 msgid "Norfolk"
 msgstr ""
 
 #. A city in Virginia in the United States
-#| msgid "Norfolk"
 msgctxt "City in Virginia, United States"
 msgid "Norfolk"
 msgstr ""
@@ -17955,7 +16664,6 @@ msgid "North Las Vegas"
 msgstr "North Las Vegas"
 
 #. A city in South Carolina in the United States
-#| msgid "N Myrtle Beach"
 msgid "North Myrtle Beach"
 msgstr ""
 
@@ -17972,7 +16680,6 @@ msgid "Northway"
 msgstr "Northway"
 
 #. A city in California in the United States
-#| msgid "Norway"
 msgid "Norwalk"
 msgstr ""
 
@@ -18025,7 +16732,6 @@ msgid "Odessa"
 msgstr "Odesa"
 
 #. A city in Iowa in the United States
-#| msgid "Oelwen"
 msgid "Oelwein"
 msgstr ""
 
@@ -18062,7 +16768,6 @@ msgid "Olivia"
 msgstr "Olivia"
 
 #. A city in Illinois in the United States
-#| msgid "Orly"
 msgid "Olney"
 msgstr ""
 
@@ -18079,37 +16784,31 @@ msgid "Omak"
 msgstr "Omak"
 
 #. A city in California in the United States
-#| msgid "Ontario"
 msgctxt "City in California, United States"
 msgid "Ontario"
 msgstr ""
 
 #. A city in Oregon in the United States
-#| msgid "Ontario"
 msgctxt "City in Oregon, United States"
 msgid "Ontario"
 msgstr ""
 
 #. A city in California in the United States
-#| msgid "Orange"
 msgctxt "City in California, United States"
 msgid "Orange"
 msgstr "OranÅ¾a"
 
 #. A city in Massachusetts in the United States
-#| msgid "Orange"
 msgctxt "City in Massachusetts, United States"
 msgid "Orange"
 msgstr "OranÅ¾a"
 
 #. A city in Texas in the United States
-#| msgid "Orange"
 msgctxt "City in Texas, United States"
 msgid "Orange"
 msgstr "OranÅ¾a"
 
 #. A city in Virginia in the United States
-#| msgid "Orange"
 msgctxt "City in Virginia, United States"
 msgid "Orange"
 msgstr "OranÅ¾a"
@@ -18123,7 +16822,6 @@ msgid "Orangeburg"
 msgstr "Orangeburg"
 
 #. A city in Nebraska in the United States
-#| msgid "Ohrid"
 msgid "Ord"
 msgstr ""
 
@@ -18132,7 +16830,6 @@ msgid "Orlando"
 msgstr "Orlando"
 
 #. A city in Florida in the United States
-#| msgid "Long Beach"
 msgid "Ormond Beach"
 msgstr ""
 
@@ -18169,7 +16866,6 @@ msgid "Ottumwa"
 msgstr "Ottumwa"
 
 #. A city in Kansas in the United States
-#| msgid "Central Park"
 msgid "Overland Park"
 msgstr ""
 
@@ -18182,24 +16878,20 @@ msgid "Owensboro"
 msgstr "Owensboro"
 
 #. A city in Michigan in the United States
-#| msgid "Rosso"
 msgid "Owosso"
 msgstr ""
 
 #. A city in Connecticut in the United States
-#| msgid "Oxford"
 msgctxt "City in Connecticut, United States"
 msgid "Oxford"
 msgstr ""
 
 #. A city in Mississippi in the United States
-#| msgid "Oxford"
 msgctxt "City in Mississippi, United States"
 msgid "Oxford"
 msgstr ""
 
 #. A city in North Carolina in the United States
-#| msgid "Oxford"
 msgctxt "City in North Carolina, United States"
 msgid "Oxford"
 msgstr ""
@@ -18257,13 +16949,11 @@ msgid "Panama City"
 msgstr "Panama City"
 
 #. A city in Illinois in the United States
-#| msgid "Paris"
 msgctxt "City in Illinois, United States"
 msgid "Paris"
 msgstr ""
 
 #. A city in Texas in the United States
-#| msgid "Paris"
 msgctxt "City in Texas, United States"
 msgid "Paris"
 msgstr ""
@@ -18281,13 +16971,11 @@ msgid "Parsons"
 msgstr "Parsons"
 
 #. A city in California in the United States
-#| msgid "Parana"
 msgctxt "City in California, United States"
 msgid "Pasadena"
 msgstr ""
 
 #. A city in Texas in the United States
-#| msgid "Parana"
 msgctxt "City in Texas, United States"
 msgid "Pasadena"
 msgstr ""
@@ -18305,7 +16993,6 @@ msgid "Paso Robles"
 msgstr "Paso Robles"
 
 #. A city in New Jersey in the United States
-#| msgid "Patterson"
 msgid "Paterson"
 msgstr ""
 
@@ -18314,7 +17001,6 @@ msgid "Patterson"
 msgstr "Patterson"
 
 #. A city in Maryland in the United States
-#| msgid "Patuxent River"
 msgid "Patuxent"
 msgstr ""
 
@@ -18335,7 +17021,6 @@ msgid "Paynesville"
 msgstr "Paynesville"
 
 #. A city in Louisiana in the United States
-#| msgid "Paxson"
 msgid "Peason"
 msgstr ""
 
@@ -18352,7 +17037,6 @@ msgid "Pellston"
 msgstr "Pellston"
 
 #. A city in Florida in the United States
-#| msgid "Puerto Princesa"
 msgid "Pembroke Pines"
 msgstr ""
 
@@ -18369,19 +17053,16 @@ msgid "Pensacola"
 msgstr "Pensacola"
 
 #. A city in Arizona in the United States
-#| msgid "Peoria"
 msgctxt "City in Arizona, United States"
 msgid "Peoria"
 msgstr ""
 
 #. A city in Illinois in the United States
-#| msgid "Peoria"
 msgctxt "City in Illinois, United States"
 msgid "Peoria"
 msgstr ""
 
 #. A city in Florida in the United States
-#| msgid "Perryton"
 msgid "Perry"
 msgstr ""
 
@@ -18390,31 +17071,26 @@ msgid "Perryton"
 msgstr "Perryton"
 
 #. A city in Illinois in the United States
-#| msgid "Peru"
 msgctxt "City in Illinois, United States"
 msgid "Peru"
 msgstr ""
 
 #. A city in Indiana in the United States
-#| msgid "Peru"
 msgctxt "City in Indiana, United States"
 msgid "Peru"
 msgstr ""
 
 #. A city in Alaska in the United States
-#| msgid "Petersburg"
 msgctxt "City in Alaska, United States"
 msgid "Petersburg"
 msgstr ""
 
 #. A city in Virginia in the United States
-#| msgid "Petersburg"
 msgctxt "City in Virginia, United States"
 msgid "Petersburg"
 msgstr ""
 
 #. A city in West Virginia in the United States
-#| msgid "Petersburg"
 msgctxt "City in West Virginia, United States"
 msgid "Petersburg"
 msgstr ""
@@ -18456,12 +17132,10 @@ msgid "Pine Springs"
 msgstr "Pine Springs"
 
 #. A city in Wyoming in the United States
-#| msgid "Sindal"
 msgid "Pinedale"
 msgstr ""
 
 #. A city in North Carolina in the United States
-#| msgid "Lakehurst"
 msgid "Pinehurst"
 msgstr ""
 
@@ -18474,19 +17148,16 @@ msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
 #. A city in Illinois in the United States
-#| msgid "Pittsfield"
 msgctxt "City in Illinois, United States"
 msgid "Pittsfield"
 msgstr ""
 
 #. A city in Massachusetts in the United States
-#| msgid "Pittsfield"
 msgctxt "City in Massachusetts, United States"
 msgid "Pittsfield"
 msgstr ""
 
 #. A city in Oregon in the United States
-#| msgid "Palmer"
 msgid "Placer"
 msgstr ""
 
@@ -18495,7 +17166,6 @@ msgid "Plainview"
 msgstr "Plainview"
 
 #. A city in Texas in the United States
-#| msgid "Llano"
 msgid "Plano"
 msgstr ""
 
@@ -18508,18 +17178,15 @@ msgid "Plattsburgh"
 msgstr "Plattsburgh"
 
 #. A city in Nebraska in the United States
-#| msgid "Portsmouth"
 msgid "Plattsmouth"
 msgstr ""
 
 #. A city in Massachusetts in the United States
-#| msgid "Plymouth"
 msgctxt "City in Massachusetts, United States"
 msgid "Plymouth"
 msgstr ""
 
 #. A city in New Hampshire in the United States
-#| msgid "Plymouth"
 msgctxt "City in New Hampshire, United States"
 msgid "Plymouth"
 msgstr ""
@@ -18529,7 +17196,6 @@ msgid "Pocatello"
 msgstr "Pocatello"
 
 #. A city in Virginia in the United States
-#| msgid "Bohicon"
 msgid "Pohick"
 msgstr ""
 
@@ -18546,7 +17212,6 @@ msgid "Point Pleasant"
 msgstr "Point Pleasant"
 
 #. A city in California in the United States
-#| msgid "Ponza"
 msgid "Pomona"
 msgstr ""
 
@@ -18559,13 +17224,11 @@ msgid "Ponca City"
 msgstr "Ponca City"
 
 #. A city in Illinois in the United States
-#| msgid "Pontiac"
 msgctxt "City in Illinois, United States"
 msgid "Pontiac"
 msgstr ""
 
 #. A city in Michigan in the United States
-#| msgid "Pontiac"
 msgctxt "City in Michigan, United States"
 msgid "Pontiac"
 msgstr ""
@@ -18611,25 +17274,21 @@ msgid "Porterville"
 msgstr "Porterville"
 
 #. A city in Maine in the United States
-#| msgid "Portland"
 msgctxt "City in Maine, United States"
 msgid "Portland"
 msgstr ""
 
 #. A city in Oregon in the United States
-#| msgid "Portland"
 msgctxt "City in Oregon, United States"
 msgid "Portland"
 msgstr ""
 
 #. A city in New Hampshire in the United States
-#| msgid "Portsmouth"
 msgctxt "City in New Hampshire, United States"
 msgid "Portsmouth"
 msgstr ""
 
 #. A city in Virginia in the United States
-#| msgid "Portsmouth"
 msgctxt "City in Virginia, United States"
 msgid "Portsmouth"
 msgstr ""
@@ -18647,7 +17306,6 @@ msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
 #. A city in Wisconsin in the United States
-#| msgid "Prairie Du Chien"
 msgid "Prairie du Chien"
 msgstr ""
 
@@ -18668,12 +17326,10 @@ msgid "Preston"
 msgstr "Preston"
 
 #. A city in Utah in the United States
-#| msgid "Principe"
 msgid "Price"
 msgstr ""
 
 #. A city in Minnesota in the United States
-#| msgid "Princeton"
 msgctxt "City in Minnesota, United States"
 msgid "Princeton"
 msgstr ""
@@ -18754,11 +17410,6 @@ msgstr "Reading"
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#. A city in Colorado in the United States
-#| msgid "Red Bluff"
-msgid "Red Cliff"
-msgstr ""
-
 #. A city in Iowa in the United States
 msgid "Red Oak"
 msgstr "Red Oak"
@@ -18800,11 +17451,6 @@ msgid "Rice Lake"
 msgstr "Rice Lake"
 
 #. A city in Virginia in the United States
-msgid "Richlands"
-msgstr "Richlands"
-
-#. A city in Virginia in the United States
-#| msgid "Richmond"
 msgctxt "City in Virginia, United States"
 msgid "Richmond"
 msgstr ""
@@ -18829,11 +17475,6 @@ msgstr "Roanoke"
 msgid "Roanoke Rapids"
 msgstr "Roanoke Rapids"
 
-#. A city in Missouri in the United States
-#| msgid "Elberton"
-msgid "Robertson"
-msgstr ""
-
 #. A city in Illinois in the United States
 msgid "Robinson"
 msgstr "Robinson"
@@ -18843,19 +17484,16 @@ msgid "Rochelle"
 msgstr "Rochelle"
 
 #. A city in Minnesota in the United States
-#| msgid "Rochester"
 msgctxt "City in Minnesota, United States"
 msgid "Rochester"
 msgstr ""
 
 #. A city in New Hampshire in the United States
-#| msgid "Rochester"
 msgctxt "City in New Hampshire, United States"
 msgid "Rochester"
 msgstr ""
 
 #. A city in New York in the United States
-#| msgid "Rochester"
 msgctxt "City in New York, United States"
 msgid "Rochester"
 msgstr ""
@@ -18889,7 +17527,6 @@ msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
 #. A city in North Carolina in the United States
-#| msgid "Rome"
 msgid "Roe"
 msgstr ""
 
@@ -18898,30 +17535,25 @@ msgid "Rogers"
 msgstr "Rogers"
 
 #. A city in Michigan in the United States
-#| msgid "Dodge City"
 msgid "Rogers City"
 msgstr ""
 
 #. A city in Georgia in the United States
-#| msgid "Rome"
 msgctxt "City in Georgia, United States"
 msgid "Rome"
 msgstr ""
 
 #. A city in New York in the United States
-#| msgid "Rome"
 msgctxt "City in New York, United States"
 msgid "Rome"
 msgstr ""
 
 #. A city in Oregon in the United States
-#| msgid "Rome"
 msgctxt "City in Oregon, United States"
 msgid "Rome"
 msgstr ""
 
 #. A city in Minnesota in the United States
-#| msgid "Roseau"
 msgctxt "City in Minnesota, United States"
 msgid "Roseau"
 msgstr ""
@@ -18939,7 +17571,6 @@ msgid "Roxboro"
 msgstr "Roxboro"
 
 #. A city in New Mexico in the United States
-#| msgid "Rosso"
 msgid "Ruidoso"
 msgstr ""
 
@@ -18963,10 +17594,6 @@ msgstr "Ruston"
 msgid "Rutland"
 msgstr "Rutland"
 
-#. A city in Texas in the United States
-msgid "Sabine Pass"
-msgstr "Sabine Pass"
-
 #. A city in California in the United States
 msgid "Sacramento"
 msgstr "Sacramento"
@@ -18984,61 +17611,50 @@ msgid "Saguache"
 msgstr "Saguache"
 
 #. A city in Minnesota in the United States
-#| msgid "St Cloud"
 msgid "Saint Cloud"
 msgstr ""
 
 #. A city in Alaska in the United States
-#| msgid "St. George"
 msgctxt "City in Alaska, United States"
 msgid "Saint George"
 msgstr ""
 
 #. A city in Michigan in the United States
-#| msgid "St. James"
 msgctxt "City in Michigan, United States"
 msgid "Saint James"
 msgstr ""
 
 #. A city in Minnesota in the United States
-#| msgid "St. James"
 msgctxt "City in Minnesota, United States"
 msgid "Saint James"
 msgstr ""
 
 #. A city in Arizona in the United States
-#| msgid "Saint John"
 msgid "Saint Johns"
 msgstr ""
 
 #. A city in Vermont in the United States
-#| msgid "St Johnsbury"
 msgid "Saint Johnsbury"
 msgstr ""
 
 #. A city in Alaska in the United States
-#| msgid "San Marcos"
 msgid "Saint Marys"
 msgstr ""
 
 #. A city in Maryland in the United States
-#| msgid "Saint Maarten"
 msgid "Saint Marys City"
 msgstr ""
 
 #. A city in Alaska in the United States
-#| msgid "St Paul"
 msgid "Saint Paul"
 msgstr ""
 
 #. A city in Illinois in the United States
-#| msgid "Salem"
 msgctxt "City in Illinois, United States"
 msgid "Salem"
 msgstr ""
 
 #. A city in Oregon in the United States
-#| msgid "Salem"
 msgctxt "City in Oregon, United States"
 msgid "Salem"
 msgstr ""
@@ -19056,13 +17672,11 @@ msgid "Salinas"
 msgstr "Salinas"
 
 #. A city in Maryland in the United States
-#| msgid "Salisbury"
 msgctxt "City in Maryland, United States"
 msgid "Salisbury"
 msgstr ""
 
 #. A city in North Carolina in the United States
-#| msgid "Salisbury"
 msgctxt "City in North Carolina, United States"
 msgid "Salisbury"
 msgstr ""
@@ -19088,7 +17702,6 @@ msgid "San Antonio"
 msgstr "San Antonio"
 
 #. A city in California in the United States
-#| msgid "San Fernando"
 msgid "San Bernardino"
 msgstr ""
 
@@ -19133,13 +17746,11 @@ msgid "Sandwich"
 msgstr "Sandwich"
 
 #. A city in Maine in the United States
-#| msgid "Sanford"
 msgctxt "City in Maine, United States"
 msgid "Sanford"
 msgstr ""
 
 #. A city in North Carolina in the United States
-#| msgid "Sanford"
 msgctxt "City in North Carolina, United States"
 msgid "Sanford"
 msgstr ""
@@ -19153,13 +17764,11 @@ msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
 #. A city in California in the United States
-#| msgid "Santa Clara"
 msgctxt "City in California, United States"
 msgid "Santa Clara"
 msgstr ""
 
 #. A city in Utah in the United States
-#| msgid "Santa Clara"
 msgctxt "City in Utah, United States"
 msgid "Santa Clara"
 msgstr ""
@@ -19169,7 +17778,6 @@ msgid "Santa Fe"
 msgstr "Santa Fe"
 
 #. A city in California in the United States
-#| msgid "Santa Maria"
 msgctxt "City in California, United States"
 msgid "Santa Maria"
 msgstr ""
@@ -19207,7 +17815,6 @@ msgid "Savoonga"
 msgstr "Savoonga"
 
 #. A city in Alaska in the United States
-#| msgid "Scampton"
 msgid "Scammon Bay"
 msgstr ""
 
@@ -19248,13 +17855,11 @@ msgid "Selinsgrove"
 msgstr "Selinsgrove"
 
 #. A city in Oklahoma in the United States
-#| msgid "Seminole"
 msgctxt "City in Oklahoma, United States"
 msgid "Seminole"
 msgstr ""
 
 #. A city in Texas in the United States
-#| msgid "Seminole"
 msgctxt "City in Texas, United States"
 msgid "Seminole"
 msgstr ""
@@ -19296,7 +17901,6 @@ msgid "Sheridan"
 msgstr "Sheridan"
 
 #. A city in Texas in the United States
-#| msgid "Sheridan"
 msgid "Sherman"
 msgstr ""
 
@@ -19317,19 +17921,16 @@ msgid "Shreveport"
 msgstr "Shreveport"
 
 #. A city in Montana in the United States
-#| msgid "Sidney"
 msgctxt "City in Montana, United States"
 msgid "Sidney"
 msgstr ""
 
 #. A city in Nebraska in the United States
-#| msgid "Sidney"
 msgctxt "City in Nebraska, United States"
 msgid "Sidney"
 msgstr ""
 
 #. A city in Arizona in the United States
-#| msgid "Boa Vista"
 msgid "Sierra Vista"
 msgstr ""
 
@@ -19346,7 +17947,6 @@ msgid "Silver City"
 msgstr "Silver City"
 
 #. A city in California in the United States
-#| msgid "Valley"
 msgid "Simi Valley"
 msgstr ""
 
@@ -19375,7 +17975,6 @@ msgid "Skagway"
 msgstr "Skagway"
 
 #. A city in Minnesota in the United States
-#| msgid "Clayton"
 msgid "Slayton"
 msgstr ""
 
@@ -19416,7 +18015,6 @@ msgid "Somerville"
 msgstr "Somerville"
 
 #. A city in Texas in the United States
-#| msgid "Sonora"
 msgctxt "City in Texas, United States"
 msgid "Sonora"
 msgstr "Sonora"
@@ -19426,7 +18024,6 @@ msgid "South Bend"
 msgstr "South Bend"
 
 #. A city in Michigan in the United States
-#| msgid "South Bend"
 msgid "South Haven"
 msgstr ""
 
@@ -19435,18 +18032,15 @@ msgid "South Hill"
 msgstr "South Hill"
 
 #. A city in California in the United States
-#| msgid "Lake Tahoe"
 msgid "South Lake Tahoe"
 msgstr ""
 
 #. A city in Illinois in the United States
-#| msgid "Sparta"
 msgctxt "City in Illinois, United States"
 msgid "Sparta"
 msgstr "Sparta"
 
 #. A city in Wisconsin in the United States
-#| msgid "Sparta"
 msgctxt "City in Wisconsin, United States"
 msgid "Sparta"
 msgstr "Sparta"
@@ -19456,7 +18050,6 @@ msgid "Spencer"
 msgstr "Spencer"
 
 #. A city in Texas in the United States
-#| msgid "Safford"
 msgid "Spofford"
 msgstr ""
 
@@ -19469,69 +18062,64 @@ msgid "Springdale"
 msgstr "Springdale"
 
 #. A city in Colorado in the United States
-#| msgid "Springfield"
 msgctxt "City in Colorado, United States"
 msgid "Springfield"
 msgstr ""
 
 #. A city in Florida in the United States
-#| msgid "Springfield"
 msgctxt "City in Florida, United States"
 msgid "Springfield"
 msgstr ""
 
 #. A city in Illinois in the United States
-#| msgid "Springfield"
 msgctxt "City in Illinois, United States"
 msgid "Springfield"
 msgstr ""
 
 #. A city in Massachusetts in the United States
-#| msgid "Springfield"
 msgctxt "City in Massachusetts, United States"
 msgid "Springfield"
 msgstr ""
 
 #. A city in Missouri in the United States
-#| msgid "Springfield"
 msgctxt "City in Missouri, United States"
 msgid "Springfield"
 msgstr ""
 
 #. A city in Ohio in the United States
-#| msgid "Springfield"
 msgctxt "City in Ohio, United States"
 msgid "Springfield"
 msgstr ""
 
 #. A city in Vermont in the United States
-#| msgid "Springfield"
 msgctxt "City in Vermont, United States"
 msgid "Springfield"
 msgstr ""
 
+#. A city in Missouri in the United States
+#, fuzzy
+#| msgid "Saint-Louis"
+msgid "St. Louis"
+msgstr "Saint-Louis"
+
 #. A city in Virginia in the United States
 msgid "Stafford"
 msgstr "Stafford"
 
 #. A city in Connecticut in the United States
-#| msgid "Stafford"
 msgid "Stamford"
 msgstr ""
 
 #. A city in Washington in the United States
-#| msgid "Stampede Pass"
 msgid "Stampede"
 msgstr ""
 
 #. A city in Idaho in the United States
-#| msgid "Stanley"
 msgctxt "City in Idaho, United States"
 msgid "Stanley"
 msgstr ""
 
 #. A city in Minnesota in the United States
-#| msgid "Staunton"
 msgid "Stanton"
 msgstr ""
 
@@ -19560,13 +18148,11 @@ msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
 #. A city in Texas in the United States
-#| msgid "Stephenville"
 msgctxt "City in Texas, United States"
 msgid "Stephenville"
 msgstr ""
 
 #. A city in Illinois in the United States
-#| msgid "Mount Sterling"
 msgid "Sterling"
 msgstr ""
 
@@ -19583,7 +18169,6 @@ msgid "Stillwater"
 msgstr "Stillwater"
 
 #. A city in California in the United States
-#| msgid "Stockton"
 msgctxt "City in California, United States"
 msgid "Stockton"
 msgstr ""
@@ -19605,7 +18190,6 @@ msgid "Sturgis"
 msgstr "Sturgis"
 
 #. A city in Arkansas in the United States
-#| msgid "Stuttgart"
 msgctxt "City in Arkansas, United States"
 msgid "Stuttgart"
 msgstr ""
@@ -19619,7 +18203,6 @@ msgid "Sulphur Springs"
 msgstr "Sulphur Springs"
 
 #. A city in California in the United States
-#| msgid "Susanville"
 msgid "Sunnyvale"
 msgstr ""
 
@@ -19632,13 +18215,11 @@ msgid "Sussex"
 msgstr "Sussex"
 
 #. A city in Alaska in the United States
-#| msgid "Sutton"
 msgctxt "City in Alaska, United States"
 msgid "Sutton"
 msgstr ""
 
 #. A city in West Virginia in the United States
-#| msgid "Sutton"
 msgctxt "City in West Virginia, United States"
 msgid "Sutton"
 msgstr ""
@@ -19664,7 +18245,6 @@ msgid "Tahlequah"
 msgstr "Tahlequah"
 
 #. A city in Alaska in the United States
-#| msgid "Talkeetna"
 msgid "Takotna"
 msgstr ""
 
@@ -19689,14 +18269,9 @@ msgid "Taos"
 msgstr "Taos"
 
 #. A city in Colorado in the United States
-#| msgid "Carroll"
 msgid "Tarryall"
 msgstr ""
 
-#. A city in Massachusetts in the United States
-msgid "Taunton"
-msgstr "Taunton"
-
 #. A city in Illinois in the United States
 msgid "Taylorville"
 msgstr "Taylorville"
@@ -19710,7 +18285,6 @@ msgid "Telluride"
 msgstr "Telluride"
 
 #. A city in Arizona in the United States
-#| msgid "Temple"
 msgid "Tempe"
 msgstr ""
 
@@ -19759,12 +18333,10 @@ msgid "Thomson"
 msgstr "Thomson"
 
 #. A city in California in the United States
-#| msgid "Land O' Lakes"
 msgid "Thousand Oaks"
 msgstr ""
 
 #. A city in Washington in the United States
-#| msgid "Dilli"
 msgid "Tillicum"
 msgstr ""
 
@@ -19777,7 +18349,6 @@ msgid "Titusville"
 msgstr "Titusville"
 
 #. A city in Alaska in the United States
-#| msgid "Tonga"
 msgid "Togiak"
 msgstr ""
 
@@ -19818,25 +18389,21 @@ msgid "Traverse City"
 msgstr "Traverse City"
 
 #. A city in New Jersey in the United States
-#| msgid "Trenton"
 msgctxt "City in New Jersey, United States"
 msgid "Trenton"
 msgstr ""
 
 #. A city in Colorado in the United States
-#| msgid "Trinidad"
 msgctxt "City in Colorado, United States"
 msgid "Trinidad"
 msgstr ""
 
 #. A city in Alabama in the United States
-#| msgid "Troy"
 msgctxt "City in Alabama, United States"
 msgid "Troy"
 msgstr ""
 
 #. A city in Michigan in the United States
-#| msgid "Troy"
 msgctxt "City in Michigan, United States"
 msgid "Troy"
 msgstr ""
@@ -19862,7 +18429,6 @@ msgid "Tulsa"
 msgstr "Tulsa"
 
 #. A city in Mississippi in the United States
-#| msgid "Tunisia"
 msgid "Tunica"
 msgstr ""
 
@@ -19903,12 +18469,10 @@ msgid "Unalaska"
 msgstr "Unalaska"
 
 #. A city in Missouri in the United States
-#| msgid "Arctic Village"
 msgid "Unity Village"
 msgstr ""
 
 #. A city in Texas in the United States
-#| msgid "Intercostal City"
 msgid "Universal City"
 msgstr ""
 
@@ -19933,18 +18497,15 @@ msgid "Valentine"
 msgstr "Valentine"
 
 #. A city in California in the United States
-#| msgid "Valley"
 msgid "Vallejo"
 msgstr ""
 
 #. A city in Florida in the United States
-#| msgid "Valparaiso"
 msgctxt "City in Florida, United States"
 msgid "Valparaiso"
 msgstr ""
 
 #. A city in Indiana in the United States
-#| msgid "Valparaiso"
 msgctxt "City in Indiana, United States"
 msgid "Valparaiso"
 msgstr ""
@@ -19954,13 +18515,11 @@ msgid "Van Nuys"
 msgstr "Van Nuys"
 
 #. A city in Washington in the United States
-#| msgid "Vancouver"
 msgctxt "City in Washington, United States"
 msgid "Vancouver"
 msgstr ""
 
 #. A city in California in the United States
-#| msgid "Central"
 msgid "Ventura"
 msgstr ""
 
@@ -19969,7 +18528,6 @@ msgid "Vernal"
 msgstr "Vernal"
 
 #. A city in Texas in the United States
-#| msgid "Vernon"
 msgctxt "City in Texas, United States"
 msgid "Vernon"
 msgstr ""
@@ -19979,7 +18537,6 @@ msgid "Vero Beach"
 msgstr "Vero Beach"
 
 #. A city in Missouri in the United States
-#| msgid "Vichy"
 msgctxt "City in Missouri, United States"
 msgid "Vichy"
 msgstr ""
@@ -19989,13 +18546,11 @@ msgid "Vicksburg"
 msgstr "Vicksburg"
 
 #. A city in Texas in the United States
-#| msgid "Victoria"
 msgctxt "City in Texas, United States"
 msgid "Victoria"
 msgstr ""
 
 #. A city in California in the United States
-#| msgid "Victoria"
 msgid "Victorville"
 msgstr ""
 
@@ -20004,12 +18559,10 @@ msgid "Vidalia"
 msgstr "Vidalia"
 
 #. A city in Florida in the United States
-#| msgid "Solana Beach"
 msgid "Vilano Beach"
 msgstr ""
 
 #. A city in Massachusetts in the United States
-#| msgid "Winter Haven"
 msgid "Vineyard Haven"
 msgstr ""
 
@@ -20034,7 +18587,6 @@ msgid "Wadena"
 msgstr "Wadena"
 
 #. A city in North Carolina in the United States
-#| msgid "Waynesboro"
 msgid "Wadesboro"
 msgstr ""
 
@@ -20043,7 +18595,6 @@ msgid "WahiawÄ?"
 msgstr ""
 
 #. A city in North Dakota in the United States
-#| msgid "Wheaton"
 msgid "Wahpeton"
 msgstr ""
 
@@ -20072,7 +18623,6 @@ msgid "Warner Robins"
 msgstr "Warner Robins"
 
 #. A city in Michigan in the United States
-#| msgid "Barre"
 msgid "Warren"
 msgstr ""
 
@@ -20081,7 +18631,6 @@ msgid "Warroad"
 msgstr "Warroad"
 
 #. A city in Indiana in the United States
-#| msgid "Warsaw"
 msgctxt "City in Indiana, United States"
 msgid "Warsaw"
 msgstr ""
@@ -20091,25 +18640,21 @@ msgid "Waseca"
 msgstr "Waseca"
 
 #. The capital of the United States
-#| msgid "Washington"
 msgctxt "City in District of Columbia, United States"
 msgid "Washington"
 msgstr ""
 
 #. A city in Iowa in the United States
-#| msgid "Washington"
 msgctxt "City in Iowa, United States"
 msgid "Washington"
 msgstr ""
 
 #. A city in North Carolina in the United States
-#| msgid "Washington"
 msgctxt "City in North Carolina, United States"
 msgid "Washington"
 msgstr ""
 
 #. A city in Pennsylvania in the United States
-#| msgid "Washington"
 msgctxt "City in Pennsylvania, United States"
 msgid "Washington"
 msgstr ""
@@ -20127,25 +18672,21 @@ msgid "Waterbury"
 msgstr "Waterbury"
 
 #. A city in Iowa in the United States
-#| msgid "Waterloo"
 msgctxt "City in Iowa, United States"
 msgid "Waterloo"
 msgstr ""
 
 #. A city in New York in the United States
-#| msgid "Watertown"
 msgctxt "City in New York, United States"
 msgid "Watertown"
 msgstr ""
 
 #. A city in South Dakota in the United States
-#| msgid "Watertown"
 msgctxt "City in South Dakota, United States"
 msgid "Watertown"
 msgstr ""
 
 #. A city in Wisconsin in the United States
-#| msgid "Watertown"
 msgctxt "City in Wisconsin, United States"
 msgid "Watertown"
 msgstr ""
@@ -20175,7 +18716,6 @@ msgid "Wausau"
 msgstr "Wausau"
 
 #. A city in Wisconsin in the United States
-#| msgid "Watonga"
 msgid "Wautoma"
 msgstr ""
 
@@ -20184,17 +18724,14 @@ msgid "Waycross"
 msgstr "Waycross"
 
 #. A city in Nebraska in the United States
-#| msgid "Fort Wayne"
 msgid "Wayne"
 msgstr ""
 
 #. A city in Missouri in the United States
-#| msgid "Paynesville"
 msgid "Waynesville"
 msgstr ""
 
 #. A city in Oklahoma in the United States
-#| msgid "Rutherfordton"
 msgid "Weatherford"
 msgstr ""
 
@@ -20227,7 +18764,6 @@ msgid "West Chicago"
 msgstr "West Chicago"
 
 #. A city in California in the United States
-#| msgid "West Point"
 msgid "West Covina"
 msgstr ""
 
@@ -20248,19 +18784,13 @@ msgid "West Point"
 msgstr "West Point"
 
 #. A city in Wyoming in the United States
-#| msgid "West Burke"
 msgid "West Thumb"
 msgstr ""
 
 #. A city in Utah in the United States
-#| msgid "Webster City"
 msgid "West Valley City"
 msgstr ""
 
-#. A city in Montana in the United States
-msgid "West Yellowstone"
-msgstr "West Yellowstone"
-
 #. A city in Rhode Island in the United States
 msgid "Westerly"
 msgstr "Westerly"
@@ -20270,12 +18800,10 @@ msgid "Westfield"
 msgstr "Westfield"
 
 #. A city in New York in the United States
-#| msgid "Westhampton"
 msgid "Westhampton Beach"
 msgstr ""
 
 #. A city in Colorado in the United States
-#| msgid "West Point"
 msgid "Westminster"
 msgstr ""
 
@@ -20299,10 +18827,6 @@ msgstr "White Plains"
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#. A city in North Carolina in the United States
-msgid "Whiteville"
-msgstr "Whiteville"
-
 #. A city in Alaska in the United States
 msgid "Whittier"
 msgstr "Whittier"
@@ -20327,10 +18851,6 @@ msgstr "Williamsburg"
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#. A city in Connecticut in the United States
-msgid "Willimantic"
-msgstr "Willimantic"
-
 #. A city in North Dakota in the United States
 msgid "Williston"
 msgstr "Williston"
@@ -20344,19 +18864,16 @@ msgid "Willow Grove"
 msgstr "Willow Grove"
 
 #. A city in Delaware in the United States
-#| msgid "Wilmington"
 msgctxt "City in Delaware, United States"
 msgid "Wilmington"
 msgstr ""
 
 #. A city in North Carolina in the United States
-#| msgid "Wilmington"
 msgctxt "City in North Carolina, United States"
 msgid "Wilmington"
 msgstr ""
 
 #. A city in Ohio in the United States
-#| msgid "Wilmington"
 msgctxt "City in Ohio, United States"
 msgid "Wilmington"
 msgstr ""
@@ -20410,7 +18927,6 @@ msgid "Winter Haven"
 msgstr "Winter Haven"
 
 #. A city in North Carolina in the United States
-#| msgid "Waterville"
 msgid "Winterville"
 msgstr ""
 
@@ -20431,14 +18947,9 @@ msgid "Wolf Point"
 msgstr "Wolf Point"
 
 #. A city in Wisconsin in the United States
-#| msgid "Woodring"
 msgid "Woodruff"
 msgstr ""
 
-#. A city in Oklahoma in the United States
-msgid "Woodward"
-msgstr "Woodward"
-
 #. A city in Ohio in the United States
 msgid "Wooster"
 msgstr "Wooster"
@@ -20460,7 +18971,6 @@ msgid "Wrangell"
 msgstr "Wrangell"
 
 #. A city in Wyoming in the United States
-#| msgid "Wyoming"
 msgctxt "City in Wyoming, United States"
 msgid "Wyoming"
 msgstr ""
@@ -20478,18 +18988,15 @@ msgid "Yankton"
 msgstr "Yankton"
 
 #. A city in New York in the United States
-#| msgid "Angers"
 msgid "Yonkers"
 msgstr ""
 
 #. A city in Nebraska in the United States
-#| msgid "York"
 msgctxt "City in Nebraska, United States"
 msgid "York"
 msgstr ""
 
 #. A city in Pennsylvania in the United States
-#| msgid "York"
 msgctxt "City in Pennsylvania, United States"
 msgid "York"
 msgstr ""
@@ -20507,12 +19014,10 @@ msgid "Zanesville"
 msgstr "Zanesville"
 
 #. A city in the United States Minor Outlying Islands
-#| msgid "McClellan Airfield Airport"
 msgid "Wake Island, Wake Island Army Airfield Airport"
 msgstr ""
 
 #. A city in the United States Virgin Islands
-#| msgid "Charlotte Amalie St. Thomas"
 msgid "Charlotte Amalie"
 msgstr ""
 
@@ -20521,7 +19026,6 @@ msgid "Christiansted"
 msgstr "Christiansted"
 
 #. A city in Uruguay
-#| msgid "Baracoa"
 msgid "Carrasco"
 msgstr ""
 
@@ -20534,23 +19038,19 @@ msgid "Durazno"
 msgstr "Durazno"
 
 #. A city in Uruguay
-#| msgid "Puerto Maldonado"
 msgid "Maldonado"
 msgstr ""
 
 #. The capital of Uruguay
-#| msgid "Montevideo"
 msgctxt "City in Uruguay"
 msgid "Montevideo"
 msgstr ""
 
 #. A city in Uzbekistan
-#| msgid "Nakusp"
 msgid "Nukus"
 msgstr ""
 
 #. A city in Uzbekistan
-#| msgid "Samarkand"
 msgid "Samarqand"
 msgstr ""
 
@@ -20562,12 +19062,10 @@ msgid "Tashkent"
 msgstr "Tashkent"
 
 #. A city in Uzbekistan
-#| msgid "Termez"
 msgid "Termiz"
 msgstr ""
 
 #. A city in Uzbekistan
-#| msgid "Urgench"
 msgid "Urganch"
 msgstr ""
 
@@ -20576,7 +19074,6 @@ msgid "Acarigua"
 msgstr "Akarigva"
 
 #. A city in Venezuela
-#| msgid "Barcelona"
 msgctxt "City in Venezuela"
 msgid "Barcelona"
 msgstr ""
@@ -20594,7 +19091,6 @@ msgid "Calabozo"
 msgstr "Calabozo"
 
 #. The capital of Venezuela
-#| msgid "Caravelas"
 msgid "Caracas"
 msgstr ""
 
@@ -20607,12 +19103,10 @@ msgid "Coro"
 msgstr "Coro"
 
 #. A city in Venezuela
-#| msgid "El Monte"
 msgid "El Variante"
 msgstr ""
 
 #. A city in Venezuela
-#| msgid "El VigÃa/Perez Alph"
 msgid "El VigÃa"
 msgstr ""
 
@@ -20621,37 +19115,30 @@ msgid "Guanare"
 msgstr "Guanare"
 
 #. A city in Venezuela
-#| msgid "Guanare"
 msgid "Guaricure"
 msgstr ""
 
 #. A city in Venezuela
-#| msgid "Guasdualito"
 msgid "Guasdalito"
 msgstr ""
 
 #. A city in Venezuela
-#| msgid "Guiria"
 msgid "GÃ¼iria"
 msgstr ""
 
 #. A city in Venezuela
-#| msgid "La Ceiba"
 msgid "La Chica"
 msgstr ""
 
 #. A city in Venezuela
-#| msgid "Maribor"
 msgid "Maracaibo"
 msgstr ""
 
 #. A city in Venezuela
-#| msgid "Mackay"
 msgid "Maracay"
 msgstr ""
 
 #. A city in Venezuela
-#| msgid "Maturin"
 msgid "MaturÃn"
 msgstr ""
 
@@ -20660,18 +19147,15 @@ msgid "Mene Grande"
 msgstr "Mene Grande"
 
 #. A city in Venezuela
-#| msgid "Monroe"
 msgid "Morocure"
 msgstr ""
 
 #. A city in Venezuela
-#| msgid "MÃ©rida"
 msgctxt "City in Venezuela"
 msgid "MÃ©rida"
 msgstr ""
 
 #. A city in Venezuela
-#| msgid "Amarillo"
 msgid "Paramillo"
 msgstr ""
 
@@ -20680,12 +19164,10 @@ msgid "Puerto Ayacucho"
 msgstr "Puerto Ayacucho"
 
 #. A city in Venezuela
-#| msgid "Puerto Plata"
 msgid "Puerto Borburata"
 msgstr ""
 
 #. A city in Venezuela
-#| msgid "San Antonio Del Tachira"
 msgid "San Antonio del TÃ¡chira"
 msgstr ""
 
@@ -20694,28 +19176,23 @@ msgid "San Felipe"
 msgstr "San Felipe"
 
 #. A city in Venezuela
-#| msgid "San Fernando"
 msgctxt "City in Venezuela"
 msgid "San Fernando"
 msgstr ""
 
 #. A city in Venezuela
-#| msgid "San Juan De Los Morros"
 msgid "San Juan de los Morros"
 msgstr ""
 
 #. A city in Venezuela
-#| msgid "S. Tome"
 msgid "San TomÃ©"
 msgstr ""
 
 #. A city in Venezuela
-#| msgid "Santa Barbara"
 msgid "Santa BÃ¡rbara"
 msgstr ""
 
 #. A city in Venezuela
-#| msgid "Valencia"
 msgctxt "City in Venezuela"
 msgid "Valencia"
 msgstr ""
@@ -20732,7 +19209,6 @@ msgstr "Da Nang"
 #. "Hanoi" is the traditional English name.
 #. The local name in Vietnamese is "Ha Noi".
 #.
-#| msgid "Hao"
 msgid "Hanoi"
 msgstr ""
 
@@ -20740,42 +19216,34 @@ msgstr ""
 #. "Ho Chi Minh City" is the traditional English name.
 #. The local name in Vietnamese is "Thanh Pho Ho Chi Minh".
 #.
-#| msgid "Ho Chi Minh"
 msgid "Ho Chi Minh City"
 msgstr ""
 
 #. A city in Wallis and Futuna
-#| msgid "Macau"
 msgid "Mata'utu"
 msgstr ""
 
 #. A city in Yemen
-#| msgid "Ada"
 msgid "'Adan"
 msgstr ""
 
 #. A city in Yemen
-#| msgid "Ataq"
 msgid "'Ataq"
 msgstr ""
 
 #. A city in Yemen
-#| msgid "Al Qaysumah"
 msgid "Al Hudaydah"
 msgstr "Alkuaisumaha"
 
 #. A city in Yemen
-#| msgid "Marib"
 msgid "Ma'rib"
 msgstr ""
 
 #. A city in Yemen
-#| msgid "Morris"
 msgid "Mori"
 msgstr ""
 
 #. A city in Yemen
-#| msgid "Sa'Ada/Sadah"
 msgid "Sa'dah"
 msgstr ""
 
@@ -20783,22 +19251,18 @@ msgstr ""
 #. "Sanaa" is the traditional English name.
 #. The local name in Arabic is "San'a'".
 #.
-#| msgid "Sanana"
 msgid "Sanaa"
 msgstr "Sanana"
 
 #. A city in Yemen
-#| msgid "Sayun"
 msgid "Say'un"
 msgstr ""
 
 #. A city in Yemen
-#| msgid "Taiz"
 msgid "Ta'izz"
 msgstr "Taiz"
 
 #. A city in Zambia
-#| msgid "Chinandega"
 msgid "Chinganze"
 msgstr ""
 
@@ -20807,7 +19271,6 @@ msgid "Livingstone"
 msgstr "Livingstone"
 
 #. The capital of Zambia
-#| msgid "Osaka"
 msgid "Lusaka"
 msgstr ""
 
@@ -20815,14 +19278,97 @@ msgstr ""
 msgid "Ndola"
 msgstr "Ndola"
 
-#. The capital of Zimbabwe
-#| msgid "Harar Meda"
-msgid "Harare"
-msgstr ""
-
 #. A city in the Ã?land Islands.
 #. The local name in Finnish is "Maarianhamina".
 #.
 msgid "Mariehamn"
 msgstr "Mariehamn"
 
+#~ msgid "Luanda"
+#~ msgstr "Luanda"
+
+#~ msgid "Malahat"
+#~ msgstr "Malahat"
+
+#~ msgid "Port Colborne"
+#~ msgstr "Port Colborne"
+
+#~ msgid "Nausori"
+#~ msgstr "Nausori"
+
+#~| msgid "Bowman"
+#~ msgid "Bombay"
+#~ msgstr "Bombeja"
+
+#~| msgid "Calcutta/Dum Dum"
+#~ msgid "Calcutta"
+#~ msgstr "Kalkuta"
+
+#~ msgid "Casablanca"
+#~ msgstr "Casablanca"
+
+#~ msgid "Inhambane"
+#~ msgstr "Inhambane"
+
+#~ msgid "Tete"
+#~ msgstr "Tete"
+
+#~ msgid "Ibadan"
+#~ msgstr "Ibadan"
+
+#~ msgid "Wewak"
+#~ msgstr "Wewak"
+
+#~ msgid "Cajamarca"
+#~ msgstr "Cajamarca"
+
+#~ msgid "Yurimaguas"
+#~ msgstr "Yurimaguas"
+
+#~ msgid "Rustenburg"
+#~ msgstr "Rustenburg"
+
+#~ msgid "Standerton"
+#~ msgstr "Standerton"
+
+#~ msgid "Cantwell"
+#~ msgstr "Cantwell"
+
+#~ msgid "Central"
+#~ msgstr "Central"
+
+#~ msgid "Deering"
+#~ msgstr "Deering"
+
+#~ msgid "Golovin"
+#~ msgstr "Golovin"
+
+#~ msgid "Green River"
+#~ msgstr "Green River"
+
+#~ msgid "Kremmling"
+#~ msgstr "Kremmling"
+
+#~ msgid "Lincolnton"
+#~ msgstr "Lincolnton"
+
+#~ msgid "Richlands"
+#~ msgstr "Richlands"
+
+#~ msgid "Sabine Pass"
+#~ msgstr "Sabine Pass"
+
+#~ msgid "Taunton"
+#~ msgstr "Taunton"
+
+#~ msgid "West Yellowstone"
+#~ msgstr "West Yellowstone"
+
+#~ msgid "Whiteville"
+#~ msgstr "Whiteville"
+
+#~ msgid "Willimantic"
+#~ msgstr "Willimantic"
+
+#~ msgid "Woodward"
+#~ msgstr "Woodward"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]