[libgweather] L10N: Updated Persian Translation

[Arash Mousavi <amousavi src gnome org>]

commit a8b9b25a780aa4c132df5372847af80bf64de561
Author: Arash Mousavi <mousavi arash gmail com>
Date:   Sat Mar 23 18:24:23 2013 +0430

    L10N: Updated Persian Translation

 po-locations/fa.po | 1170 +---------------------------------------------------
 po/fa.po           |  388 +++++++++++-------
 2 files changed, 248 insertions(+), 1310 deletions(-)
---
diff --git a/po-locations/fa.po b/po-locations/fa.po
index 38c92f6..2e7b1d4 100644
--- a/po-locations/fa.po
+++ b/po-locations/fa.po
@@ -1,16 +1,21 @@
+# Persian translation of gnome-applets-locations.
+# Copyright (C) 2004-2010 The Free Software Foundation.
+# This file is distributed under the same license as the gnome-applets package.
+# Arash Mousavi <mousavi arash gmail com>, 2010, 2011, 2012, 2013.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-applets-locations HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 20:36+0000\n"
-"PO-Revision-Date: 2012-10-22 23:33+0330\n"
+"POT-Creation-Date: 2013-03-04 21:43+0000\n"
+"PO-Revision-Date: 2013-03-23 18:20+0330\n"
 "Last-Translator: Arash Mousavi <mousavi arash gmail com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-DamnedLies-Scope: partial\n"
-"X-Generator: Translate Toolkit 1.8.0\n"
+"X-Generator: Poedit 1.5.4\n"
 
 msgid "Africa"
 msgstr "آفریقا"
@@ -1235,7 +1240,6 @@ msgstr "ایستگاه مک‌موردُ (زمان نیوزیلند)"
 #. 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 "Amundsen-Scott South Pole Station (New Zealand Time)"
 
@@ -1292,7 +1296,6 @@ msgstr "گرین‌لند شرقی"
 #. The timezone at the Thule US Air Force Base on the west
 #. coast of Greenland.
 #.
-#| msgid "Langley AFB"
 msgid "Thule AFB"
 msgstr "Thule AFB"
 
@@ -1471,7 +1474,6 @@ msgstr "یاپ / چوک"
 #. there a better name for this? "Mainland" seems odd in
 #. reference to an island nation...
 #.
-#| msgid "New Zealand"
 msgid "Mainland New Zealand"
 msgstr "Mainland New Zealand"
 
@@ -1655,7 +1657,6 @@ msgstr "زمان برزیل"
 #. This refers to the time zone for mainland Chile (as
 #. opposed to the time zone for Easter Island).
 #.
-#| msgid "Marignane"
 msgid "Mainland Chile"
 msgstr "Mainland Chile"
 
@@ -1669,7 +1670,6 @@ 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 "Mainland Ecuador"
 
@@ -1706,7 +1706,6 @@ msgstr "مادیرا"
 #. This refers to the time zone for mainland Portugal (as
 #. opposed to the time zone for the Azores).
 #.
-#| msgid "Portugal"
 msgid "Mainland Portugal"
 msgstr "Mainland Portugal"
 
@@ -2900,7 +2899,6 @@ msgid "Setif"
 msgstr "سطيف‎"
 
 #. A city in Algeria
-#| msgid "Saudi Arabia"
 msgid "Sidi Amrane"
 msgstr "Sidi Amrane"
 
@@ -3527,7 +3525,6 @@ msgid "Kasane"
 msgstr "کاسان"
 
 #. A city in Botswana
-#| msgid "Ketchikan"
 msgid "Letlhakane"
 msgstr "Letlhakane"
 
@@ -4140,7 +4137,6 @@ msgid "Cap-Chat"
 msgstr "کاپ-چپ"
 
 #. A city in Quebec in Canada
-#| msgid "Capo Mele"
 msgid "Cap-aux-Meules"
 msgstr "Cap-aux-Meules"
 
@@ -4575,7 +4571,6 @@ msgid "Inuvik"
 msgstr "اینوویک"
 
 #. A city in Nunavut in Canada
-#| msgid "Iquitos"
 msgid "Iqaluit"
 msgstr "Iqaluit"
 
@@ -4646,12 +4641,10 @@ msgid "Kuujjuaq"
 msgstr "Kuujjuaq"
 
 #. A city in Quebec in Canada
-#| msgid "Saint-Quentin"
 msgid "L'Anse-Saint-Jean"
 msgstr "L'Anse-Saint-Jean"
 
 #. A city in Quebec in Canada
-#| msgid "L'Assomption"
 msgid "L'Ascension"
 msgstr "L'Ascension"
 
@@ -4705,7 +4698,6 @@ msgid "Liverpool"
 msgstr "لیورپول"
 
 #. A city in Saskatchewan in Canada
-#| msgid "Lloydminister"
 msgid "Lloydminster"
 msgstr "Lloydminster"
 
@@ -6114,7 +6106,7 @@ msgstr "البورگ"
 #. The capital of Djibouti
 msgctxt "City in Djibouti"
 msgid "Djibouti"
-msgstr "Djibouti"
+msgstr "جیبوتی"
 
 #. A city in Dominica
 msgid "Marigot"
@@ -6183,7 +6175,6 @@ msgid "Al Ghardaqah"
 msgstr "الغردقة‎"
 
 #. A city in Egypt
-#| msgid "Alabat"
 msgid "Al Qabuti"
 msgstr "Al Qabuti"
 
@@ -6252,11 +6243,11 @@ msgstr "کورساره"
 
 #. A city in Estonia
 msgid "Kärdla"
-msgstr "Kärdla"
+msgstr "کاردلا"
 
 #. A city in Estonia
 msgid "Pärnu"
-msgstr "Pärnu"
+msgstr "پارنو"
 
 #. The capital of Estonia
 msgid "Tallinn"
@@ -6273,11 +6264,15 @@ msgstr "استنلی"
 
 #. A city in the Faroe Islands
 msgid "Sørvágur"
-msgstr "Sørvágur"
+msgstr "سورواگور"
 
 #. The capital of the Faroe Islands
 msgid "Tórshavn"
-msgstr "Tórshavn"
+msgstr "تورشاون"
+
+#. The capital of Fiji
+msgid "Suva"
+msgstr "سوا"
 
 #. A city in Finland
 msgid "Enontekiö"
@@ -7063,17 +7058,14 @@ msgid "Stuttgart"
 msgstr "اشتوتگارت"
 
 #. A city in Mecklenburg-Western Pomerania in Germany
-#| msgid "Copenhagen"
 msgid "Trollenhagen"
 msgstr "Trollenhagen"
 
 #. A city in Schleswig-Holstein in Germany
-#| msgid "Bluefield"
 msgid "Ulstrupfeld"
 msgstr "Ulstrupfeld"
 
 #. A city in Schleswig-Holstein in Germany
-#| msgid "Volterra"
 msgid "Vorrade"
 msgstr "Vorrade"
 
@@ -7131,7 +7123,6 @@ msgid "Athens"
 msgstr "آتن"
 
 #. A city in Greece
-#| msgid "Metropolis"
 msgid "Chrysoúpolis"
 msgstr "Chrysoúpolis"
 
@@ -7160,7 +7151,6 @@ msgid "Karpásion"
 msgstr "کارپاسیون"
 
 #. A city in Greece
-#| msgid "Kastoria"
 msgid "Katomérion"
 msgstr "Katomérion"
 
@@ -7281,12 +7271,10 @@ msgid "Kulusuk"
 msgstr "Kulusuk"
 
 #. A city in Greenland
-#| msgid "Nicaragua"
 msgid "Narsarsuaq"
 msgstr "Narsarsuaq"
 
 #. A city in Greenland
-#| msgid "Sønderborg"
 msgid "Søndre Strømfjord"
 msgstr "Søndre Strømfjord"
 
@@ -7320,7 +7308,6 @@ msgid "Guatemala"
 msgstr "گواتمالا"
 
 #. A city in Guatemala
-#| msgid "Quezaltenango"
 msgid "Huehuetenango"
 msgstr "Huehuetenango"
 
@@ -7341,7 +7328,6 @@ msgid "Tikal"
 msgstr "تیکال"
 
 #. A city in Guernsey
-#| msgid "Hawthorne"
 msgid "Hautnez"
 msgstr "Hautnez"
 
@@ -7371,7 +7357,6 @@ msgid "Catacamas"
 msgstr "کاتاکاماس"
 
 #. A city in Honduras
-#| msgid "Choluteca"
 msgid "Ciudad Choluteca"
 msgstr "Ciudad Choluteca"
 
@@ -7531,7 +7516,6 @@ msgstr "بهوپال"
 #. A city in India.
 #. The local name in Oriya is "ଭୁବେନଶ୍ବର".
 #.
-#| msgid "Bhubaneswar"
 msgid "Bhubaneshwar"
 msgstr "Bhubaneshwar"
 
@@ -7956,7 +7940,6 @@ msgstr "دوبلین"
 #. A city in Ireland.
 #. The local name in Irish is "Dún Laoghaire".
 #.
-#| msgid "Tulear"
 msgid "Dunleary"
 msgstr "Dunleary"
 
@@ -7971,23 +7954,19 @@ msgid "Shannon"
 msgstr "شنون"
 
 #. The capital of the Isle of Man
-#| msgid "Douglas"
 msgctxt "City in Isle of Man"
 msgid "Douglas"
 msgstr "Douglas"
 
 #. A city in the Isle of Man
-#| msgid "Rockaway"
 msgid "Ronaldsway"
 msgstr "Ronaldsway"
 
 #. A city in Israel
-#| msgid "Elkhart"
 msgid "Elat"
 msgstr "Elat"
 
 #. A city in Israel
-#| msgid "Marham"
 msgid "Mahanayim"
 msgstr "Mahanayim"
 
@@ -8000,7 +7979,6 @@ msgid "Ramot Remez"
 msgstr "Ramot Remez"
 
 #. A city in Israel
-#| msgid "Shannon"
 msgid "Shizzafon"
 msgstr "Shizzafon"
 
@@ -8025,7 +8003,6 @@ msgid "Aviano"
 msgstr "آویانو"
 
 #. A city in Italy
-#| msgid "Barin"
 msgid "Bari"
 msgstr "Bari"
 
@@ -8034,7 +8011,6 @@ msgid "Bergamo"
 msgstr "برگامو"
 
 #. A city in Italy
-#| msgid "Colonia"
 msgid "Bologna"
 msgstr "Bologna"
 
@@ -8043,7 +8019,6 @@ msgid "Bolzano"
 msgstr "بولتسانو"
 
 #. A city in Italy
-#| msgid "Bria"
 msgid "Brescia"
 msgstr "Brescia"
 
@@ -8056,7 +8031,6 @@ msgid "Brindisi"
 msgstr "بریندیزی"
 
 #. A city in Italy
-#| msgid "Cagliari/Elmas"
 msgid "Cagliari"
 msgstr "Cagliari"
 
@@ -8065,7 +8039,6 @@ msgid "Capri"
 msgstr "کاپری"
 
 #. A city in Italy
-#| msgid "Canefield"
 msgid "Case Arfel"
 msgstr "Case Arfel"
 
@@ -8082,7 +8055,6 @@ msgid "Crotone"
 msgstr "کروتونه"
 
 #. A city in Italy
-#| msgid "Cleburne"
 msgid "Cuneo"
 msgstr "Cuneo"
 
@@ -8091,7 +8063,6 @@ msgid "Decimomannu"
 msgstr "Decimomannu"
 
 #. A city in Italy
-#| msgid "Dubbo"
 msgid "Dobbiaco"
 msgstr "Dobbiaco"
 
@@ -8103,13 +8074,11 @@ msgstr "فرارا"
 #. "Florence" is the traditional English name.
 #. The local name in Italian is "Firenze".
 #.
-#| msgid "Florence"
 msgctxt "City in Italy"
 msgid "Florence"
 msgstr "Florence"
 
 #. A city in Italy
-#| msgid "Forli"
 msgid "Forlì"
 msgstr "Forlì"
 
@@ -8121,12 +8090,10 @@ msgstr "فروزینونه"
 #. "Genoa" is the traditional English name.
 #. The local name in Italian is "Genova".
 #.
-#| msgid "Gagnoa"
 msgid "Genoa"
 msgstr "Genoa"
 
 #. A city in Italy
-#| msgid "Punta Marina"
 msgid "Ginosa Marina"
 msgstr "Ginosa Marina"
 
@@ -8135,7 +8102,6 @@ msgid "Gioia del Colle"
 msgstr "Gioia del Colle"
 
 #. A city in Italy
-#| msgid "Brazil"
 msgid "Grazzanise"
 msgstr "Grazzanise"
 
@@ -8144,7 +8110,6 @@ msgid "Grosseto"
 msgstr "گروستو"
 
 #. A city in Italy
-#| msgid "Troutdale"
 msgid "Grottaglie"
 msgstr "Grottaglie"
 
@@ -8153,7 +8118,6 @@ msgid "Isola del Cantone"
 msgstr "Isola del Cantone"
 
 #. A city in Italy
-#| msgid "Laughlin"
 msgid "Laigueglia"
 msgstr "Laigueglia"
 
@@ -8177,7 +8141,6 @@ msgstr "مسینا"
 #. "Milan" is the traditional English name.
 #. The local name in Italian is "Milano".
 #.
-#| msgid "Midland"
 msgid "Milan"
 msgstr "Milan"
 
@@ -8185,18 +8148,15 @@ msgstr "Milan"
 #. "Naples" is the traditional English name.
 #. The local name in Italian is "Napoli".
 #.
-#| msgid "Naples"
 msgctxt "City in Italy"
 msgid "Naples"
 msgstr "Naples"
 
 #. A city in Italy
-#| msgid "Olivia"
 msgid "Olbia"
 msgstr "Olbia"
 
 #. A city in Italy
-#| msgid "Pala"
 msgid "Palazzo"
 msgstr "Palazzo"
 
@@ -8229,17 +8189,14 @@ msgid "Piacenza"
 msgstr "پیاچنزا"
 
 #. A city in Italy
-#| msgid "Bisha"
 msgid "Pisa"
 msgstr "Pisa"
 
 #. A city in Italy
-#| msgid "Montana"
 msgid "Pontecagnano"
 msgstr "Pontecagnano"
 
 #. A city in Italy
-#| msgid "Baia Mare"
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
@@ -8248,7 +8205,6 @@ msgid "Reggio di Calabria"
 msgstr "Reggio di Calabria"
 
 #. A city in Italy
-#| msgid "Regina"
 msgid "Resia"
 msgstr "Resia"
 
@@ -8264,7 +8220,6 @@ msgstr "ریمینی"
 #. "Rome" is the traditional English name.
 #. The local name in Italian is "Roma".
 #.
-#| msgid "Rome"
 msgctxt "City in Italy"
 msgid "Rome"
 msgstr "Rome"
@@ -8274,12 +8229,10 @@ msgid "Ronchi dei Legionari"
 msgstr "Ronchi dei Legionari"
 
 #. A city in Italy
-#| msgid "Salina"
 msgid "Salignano"
 msgstr "Salignano"
 
 #. A city in Italy
-#| msgid "San Antonio"
 msgid "San Stèfano"
 msgstr "San Stèfano"
 
@@ -8288,12 +8241,10 @@ msgid "Sant'Eufemia Lamezia"
 msgstr "Sant'Eufemia Lamezia"
 
 #. A city in Italy
-#| msgid "Seminole"
 msgid "Sporminore"
 msgstr "Sporminore"
 
 #. A city in Italy
-#| msgid "Jamaica"
 msgid "Tamaricciola"
 msgstr "Tamaricciola"
 
@@ -8302,17 +8253,14 @@ msgid "Tarvisio"
 msgstr "تارویزیو"
 
 #. A city in Italy
-#| msgid "Japan"
 msgid "Trapani"
 msgstr "Trapani"
 
 #. A city in Italy
-#| msgid "Tarvisio"
 msgid "Trevico"
 msgstr "Trevico"
 
 #. A city in Italy
-#| msgid "Tarvisio"
 msgid "Treviso"
 msgstr "Treviso"
 
@@ -8324,7 +8272,6 @@ msgstr "تریست"
 #. "Turin" is the traditional English name.
 #. The local name is "Torino".
 #.
-#| msgid "Turaif"
 msgid "Turin"
 msgstr "Turin"
 
@@ -8336,7 +8283,6 @@ msgid "Venice"
 msgstr "ونیس"
 
 #. A city in Italy
-#| msgid "Vernal"
 msgid "Verona"
 msgstr "Verona"
 
@@ -8349,7 +8295,6 @@ msgid "Àrbatax"
 msgstr "Àrbatax"
 
 #. The capital of Jamaica
-#| msgid "Kingston"
 msgctxt "City in Jamaica"
 msgid "Kingston"
 msgstr "Kingston"
@@ -8363,7 +8308,6 @@ msgid "Akita"
 msgstr "آکیتا"
 
 #. A city in Japan
-#| msgid "Amami"
 msgid "Ami"
 msgstr "Ami"
 
@@ -8372,17 +8316,14 @@ msgid "Aomori"
 msgstr "آئوموری"
 
 #. A city in Japan
-#| msgid "Asahikawa Airport"
 msgid "Asahikawa"
 msgstr "Asahikawa"
 
 #. A city in Japan
-#| msgid "Asia"
 msgid "Ashiya"
 msgstr "Ashiya"
 
 #. A city in Japan
-#| msgid "Chios"
 msgid "Chitose"
 msgstr "Chitose"
 
@@ -8391,47 +8332,38 @@ msgid "Chofu"
 msgstr "چوی‌فو"
 
 #. A city in Japan
-#| msgid "Fiji"
 msgid "Fuji"
 msgstr "Fuji"
 
 #. A city in Japan
-#| msgid "Turku"
 msgid "Fukue"
 msgstr "Fukue"
 
 #. A city in Japan
-#| msgid "Bukoba"
 msgid "Fukuoka"
 msgstr "Fukuoka"
 
 #. A city in Japan
-#| msgid "Guatemala"
 msgid "Futemma"
 msgstr "Futemma"
 
 #. A city in Japan
-#| msgid "Guiuan"
 msgid "Gifu"
 msgstr "Gifu"
 
 #. A city in Japan
-#| msgid "Oakdale"
 msgid "Hakodate"
 msgstr "Hakodate"
 
 #. A city in Japan
-#| msgid "Takamatsu"
 msgid "Hamamatsu"
 msgstr "Hamamatsu"
 
 #. A city in Japan
-#| msgid "Hamadan"
 msgid "Hamanaka"
 msgstr "Hamanaka"
 
 #. A city in Japan
-#| msgid "Panama"
 msgid "Hanamaki"
 msgstr "Hanamaki"
 
@@ -8440,7 +8372,6 @@ msgid "Hiroshima"
 msgstr "هیروشیما"
 
 #. A city in Japan
-#| msgid "Hof"
 msgid "Hofu"
 msgstr "Hofu"
 
@@ -8453,17 +8384,14 @@ msgid "Iwakuni"
 msgstr "Iwakuni"
 
 #. A city in Japan
-#| msgid "Izmir"
 msgid "Izumo"
 msgstr "Izumo"
 
 #. A city in Japan
-#| msgid "Canada"
 msgid "Janado"
 msgstr "Janado"
 
 #. A city in Japan
-#| msgid "Kaduna"
 msgid "Kadena"
 msgstr "Kadena"
 
@@ -8472,17 +8400,14 @@ msgid "Kagoshima"
 msgstr "کاگوشیما"
 
 #. A city in Japan
-#| msgid "Kananga"
 msgid "Kanayama"
 msgstr "Kanayama"
 
 #. A city in Japan
-#| msgid "Kenya"
 msgid "Kanoya"
 msgstr "Kanoya"
 
 #. A city in Japan
-#| msgid "Kamishli"
 msgid "Kashoji"
 msgstr "Kashoji"
 
@@ -8491,27 +8416,22 @@ msgid "Kitakyushu"
 msgstr "Kitakyushu"
 
 #. A city in Japan
-#| msgid "Takamatsu"
 msgid "Komatsu"
 msgstr "Komatsu"
 
 #. A city in Japan
-#| msgid "Matsushima Ab"
 msgid "Komatsushima"
 msgstr "Komatsushima"
 
 #. A city in Japan
-#| msgid "Kuusamo"
 msgid "Kumamoto"
 msgstr "Kumamoto"
 
 #. A city in Japan
-#| msgid "Kuopio"
 msgid "Kushiro"
 msgstr "Kushiro"
 
 #. A city in Japan
-#| msgid "Matsuyama"
 msgid "Matsubara"
 msgstr "Matsubara"
 
@@ -8520,7 +8440,6 @@ msgid "Matsumoto"
 msgstr "ماتسوموتو"
 
 #. A city in Japan
-#| msgid "Matsushima Ab"
 msgid "Matsushima"
 msgstr "Matsushima"
 
@@ -8533,22 +8452,18 @@ msgid "Memambetsu"
 msgstr "Memambetsu"
 
 #. A city in Japan
-#| msgid "Mikonos"
 msgid "Mihonoseki"
 msgstr "Mihonoseki"
 
 #. A city in Japan
-#| msgid "Miami"
 msgid "Minami"
 msgstr "Minami"
 
 #. A city in Japan
-#| msgid "Visalia"
 msgid "Misawa"
 msgstr "Misawa"
 
 #. A city in Japan
-#| msgid "Milton"
 msgid "Mito"
 msgstr "Mito"
 
@@ -8557,7 +8472,6 @@ msgid "Miyazaki"
 msgstr "میازاکی"
 
 #. A city in Japan
-#| msgid "Takamatsu"
 msgid "Mombetsu"
 msgstr "Mombetsu"
 
@@ -8570,37 +8484,30 @@ msgid "Nagoya"
 msgstr "ناگویا"
 
 #. A city in Japan
-#| msgid "Nashua"
 msgid "Naha"
 msgstr "Naha"
 
 #. A city in Japan
-#| msgid "Takamatsu"
 msgid "Naka-shibetsu"
 msgstr "Naka-shibetsu"
 
 #. A city in Japan
-#| msgid "Niagara"
 msgid "Niigata"
 msgstr "Niigata"
 
 #. A city in Japan
-#| msgid "Ohio"
 msgid "Obihiro"
 msgstr "Obihiro"
 
 #. A city in Japan
-#| msgid "Odiham"
 msgid "Odaira"
 msgstr "Odaira"
 
 #. A city in Japan
-#| msgid "Osaka"
 msgid "Odaka"
 msgstr "Odaka"
 
 #. A city in Japan
-#| msgid "Olathe"
 msgid "Odate"
 msgstr "Odate"
 
@@ -8609,17 +8516,14 @@ msgid "Ofunakoshi"
 msgstr "Ofunakoshi"
 
 #. A city in Japan
-#| msgid "Omaha"
 msgid "Ogimachiya"
 msgstr "Ogimachiya"
 
 #. A city in Japan
-#| msgid "Olivia"
 msgid "Oita"
 msgstr "Oita"
 
 #. A city in Japan
-#| msgid "Okayama"
 msgid "Okata"
 msgstr "Okata"
 
@@ -8628,7 +8532,6 @@ msgid "Okayama"
 msgstr "اوکایاما"
 
 #. A city in Japan
-#| msgid "Okayama"
 msgid "Okazato"
 msgstr "Okazato"
 
@@ -8637,32 +8540,26 @@ msgid "Osaka"
 msgstr "اوزاکا"
 
 #. A city in Japan
-#| msgid "Oki"
 msgid "Ozuki"
 msgstr "Ozuki"
 
 #. A city in Japan
-#| msgid "Santiago"
 msgid "Saga"
 msgstr "Saga"
 
 #. A city in Japan
-#| msgid "Sarnia"
 msgid "Sanrizuka"
 msgstr "Sanrizuka"
 
 #. A city in Japan
-#| msgid "Sanandaj"
 msgid "Sawada"
 msgstr "Sawada"
 
 #. A city in Japan
-#| msgid "Sedalia"
 msgid "Sendai"
 msgstr "Sendai"
 
 #. A city in Japan
-#| msgid "Shiraz"
 msgid "Shiroi"
 msgstr "Shiroi"
 
@@ -8671,12 +8568,10 @@ msgid "Takamatsu"
 msgstr "تاکاماتسو"
 
 #. A city in Japan
-#| msgid "Takamatsu"
 msgid "Takatsu"
 msgstr "Takatsu"
 
 #. A city in Japan
-#| msgid "Matsuyama"
 msgid "Tateyama"
 msgstr "Tateyama"
 
@@ -8685,42 +8580,34 @@ msgid "Tokyo"
 msgstr "توکیو"
 
 #. A city in Japan
-#| msgid "Aomori"
 msgid "Tottori"
 msgstr "Tottori"
 
 #. A city in Japan
-#| msgid "Tampa"
 msgid "Toyama"
 msgstr "Toyama"
 
 #. A city in Japan
-#| msgid "Tokyo"
 msgid "Toyooka"
 msgstr "Toyooka"
 
 #. A city in Japan
-#| msgid "Tunisia"
 msgid "Tsuiki"
 msgstr "Tsuiki"
 
 #. A city in Japan
-#| msgid "Ushuaia"
 msgid "Ushuku"
 msgstr "Ushuku"
 
 #. A city in Japan
-#| msgid "Waukegan"
 msgid "Wakkanai"
 msgstr "Wakkanai"
 
 #. A city in Japan
-#| msgid "Hamadan"
 msgid "Yamagata"
 msgstr "Yamagata"
 
 #. A city in Japan
-#| msgid "Karachi"
 msgid "Yamaguchi"
 msgstr "Yamaguchi"
 
@@ -8729,32 +8616,26 @@ msgid "Yao"
 msgstr "یائو"
 
 #. A city in Japan
-#| msgid "Nootka"
 msgid "Yokota"
 msgstr "Yokota"
 
 #. A city in Japan
-#| msgid "Chinandega"
 msgid "Yoshinaga"
 msgstr "Yoshinaga"
 
 #. A city in Jersey
-#| msgid "La Tuque"
 msgid "La Hougue"
 msgstr "La Hougue"
 
 #. The capital of Jersey
-#| msgid "Saint Helena"
 msgid "Saint Helier"
 msgstr "Saint Helier"
 
 #. A city in Jordan
-#| msgid "Aqaba"
 msgid "Al 'Aqabah"
 msgstr "Al 'Aqabah"
 
 #. A city in Jordan
-#| msgid "Al Baha"
 msgid "Al Jizah"
 msgstr "Al Jizah"
 
@@ -8772,7 +8653,6 @@ msgstr "آلماتی"
 #. A city in Kazakhstan.
 #. The local name in Russian is "Aktau".
 #.
-#| msgid "Aktau"
 msgid "Aqtau"
 msgstr "Aqtau"
 
@@ -8789,48 +8669,40 @@ msgstr "آستانه"
 #. A city in Kazakhstan.
 #. The local name in Russian is "Ural'sk".
 #.
-#| msgid "Orly"
 msgid "Oral"
 msgstr "Oral"
 
 #. A city in Kazakhstan.
 #. The local name in Russian is "Karaganda".
 #.
-#| msgid "Karaganda"
 msgid "Qaraghandy"
 msgstr "Qaraghandy"
 
 #. A city in Kazakhstan.
 #. The local name in Russian is "Kostanay".
 #.
-#| msgid "Astana"
 msgid "Qostanay"
 msgstr "Qostanay"
 
 #. A city in Kazakhstan.
 #. The local name in Russian is "Kyzylorda".
 #.
-#| msgid "Kzyl-Orda"
 msgid "Qyzylorda"
 msgstr "Qyzylorda"
 
 #. A city in Kazakhstan
-#| msgid "Tashkent"
 msgid "Shymkent"
 msgstr "Shymkent"
 
 #. A city in Kenya
-#| msgid "Loreto"
 msgid "Eldoret"
 msgstr "Eldoret"
 
 #. A city in Kenya
-#| msgid "Kish"
 msgid "Kisumu"
 msgstr "Kisumu"
 
 #. A city in Kenya
-#| msgid "Tasmania"
 msgid "Mombasa"
 msgstr "Mombasa"
 
@@ -8839,7 +8711,6 @@ msgid "Nairobi"
 msgstr "نایروبی"
 
 #. A city in Kiribati
-#| msgid "London"
 msgctxt "City in Kiribati"
 msgid "London"
 msgstr "London"
@@ -8848,7 +8719,6 @@ msgstr "London"
 #. "Kuwait" is the traditional English name.
 #. The local name in Arabic is "Al Kuwayt / الكويت".
 #.
-#| msgid "Kuwait"
 msgctxt "City in Kuwait"
 msgid "Kuwait"
 msgstr "Kuwait"
@@ -8869,7 +8739,6 @@ msgid "Liepāja"
 msgstr "لی‌یپایا"
 
 #. The capital of Latvia
-#| msgid "Riga"
 msgid "Rīga"
 msgstr "Rīga"
 
@@ -8881,12 +8750,10 @@ msgid "Beirut"
 msgstr "بیروت"
 
 #. A city in Libya
-#| msgid "Benina"
 msgid "Baninah"
 msgstr "Baninah"
 
 #. A city in Libya
-#| msgid "Abha"
 msgid "Sabha"
 msgstr "Sabha"
 
@@ -8898,7 +8765,6 @@ msgid "Tripoli"
 msgstr "طرابلس"
 
 #. The capital of Liechtenstein
-#| msgid "Veracruz"
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -8907,7 +8773,6 @@ msgid "Kaunas"
 msgstr "کاوناس"
 
 #. A city in Lithuania
-#| msgid "Zamboanga"
 msgid "Palanga"
 msgstr "Palanga"
 
@@ -8916,12 +8781,10 @@ msgid "Vilnius"
 msgstr "ویلنیوز"
 
 #. A city in Lithuania
-#| msgid "Vidalia"
 msgid "Šiauliai"
 msgstr "Šiauliai"
 
 #. The capital of Luxembourg
-#| msgid "Luxembourg"
 msgctxt "City in Luxembourg"
 msgid "Luxembourg"
 msgstr "Luxembourg"
@@ -8929,7 +8792,6 @@ msgstr "Luxembourg"
 #. The capital of Macau.
 #. The local name in Chinese is "Aomen / 澳门".
 #.
-#| msgid "Macau"
 msgctxt "City in Macau"
 msgid "Macau"
 msgstr "Macau"
@@ -8937,32 +8799,26 @@ msgstr "Macau"
 #. A city in Macau.
 #. The local name in Chinese is "Dangzai / 氹仔".
 #.
-#| msgid "Tampa"
 msgid "Taipa"
 msgstr "Taipa"
 
 #. A city in Macedonia
-#| msgid "Ord"
 msgid "Ohrid"
 msgstr "Ohrid"
 
 #. The capital of Macedonia
-#| msgid "Hope"
 msgid "Skopje"
 msgstr "Skopje"
 
 #. A city in Madagascar
-#| msgid "Ankeny"
 msgid "Ankarena"
 msgstr "Ankarena"
 
 #. The capital of Madagascar
-#| msgid "Antananarivo / Ivato"
 msgid "Antananarivo"
 msgstr "Antananarivo"
 
 #. A city in Madagascar
-#| msgid "Antalaha"
 msgid "Antsiranana"
 msgstr "Antsiranana"
 
@@ -8971,17 +8827,14 @@ msgid "Fasenina-Ampasy"
 msgstr "Fasenina-Ampasy"
 
 #. A city in Madagascar
-#| msgid "Manhattan"
 msgid "Mahajanga"
 msgstr "Mahajanga"
 
 #. A city in Madagascar
-#| msgid "Tasmania"
 msgid "Toamasina"
 msgstr "Toamasina"
 
 #. A city in Madagascar
-#| msgid "Bolzano"
 msgid "Tolanaro"
 msgstr "Tolanaro"
 
@@ -8990,23 +8843,19 @@ msgid "Bintulu"
 msgstr "بینتولو"
 
 #. A city in Malaysia
-#| msgid "Georgetown"
 msgctxt "City in Malaysia"
 msgid "George Town"
 msgstr "George Town"
 
 #. A city in Malaysia
-#| msgid "Short Beach"
 msgid "Johor Bahru"
 msgstr "Johor Bahru"
 
 #. A city in Malaysia
-#| msgid "Kananga"
 msgid "Klang"
 msgstr "Klang"
 
 #. A city in Malaysia
-#| msgid "Chah Bahar"
 msgid "Kota Baharu"
 msgstr "Kota Baharu"
 
@@ -9015,7 +8864,6 @@ msgid "Kota Kinabalu"
 msgstr "Kota Kinabalu"
 
 #. A city in Malaysia
-#| msgid "Kaduna"
 msgid "Kuah"
 msgstr "Kuah"
 
@@ -9024,58 +8872,46 @@ msgid "Kuala Lumpur"
 msgstr "کولا لامپور"
 
 #. A city in Malaysia
-#| msgid "Kustatan"
 msgid "Kuantan"
 msgstr "Kuantan"
 
 #. A city in Malaysia
-#| msgid "Junin"
 msgid "Kuching"
 msgstr "Kuching"
 
 #. A city in Malaysia
-#| msgctxt "Country"
-#| msgid "Kuwait"
 msgid "Kudat"
 msgstr "Kudat"
 
 #. A city in Malaysia
-#| msgid "Alaska"
 msgid "Melaka"
 msgstr "Melaka"
 
 #. A city in Malaysia
-#| msgid "Morris"
 msgid "Miri"
 msgstr "Miri"
 
 #. A city in Malaysia
-#| msgid "Canadian"
 msgid "Sandakan"
 msgstr "Sandakan"
 
 #. A city in Malaysia
-#| msgid "Spain"
 msgid "Sepang"
 msgstr "Sepang"
 
 #. A city in Malaysia
-#| msgid "Sibiu"
 msgid "Sibu"
 msgstr "Sibu"
 
 #. A city in Malaysia
-#| msgid "Sitka"
 msgid "Sitiawan"
 msgstr "Sitiawan"
 
 #. A city in Malaysia
-#| msgid "Taiwan"
 msgid "Tawau"
 msgstr "Tawau"
 
 #. A city in Malaysia
-#| msgid "Victoria"
 msgctxt "City in Malaysia"
 msgid "Victoria"
 msgstr "Victoria"
@@ -9088,32 +8924,26 @@ msgid "Male"
 msgstr "مِیل"
 
 #. A city in Malta
-#| msgid "Lugano"
 msgid "Luqa"
 msgstr "Luqa"
 
 #. The capital of Malta
-#| msgid "Vallenar"
 msgid "Valletta"
 msgstr "Valletta"
 
 #. The capital of the Marshall Islands
-#| msgid "Marion"
 msgid "Majuro"
 msgstr "Majuro"
 
 #. The capital of Martinique
-#| msgid "Mont-de-Marsan"
 msgid "Fort-de-France"
 msgstr "Fort-de-France"
 
 #. A city in Martinique
-#| msgid "Vermont"
 msgid "Le Lamentin"
 msgstr "Le Lamentin"
 
 #. A city in Mauritania
-#| msgid "Nouakchott"
 msgid "Nouadhibou"
 msgstr "Nouadhibou"
 
@@ -9122,17 +8952,14 @@ msgid "Nouakchott"
 msgstr "نوئاکچوت"
 
 #. A city in Mauritius
-#| msgid "Alliance"
 msgid "Plaisance"
 msgstr "Plaisance"
 
 #. The capital of Mauritius
-#| msgid "St Louis"
 msgid "Port Louis"
 msgstr "Port Louis"
 
 #. A city in Mauritius
-#| msgid "Maturin"
 msgid "Port Mathurin"
 msgstr "Port Mathurin"
 
@@ -9149,13 +8976,11 @@ msgid "Acapulco"
 msgstr "آکاپولکو"
 
 #. A city in Aguascalientes in Mexico
-#| msgid "Aguascalientes"
 msgctxt "City in Aguascalientes, Mexico"
 msgid "Aguascalientes"
 msgstr "Aguascalientes"
 
 #. A city in Campeche in Mexico
-#| msgid "Campeche"
 msgctxt "City in Campeche, Mexico"
 msgid "Campeche"
 msgstr "Campeche"
@@ -9165,7 +8990,6 @@ msgid "Cancún"
 msgstr "کانکون"
 
 #. A city in Campeche in Mexico
-#| msgid "Camden"
 msgid "Carmen"
 msgstr "Carmen"
 
@@ -9174,12 +8998,10 @@ msgid "Chetumal"
 msgstr "چتومال"
 
 #. A city in Yucatán in Mexico
-#| msgid "Chichen-Itzá"
 msgid "Chichén-Itzá"
 msgstr "Chichén-Itzá"
 
 #. A city in Chihuahua in Mexico
-#| msgid "Chihuahua"
 msgctxt "City in Chihuahua, Mexico"
 msgid "Chihuahua"
 msgstr "Chihuahua"
@@ -9199,7 +9021,6 @@ msgid "Ciudad Victoria"
 msgstr "سیوداد ویکتوریا"
 
 #. A city in Colima in Mexico
-#| msgid "Colima"
 msgctxt "City in Colima, Mexico"
 msgid "Colima"
 msgstr "Colima"
@@ -9209,23 +9030,19 @@ msgid "Cozumel"
 msgstr "کوسومل"
 
 #. A city in Morelos in Mexico
-#| msgid "Curacao"
 msgid "Cuernavaca"
 msgstr "Cuernavaca"
 
 #. A city in Sinaloa in Mexico
-#| msgid "Michigan"
 msgid "Culiacán"
 msgstr "Culiacán"
 
 #. A city in Durango in Mexico
-#| msgid "Durango"
 msgctxt "City in Durango, Mexico"
 msgid "Durango"
 msgstr "Durango"
 
 #. A city in Oaxaca in Mexico
-#| msgid "El Monte"
 msgid "El Zapote"
 msgstr "El Zapote"
 
@@ -9246,12 +9063,10 @@ msgid "Ixtapa"
 msgstr "ایستاپا"
 
 #. A city in Oaxaca in Mexico
-#| msgid "Ixtapa"
 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 "La Paz"
@@ -9261,7 +9076,6 @@ msgid "Laguna Tepic"
 msgstr "Laguna Tepic"
 
 #. A city in Guanajuato in Mexico
-#| msgid "Torreón"
 msgctxt "City in Guanajuato, Mexico"
 msgid "León"
 msgstr "León"
@@ -9271,12 +9085,10 @@ msgid "Loreto"
 msgstr "لورتو"
 
 #. A city in Sinaloa in Mexico
-#| msgid "Los Alamos"
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
 #. A city in Colima in Mexico
-#| msgid "Manzanillo"
 msgctxt "City in Colima, Mexico"
 msgid "Manzanillo"
 msgstr "Manzanillo"
@@ -9297,7 +9109,6 @@ msgstr "مخیکالی"
 #. "Mexico City" is the traditional English name.
 #. The local name in Spanish is "México".
 #.
-#| msgid "Mason City"
 msgid "Mexico City"
 msgstr "Mexico City"
 
@@ -9318,24 +9129,20 @@ msgid "Morelia"
 msgstr "مورلیا"
 
 #. A city in Yucatán in Mexico
-#| msgid "Merida"
 msgctxt "City in Yucatán, Mexico"
 msgid "Mérida"
 msgstr "Mérida"
 
 #. A city in Tamaulipas in Mexico
-#| msgid "Laredo"
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
 #. A city in Oaxaca in Mexico
-#| msgid "Oaxaca"
 msgctxt "City in Oaxaca, Mexico"
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
 #. A city in Coahuila in Mexico
-#| msgid "Minneapolis"
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
@@ -9346,13 +9153,11 @@ msgid "Poza Rica de Hidalgo"
 msgstr "Poza Rica de Hidalgo"
 
 #. A city in Puebla in Mexico
-#| msgid "Puebla"
 msgctxt "City in Puebla, Mexico"
 msgid "Puebla"
 msgstr "Puebla"
 
 #. A city in Oaxaca in Mexico
-#| msgid "Estonia"
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
@@ -9361,7 +9166,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 "Querétaro"
@@ -9375,18 +9179,15 @@ msgid "Saltillo"
 msgstr "سالتیلیو"
 
 #. A city in Baja California Sur in Mexico
-#| msgid "São José dos Campos"
 msgid "San José del Cabo"
 msgstr "San José del Cabo"
 
 #. A city in San Luis Potosí in Mexico
-#| msgid "San Luis"
 msgctxt "City in San Luis Potosí, Mexico"
 msgid "San Luis Potosí"
 msgstr "San Luis Potosí"
 
 #. A city in Tamaulipas in Mexico
-#| msgid "Campo"
 msgid "Tampico"
 msgstr "Tampico"
 
@@ -9407,17 +9208,14 @@ msgid "Torreón"
 msgstr "تورئون"
 
 #. A city in Chiapas in Mexico
-#| msgid "Tulsa"
 msgid "Tuxtla"
 msgstr "Tuxtla"
 
 #. A city in Michoacán in Mexico
-#| msgid "Japan"
 msgid "Uruapan"
 msgstr "Uruapan"
 
 #. A city in Veracruz in Mexico
-#| msgid "Veracruz"
 msgctxt "City in Veracruz, Mexico"
 msgid "Veracruz"
 msgstr "Veracruz"
@@ -9427,13 +9225,11 @@ msgid "Villahermosa"
 msgstr "بیاارموسا"
 
 #. A city in Zacatecas in Mexico
-#| msgid "Zacatecas"
 msgctxt "City in Zacatecas, Mexico"
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
 #. The capital of the Federated States of Micronesia
-#| msgid "Balikesir"
 msgid "Palikir"
 msgstr "Palikir"
 
@@ -9442,7 +9238,6 @@ msgid "Chişinău"
 msgstr "کیشی‌نف"
 
 #. The capital of Monaco
-#| msgid "Moncton"
 msgctxt "City in Monaco"
 msgid "Monaco"
 msgstr "Monaco"
@@ -9450,7 +9245,6 @@ msgstr "Monaco"
 #. The capital of Mongolia.
 #. The name is also written "Улаанбаатар".
 #.
-#| msgid "Ulan-Bator"
 msgid "Ulaanbaatar"
 msgstr "Ulaanbaatar"
 
@@ -9459,7 +9253,6 @@ msgid "Podgorica"
 msgstr "پودگوریتسا"
 
 #. A city in Montenegro
-#| msgid "Tiaret"
 msgid "Tivat"
 msgstr "Tivat"
 
@@ -9472,7 +9265,6 @@ msgid "Al Hoceima"
 msgstr "Al Hoceima"
 
 #. A city in Morocco
-#| msgid "Flores"
 msgid "Fes"
 msgstr "Fes"
 
@@ -9485,12 +9277,10 @@ msgid "Meknes"
 msgstr "مکنس"
 
 #. A city in Morocco
-#| msgid "Ecuador"
 msgid "Nador"
 msgstr "Nador"
 
 #. A city in Morocco
-#| msgid "Roseburg"
 msgid "Nouaseur"
 msgstr "Nouaseur"
 
@@ -9499,12 +9289,10 @@ msgid "Ouarzazat"
 msgstr "Ouarzazat"
 
 #. A city in Morocco
-#| msgid "Sudan"
 msgid "Oujda"
 msgstr "Oujda"
 
 #. The capital of Morocco
-#| msgid "Alabat"
 msgid "Rabat"
 msgstr "Rabat"
 
@@ -9512,12 +9300,10 @@ msgstr "Rabat"
 #. "Tangier" is the traditional English name.
 #. The local name is "Tanger".
 #.
-#| msgid "Tanagra"
 msgid "Tangier"
 msgstr "Tangier"
 
 #. A city in Morocco
-#| msgid "Trenton"
 msgid "Tetouan"
 msgstr "Tetouan"
 
@@ -9530,12 +9316,10 @@ msgid "Chimoio"
 msgstr "چیمویو"
 
 #. A city in Mozambique
-#| msgid "Michigan"
 msgid "Lichinga"
 msgstr "Lichinga"
 
 #. The capital of Mozambique
-#| msgid "Matsumoto"
 msgid "Maputo"
 msgstr "Maputo"
 
@@ -9544,7 +9328,6 @@ msgid "Nampula"
 msgstr "نمپولا"
 
 #. A city in Mozambique
-#| msgid "Puebla"
 msgid "Pemba"
 msgstr "Pemba"
 
@@ -9556,7 +9339,6 @@ msgstr "کلیمانه"
 #. "Rangoon" is the traditional English name.
 #. The local name in Burmese is "Yangon".
 #.
-#| msgid "Angoon"
 msgid "Rangoon"
 msgstr "Rangoon"
 
@@ -9575,7 +9357,6 @@ msgid "De Kooy"
 msgstr "De Kooy"
 
 #. A city in the Netherlands
-#| msgid "Debrecen"
 msgid "Deelen"
 msgstr "Deelen"
 
@@ -9584,7 +9365,6 @@ msgid "Eindhoven"
 msgstr "آینتهوون"
 
 #. A city in the Netherlands
-#| msgid "Gilmer"
 msgid "Gilze"
 msgstr "Gilze"
 
@@ -9601,7 +9381,6 @@ msgid "Maastricht"
 msgstr "ماستریخت"
 
 #. A city in the Netherlands
-#| msgid "Vlieland"
 msgid "Oost-Vlieland"
 msgstr "Oost-Vlieland"
 
@@ -9613,17 +9392,14 @@ msgstr "روتردام"
 #. "The Hague" is the traditional English name.
 #. The local name in Dutch is "'s-Gravenhage".
 #.
-#| msgid "Terre Haute"
 msgid "The Hague"
 msgstr "The Hague"
 
 #. A city in the Netherlands
-#| msgid "Altenburg"
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
 #. A city in the Netherlands
-#| msgid "Volk"
 msgid "Volkel"
 msgstr "Volkel"
 
@@ -9632,12 +9408,10 @@ msgid "Woensdrecht"
 msgstr "وونزدرخت"
 
 #. A city in the Netherlands Antilles
-#| msgid "Rennes"
 msgid "Benners"
 msgstr "Benners"
 
 #. A city in the Netherlands Antilles
-#| msgid "Cape May"
 msgid "Cupe Coy"
 msgstr "Cupe Coy"
 
@@ -9646,17 +9420,14 @@ msgid "Dorp Nikiboko"
 msgstr "Dorp Nikiboko"
 
 #. A city in the Netherlands Antilles
-#| msgid "Gabon"
 msgid "Gato"
 msgstr "Gato"
 
 #. A city in New Caledonia
-#| msgid "Kananga"
 msgid "Karenga"
 msgstr "Karenga"
 
 #. The capital of New Caledonia
-#| msgid "Houma"
 msgid "Nouméa"
 msgstr "Nouméa"
 
@@ -9681,7 +9452,6 @@ msgid "Chinandega"
 msgstr "چیناندگا"
 
 #. A city in Nicaragua
-#| msgid "Minot"
 msgid "Jinotega"
 msgstr "Jinotega"
 
@@ -9690,12 +9460,10 @@ msgid "Juigalpa"
 msgstr "خوئیگالپا"
 
 #. The capital of Nicaragua
-#| msgid "Manaus"
 msgid "Managua"
 msgstr "Managua"
 
 #. A city in Nicaragua
-#| msgid "Iguazú"
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
@@ -9708,17 +9476,14 @@ msgid "Agadez"
 msgstr "آگادِز"
 
 #. The capital of Niger
-#| msgid "Nice"
 msgid "Niamey"
 msgstr "Niamey"
 
 #. A city in Niger
-#| msgid "Gander"
 msgid "Zinder"
 msgstr "Zinder"
 
 #. A city in Lagos Nigeria
-#| msgid "Beja"
 msgid "Ikeja"
 msgstr "Ikeja"
 
@@ -9731,28 +9496,23 @@ msgid "Kaduna"
 msgstr "کادونا"
 
 #. A city in Nigeria
-#| msgid "Kenya"
 msgid "Kano"
 msgstr "Kano"
 
 #. A city in Nigeria
-#| msgid "Coral Harbour"
 msgid "Port Harcourt"
 msgstr "Port Harcourt"
 
 #. The capital of Niue
-#| msgid "Al-Jouf"
 msgid "Alofi"
 msgstr "Alofi"
 
 #. A city in Norfolk Island
-#| msgid "Kingston"
 msgctxt "City in Norfolk Island"
 msgid "Kingston"
 msgstr "Kingston"
 
 #. A city in the Northern Mariana Islands
-#| msgid "Calapan"
 msgid "Chalan Kanoa"
 msgstr "Chalan Kanoa"
 
@@ -9769,12 +9529,10 @@ msgid "Bodø"
 msgstr "بودو"
 
 #. A city in Norway
-#| msgid "Bole"
 msgid "Bolle"
 msgstr "Bolle"
 
 #. A city in Norway
-#| msgid "Bole"
 msgid "Boltåsen"
 msgstr "Boltåsen"
 
@@ -9783,12 +9541,10 @@ msgid "Brønnøysund"
 msgstr "Brønnøysund"
 
 #. A city in Norway
-#| msgid "Abbotsford"
 msgid "Båtsfjord"
 msgstr "Båtsfjord"
 
 #. A city in Norway
-#| msgid "Salem"
 msgid "Dalem"
 msgstr "Dalem"
 
@@ -9797,7 +9553,6 @@ msgid "Djupdalen"
 msgstr "Djupdalen"
 
 #. A city in Norway
-#| msgid "Elko"
 msgid "Eldskog"
 msgstr "Eldskog"
 
@@ -9806,12 +9561,10 @@ msgid "Fagernes"
 msgstr "فاگرنس"
 
 #. A city in Norway
-#| msgid "Kirkenes"
 msgid "Fiskenes"
 msgstr "Fiskenes"
 
 #. A city in Norway
-#| msgid "Vlieland"
 msgid "Flesland"
 msgstr "Flesland"
 
@@ -9824,7 +9577,6 @@ msgid "Førde"
 msgstr "Førde"
 
 #. A city in Norway
-#| msgid "Garden Creek"
 msgid "Gardermoen"
 msgstr "Gardermoen"
 
@@ -9833,22 +9585,18 @@ msgid "Hammerfest"
 msgstr "هامرفست"
 
 #. A city in Norway
-#| msgid "Narvik"
 msgid "Hasvik"
 msgstr "Hasvik"
 
 #. A city in Norway
-#| msgid "Hadsund"
 msgid "Haugesund"
 msgstr "Haugesund"
 
 #. A city in Norway
-#| msgid "Ho"
 msgid "Holm"
 msgstr "Holm"
 
 #. A city in Norway
-#| msgid "Honningsvåg/Valan"
 msgid "Honningsvåg"
 msgstr "Honningsvåg"
 
@@ -9857,27 +9605,22 @@ msgid "Kirkenes"
 msgstr "خیرکنس"
 
 #. A city in Norway
-#| msgid "Kiev"
 msgid "Kjevik"
 msgstr "Kjevik"
 
 #. A city in Norway
-#| msgid "Kristianstad"
 msgid "Kristiansund"
 msgstr "Kristiansund"
 
 #. A city in Norway
-#| msgid "Mariehamn"
 msgid "Mehamn"
 msgstr "Mehamn"
 
 #. A city in Norway
-#| msgid "Golden"
 msgid "Molde"
 msgstr "Molde"
 
 #. A city in Norway
-#| msgid "Voss/Bømoen"
 msgid "Mosjøen"
 msgstr "Mosjøen"
 
@@ -9894,7 +9637,6 @@ msgid "Notodden"
 msgstr "نوتودن"
 
 #. A city in Norway
-#| msgid "Oseberg A"
 msgid "Oseberg"
 msgstr "Oseberg"
 
@@ -9903,7 +9645,6 @@ msgid "Oslo"
 msgstr "اوسلو"
 
 #. A city in Norway
-#| msgid "Reyes"
 msgid "Rygge"
 msgstr "Rygge"
 
@@ -9912,47 +9653,38 @@ msgid "Røros"
 msgstr "روروس"
 
 #. A city in Norway
-#| msgid "Narvik"
 msgid "Rørvik"
 msgstr "Rørvik"
 
 #. A city in Norway
-#| msgid "Russell"
 msgid "Røssvoll"
 msgstr "Røssvoll"
 
 #. A city in Norway
-#| msgid "Røros"
 msgid "Røst"
 msgstr "Røst"
 
 #. A city in Norway
-#| msgid "Canadian"
 msgid "Sandane"
 msgstr "Sandane"
 
 #. A city in Norway
-#| msgid "Saghez"
 msgid "Skagen"
 msgstr "Skagen"
 
 #. A city in Norway
-#| msgid "Skive"
 msgid "Skien"
 msgstr "Skien"
 
 #. A city in Norway
-#| msgid "Yola"
 msgid "Sola"
 msgstr "Sola"
 
 #. A city in Norway
-#| msgid "Atoka"
 msgid "Stokka"
 msgstr "Stokka"
 
 #. A city in Norway
-#| msgid "Sartine Island"
 msgid "Svartnes"
 msgstr "Svartnes"
 
@@ -9961,22 +9693,18 @@ msgid "Svolvær"
 msgstr "Svolvær"
 
 #. A city in Norway
-#| msgid "Røros"
 msgid "Sørkjosen"
 msgstr "Sørkjosen"
 
 #. A city in Norway
-#| msgid "Tours"
 msgid "Torp"
 msgstr "Torp"
 
 #. A city in Norway
-#| msgid "Tromsø/Langnes"
 msgid "Tromsø"
 msgstr "Tromsø"
 
 #. A city in Norway
-#| msgid "Trondheim/Vaernes"
 msgid "Trondheim"
 msgstr "Trondheim"
 
@@ -9985,12 +9713,10 @@ msgid "Vadsø"
 msgstr "وادسو"
 
 #. A city in Norway
-#| msgid "Ålesund/Vigra"
 msgid "Ålesund"
 msgstr "Ålesund"
 
 #. A city in Norway
-#| msgid "Larissa"
 msgid "Ørsta"
 msgstr "Ørsta"
 
@@ -10002,7 +9728,6 @@ msgstr "Mu'askar al Murtafi'ah"
 #. "Muscat" is the traditional English name.
 #. The local name in Arabic is "Masqat".
 #.
-#| msgid "Murcia"
 msgid "Muscat"
 msgstr "Muscat"
 
@@ -10027,12 +9752,10 @@ msgid "Nawabshah"
 msgstr "نواب شاه"
 
 #. The capital of Palau
-#| msgid "Coro"
 msgid "Koror"
 msgstr "Koror"
 
 #. The capital of Palau
-#| msgid "Meeker"
 msgid "Melekeok"
 msgstr "Melekeok"
 
@@ -10049,12 +9772,10 @@ msgid "Panamá"
 msgstr "پاناما"
 
 #. A city in Panama
-#| msgid "Tyumen"
 msgid "Tocumen"
 msgstr "Tocumen"
 
 #. The capital of Papua New Guinea
-#| msgid "Moresby"
 msgid "Port Moresby"
 msgstr "Port Moresby"
 
@@ -10067,7 +9788,6 @@ msgid "Colonia Félix de Azara"
 msgstr "Colonia Félix de Azara"
 
 #. A city in Peru
-#| msgid "Andahuayla"
 msgid "Andahuaylas"
 msgstr "Andahuaylas"
 
@@ -10084,7 +9804,6 @@ msgid "Chiclayo"
 msgstr "چیکلایو"
 
 #. A city in Peru
-#| msgid "Cuzco"
 msgid "Cusco"
 msgstr "Cusco"
 
@@ -10097,7 +9816,6 @@ msgid "Juliaca"
 msgstr "خولیاکا"
 
 #. The capital of Peru
-#| msgid "Lima"
 msgctxt "City in Peru"
 msgid "Lima"
 msgstr "Lima"
@@ -10111,7 +9829,6 @@ msgid "Pucallpa"
 msgstr "پوکایپا"
 
 #. A city in Peru
-#| msgid "Macedonia"
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
@@ -10120,12 +9837,10 @@ msgid "Tacna"
 msgstr "تاکنا"
 
 #. A city in Peru
-#| msgid "Tarija"
 msgid "Talara"
 msgstr "Talara"
 
 #. A city in Peru
-#| msgid "Taranto"
 msgid "Tarapoto"
 msgstr "Tarapoto"
 
@@ -10138,7 +9853,6 @@ msgid "Tumbes"
 msgstr "تومبس"
 
 #. A city in the Philippines
-#| msgid "Los Angeles"
 msgid "Angeles"
 msgstr "Angeles"
 
@@ -10147,7 +9861,6 @@ msgid "Davao"
 msgstr "داوائو"
 
 #. A city in the Philippines
-#| msgid "Laos"
 msgid "Laoag"
 msgstr "Laoag"
 
@@ -10160,17 +9873,14 @@ msgid "Masbate"
 msgstr "ماسواته"
 
 #. A city in the Philippines
-#| msgid "Mildura"
 msgid "Pildira"
 msgstr "Pildira"
 
 #. A city in the Philippines
-#| msgid "Dubai"
 msgid "Subic"
 msgstr "Subic"
 
 #. A city in the Philippines
-#| msgid "Zamboanga"
 msgid "Zamboanga City"
 msgstr "Zamboanga City"
 
@@ -10202,7 +9912,6 @@ msgstr "اشچتسین"
 #. "Warsaw" is the traditional English name.
 #. The local name in Polish is "Warszawa".
 #.
-#| msgid "Waseca"
 msgctxt "City in Poland"
 msgid "Warsaw"
 msgstr "Warsaw"
@@ -10220,7 +9929,6 @@ msgid "Beja"
 msgstr "بژا"
 
 #. A city in Portugal
-#| msgid "Cape Blanco"
 msgid "Castelo Branco"
 msgstr "Castelo Branco"
 
@@ -10229,7 +9937,6 @@ msgid "Faro"
 msgstr "فارو"
 
 #. A city in Portugal
-#| msgid "Florida"
 msgid "Flor da Rosa"
 msgstr "Flor da Rosa"
 
@@ -10253,7 +9960,6 @@ msgid "Montijo"
 msgstr "مونتیخو"
 
 #. A city in Portugal
-#| msgid "Hvar"
 msgid "Ovar"
 msgstr "Ovar"
 
@@ -10262,19 +9968,16 @@ msgid "Ponta Delgada"
 msgstr "پونتا دلگادا"
 
 #. A city in Portugal
-#| msgid "Loreto"
 msgid "Porto"
 msgstr "Porto"
 
 #. A city in Portugal
-#| msgid "Toronto"
 msgid "Porto Santo"
 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 "Santa Cruz das Flores"
 
@@ -10341,12 +10044,10 @@ msgid "Iaşi"
 msgstr "یاشی"
 
 #. A city in Romania
-#| msgid "Mihail Kogalniceanu"
 msgid "Mihail Kogălniceanu"
 msgstr "Mihail Kogălniceanu"
 
 #. A city in Romania
-#| msgid "Odesa"
 msgid "Oradea"
 msgstr "Oradea"
 
@@ -10389,28 +10090,24 @@ msgstr "آدلر"
 #. A city in Russia.
 #. The local name in Russian is "Анадырь".
 #.
-#| msgid "Anadyr"
 msgid "Anadyr'"
 msgstr "Anadyr'"
 
 #. A city in Russia.
 #. The local name in Russian is "Анапа".
 #.
-#| msgid "Andapa"
 msgid "Anapa"
 msgstr "Anapa"
 
 #. A city in Russia.
 #. The local name in Russian is "Архангельск".
 #.
-#| msgid "Arkhangel'Sk"
 msgid "Arkhangel'sk"
 msgstr "Arkhangel'sk"
 
 #. A city in Russia.
 #. The local name in Russian is "Астрахань".
 #.
-#| msgid "Astrakhan"
 msgid "Astrakhan'"
 msgstr "Astrakhan'"
 
@@ -10423,21 +10120,18 @@ msgstr "برنائول"
 #. A city in Russia.
 #. The local name in Russian is "Брацк".
 #.
-#| msgid "Brjansk"
 msgid "Bratsk"
 msgstr "Bratsk"
 
 #. A city in Russia.
 #. The local name in Russian is "Брянск".
 #.
-#| msgid "Brjansk"
 msgid "Bryansk"
 msgstr "Bryansk"
 
 #. A city in Russia.
 #. The local name in Russian is "Челябинск".
 #.
-#| msgid "Chelyabinsk-Balandino"
 msgid "Chelyabinsk"
 msgstr "Chelyabinsk"
 
@@ -10450,14 +10144,12 @@ msgstr "چیتا"
 #. A city in Russia.
 #. The local name in Russian is "Чульман".
 #.
-#| msgid "Cullman"
 msgid "Chul'man"
 msgstr "Chul'man"
 
 #. A city in Russia.
 #. The local name in Russian is "Энгельс".
 #.
-#| msgid "Angers"
 msgid "Engel's"
 msgstr "Engel's"
 
@@ -10518,14 +10210,12 @@ msgstr "مگادان"
 #. A city in Russia.
 #. The local name in Russian is "Минеральные Воды".
 #.
-#| msgid "Mineral Point"
 msgid "Mineral'nyye Vody"
 msgstr "Mineral'nyye Vody"
 
 #. A city in Russia.
 #. The local name in Russian is "Мирный".
 #.
-#| msgid "Mirny"
 msgid "Mirnyy"
 msgstr "Mirnyy"
 
@@ -10533,7 +10223,6 @@ msgstr "Mirnyy"
 #. "Moscow" is the traditional English name.
 #. The local name in Russian is "Moskva / Москва".
 #.
-#| msgid "Moscow"
 msgctxt "City in Russia"
 msgid "Moscow"
 msgstr "Moscow"
@@ -10547,21 +10236,18 @@ msgstr "مورمانسک"
 #. A city in Russia.
 #. The local name in Russian is "Нальчик".
 #.
-#| msgid "Nalchik"
 msgid "Nal'chik"
 msgstr "Nal'chik"
 
 #. A city in Russia.
 #. The local name in Russian is "Нижневартовск".
 #.
-#| msgid "Nizhneudinsk"
 msgid "Nizhnevartovsk"
 msgstr "Nizhnevartovsk"
 
 #. A city in Russia.
 #. The local name in Russian is "Новокузнецк".
 #.
-#| msgid "Donets'k"
 msgid "Novokuznetsk"
 msgstr "Novokuznetsk"
 
@@ -10586,28 +10272,24 @@ msgstr "آرنبورک"
 #. A city in Russia.
 #. The local name in Russian is "Пенза".
 #.
-#| msgid "Potenza"
 msgid "Penza"
 msgstr "Penza"
 
 #. A city in Russia.
 #. The local name in Russian is "Пермь".
 #.
-#| msgid "Palermo"
 msgid "Perm'"
 msgstr "Perm'"
 
 #. A city in Russia.
 #. The local name in Russian is "Петропавловск-Камчатский".
 #.
-#| msgid "Petrozavodsk"
 msgid "Petropavlovsk"
 msgstr "Petropavlovsk"
 
 #. A city in Russia.
 #. The local name in Russian is "Ростов-на-Дону".
 #.
-#| msgid "Rostock"
 msgid "Rostov"
 msgstr "Rostov"
 
@@ -10616,7 +10298,6 @@ msgstr "Rostov"
 #. The local name in Russian is "Sankt-Peterburg /
 #. Санкт-Петербург".
 #.
-#| msgid "St. Petersburg"
 msgid "Saint Petersburg"
 msgstr "Saint Petersburg"
 
@@ -10633,21 +10314,18 @@ msgstr "ساراتف"
 #. A city in Russia.
 #. The local name in Russian is "Ставрополь".
 #.
-#| msgid "Stavropol"
 msgid "Stavropol'"
 msgstr "Stavropol'"
 
 #. A city in Russia.
 #. The local name in Russian is "Стригино".
 #.
-#| msgid "Sturgis"
 msgid "Strigino"
 msgstr "Strigino"
 
 #. A city in Russia.
 #. The local name in Russian is "Сургут".
 #.
-#| msgid "Sturgis"
 msgid "Surgut"
 msgstr "Surgut"
 
@@ -10656,7 +10334,6 @@ msgid "Syktyvkar"
 msgstr "سیکتیوار"
 
 #. A city in Russia
-#| msgid "Tunisia"
 msgid "Tiksi"
 msgstr "Tiksi"
 
@@ -10693,7 +10370,6 @@ msgid "Volgograd"
 msgstr "ولگاگرات"
 
 #. A city in Russia
-#| msgid "Voronez"
 msgid "Voronezh"
 msgstr "Voronezh"
 
@@ -10702,7 +10378,6 @@ msgid "Yakutsk"
 msgstr "یکوتسک"
 
 #. A city in Russia
-#| msgid "Ekaterinburg"
 msgid "Yekaterinburg"
 msgstr "Yekaterinburg"
 
@@ -10711,24 +10386,20 @@ msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
 #. The capital of Réunion
-#| msgid "Saint-Quentin"
 msgid "Saint-Denis"
 msgstr "Saint-Denis"
 
 #. A city in Réunion
-#| msgid "Saint-Pierre"
 msgctxt "City in Réunion"
 msgid "Saint-Pierre"
 msgstr "Saint-Pierre"
 
 #. A city in Saint Helena
-#| msgid "Georgetown"
 msgctxt "City in Saint Helena"
 msgid "Georgetown"
 msgstr "Georgetown"
 
 #. The capital of Saint Kitts and Nevis
-#| msgid "Barre"
 msgid "Basseterre"
 msgstr "Basseterre"
 
@@ -10737,55 +10408,45 @@ msgid "Golden Rock"
 msgstr "گولدن راک"
 
 #. A city in Saint Kitts and Nevis
-#| msgid "Newcastle"
 msgctxt "City in Saint Kitts and Nevis"
 msgid "Newcastle"
 msgstr "Newcastle"
 
 #. The capital of Saint Lucia
-#| msgid "Chartres"
 msgid "Castries"
 msgstr "Castries"
 
 #. A city in Saint Lucia
-#| msgid "Monte Real"
 msgid "Pointe Sable"
 msgstr "Pointe Sable"
 
 #. A city in Saint Lucia
-#| msgid "Vigan"
 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 "Saint-Pierre"
 
 #. A city in Saint Vincent and the Grenadines
-#| msgid "Burns Lake"
 msgid "Arnos Vale"
 msgstr "Arnos Vale"
 
 #. The capital of Saint Vincent and the Grenadines
-#| msgid "Kingston"
 msgid "Kingstown"
 msgstr "Kingstown"
 
 #. The capital of Samoa
-#| msgid "Asia"
 msgid "Apia"
 msgstr "Apia"
 
 #. The capital of San Marino
-#| msgid "San Marcos"
 msgctxt "City in San Marino"
 msgid "San Marino"
 msgstr "San Marino"
 
 #. A city in Saudi Arabia
-#| msgid "Arar"
 msgid "'Ar'ar"
 msgstr "'Ar'ar"
 
@@ -10794,17 +10455,14 @@ msgid "Abha"
 msgstr "ابها"
 
 #. A city in Saudi Arabia
-#| msgid "Dammam"
 msgid "Ad Dalfa'ah"
 msgstr "Ad Dalfa'ah"
 
 #. A city in Saudi Arabia
-#| msgid "Dammam"
 msgid "Ad Dammam"
 msgstr "Ad Dammam"
 
 #. A city in Saudi Arabia
-#| msgid "Al Ain"
 msgid "Al 'Aqiq"
 msgstr "Al 'Aqiq"
 
@@ -10813,17 +10471,14 @@ msgid "Al Qaysumah"
 msgstr "القیصومه"
 
 #. A city in Saudi Arabia
-#| msgid "Al Qaysumah"
 msgid "Al Qurayyat"
 msgstr "Al Qurayyat"
 
 #. A city in Saudi Arabia
-#| msgid "Al Baha"
 msgid "Al Wajh"
 msgstr "Al Wajh"
 
 #. A city in Saudi Arabia
-#| msgid "Al Qaysumah"
 msgid "Al Wuday'ah"
 msgstr "Al Wuday'ah"
 
@@ -10832,7 +10487,6 @@ msgid "Ar Ruqayyiqah"
 msgstr "Ar Ruqayyiqah"
 
 #. A city in Saudi Arabia
-#| msgid "Taif"
 msgid "At Ta'if"
 msgstr "At Ta'if"
 
@@ -10844,22 +10498,18 @@ msgid "Dhahran"
 msgstr "ظهران"
 
 #. A city in Saudi Arabia
-#| msgid "Hail"
 msgid "Ha'il"
 msgstr "Ha'il"
 
 #. A city in Saudi Arabia
-#| msgid "Jeddah"
 msgid "Jiddah"
 msgstr "Jiddah"
 
 #. A city in Saudi Arabia
-#| msgid "Gizan"
 msgid "Jizan"
 msgstr "Jizan"
 
 #. A city in Saudi Arabia
-#| msgid "Khamis Mushait"
 msgid "Khamis Mushayt"
 msgstr "Khamis Mushayt"
 
@@ -10871,7 +10521,6 @@ msgstr "Masjid Ibn Rashid"
 #. "Mecca" is the traditional English name.
 #. The local name in Arabic is "Makkah".
 #.
-#| msgid "Meacham"
 msgid "Mecca"
 msgstr "Mecca"
 
@@ -10879,7 +10528,6 @@ msgstr "Mecca"
 #. "Medina" is the traditional English name.
 #. The local name in Arabic is "Al Madinah al Munawwarah".
 #.
-#| msgid "Mena"
 msgid "Medina"
 msgstr "Medina"
 
@@ -10892,7 +10540,6 @@ msgid "Qal'at Bishah"
 msgstr "Qal'at Bishah"
 
 #. A city in Saudi Arabia
-#| msgid "Barca"
 msgid "Qara"
 msgstr "Qara"
 
@@ -10912,12 +10559,10 @@ msgid "Tabuk"
 msgstr "تبوک"
 
 #. A city in Saudi Arabia
-#| msgid "Farah"
 msgid "Tamrah"
 msgstr "Tamrah"
 
 #. A city in Saudi Arabia
-#| msgid "Turaif"
 msgid "Turayf"
 msgstr "Turayf"
 
@@ -10930,7 +10575,6 @@ msgid "Boukot Ouolof"
 msgstr "Boukot Ouolof"
 
 #. The capital of Senegal
-#| msgid "Dhaka"
 msgid "Dakar"
 msgstr "Dakar"
 
@@ -10939,7 +10583,6 @@ msgid "Saint-Louis"
 msgstr "سن لوئی"
 
 #. A city in Senegal
-#| msgid "Tabas"
 msgid "Tambacounda"
 msgstr "Tambacounda"
 
@@ -10963,33 +10606,27 @@ msgid "Vršac"
 msgstr "ورشاتس"
 
 #. A city in Serbia
-#| msgid "Melun"
 msgid "Zemun"
 msgstr "Zemun"
 
 #. A city in the Seychelles
-#| msgid "Cascade Locks"
 msgid "Cascade"
 msgstr "Cascade"
 
 #. The capital of the Seychelles
-#| msgid "Victoria"
 msgctxt "City in Seychelles"
 msgid "Victoria"
 msgstr "Victoria"
 
 #. The capital of Sierra Leone
-#| msgid "Greytown"
 msgid "Freetown"
 msgstr "Freetown"
 
 #. A city in Sierra Leone
-#| msgid "Guangxi"
 msgid "Lungi"
 msgstr "Lungi"
 
 #. The capital of Singapore
-#| msgid "Singapore"
 msgctxt "City in Singapore"
 msgid "Singapore"
 msgstr "Singapore"
@@ -11023,7 +10660,6 @@ msgid "Piešťany"
 msgstr "پیئشتانی"
 
 #. A city in Slovakia
-#| msgid "Portland"
 msgid "Poprad"
 msgstr "Poprad"
 
@@ -11032,7 +10668,6 @@ msgid "Prievidza"
 msgstr "پریئویدزا"
 
 #. A city in Slovakia
-#| msgid "Salida"
 msgid "Sliač"
 msgstr "Sliač"
 
@@ -11045,27 +10680,22 @@ msgid "Maribor"
 msgstr "ماریبور"
 
 #. A city in Slovenia
-#| msgid "Loreto"
 msgid "Portorož"
 msgstr "Portorož"
 
 #. The capital of the Solomon Islands
-#| msgid "Honduras"
 msgid "Honiara"
 msgstr "Honiara"
 
 #. A city in South Africa
-#| msgid "Bloomington"
 msgid "Bloemfontein"
 msgstr "Bloemfontein"
 
 #. A city in South Africa
-#| msgid "Cape Young"
 msgid "Cape Town"
 msgstr "Cape Town"
 
 #. A city in South Africa
-#| msgid "Durant"
 msgid "Durban"
 msgstr "Durban"
 
@@ -11078,13 +10708,10 @@ msgid "Klerksdorp"
 msgstr "Klerksdorp"
 
 #. A city in South Africa
-#| msgid "Elizabethtown"
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
 #. A city in South Africa
-#| msgctxt "City in Minnesota, United States"
-#| msgid "Rochester"
 msgid "Potchefstroom"
 msgstr "Potchefstroom"
 
@@ -11093,8 +10720,6 @@ msgid "Pretoria"
 msgstr "پرتوریا"
 
 #. A city in South Africa
-#| msgctxt "City in Arkansas, United States"
-#| msgid "Hot Springs"
 msgid "Springs"
 msgstr "Springs"
 
@@ -11103,12 +10728,10 @@ msgid "Upington"
 msgstr "آپینگتون"
 
 #. A city in South Africa
-#| msgid "Vermilion"
 msgid "Vereeniging"
 msgstr "Vereeniging"
 
 #. A city in South Korea
-#| msgid "Chungju"
 msgid "Ch'ongju"
 msgstr "Ch'ongju"
 
@@ -11117,29 +10740,24 @@ msgid "Cheju"
 msgstr "چه‌جو"
 
 #. A city in South Korea
-#| msgid "Ancona"
 msgid "Inch'on"
 msgstr "Inch'on"
 
 #. A city in South Korea
-#| msgid "Hunan"
 msgid "Kunsan"
 msgstr "Kunsan"
 
 #. A city in South Korea.
 #. The name is also written "오산".
 #.
-#| msgid "Oman"
 msgid "Osan"
 msgstr "Osan"
 
 #. A city in South Korea
-#| msgid "Pyongyang"
 msgid "P'yongt'aek"
 msgstr "P'yongt'aek"
 
 #. A city in South Korea
-#| msgid "Pullman"
 msgid "Pusan"
 msgstr "Pusan"
 
@@ -11151,48 +10769,38 @@ msgid "Seoul"
 msgstr "سئول"
 
 #. A city in South Korea
-#| msgid "Tartu"
 msgid "Taegu"
 msgstr "Taegu"
 
 #. A city in Spain
-#| msgid "Arua"
 msgid "A Coruña"
 msgstr "A Coruña"
 
 #. A city in Spain
-#| msgid "Anchialos"
 msgid "Agoncillo"
 msgstr "Agoncillo"
 
 #. A city in Spain
-#| msgctxt "Region"
-#| msgid "Antarctica"
 msgid "Alcantarilla"
 msgstr "Alcantarilla"
 
 #. A city in Spain
-#| msgid "Alice"
 msgid "Alicante"
 msgstr "Alicante"
 
 #. A city in Spain
-#| msgid "Alameda"
 msgid "Almería"
 msgstr "Almería"
 
 #. A city in Spain
-#| msgid "Aurillac"
 msgid "Armilla"
 msgstr "Armilla"
 
 #. A city in Spain
-#| msgid "Antigo"
 msgid "Atogo"
 msgstr "Atogo"
 
 #. A city in Spain
-#| msgid "Asturias/Avilés"
 msgid "Avilés"
 msgstr "Avilés"
 
@@ -11201,54 +10809,44 @@ msgid "Barajas"
 msgstr "باراخاس"
 
 #. A city in Spain
-#| msgid "Barcelona"
 msgctxt "City in Spain"
 msgid "Barcelona"
 msgstr "Barcelona"
 
 #. A city in Spain
-#| msgid "Bilma"
 msgid "Bilbao"
 msgstr "Bilbao"
 
 #. A city in Spain
-#| msgid "Colmar"
 msgid "Colmenar Viejo"
 msgstr "Colmenar Viejo"
 
 #. A city in Spain
-#| msgid "Cordova"
 msgid "Corcovados"
 msgstr "Corcovados"
 
 #. A city in Spain
-#| msgid "Chartres"
 msgid "Cuatro Vientos"
 msgstr "Cuatro Vientos"
 
 #. A city in Spain
-#| msgid "Córdoba"
 msgctxt "City in Spain"
 msgid "Córdoba"
 msgstr "Córdoba"
 
 #. A city in Spain
-#| msgid "El Dorado"
 msgid "El Matorral"
 msgstr "El Matorral"
 
 #. A city in Spain
-#| msgid "Ferrara"
 msgid "Fuenterrabía"
 msgstr "Fuenterrabía"
 
 #. A city in Spain
-#| msgid "Gagnoa"
 msgid "Gando"
 msgstr "Gando"
 
 #. A city in Spain
-#| msgid "Gorna"
 msgid "Gerona"
 msgstr "Gerona"
 
@@ -11257,38 +10855,31 @@ msgid "Getafe"
 msgstr "ختافه"
 
 #. A city in Spain
-#| msgid "Grenada"
 msgid "Granada"
 msgstr "Granada"
 
 #. A city in Spain
-#| msgid "Gilmer"
 msgid "Güime"
 msgstr "Güime"
 
 #. A city in Spain
-#| msgid "Iba"
 msgid "Ibiza"
 msgstr "Ibiza"
 
 #. A city in Spain
-#| msgid "Jerome"
 msgid "Jerez"
 msgstr "Jerez"
 
 #. A city in Spain
-#| msgid "Torreón"
 msgctxt "City in Spain"
 msgid "León"
 msgstr "León"
 
 #. A city in Spain
-#| msgid "Los Alamos"
 msgid "Los Baldíos"
 msgstr "Los Baldíos"
 
 #. A city in Spain
-#| msgid "Los Alamos"
 msgid "Los Llanos"
 msgstr "Los Llanos"
 
@@ -11297,7 +10888,6 @@ msgid "Madrid"
 msgstr "مادرید"
 
 #. A city in Spain
-#| msgid "Man"
 msgid "Mahón"
 msgstr "Mahón"
 
@@ -11306,7 +10896,6 @@ msgid "Melilla"
 msgstr "ملیلا"
 
 #. A city in Spain
-#| msgid "Mossoró"
 msgid "Morón"
 msgstr "Morón"
 
@@ -11315,12 +10904,10 @@ msgid "Málaga"
 msgstr "مالاگا"
 
 #. A city in Spain
-#| msgid "Lošinj"
 msgid "Noáin"
 msgstr "Noáin"
 
 #. A city in Spain
-#| msgid "Pala"
 msgid "Palma"
 msgstr "Palma"
 
@@ -11341,59 +10928,48 @@ msgid "Salamanca"
 msgstr "Salamanca"
 
 #. A city in Spain
-#| msgid "San Juan"
 msgid "San Javier"
 msgstr "San Javier"
 
 #. A city in Spain
-#| msgid "San Carlos"
 msgid "San Pablo"
 msgstr "San Pablo"
 
 #. A city in Spain
-#| msgid "Standerton"
 msgid "Santander"
 msgstr "Santander"
 
 #. A city in Spain
-#| msgid "Santiago"
 msgctxt "City in Spain"
 msgid "Santiago"
 msgstr "Santiago"
 
 #. A city in Spain
-#| msgid "Badajoz/Talavera la Real"
 msgid "Talavera la Real"
 msgstr "Talavera la Real"
 
 #. A city in Spain
-#| msgid "Tamatave"
 msgid "Tamaduste"
 msgstr "Tamaduste"
 
 #. A city in Spain
-#| msgid "Torreón"
 msgid "Torrejón del Rey"
 msgstr "Torrejón del Rey"
 
 #. A city in Spain
-#| msgid "Valencia"
 msgctxt "City in Spain"
 msgid "Valencia"
 msgstr "Valencia"
 
 #. A city in Spain
-#| msgid "Vigan"
 msgid "Vigo"
 msgstr "Vigo"
 
 #. A city in Spain
-#| msgid "Villaguay"
 msgid "Villanubla"
 msgstr "Villanubla"
 
 #. A city in Spain
-#| msgid "Vitoria"
 msgid "Vitoria-Gasteiz"
 msgstr "Vitoria-Gasteiz"
 
@@ -11402,12 +10978,10 @@ msgid "Zaragoza"
 msgstr "ساراگوسا"
 
 #. The capital of Sri Lanka
-#| msgid "Colombia"
 msgid "Colombo"
 msgstr "Colombo"
 
 #. A city in Sri Lanka
-#| msgid "Matsuyama"
 msgid "Katunayaka"
 msgstr "Katunayaka"
 
@@ -11423,12 +10997,10 @@ msgid "Khartoum"
 msgstr "خارطوم"
 
 #. The capital of Suriname
-#| msgid "Parma"
 msgid "Paramaribo"
 msgstr "Paramaribo"
 
 #. A city in Suriname
-#| msgid "Gander"
 msgid "Zanderij"
 msgstr "Zanderij"
 
@@ -11437,17 +11009,14 @@ msgid "Longyearbyen"
 msgstr "Longyearbyen"
 
 #. The capital of Swaziland
-#| msgid "Cochabamba"
 msgid "Lobamba"
 msgstr "Lobamba"
 
 #. A city in Swaziland
-#| msgid "Manning"
 msgid "Manzini"
 msgstr "Manzini"
 
 #. The capital of Swaziland
-#| msgid "Masbate"
 msgid "Mbabane"
 msgstr "Mbabane"
 
@@ -11460,7 +11029,6 @@ msgid "Gällivare"
 msgstr "یلیواره"
 
 #. A city in Sweden
-#| msgid "Gothenburg"
 msgid "Göteborg"
 msgstr "Göteborg"
 
@@ -11517,7 +11085,6 @@ msgid "Norrköping"
 msgstr "نورچوپینگ"
 
 #. A city in Sweden
-#| msgid "Norrköping"
 msgid "Nyköping"
 msgstr "Nyköping"
 
@@ -11538,7 +11105,6 @@ msgid "Stockholm"
 msgstr "استکهلم"
 
 #. A city in Sweden
-#| msgid "Huntsville"
 msgid "Sundsvall"
 msgstr "Sundsvall"
 
@@ -11575,7 +11141,6 @@ msgid "Örnsköldsvik"
 msgstr "اونشولدسویک"
 
 #. A city in Switzerland
-#| msgid "Kassel"
 msgid "Basel"
 msgstr "Basel"
 
@@ -11603,7 +11168,6 @@ msgid "Neuchâtel"
 msgstr "نوشاتل"
 
 #. A city in Switzerland
-#| msgid "Saint Helena"
 msgid "Sankt Gallen"
 msgstr "Sankt Gallen"
 
@@ -11612,17 +11176,14 @@ msgid "Sion"
 msgstr "سیون"
 
 #. A city in Switzerland
-#| msgid "Salt Point"
 msgid "St. Moritz"
 msgstr "St. Moritz"
 
 #. A city in Switzerland
-#| msgid "Zurich"
 msgid "Zürich"
 msgstr "Zürich"
 
 #. A city in Syria
-#| msgid "Kamishli"
 msgid "Al Qamishli"
 msgstr "Al Qamishli"
 
@@ -11648,28 +11209,24 @@ msgstr "Dayr az Zawr"
 #. "Latakia" is the traditional English name.
 #. The local name in Arabic is "Al Ladhiqiyah".
 #.
-#| msgid "Lattakia"
 msgid "Latakia"
 msgstr "Latakia"
 
 #. A city in Taiwan.
 #. The name is also written "高雄".
 #.
-#| msgid "Lansing"
 msgid "Kaohsiung"
 msgstr "Kaohsiung"
 
 #. The capital of Taiwan.
 #. The name is also written "臺北".
 #.
-#| msgid "Tripoli"
 msgid "Taipei"
 msgstr "Taipei"
 
 #. A city in Taiwan.
 #. The name is also written "埔頂".
 #.
-#| msgid "Tahoua"
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
@@ -11686,67 +11243,54 @@ msgid "Bukoba"
 msgstr "بوکوبا"
 
 #. The capital of Tanzania
-#| msgid "Dar Es Salaam"
 msgid "Dar es Salaam"
 msgstr "Dar es Salaam"
 
 #. A city in Tanzania
-#| msgid "Moldova"
 msgid "Dodoma"
 msgstr "Dodoma"
 
 #. A city in Tanzania
-#| msgid "Erding"
 msgid "Iringa"
 msgstr "Iringa"
 
 #. A city in Tanzania
-#| msgid "Kingman"
 msgid "Kigoma"
 msgstr "Kigoma"
 
 #. A city in Tanzania
-#| msgid "Mena"
 msgid "Mbeya"
 msgstr "Mbeya"
 
 #. A city in Tanzania
-#| msgid "Morocco"
 msgid "Morogoro"
 msgstr "Morogoro"
 
 #. A city in Tanzania
-#| msgid "Morris"
 msgid "Moshi"
 msgstr "Moshi"
 
 #. A city in Tanzania
-#| msgid "Marfa"
 msgid "Mtwara"
 msgstr "Mtwara"
 
 #. A city in Tanzania
-#| msgid "Dubai"
 msgid "Musoma"
 msgstr "Musoma"
 
 #. A city in Tanzania
-#| msgid "Manta"
 msgid "Mwanza"
 msgstr "Mwanza"
 
 #. A city in Tanzania
-#| msgid "Tonga"
 msgid "Songea"
 msgstr "Songea"
 
 #. A city in Tanzania
-#| msgid "Tabas"
 msgid "Tabora"
 msgstr "Tabora"
 
 #. A city in Tanzania
-#| msgid "Manitoba"
 msgid "Zanzibar"
 msgstr "Zanzibar"
 
@@ -11766,12 +11310,10 @@ msgid "Chon Buri"
 msgstr "چون‌بوری"
 
 #. A city in Thailand
-#| msgid "Haiti"
 msgid "Hat Yai"
 msgstr "Hat Yai"
 
 #. A city in Thailand
-#| msgid "Hunan"
 msgid "Hua Hin"
 msgstr "Hua Hin"
 
@@ -11780,47 +11322,38 @@ msgid "Khon Kaen"
 msgstr "Khon Kaen"
 
 #. A city in Thailand
-#| msgid "Japan"
 msgid "Lampang"
 msgstr "Lampang"
 
 #. A city in Thailand
-#| msgid "Hong Kong"
 msgid "Mae Hong Son"
 msgstr "Mae Hong Son"
 
 #. A city in Thailand
-#| msgid "Nancy"
 msgid "Nan"
 msgstr "Nan"
 
 #. A city in Thailand
-#| msgid "Prague"
 msgid "Phrae"
 msgstr "Phrae"
 
 #. A city in Thailand
-#| msgid "Pawtucket"
 msgid "Phuket"
 msgstr "Phuket"
 
 #. A city in Thailand
-#| msgid "Angoon"
 msgid "Ranong"
 msgstr "Ranong"
 
 #. A city in Thailand
-#| msgid "Raton"
 msgid "Rayong"
 msgstr "Rayong"
 
 #. A city in Thailand
-#| msgid "Santa Ana"
 msgid "Surat Thani"
 msgstr "Surat Thani"
 
 #. A city in Thailand
-#| msgid "Tirana"
 msgid "Trang"
 msgstr "Trang"
 
@@ -11849,17 +11382,14 @@ msgid "Nuku'alofa"
 msgstr "نوکوآلوفا"
 
 #. A city in Trinidad and Tobago
-#| msgid "Concord"
 msgid "Bon Accord"
 msgstr "Bon Accord"
 
 #. A city in Trinidad and Tobago
-#| msgid "Paros"
 msgid "Piarco"
 msgstr "Piarco"
 
 #. The capital of Trinidad and Tobago
-#| msgid "Port Said"
 msgid "Port-of-Spain"
 msgstr "Port-of-Spain"
 
@@ -11868,7 +11398,6 @@ msgid "Bizerte"
 msgstr "بیزرت"
 
 #. A city in Tunisia
-#| msgid "El Dorado"
 msgid "El Borma"
 msgstr "El Borma"
 
@@ -11893,7 +11422,6 @@ msgid "Kairouan"
 msgstr "کروئان"
 
 #. A city in Tunisia
-#| msgid "Mostar"
 msgid "Monastir"
 msgstr "Monastir"
 
@@ -11902,37 +11430,30 @@ msgid "Qulaybiyah"
 msgstr "Qulaybiyah"
 
 #. A city in Tunisia
-#| msgid "Rwanda"
 msgid "Remada"
 msgstr "Remada"
 
 #. A city in Tunisia
-#| msgid "Sofia"
 msgid "Sfax"
 msgstr "Sfax"
 
 #. A city in Tunisia
-#| msgid "Tabas"
 msgid "Tabarka"
 msgstr "Tabarka"
 
 #. A city in Tunisia
-#| msgid "Tours"
 msgid "Tozeur"
 msgstr "Tozeur"
 
 #. The capital of Tunisia
-#| msgid "Tunisia"
 msgid "Tunis"
 msgstr "Tunis"
 
 #. A city in Turkey
-#| msgid "Agana"
 msgid "Adana"
 msgstr "Adana"
 
 #. The capital of Turkey
-#| msgid "Anadyr"
 msgid "Ankara"
 msgstr "Ankara"
 
@@ -11953,7 +11474,6 @@ msgid "Bodrum"
 msgstr "بودروم"
 
 #. A city in Turkey
-#| msgid "Bauru"
 msgid "Burdur"
 msgstr "Burdur"
 
@@ -11982,7 +11502,6 @@ msgid "Eskisehir"
 msgstr "Eskisehir"
 
 #. A city in Turkey
-#| msgid "El Monte"
 msgid "Gaziantep"
 msgstr "Gaziantep"
 
@@ -11995,17 +11514,14 @@ msgid "Izmir"
 msgstr "ازمیر"
 
 #. A city in Turkey
-#| msgid "Karaj"
 msgid "Kars"
 msgstr "Kars"
 
 #. A city in Turkey
-#| msgid "Kaiser"
 msgid "Kayseri"
 msgstr "Kayseri"
 
 #. A city in Turkey
-#| msgid "Islay"
 msgid "Kislakoy"
 msgstr "Kislakoy"
 
@@ -12014,23 +11530,18 @@ msgid "Konya"
 msgstr "کونیا"
 
 #. A city in Turkey
-#| msgid "Malta"
 msgid "Malatya"
 msgstr "Malatya"
 
 #. A city in Turkey
-#| msgctxt "City in Illinois, United States"
-#| msgid "Marion"
 msgid "Merzifon"
 msgstr "Merzifon"
 
 #. A city in Turkey
-#| msgid "Nevers"
 msgid "Nevsehir"
 msgstr "Nevsehir"
 
 #. A city in Turkey
-#| msgid "Salmon"
 msgid "Samsun"
 msgstr "Samsun"
 
@@ -12039,12 +11550,10 @@ msgid "Tepetarla"
 msgstr "Tepetarla"
 
 #. A city in Turkey
-#| msgid "Gabon"
 msgid "Trabzon"
 msgstr "Trabzon"
 
 #. A city in Turkey
-#| msgid "Varna"
 msgid "Van"
 msgstr "Van"
 
@@ -12068,27 +11577,22 @@ msgid "Entebbe"
 msgstr "انتبه"
 
 #. A city in Uganda
-#| msgid "Kabul"
 msgid "Kabale"
 msgstr "Kabale"
 
 #. The capital of Uganda
-#| msgid "Kavala"
 msgid "Kampala"
 msgstr "Kampala"
 
 #. A city in Ukraine
-#| msgid "Boryspil"
 msgid "Boryspil'"
 msgstr "Boryspil'"
 
 #. A city in Ukraine
-#| msgid "Chicago"
 msgid "Chagor"
 msgstr "Chagor"
 
 #. A city in Ukraine
-#| msgid "Donets'k"
 msgid "Dnipropetrovs'k"
 msgstr "Dnipropetrovs'k"
 
@@ -12097,7 +11601,6 @@ msgid "Donets'k"
 msgstr "دانتسک"
 
 #. A city in Ukraine
-#| msgid "Gomel'"
 msgid "Hostomel'"
 msgstr "Hostomel'"
 
@@ -12121,17 +11624,14 @@ msgid "Kryvyy Rih"
 msgstr "Kryvyy Rih"
 
 #. A city in Ukraine
-#| msgid "Livno"
 msgid "L'viv"
 msgstr "L'viv"
 
 #. A city in Ukraine
-#| msgid "Monroe"
 msgid "Mokroye"
 msgstr "Mokroye"
 
 #. A city in Ukraine
-#| msgid "Morlaix"
 msgid "Mykolayiv"
 msgstr "Mykolayiv"
 
@@ -12140,7 +11640,6 @@ msgid "Odesa"
 msgstr "اودسا"
 
 #. A city in Ukraine
-#| msgid "Rheine"
 msgid "Rivne"
 msgstr "Rivne"
 
@@ -12164,12 +11663,10 @@ msgid "Abu Dhabi"
 msgstr "ابوظبی"
 
 #. A city in the United Arab Emirates
-#| msgid "Al Ain"
 msgid "Al 'Ayn"
 msgstr "Al 'Ayn"
 
 #. A city in the United Arab Emirates
-#| msgid "Fujairah"
 msgid "Al Fujayrah"
 msgstr "Al Fujayrah"
 
@@ -12181,7 +11678,6 @@ msgid "Dubai"
 msgstr "دوبی"
 
 #. A city in the United Arab Emirates
-#| msgid "Ras Al Khaimah"
 msgid "Ra's al Khaymah"
 msgstr "Ra's al Khaymah"
 
@@ -12193,20 +11689,17 @@ msgid "Sharjah"
 msgstr "شارجه"
 
 #. A city in Scotland in the United Kingdom
-#| msgid "Aberdeen"
 msgctxt "City in Scotland, United Kingdom"
 msgid "Aberdeen"
 msgstr "Aberdeen"
 
 #. A city in Northern Ireland in the United Kingdom
-#| msgid "Belfast/City"
 msgid "Belfast"
 msgstr "Belfast"
 
 #. 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 "Benson"
@@ -12218,7 +11711,6 @@ msgid "Biggin Hill"
 msgstr "بیگین‌هیل"
 
 #. A city in Midlands in the United Kingdom
-#| msgid "Birmingham"
 msgctxt "City in Midlands, United Kingdom"
 msgid "Birmingham"
 msgstr "Birmingham"
@@ -12230,7 +11722,6 @@ msgstr "بلکپول"
 #. A city in South and South West England in the United
 #. Kingdom
 #.
-#| msgid "Boscobel"
 msgid "Boscombe"
 msgstr "Boscombe"
 
@@ -12255,27 +11746,23 @@ msgstr "برایز نورتون"
 #. A city in South and South West England in the United
 #. Kingdom
 #.
-#| msgid "Butte"
 msgid "Butes"
 msgstr "Butes"
 
 #. 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 "Cambridge"
 
 #. A city in Scotland in the United Kingdom
-#| msgid "Jamestown"
 msgid "Campbeltown"
 msgstr "Campbeltown"
 
 #. 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 "Cardiff"
@@ -12285,12 +11772,10 @@ msgid "Carlisle"
 msgstr "کارلایل"
 
 #. A city in Midlands in the United Kingdom
-#| msgid "Covington"
 msgid "Castle Donington"
 msgstr "Castle Donington"
 
 #. A city in North West England in the United Kingdom
-#| msgid "Charleston"
 msgid "Church Fenton"
 msgstr "Church Fenton"
 
@@ -12299,7 +11784,6 @@ msgid "Coningsby"
 msgstr "کانینگزبی"
 
 #. A city in Midlands in the United Kingdom
-#| msgid "Claremore"
 msgid "Cottesmore"
 msgstr "Cottesmore"
 
@@ -12316,7 +11800,6 @@ msgid "Cranwell"
 msgstr "کرِین‌وِل"
 
 #. A city in North East England in the United Kingdom
-#| msgid "Ainsworth"
 msgid "Dishforth"
 msgstr "Dishforth"
 
@@ -12329,7 +11812,6 @@ msgid "Edinburgh"
 msgstr "ادینبرو"
 
 #. A city in Northern Ireland in the United Kingdom
-#| msgid "Clinton"
 msgid "Eglinton"
 msgstr "Eglinton"
 
@@ -12340,7 +11822,6 @@ msgid "Exeter"
 msgstr "اکستر"
 
 #. A city in the United Kingdom
-#| msgid "Fairborn"
 msgid "Fairford"
 msgstr "Fairford"
 
@@ -12353,18 +11834,15 @@ msgstr "فارنبرو"
 #. A city in South and South West England in the United
 #. Kingdom
 #.
-#| msgid "Fulton"
 msgid "Filton"
 msgstr "Filton"
 
 #. A city in Scotland in the United Kingdom
-#| msgid "Glasgow"
 msgctxt "City in Scotland, United Kingdom"
 msgid "Glasgow"
 msgstr "Glasgow"
 
 #. A city in Scotland in the United Kingdom
-#| msgid "Farmingdale"
 msgid "Gramisdale"
 msgstr "Gramisdale"
 
@@ -12375,7 +11853,6 @@ msgstr "هیوردن"
 #. A city in South and South West England in the United
 #. Kingdom
 #.
-#| msgid "Nelson"
 msgid "Helston"
 msgstr "Helston"
 
@@ -12390,17 +11867,14 @@ msgid "Inverness"
 msgstr "اینورنس"
 
 #. A city in Scotland in the United Kingdom
-#| msgid "Kairouan"
 msgid "Kilmoluag"
 msgstr "Kilmoluag"
 
 #. A city in Scotland in the United Kingdom
-#| msgid "Kansas"
 msgid "Kinloss"
 msgstr "Kinloss"
 
 #. A city in Scotland in the United Kingdom
-#| msgid "Sintra"
 msgid "Kintra"
 msgstr "Kintra"
 
@@ -12409,14 +11883,12 @@ msgid "Kirkwall"
 msgstr "کرکوال"
 
 #. A city in North West England in the United Kingdom
-#| msgid "Farmington"
 msgid "Kirmington"
 msgstr "Kirmington"
 
 #. A city in East and South East England in the United
 #. Kingdom
 #.
-#| msgid "Lakefront"
 msgid "Lakenheath"
 msgstr "Lakenheath"
 
@@ -12425,7 +11897,6 @@ msgid "Leeds"
 msgstr "لیدز"
 
 #. A city in North West England in the United Kingdom
-#| msgid "Green Bay"
 msgid "Leeming Bar"
 msgstr "Leeming Bar"
 
@@ -12438,13 +11909,11 @@ msgid "Linton upon Ouse"
 msgstr "Linton upon Ouse"
 
 #. A city in North West England in the United Kingdom
-#| msgid "Liverpool"
 msgctxt "City in North West England, United Kingdom"
 msgid "Liverpool"
 msgstr "Liverpool"
 
 #. The capital of the United Kingdom
-#| msgid "London"
 msgctxt "City in East and South East England, United Kingdom"
 msgid "London"
 msgstr "London"
@@ -12472,7 +11941,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 "Manchester"
@@ -12480,7 +11948,6 @@ msgstr "Manchester"
 #. A city in East and South East England in the United
 #. Kingdom
 #.
-#| msgid "Mason"
 msgid "Manston"
 msgstr "Manston"
 
@@ -12493,7 +11960,6 @@ msgstr "مرم"
 #. A city in South and South West England in the United
 #. Kingdom
 #.
-#| msgid "Middle East"
 msgid "Middle Wallop"
 msgstr "Middle Wallop"
 
@@ -12504,12 +11970,10 @@ msgid "Mildenhall"
 msgstr "میلدنهال"
 
 #. A city in Scotland in the United Kingdom
-#| msgid "Moses Lake"
 msgid "Mossbank"
 msgstr "Mossbank"
 
 #. A city in North East England in the United Kingdom
-#| msgid "Newcastle"
 msgctxt "City in North East England, United Kingdom"
 msgid "Newcastle"
 msgstr "Newcastle"
@@ -12517,7 +11981,6 @@ msgstr "Newcastle"
 #. A city in East and South East England in the United
 #. Kingdom
 #.
-#| msgid "North Point"
 msgid "Northolt"
 msgstr "Northolt"
 
@@ -12534,14 +11997,12 @@ msgid "Odiham"
 msgstr "اودیهم"
 
 #. A city in Wales in the United Kingdom
-#| msgid "Perry"
 msgid "Pembrey"
 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 "Plymouth"
@@ -12551,12 +12012,10 @@ msgid "Prestwick"
 msgstr "پرستویک"
 
 #. A city in Wales in the United Kingdom
-#| msgid "Santa Ana"
 msgid "Saint Athan"
 msgstr "Saint Athan"
 
 #. A city in North West England in the United Kingdom
-#| msgid "Salisbury"
 msgid "Shawbury"
 msgstr "Shawbury"
 
@@ -12575,7 +12034,6 @@ msgstr "ساوتمپتن"
 #. A city in East and South East England in the United
 #. Kingdom
 #.
-#| msgid "North Bend"
 msgctxt "City in East and South East England, United Kingdom"
 msgid "Southend"
 msgstr "Southend"
@@ -12583,25 +12041,21 @@ msgstr "Southend"
 #. A city in East and South East England in the United
 #. Kingdom
 #.
-#| msgid "Santa Monica"
 msgid "Stansted Mountfitchet"
 msgstr "Stansted Mountfitchet"
 
 #. A city in South and South West England in the United
 #. Kingdom
 #.
-#| msgid "Standerton"
 msgid "Staverton"
 msgstr "Staverton"
 
 #. A city in North East England in the United Kingdom
-#| msgid "Stockton"
 msgctxt "City in North East England, United Kingdom"
 msgid "Stockton"
 msgstr "Stockton"
 
 #. A city in Scotland in the United Kingdom
-#| msgid "Norway"
 msgid "Stornoway"
 msgstr "Stornoway"
 
@@ -12630,31 +12084,26 @@ msgstr "Wainfleet"
 #. A city in East and South East England in the United
 #. Kingdom
 #.
-#| msgid "Chatham"
 msgid "Wattisham"
 msgstr "Wattisham"
 
 #. A city in Scotland in the United Kingdom
-#| msgid "Wittstock"
 msgid "Wick"
 msgstr "Wick"
 
 #. A city in East and South East England in the United
 #. Kingdom
 #.
-#| msgid "Berlin"
 msgid "Wittering"
 msgstr "Wittering"
 
 #. A city in South and South West England in the United
 #. Kingdom
 #.
-#| msgid "Fulton"
 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 "Aberdeen"
@@ -12672,12 +12121,10 @@ msgid "Ada"
 msgstr "آدا"
 
 #. A city in Alaska in the United States
-#| msgid "Ada"
 msgid "Adak"
 msgstr "Adak"
 
 #. A city in North Carolina in the United States
-#| msgid "Asheville"
 msgid "Adamsville"
 msgstr "Adamsville"
 
@@ -12698,13 +12145,11 @@ msgid "Aitkin"
 msgstr "آیتکین"
 
 #. A city in Colorado in the United States
-#| msgid "Akron"
 msgctxt "City in Colorado, United States"
 msgid "Akron"
 msgstr "Akron"
 
 #. A city in Ohio in the United States
-#| msgid "Akron"
 msgctxt "City in Ohio, United States"
 msgid "Akron"
 msgstr "Akron"
@@ -12722,13 +12167,11 @@ msgid "Alamosa"
 msgstr "الاموسا"
 
 #. A city in Georgia in the United States
-#| msgid "Albany"
 msgctxt "City in Georgia, United States"
 msgid "Albany"
 msgstr "Albany"
 
 #. A city in New York in the United States
-#| msgid "Albany"
 msgctxt "City in New York, United States"
 msgid "Albany"
 msgstr "Albany"
@@ -12742,7 +12185,6 @@ msgid "Albert Lea"
 msgstr "آلبرت لی"
 
 #. A city in Alabama in the United States
-#| msgid "Abbeville"
 msgid "Albertville"
 msgstr "Albertville"
 
@@ -12759,19 +12201,16 @@ msgid "Alexander City"
 msgstr "الکساندر سیتی"
 
 #. A city in Louisiana in the United States
-#| msgid "Alexandria"
 msgctxt "City in Louisiana, United States"
 msgid "Alexandria"
 msgstr "Alexandria"
 
 #. A city in Minnesota in the United States
-#| msgid "Alexandria"
 msgctxt "City in Minnesota, United States"
 msgid "Alexandria"
 msgstr "Alexandria"
 
 #. A city in Virginia in the United States
-#| msgid "Alexandria"
 msgctxt "City in Virginia, United States"
 msgid "Alexandria"
 msgstr "Alexandria"
@@ -12789,13 +12228,11 @@ msgid "Alliance"
 msgstr "الاینس"
 
 #. 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"
@@ -12805,13 +12242,11 @@ msgid "Alpena"
 msgstr "الپینا"
 
 #. A city in Alaska in the United States
-#| msgid "Alpine"
 msgctxt "City in Alaska, United States"
 msgid "Alpine"
 msgstr "Alpine"
 
 #. A city in Texas in the United States
-#| msgid "Alpine"
 msgctxt "City in Texas, United States"
 msgid "Alpine"
 msgstr "Alpine"
@@ -12853,7 +12288,6 @@ msgid "Ames"
 msgstr "ایمز"
 
 #. A city in California in the United States
-#| msgid "Ensheim"
 msgid "Anaheim"
 msgstr "Anaheim"
 
@@ -12870,13 +12304,11 @@ msgid "Andalusia"
 msgstr "اندالوشا"
 
 #. A city in Indiana in the United States
-#| msgid "Anderson"
 msgctxt "City in Indiana, United States"
 msgid "Anderson"
 msgstr "Anderson"
 
 #. A city in South Carolina in the United States
-#| msgid "Anderson"
 msgctxt "City in South Carolina, United States"
 msgid "Anderson"
 msgstr "Anderson"
@@ -12890,7 +12322,6 @@ msgid "Andrews"
 msgstr "اَندروز"
 
 #. A city in Minnesota in the United States
-#| msgid "Angleton"
 msgid "Angle Inlet"
 msgstr "Angle Inlet"
 
@@ -12939,13 +12370,11 @@ msgid "Apalachicola"
 msgstr "اپالچیکولا"
 
 #. A city in Minnesota in the United States
-#| msgid "Appleton"
 msgctxt "City in Minnesota, United States"
 msgid "Appleton"
 msgstr "Appleton"
 
 #. A city in Wisconsin in the United States
-#| msgid "Appleton"
 msgctxt "City in Wisconsin, United States"
 msgid "Appleton"
 msgstr "Appleton"
@@ -12963,18 +12392,15 @@ msgid "Ardmore"
 msgstr "آردمور"
 
 #. A city in Arkansas in the United States
-#| msgid "Philadelphia"
 msgid "Arkadelphia"
 msgstr "Arkadelphia"
 
 #. A city in Texas in the United States
-#| msgid "Arlington"
 msgctxt "City in Texas, United States"
 msgid "Arlington"
 msgstr "Arlington"
 
 #. A city in Washington in the United States
-#| msgid "Arlington"
 msgctxt "City in Washington, United States"
 msgid "Arlington"
 msgstr "Arlington"
@@ -12984,7 +12410,6 @@ msgid "Artesia"
 msgstr "آرتِسیا"
 
 #. A city in Colorado in the United States
-#| msgid "Arad"
 msgid "Arvada"
 msgstr "Arvada"
 
@@ -12997,19 +12422,16 @@ msgid "Asheville"
 msgstr "اشویل"
 
 #. A city in Virginia in the United States
-#| msgid "Ashland"
 msgctxt "City in Virginia, United States"
 msgid "Ashland"
 msgstr "Ashland"
 
 #. A city in Wisconsin in the United States
-#| msgid "Ashland"
 msgctxt "City in Wisconsin, United States"
 msgid "Ashland"
 msgstr "Ashland"
 
 #. A city in Ohio in the United States
-#| msgid "Ashtabulta"
 msgid "Ashtabula"
 msgstr "Ashtabula"
 
@@ -13022,7 +12444,6 @@ msgid "Astoria"
 msgstr "استوریا"
 
 #. A city in Georgia in the United States
-#| msgid "Athens"
 msgctxt "City in Georgia, United States"
 msgid "Athens"
 msgstr "Athens"
@@ -13032,7 +12453,6 @@ msgid "Atlanta"
 msgstr "آتلانتا"
 
 #. A city in Iowa in the United States
-#| msgid "Atlantic"
 msgctxt "City in Iowa, United States"
 msgid "Atlantic"
 msgstr "Atlantic"
@@ -13046,19 +12466,16 @@ msgid "Atoka"
 msgstr "اتوکا"
 
 #. A city in Alabama in the United States
-#| msgid "Auburn"
 msgctxt "City in Alabama, United States"
 msgid "Auburn"
 msgstr "Auburn"
 
 #. A city in California in the United States
-#| msgid "Auburn"
 msgctxt "City in California, United States"
 msgid "Auburn"
 msgstr "Auburn"
 
 #. A city in Maine in the United States
-#| msgid "Auburn"
 msgctxt "City in Maine, United States"
 msgid "Auburn"
 msgstr "Auburn"
@@ -13068,49 +12485,41 @@ msgid "Audubon"
 msgstr "اودابون"
 
 #. A city in Georgia in the United States
-#| msgid "Augusta"
 msgctxt "City in Georgia, United States"
 msgid "Augusta"
 msgstr "Augusta"
 
 #. A city in Maine in the United States
-#| msgid "Augusta"
 msgctxt "City in Maine, United States"
 msgid "Augusta"
 msgstr "Augusta"
 
 #. A city in Colorado in the United States
-#| msgid "Aurora"
 msgctxt "City in Colorado, United States"
 msgid "Aurora"
 msgstr "Aurora"
 
 #. A city in Illinois in the United States
-#| msgid "Aurora"
 msgctxt "City in Illinois, United States"
 msgid "Aurora"
 msgstr "Aurora"
 
 #. A city in Nebraska in the United States
-#| msgid "Aurora"
 msgctxt "City in Nebraska, United States"
 msgid "Aurora"
 msgstr "Aurora"
 
 #. A city in Oregon in the United States
-#| msgid "Aurora"
 msgctxt "City in Oregon, United States"
 msgid "Aurora"
 msgstr "Aurora"
 
 #. A city in Minnesota in the United States
-#| msgid "Austin"
 msgctxt "City in Minnesota, United States"
 msgid "Austin"
 msgstr "Austin"
 
 #. A city in Texas in the United States
-#| msgid "Austin"
 msgctxt "City in Texas, United States"
 msgid "Austin"
 msgstr "Austin"
@@ -13160,7 +12569,6 @@ msgid "Barre"
 msgstr "بری"
 
 #. A city in Georgia in the United States
-#| msgid "Barre"
 msgid "Barretts"
 msgstr "Barretts"
 
@@ -13201,13 +12609,11 @@ msgid "Beatrice"
 msgstr "بی‌یتریس"
 
 #. A city in North Carolina in the United States
-#| msgid "Beaufort"
 msgctxt "City in North Carolina, United States"
 msgid "Beaufort"
 msgstr "Beaufort"
 
 #. A city in South Carolina in the United States
-#| msgid "Beaufort"
 msgctxt "City in South Carolina, United States"
 msgid "Beaufort"
 msgstr "Beaufort"
@@ -13225,7 +12631,6 @@ msgid "Beckley"
 msgstr "بکلی"
 
 #. A city in Massachusetts in the United States
-#| msgid "Bedford"
 msgctxt "City in Massachusetts, United States"
 msgid "Bedford"
 msgstr "Bedford"
@@ -13247,7 +12652,6 @@ msgid "Bellingham"
 msgstr "بلینگهام"
 
 #. A city in New Jersey in the United States
-#| msgid "Belarus"
 msgid "Belmar"
 msgstr "Belmar"
 
@@ -13260,7 +12664,6 @@ msgid "Bennington"
 msgstr "بنینگتون"
 
 #. A city in Minnesota in the United States
-#| msgid "Benson"
 msgctxt "City in Minnesota, United States"
 msgid "Benson"
 msgstr "Benson"
@@ -13274,12 +12677,10 @@ msgid "Bentonville"
 msgstr "بنتون‌ویل"
 
 #. A city in California in the United States
-#| msgid "Beckley"
 msgid "Berkeley"
 msgstr "Berkeley"
 
 #. A city in New Hampshire in the United States
-#| msgid "Berlin"
 msgctxt "City in New Hampshire, United States"
 msgid "Berlin"
 msgstr "Berlin"
@@ -13329,7 +12730,6 @@ msgid "Birchwood"
 msgstr "برچ‌وود"
 
 #. A city in Alabama in the United States
-#| msgid "Birmingham"
 msgctxt "City in Alabama, United States"
 msgid "Birmingham"
 msgstr "Birmingham"
@@ -13343,28 +12743,23 @@ msgid "Bismarck"
 msgstr "بیسمارک"
 
 #. A city in Montana in the United States
-#| msgid "Eagle"
 msgid "Black Eagle"
 msgstr "Black Eagle"
 
 #. A city in New York in the United States
-#| msgid "Back River"
 msgid "Black River"
 msgstr "Black River"
 
 #. A city in Virginia in the United States
-#| msgid "Clarksburg"
 msgid "Blacksburg"
 msgstr "Blacksburg"
 
 #. A city in Illinois in the United States
-#| msgid "Bloomington"
 msgctxt "City in Illinois, United States"
 msgid "Bloomington"
 msgstr "Bloomington"
 
 #. A city in Indiana in the United States
-#| msgid "Bloomington"
 msgctxt "City in Indiana, United States"
 msgid "Bloomington"
 msgstr "Bloomington"
@@ -13394,13 +12789,11 @@ msgid "Boise"
 msgstr "بویسی"
 
 #. A city in Iowa in the United States
-#| msgid "Boone"
 msgctxt "City in Iowa, United States"
 msgid "Boone"
 msgstr "Boone"
 
 #. A city in North Carolina in the United States
-#| msgid "Boone"
 msgctxt "City in North Carolina, United States"
 msgid "Boone"
 msgstr "Boone"
@@ -13410,7 +12803,6 @@ msgid "Boothville"
 msgstr "بوث‌ویل"
 
 #. A city in Wyoming in the United States
-#| msgid "Bordeaux"
 msgctxt "City in Wyoming, United States"
 msgid "Bordeaux"
 msgstr "Bordeaux"
@@ -13436,7 +12828,6 @@ msgid "Bowman"
 msgstr "بومن"
 
 #. A city in South Dakota in the United States
-#| msgid "Border"
 msgid "Box Elder"
 msgstr "Box Elder"
 
@@ -13449,7 +12840,6 @@ msgid "Bradford"
 msgstr "برادفورد"
 
 #. A city in Texas in the United States
-#| msgid "Arad"
 msgid "Brady"
 msgstr "Brady"
 
@@ -13474,13 +12864,11 @@ msgid "Broken Bow"
 msgstr "بروکن باو"
 
 #. A city in Oregon in the United States
-#| msgid "Brookings"
 msgctxt "City in Oregon, United States"
 msgid "Brookings"
 msgstr "Brookings"
 
 #. A city in South Dakota in the United States
-#| msgid "Brookings"
 msgctxt "City in South Dakota, United States"
 msgid "Brookings"
 msgstr "Brookings"
@@ -13506,13 +12894,11 @@ msgid "Brownwood"
 msgstr "براون‌وود"
 
 #. A city in Georgia in the United States
-#| msgid "Brunswick"
 msgctxt "City in Georgia, United States"
 msgid "Brunswick"
 msgstr "Brunswick"
 
 #. A city in Maine in the United States
-#| msgid "Brunswick"
 msgctxt "City in Maine, United States"
 msgid "Brunswick"
 msgstr "Brunswick"
@@ -13530,25 +12916,21 @@ msgid "Buckland"
 msgstr "باکلند"
 
 #. A city in Minnesota in the United States
-#| msgid "Buffalo"
 msgctxt "City in Minnesota, United States"
 msgid "Buffalo"
 msgstr "Buffalo"
 
 #. A city in New York in the United States
-#| msgid "Buffalo"
 msgctxt "City in New York, United States"
 msgid "Buffalo"
 msgstr "Buffalo"
 
 #. A city in South Dakota in the United States
-#| msgid "Buffalo"
 msgctxt "City in South Dakota, United States"
 msgid "Buffalo"
 msgstr "Buffalo"
 
 #. A city in Wyoming in the United States
-#| msgid "Buffalo"
 msgctxt "City in Wyoming, United States"
 msgid "Buffalo"
 msgstr "Buffalo"
@@ -13566,37 +12948,31 @@ msgid "Burley"
 msgstr "برلی"
 
 #. A city in Colorado in the United States
-#| msgid "Burlington"
 msgctxt "City in Colorado, United States"
 msgid "Burlington"
 msgstr "Burlington"
 
 #. A city in Iowa in the United States
-#| msgid "Burlington"
 msgctxt "City in Iowa, United States"
 msgid "Burlington"
 msgstr "Burlington"
 
 #. A city in North Carolina in the United States
-#| msgid "Burlington"
 msgctxt "City in North Carolina, United States"
 msgid "Burlington"
 msgstr "Burlington"
 
 #. A city in Vermont in the United States
-#| msgid "Burlington"
 msgctxt "City in Vermont, United States"
 msgid "Burlington"
 msgstr "Burlington"
 
 #. A city in Washington in the United States
-#| msgid "Burlington"
 msgctxt "City in Washington, United States"
 msgid "Burlington"
 msgstr "Burlington"
 
 #. A city in Wisconsin in the United States
-#| msgid "Burlington"
 msgctxt "City in Wisconsin, United States"
 msgid "Burlington"
 msgstr "Burlington"
@@ -13610,7 +12986,6 @@ msgid "Burns"
 msgstr "برنز"
 
 #. A city in Pennsylvania in the United States
-#| msgid "Boulmer"
 msgid "Butler"
 msgstr "Butler"
 
@@ -13627,25 +13002,21 @@ msgid "Cahokia"
 msgstr "کاهوکیا"
 
 #. A city in Illinois in the United States
-#| msgid "Cairo"
 msgctxt "City in Illinois, United States"
 msgid "Cairo"
 msgstr "Cairo"
 
 #. A city in Idaho in the United States
-#| msgid "Caldwell"
 msgctxt "City in Idaho, United States"
 msgid "Caldwell"
 msgstr "Caldwell"
 
 #. A city in New Jersey in the United States
-#| msgid "Caldwell"
 msgctxt "City in New Jersey, United States"
 msgid "Caldwell"
 msgstr "Caldwell"
 
 #. A city in Texas in the United States
-#| msgid "Caldwell"
 msgctxt "City in Texas, United States"
 msgid "Caldwell"
 msgstr "Caldwell"
@@ -13655,13 +13026,11 @@ msgid "Camarillo"
 msgstr "کاماریلو"
 
 #. A city in Massachusetts in the United States
-#| msgid "Cambridge"
 msgctxt "City in Massachusetts, United States"
 msgid "Cambridge"
 msgstr "Cambridge"
 
 #. A city in Minnesota in the United States
-#| msgid "Cambridge"
 msgctxt "City in Minnesota, United States"
 msgid "Cambridge"
 msgstr "Cambridge"
@@ -13671,7 +13040,6 @@ msgid "Camden"
 msgstr "کَمدِن"
 
 #. A city in Wisconsin in the United States
-#| msgid "Douglas"
 msgid "Camp Douglas"
 msgstr "Camp Douglas"
 
@@ -13696,7 +13064,6 @@ msgid "Cape Canaveral"
 msgstr "کیپ‌کاناورال"
 
 #. A city in Florida in the United States
-#| msgid "Cape Canaveral"
 msgid "Cape Coral"
 msgstr "Cape Coral"
 
@@ -13709,7 +13076,6 @@ msgid "Carbondale"
 msgstr "کاربندیل"
 
 #. A city in Colorado in the United States
-#| msgid "Cardiff"
 msgctxt "City in Colorado, United States"
 msgid "Cardiff"
 msgstr "Cardiff"
@@ -13719,13 +13085,11 @@ msgid "Caribou"
 msgstr "کریبو"
 
 #. A city in California in the United States
-#| msgid "Carlsbad"
 msgctxt "City in California, United States"
 msgid "Carlsbad"
 msgstr "Carlsbad"
 
 #. A city in New Mexico in the United States
-#| msgid "Carlsbad"
 msgctxt "City in New Mexico, United States"
 msgid "Carlsbad"
 msgstr "Carlsbad"
@@ -13735,7 +13099,6 @@ msgid "Carmi"
 msgstr "کَرمی"
 
 #. A city in Michigan in the United States
-#| msgid "Cairo"
 msgid "Caro"
 msgstr "Caro"
 
@@ -13744,7 +13107,6 @@ msgid "Carroll"
 msgstr "کرول"
 
 #. A city in Texas in the United States
-#| msgid "Carroll"
 msgid "Carrollton"
 msgstr "Carrollton"
 
@@ -13793,18 +13155,15 @@ msgid "Champaign"
 msgstr "شَمپِین"
 
 #. A city in Alaska in the United States
-#| msgid "Chandler"
 msgid "Chandalar"
 msgstr "Chandalar"
 
 #. A city in Arizona in the United States
-#| msgid "Chandler"
 msgctxt "City in Arizona, United States"
 msgid "Chandler"
 msgstr "Chandler"
 
 #. A city in Oklahoma in the United States
-#| msgid "Chandler"
 msgctxt "City in Oklahoma, United States"
 msgid "Chandler"
 msgstr "Chandler"
@@ -13826,13 +13185,11 @@ msgid "Charles City"
 msgstr "چارلز سیتی"
 
 #. A city in South Carolina in the United States
-#| msgid "Charleston"
 msgctxt "City in South Carolina, United States"
 msgid "Charleston"
 msgstr "Charleston"
 
 #. A city in West Virginia in the United States
-#| msgid "Charleston"
 msgctxt "City in West Virginia, United States"
 msgid "Charleston"
 msgstr "Charleston"
@@ -13842,13 +13199,11 @@ msgid "Charlevoix"
 msgstr "شارلووی"
 
 #. A city in Michigan in the United States
-#| msgid "Charlotte"
 msgctxt "City in Michigan, United States"
 msgid "Charlotte"
 msgstr "Charlotte"
 
 #. A city in North Carolina in the United States
-#| msgid "Charlotte"
 msgctxt "City in North Carolina, United States"
 msgid "Charlotte"
 msgstr "Charlotte"
@@ -13870,17 +13225,14 @@ msgid "Cheboygan"
 msgstr "شیبویگان"
 
 #. A city in Iowa in the United States
-#| msgid "Sherbrooke"
 msgid "Cherokee"
 msgstr "Cherokee"
 
 #. A city in Virginia in the United States
-#| msgid "Chesapeak"
 msgid "Chesapeake"
 msgstr "Chesapeake"
 
 #. A city in Missouri in the United States
-#| msgid "Chesterfield Inlet"
 msgid "Chesterfield"
 msgstr "Chesterfield"
 
@@ -13913,7 +13265,6 @@ msgid "Childress"
 msgstr "چیلدرس"
 
 #. A city in Arizona in the United States
-#| msgid "Childress"
 msgid "Childs"
 msgstr "Childs"
 
@@ -13934,17 +13285,14 @@ msgid "Chino"
 msgstr "چینو"
 
 #. A city in Alaska in the United States
-#| msgid "Chania"
 msgid "Chisana"
 msgstr "Chisana"
 
 #. A city in Alaska in the United States
-#| msgid "Chichijima"
 msgid "Chistochina"
 msgstr "Chistochina"
 
 #. A city in California in the United States
-#| msgid "Chulitna"
 msgid "Chula Vista"
 msgstr "Chula Vista"
 
@@ -13973,13 +13321,11 @@ msgid "Clarksburg"
 msgstr "کلارکسبرگ"
 
 #. A city in Tennessee in the United States
-#| msgid "Clarksville"
 msgctxt "City in Tennessee, United States"
 msgid "Clarksville"
 msgstr "Clarksville"
 
 #. A city in Texas in the United States
-#| msgid "Clarksville"
 msgctxt "City in Texas, United States"
 msgid "Clarksville"
 msgstr "Clarksville"
@@ -14009,19 +13355,16 @@ msgid "Clines Corners"
 msgstr "کلاینز کورنرز"
 
 #. A city in Iowa in the United States
-#| msgid "Clinton"
 msgctxt "City in Iowa, United States"
 msgid "Clinton"
 msgstr "Clinton"
 
 #. A city in North Carolina in the United States
-#| msgid "Clinton"
 msgctxt "City in North Carolina, United States"
 msgid "Clinton"
 msgstr "Clinton"
 
 #. A city in Oklahoma in the United States
-#| msgid "Clinton"
 msgctxt "City in Oklahoma, United States"
 msgid "Clinton"
 msgstr "Clinton"
@@ -14039,7 +13382,6 @@ msgid "Clovis"
 msgstr "کلوویس"
 
 #. A city in Florida in the United States
-#| msgid "Cooma"
 msgid "Cocoa"
 msgstr "Cocoa"
 
@@ -14072,61 +13414,51 @@ msgid "Colorado Springs"
 msgstr "کلرادو اسپرینگز"
 
 #. A city in Missouri in the United States
-#| msgid "Columbia"
 msgctxt "City in Missouri, United States"
 msgid "Columbia"
 msgstr "Columbia"
 
 #. A city in South Carolina in the United States
-#| msgid "Columbia"
 msgctxt "City in South Carolina, United States"
 msgid "Columbia"
 msgstr "Columbia"
 
 #. A city in Georgia in the United States
-#| msgid "Columbus"
 msgctxt "City in Georgia, United States"
 msgid "Columbus"
 msgstr "Columbus"
 
 #. A city in Indiana in the United States
-#| msgid "Columbus"
 msgctxt "City in Indiana, United States"
 msgid "Columbus"
 msgstr "Columbus"
 
 #. A city in Mississippi in the United States
-#| msgid "Columbus"
 msgctxt "City in Mississippi, United States"
 msgid "Columbus"
 msgstr "Columbus"
 
 #. A city in Nebraska in the United States
-#| msgid "Columbus"
 msgctxt "City in Nebraska, United States"
 msgid "Columbus"
 msgstr "Columbus"
 
 #. A city in Ohio in the United States
-#| msgid "Columbus"
 msgctxt "City in Ohio, United States"
 msgid "Columbus"
 msgstr "Columbus"
 
 #. A city in California in the United States
-#| msgid "Concord"
 msgctxt "City in California, United States"
 msgid "Concord"
 msgstr "Concord"
 
 #. A city in New Hampshire in the United States
-#| msgid "Concord"
 msgctxt "City in New Hampshire, United States"
 msgid "Concord"
 msgstr "Concord"
 
 #. A city in North Carolina in the United States
-#| msgid "Concord"
 msgctxt "City in North Carolina, United States"
 msgid "Concord"
 msgstr "Concord"
@@ -14152,13 +13484,11 @@ msgid "Cordova"
 msgstr "کوردووا"
 
 #. A city in California in the United States
-#| msgid "Corona"
 msgctxt "City in California, United States"
 msgid "Corona"
 msgstr "Corona"
 
 #. A city in New Mexico in the United States
-#| msgid "Corona"
 msgctxt "City in New Mexico, United States"
 msgid "Corona"
 msgstr "Corona"
@@ -14180,7 +13510,6 @@ msgid "Corvallis"
 msgstr "کوروَلیس"
 
 #. A city in California in the United States
-#| msgid "Costa Rica"
 msgid "Costa Mesa"
 msgstr "Costa Mesa"
 
@@ -14205,7 +13534,6 @@ msgid "Crescent City"
 msgstr "کرِسنت"
 
 #. A city in Iowa in the United States
-#| msgid "Creston"
 msgctxt "City in Iowa, United States"
 msgid "Creston"
 msgstr "Creston"
@@ -14247,7 +13575,6 @@ msgid "Currituck"
 msgstr "کاریتاک"
 
 #. A city in Oklahoma in the United States
-#| msgid "Chingozi"
 msgid "Cushing"
 msgstr "Cushing"
 
@@ -14260,17 +13587,14 @@ msgid "Cut Bank"
 msgstr "کات بنک"
 
 #. A city in California in the United States
-#| msgid "Daet"
 msgid "Daggett"
 msgstr "Daggett"
 
 #. A city in Alabama in the United States
-#| msgid "Danville"
 msgid "Daleville"
 msgstr "Daleville"
 
 #. A city in Texas in the United States
-#| msgid "Elkhart"
 msgid "Dalhart"
 msgstr "Dalhart"
 
@@ -14279,17 +13603,14 @@ msgid "Dallas"
 msgstr "دالاس"
 
 #. A city in Georgia in the United States
-#| msgid "Dayton"
 msgid "Dalton"
 msgstr "Dalton"
 
 #. A city in California in the United States
-#| msgid "Bay City"
 msgid "Daly City"
 msgstr "Daly City"
 
 #. A city in South Carolina in the United States
-#| msgid "Caldwell"
 msgid "Dalzell"
 msgstr "Dalzell"
 
@@ -14302,13 +13623,11 @@ msgid "Dansville"
 msgstr "دنزویل"
 
 #. A city in Illinois in the United States
-#| msgid "Danville"
 msgctxt "City in Illinois, United States"
 msgid "Danville"
 msgstr "Danville"
 
 #. A city in Virginia in the United States
-#| msgid "Danville"
 msgctxt "City in Virginia, United States"
 msgid "Danville"
 msgstr "Danville"
@@ -14334,12 +13653,10 @@ msgid "De Queen"
 msgstr "دکویین"
 
 #. A city in Illinois in the United States
-#| msgid "De Kalb"
 msgid "DeKalb"
 msgstr "DeKalb"
 
 #. A city in Louisiana in the United States
-#| msgid "De Ridder"
 msgid "DeRidder"
 msgstr "DeRidder"
 
@@ -14348,19 +13665,16 @@ msgid "Deadhorse"
 msgstr "دِدهورس"
 
 #. A city in Alabama in the United States
-#| msgid "Decatur"
 msgctxt "City in Alabama, United States"
 msgid "Decatur"
 msgstr "Decatur"
 
 #. A city in Illinois in the United States
-#| msgid "Decatur"
 msgctxt "City in Illinois, United States"
 msgid "Decatur"
 msgstr "Decatur"
 
 #. A city in Texas in the United States
-#| msgid "Decatur"
 msgctxt "City in Texas, United States"
 msgid "Decatur"
 msgstr "Decatur"
@@ -14386,7 +13700,6 @@ msgid "Delta"
 msgstr "دلتا"
 
 #. A city in Alaska in the United States
-#| msgid "Grand Junction"
 msgid "Delta Junction"
 msgstr "Delta Junction"
 
@@ -14451,19 +13764,16 @@ msgid "Dothan"
 msgstr "دوتن"
 
 #. A city in Arizona in the United States
-#| msgid "Douglas"
 msgctxt "City in Arizona, United States"
 msgid "Douglas"
 msgstr "Douglas"
 
 #. A city in Georgia in the United States
-#| msgid "Douglas"
 msgctxt "City in Georgia, United States"
 msgid "Douglas"
 msgstr "Douglas"
 
 #. A city in Wyoming in the United States
-#| msgid "Douglas"
 msgctxt "City in Wyoming, United States"
 msgid "Douglas"
 msgstr "Douglas"
@@ -14481,7 +13791,6 @@ msgid "Drummond"
 msgstr "دراموند"
 
 #. A city in Texas in the United States
-#| msgid "Dryden"
 msgctxt "City in Texas, United States"
 msgid "Dryden"
 msgstr "Dryden"
@@ -14491,13 +13800,11 @@ msgid "Du Bois"
 msgstr "دوبوا"
 
 #. A city in Georgia in the United States
-#| msgid "Dublin"
 msgctxt "City in Georgia, United States"
 msgid "Dublin"
 msgstr "Dublin"
 
 #. A city in Virginia in the United States
-#| msgid "Dublin"
 msgctxt "City in Virginia, United States"
 msgid "Dublin"
 msgstr "Dublin"
@@ -14523,7 +13830,6 @@ msgid "Dunkirk"
 msgstr "دانکرک"
 
 #. A city in Colorado in the United States
-#| msgid "Durango"
 msgctxt "City in Colorado, United States"
 msgid "Durango"
 msgstr "Durango"
@@ -14541,13 +13847,11 @@ msgid "Dyersburg"
 msgstr "دایرزبرگ"
 
 #. A city in Alaska in the United States
-#| msgid "Eagle"
 msgctxt "City in Alaska, United States"
 msgid "Eagle"
 msgstr "Eagle"
 
 #. A city in Colorado in the United States
-#| msgid "Eagle"
 msgctxt "City in Colorado, United States"
 msgid "Eagle"
 msgstr "Eagle"
@@ -14585,7 +13889,6 @@ msgid "Edinburg"
 msgstr "ادینبرگ"
 
 #. A city in California in the United States
-#| msgid "Woodward"
 msgid "Edwards"
 msgstr "Edwards"
 
@@ -14614,22 +13917,18 @@ msgid "El Paso"
 msgstr "ال پاسو"
 
 #. A city in Oklahoma in the United States
-#| msgid "El Centro"
 msgid "El Reno"
 msgstr "El Reno"
 
 #. A city in Colorado in the United States
-#| msgid "Elberton"
 msgid "Elbert"
 msgstr "Elbert"
 
 #. A city in Alaska in the United States
-#| msgid "Eindhoven"
 msgid "Elfin Cove"
 msgstr "Elfin Cove"
 
 #. A city in New Jersey in the United States
-#| msgid "Elizabethtown"
 msgid "Elizabeth"
 msgstr "Elizabeth"
 
@@ -14642,13 +13941,11 @@ msgid "Elizabethtown"
 msgstr "الیزابت‌تاون"
 
 #. A city in Indiana in the United States
-#| msgid "Elkhart"
 msgctxt "City in Indiana, United States"
 msgid "Elkhart"
 msgstr "Elkhart"
 
 #. A city in Kansas in the United States
-#| msgid "Elkhart"
 msgctxt "City in Kansas, United States"
 msgid "Elkhart"
 msgstr "Elkhart"
@@ -14666,24 +13963,20 @@ msgid "Ellensburg"
 msgstr "النزبرگ"
 
 #. A city in New York in the United States
-#| msgid "Elmira"
 msgctxt "City in New York, United States"
 msgid "Elmira"
 msgstr "Elmira"
 
 #. A city in Kansas in the United States
-#| msgid "Glenwood"
 msgid "Elwood"
 msgstr "Elwood"
 
 #. A city in Minnesota in the United States
-#| msgid "Ely"
 msgctxt "City in Minnesota, United States"
 msgid "Ely"
 msgstr "Ely"
 
 #. A city in Nevada in the United States
-#| msgid "Ely"
 msgctxt "City in Nevada, United States"
 msgid "Ely"
 msgstr "Ely"
@@ -14697,18 +13990,15 @@ msgid "Emigrant Gap"
 msgstr "Emigrant Gap"
 
 #. A city in Alaska in the United States
-#| msgid "Pomona"
 msgid "Emmonak"
 msgstr "Emmonak"
 
 #. A city in Kansas in the United States
-#| msgid "Emporia"
 msgctxt "City in Kansas, United States"
 msgid "Emporia"
 msgstr "Emporia"
 
 #. A city in Virginia in the United States
-#| msgid "Emporia"
 msgctxt "City in Virginia, United States"
 msgid "Emporia"
 msgstr "Emporia"
@@ -14734,7 +14024,6 @@ msgid "Escanaba"
 msgstr "اسکانابا"
 
 #. A city in California in the United States
-#| msgid "Estonia"
 msgid "Escondido"
 msgstr "Escondido"
 
@@ -14747,13 +14036,11 @@ msgid "Eugene"
 msgstr "یوجین"
 
 #. A city in Nevada in the United States
-#| msgid "Eureka"
 msgctxt "City in Nevada, United States"
 msgid "Eureka"
 msgstr "Eureka"
 
 #. A city in Alaska in the United States
-#| msgid "Eureka Sound"
 msgid "Eureka Roadhouse"
 msgstr "Eureka Roadhouse"
 
@@ -14786,19 +14073,16 @@ msgid "Fairchild"
 msgstr "فرچایلد"
 
 #. A city in California in the United States
-#| msgid "Fairfield"
 msgctxt "City in California, United States"
 msgid "Fairfield"
 msgstr "Fairfield"
 
 #. A city in Illinois in the United States
-#| msgid "Fairfield"
 msgctxt "City in Illinois, United States"
 msgid "Fairfield"
 msgstr "Fairfield"
 
 #. A city in Iowa in the United States
-#| msgid "Fairfield"
 msgctxt "City in Iowa, United States"
 msgid "Fairfield"
 msgstr "Fairfield"
@@ -14836,13 +14120,11 @@ msgid "Farmingdale"
 msgstr "فارمینگدل"
 
 #. A city in Missouri in the United States
-#| msgid "Farmington"
 msgctxt "City in Missouri, United States"
 msgid "Farmington"
 msgstr "Farmington"
 
 #. A city in New Mexico in the United States
-#| msgid "Farmington"
 msgctxt "City in New Mexico, United States"
 msgid "Farmington"
 msgstr "Farmington"
@@ -14852,13 +14134,11 @@ msgid "Farmville"
 msgstr "فارم‌ویل"
 
 #. A city in Arkansas in the United States
-#| msgid "Fayetteville"
 msgctxt "City in Arkansas, United States"
 msgid "Fayetteville"
 msgstr "Fayetteville"
 
 #. A city in North Carolina in the United States
-#| msgid "Fayetteville"
 msgctxt "City in North Carolina, United States"
 msgid "Fayetteville"
 msgstr "Fayetteville"
@@ -14876,7 +14156,6 @@ msgid "Fitchburg"
 msgstr "فیچبرگ"
 
 #. A city in Arizona in the United States
-#| msgid "Fasa"
 msgid "Flagstaff"
 msgstr "Flagstaff"
 
@@ -14885,7 +14164,6 @@ msgid "Flint"
 msgstr "فلینت"
 
 #. A city in Arkansas in the United States
-#| msgid "Philippines"
 msgid "Flippin"
 msgstr "Flippin"
 
@@ -14894,7 +14172,6 @@ msgid "Flora"
 msgstr "فلورا"
 
 #. A city in South Carolina in the United States
-#| msgid "Florence"
 msgctxt "City in South Carolina, United States"
 msgid "Florence"
 msgstr "Florence"
@@ -14904,32 +14181,26 @@ msgid "Fond du Lac"
 msgstr "Fond du Lac"
 
 #. A city in California in the United States
-#| msgid "Montana"
 msgid "Fontana"
 msgstr "Fontana"
 
 #. A city in Georgia in the United States
-#| msgid "Bennington"
 msgid "Fort Benning"
 msgstr "Fort Benning"
 
 #. A city in Colorado in the United States
-#| msgid "Fort Madison"
 msgid "Fort Carson"
 msgstr "Fort Carson"
 
 #. A city in Colorado in the United States
-#| msgid "North Carolina"
 msgid "Fort Collins"
 msgstr "Fort Collins"
 
 #. A city in Iowa in the United States
-#| msgid "Fort Hood"
 msgid "Fort Dodge"
 msgstr "Fort Dodge"
 
 #. A city in Florida in the United States
-#| msgid "Lauderdale"
 msgid "Fort Lauderdale"
 msgstr "Fort Lauderdale"
 
@@ -14950,23 +14221,19 @@ msgid "Fort Pierce"
 msgstr "فورت پیرس"
 
 #. A city in Louisiana in the United States
-#| msgid "Fort Portal"
 msgid "Fort Polk"
 msgstr "Fort Polk"
 
 #. A city in Arkansas in the United States
-#| msgid "Fort Smith"
 msgctxt "City in Arkansas, United States"
 msgid "Fort Smith"
 msgstr "Fort Smith"
 
 #. A city in Texas in the United States
-#| msgid "Stockton"
 msgid "Fort Stockton"
 msgstr "Fort Stockton"
 
 #. A city in Florida in the United States
-#| msgid "Daytona Beach"
 msgid "Fort Walton Beach"
 msgstr "Fort Walton Beach"
 
@@ -14975,81 +14242,67 @@ msgid "Fort Wayne"
 msgstr "فورت وین"
 
 #. A city in Texas in the United States
-#| msgid "Fort Smith"
 msgid "Fort Worth"
 msgstr "Fort Worth"
 
 #. A city in Alaska in the United States
-#| msgid "Fort Nelson"
 msgid "Fort Yukon"
 msgstr "Fort Yukon"
 
 #. A city in Minnesota in the United States
-#| msgid "Boston"
 msgid "Fosston"
 msgstr "Fosston"
 
 #. A city in Kentucky in the United States
-#| msgid "Frankfort"
 msgctxt "City in Kentucky, United States"
 msgid "Frankfort"
 msgstr "Frankfort"
 
 #. A city in Michigan in the United States
-#| msgid "Frankfort"
 msgctxt "City in Michigan, United States"
 msgid "Frankfort"
 msgstr "Frankfort"
 
 #. A city in North Carolina in the United States
-#| msgid "Franklin"
 msgctxt "City in North Carolina, United States"
 msgid "Franklin"
 msgstr "Franklin"
 
 #. A city in Pennsylvania in the United States
-#| msgid "Franklin"
 msgctxt "City in Pennsylvania, United States"
 msgid "Franklin"
 msgstr "Franklin"
 
 #. A city in Virginia in the United States
-#| msgid "Franklin"
 msgctxt "City in Virginia, United States"
 msgid "Franklin"
 msgstr "Franklin"
 
 #. A city in Maryland in the United States
-#| msgid "Frederick"
 msgctxt "City in Maryland, United States"
 msgid "Frederick"
 msgstr "Frederick"
 
 #. A city in Oklahoma in the United States
-#| msgid "Frederick"
 msgctxt "City in Oklahoma, United States"
 msgid "Frederick"
 msgstr "Frederick"
 
 #. A city in Texas in the United States
-#| msgid "Frederick"
 msgid "Fredericksburg"
 msgstr "Fredericksburg"
 
 #. A city in Illinois in the United States
-#| msgid "Freeport"
 msgctxt "City in Illinois, United States"
 msgid "Freeport"
 msgstr "Freeport"
 
 #. A city in California in the United States
-#| msgid "Fremont"
 msgctxt "City in California, United States"
 msgid "Fremont"
 msgstr "Fremont"
 
 #. A city in Nebraska in the United States
-#| msgid "Fremont"
 msgctxt "City in Nebraska, United States"
 msgid "Fremont"
 msgstr "Fremont"
@@ -15063,7 +14316,6 @@ msgid "Fresno"
 msgstr "فرزنو"
 
 #. A city in Washington in the United States
-#| msgid "Bar Harbor"
 msgid "Friday Harbor"
 msgstr "Friday Harbor"
 
@@ -15088,19 +14340,16 @@ msgid "Gage"
 msgstr "گیج"
 
 #. A city in Florida in the United States
-#| msgid "Gainesville"
 msgctxt "City in Florida, United States"
 msgid "Gainesville"
 msgstr "Gainesville"
 
 #. A city in Georgia in the United States
-#| msgid "Gainesville"
 msgctxt "City in Georgia, United States"
 msgid "Gainesville"
 msgstr "Gainesville"
 
 #. A city in Texas in the United States
-#| msgid "Gainesville"
 msgctxt "City in Texas, United States"
 msgid "Gainesville"
 msgstr "Gainesville"
@@ -15114,7 +14363,6 @@ msgid "Galesburg"
 msgstr "گیلزبرگ"
 
 #. A city in Louisiana in the United States
-#| msgid "Salina"
 msgid "Galliano"
 msgstr "Galliano"
 
@@ -15131,24 +14379,20 @@ msgid "Gambell"
 msgstr "گمبل"
 
 #. A city in Kansas in the United States
-#| msgid "Garden City"
 msgctxt "City in Kansas, United States"
 msgid "Garden City"
 msgstr "Garden City"
 
 #. A city in Louisiana in the United States
-#| msgid "Garden City"
 msgctxt "City in Louisiana, United States"
 msgid "Garden City"
 msgstr "Garden City"
 
 #. A city in California in the United States
-#| msgid "Garden Creek"
 msgid "Garden Grove"
 msgstr "Garden Grove"
 
 #. A city in Texas in the United States
-#| msgid "Hartland"
 msgid "Garland"
 msgstr "Garland"
 
@@ -15173,13 +14417,11 @@ msgid "Gaylord"
 msgstr "گیلورد"
 
 #. A city in Delaware in the United States
-#| msgid "Georgetown"
 msgctxt "City in Delaware, United States"
 msgid "Georgetown"
 msgstr "Georgetown"
 
 #. A city in Texas in the United States
-#| msgid "Georgetown"
 msgctxt "City in Texas, United States"
 msgid "Georgetown"
 msgstr "Georgetown"
@@ -15189,7 +14431,6 @@ msgid "Giddings"
 msgstr "گیدینگز"
 
 #. A city in Arizona in the United States
-#| msgid "Gilmer"
 msgid "Gilbert"
 msgstr "Gilbert"
 
@@ -15202,30 +14443,25 @@ msgid "Gilmer"
 msgstr "گیلمر"
 
 #. A city in Kentucky in the United States
-#| msgid "Glasgow"
 msgctxt "City in Kentucky, United States"
 msgid "Glasgow"
 msgstr "Glasgow"
 
 #. A city in Montana in the United States
-#| msgid "Glasgow"
 msgctxt "City in Montana, United States"
 msgid "Glasgow"
 msgstr "Glasgow"
 
 #. A city in Minnesota in the United States
-#| msgid "Grenoble"
 msgid "Glencoe"
 msgstr "Glencoe"
 
 #. A city in Arizona in the United States
-#| msgid "Glendale"
 msgctxt "City in Arizona, United States"
 msgid "Glendale"
 msgstr "Glendale"
 
 #. A city in California in the United States
-#| msgid "Glendale"
 msgctxt "City in California, United States"
 msgid "Glendale"
 msgstr "Glendale"
@@ -15251,17 +14487,14 @@ msgid "Goodland"
 msgstr "گودلند"
 
 #. A city in Arizona in the United States
-#| msgid "Goodland"
 msgid "Goodyear"
 msgstr "Goodyear"
 
 #. A city in Louisiana in the United States
-#| msgid "Hooks Airport"
 msgid "Goosport"
 msgstr "Goosport"
 
 #. A city in New Hampshire in the United States
-#| msgid "Graham"
 msgid "Gorham"
 msgstr "Gorham"
 
@@ -15270,7 +14503,6 @@ msgid "Goshen"
 msgstr "گوشن"
 
 #. A city in Illinois in the United States
-#| msgid "Groton"
 msgid "Grafton"
 msgstr "Grafton"
 
@@ -15303,29 +14535,24 @@ msgid "Grand Junction"
 msgstr "گرند جانکشن"
 
 #. A city in Minnesota in the United States
-#| msgid "Cedar Rapids"
 msgid "Grand Marais"
 msgstr "Grand Marais"
 
 #. A city in Texas in the United States
-#| msgid "Cedar Rapids"
 msgid "Grand Prairie"
 msgstr "Grand Prairie"
 
 #. A city in Michigan in the United States
-#| msgid "Cedar Rapids"
 msgctxt "City in Michigan, United States"
 msgid "Grand Rapids"
 msgstr "Grand Rapids"
 
 #. A city in Minnesota in the United States
-#| msgid "Cedar Rapids"
 msgctxt "City in Minnesota, United States"
 msgid "Grand Rapids"
 msgstr "Grand Rapids"
 
 #. A city in Minnesota in the United States
-#| msgid "Great Falls"
 msgid "Granite Falls"
 msgstr "Granite Falls"
 
@@ -15334,7 +14561,6 @@ msgid "Grants"
 msgstr "گرانتس"
 
 #. A city in Michigan in the United States
-#| msgid "Franklin"
 msgid "Grayling"
 msgstr "Grayling"
 
@@ -15351,13 +14577,11 @@ msgid "Green Bay"
 msgstr "گرین بی"
 
 #. A city in Georgia in the United States
-#| msgid "Greensboro"
 msgctxt "City in Georgia, United States"
 msgid "Greensboro"
 msgstr "Greensboro"
 
 #. A city in North Carolina in the United States
-#| msgid "Greensboro"
 msgctxt "City in North Carolina, United States"
 msgid "Greensboro"
 msgstr "Greensboro"
@@ -15409,12 +14633,10 @@ msgid "Grove"
 msgstr "گروو"
 
 #. A city in Mississippi in the United States
-#| msgid "Belfort"
 msgid "Gulfport"
 msgstr "Gulfport"
 
 #. A city in Alaska in the United States
-#| msgid "Guyana"
 msgid "Gulkana"
 msgstr "Gulkana"
 
@@ -15439,7 +14661,6 @@ msgid "Hagerstown"
 msgstr "هیگرزتاون"
 
 #. A city in Idaho in the United States
-#| msgid "Hail"
 msgid "Hailey"
 msgstr "Hailey"
 
@@ -15448,7 +14669,6 @@ msgid "Haines"
 msgstr "هینز"
 
 #. A city in Alabama in the United States
-#| msgid "Charleville"
 msgid "Haleyville"
 msgstr "Haleyville"
 
@@ -15530,7 +14750,6 @@ msgid "Hattiesburg"
 msgstr "هتیزبرگ"
 
 #. A city in North Carolina in the United States
-#| msgid "Hallock"
 msgid "Havelock"
 msgstr "Havelock"
 
@@ -15561,7 +14780,6 @@ msgid "Hayward"
 msgstr "هیوارد"
 
 #. A city in Alaska in the United States
-#| msgid "Hail"
 msgid "Healy"
 msgstr "Healy"
 
@@ -15593,7 +14811,6 @@ msgid "Henderson"
 msgstr "هندرسن"
 
 #. A city in Oregon in the United States
-#| msgid "Nelson"
 msgid "Hermiston"
 msgstr "Hermiston"
 
@@ -15602,7 +14819,6 @@ msgid "Hettinger"
 msgstr "هتینگر"
 
 #. A city in Florida in the United States
-#| msgid "Hall Beach"
 msgid "Hialeah"
 msgstr "Hialeah"
 
@@ -15660,7 +14876,6 @@ msgid "Hoffman"
 msgstr "هافمن"
 
 #. A city in Nebraska in the United States
-#| msgid "Holberg"
 msgid "Holdrege"
 msgstr "Holdrege"
 
@@ -15677,12 +14892,10 @@ msgid "Homer"
 msgstr "هومر"
 
 #. A city in Florida in the United States
-#| msgid "Homestead AFB"
 msgid "Homestead"
 msgstr "Homestead"
 
 #. A city in Texas in the United States
-#| msgid "London"
 msgid "Hondo"
 msgstr "Hondo"
 
@@ -15695,7 +14908,6 @@ msgid "Hoonah"
 msgstr "هونا"
 
 #. A city in Alaska in the United States
-#| msgid "Goose Bay"
 msgid "Hooper Bay"
 msgstr "Hooper Bay"
 
@@ -15756,7 +14968,6 @@ msgid "Huron"
 msgstr "هیورن"
 
 #. A city in Alaska in the United States
-#| msgid "Australia"
 msgid "Huslia"
 msgstr "Huslia"
 
@@ -15779,7 +14990,6 @@ msgid "Hydaburg"
 msgstr "هایدابرگ"
 
 #. A city in Oklahoma in the United States
-#| msgid "Israel"
 msgid "Idabel"
 msgstr "Idabel"
 
@@ -15819,12 +15029,10 @@ msgid "Indiantown"
 msgstr "ایندیانا تاون"
 
 #. A city in California in the United States
-#| msgid "Glenwood"
 msgid "Inglewood"
 msgstr "Inglewood"
 
 #. A city in Minnesota in the United States
-#| msgid "International Airport"
 msgid "International Falls"
 msgstr "International Falls"
 
@@ -15849,12 +15057,10 @@ msgid "Ironwood"
 msgstr "آیرن‌وود"
 
 #. A city in California in the United States
-#| msgid "Ilorin"
 msgid "Irvine"
 msgstr "Irvine"
 
 #. A city in Texas in the United States
-#| msgid "Erding"
 msgid "Irving"
 msgstr "Irving"
 
@@ -15977,39 +15183,32 @@ msgid "Jordan"
 msgstr "جُردن"
 
 #. A city in New Jersey in the United States
-#| msgid "Clewiston"
 msgid "Juliustown"
 msgstr "Juliustown"
 
 #. A city in Texas in the United States
-#| msgid "Austin City"
 msgid "Junction"
 msgstr "Junction"
 
 #. A city in Kansas in the United States
-#| msgid "Austin City"
 msgid "Junction City"
 msgstr "Junction City"
 
 #. A city in Alaska in the United States
-#| msgid "Guinea"
 msgctxt "City in Alaska, United States"
 msgid "Juneau"
 msgstr "Juneau"
 
 #. A city in Wisconsin in the United States
-#| msgid "Guinea"
 msgctxt "City in Wisconsin, United States"
 msgid "Juneau"
 msgstr "Juneau"
 
 #. A city in Hawaii in the United States
-#| msgid "Kabul"
 msgid "Kahului"
 msgstr "Kahului"
 
 #. A city in Hawaii in the United States
-#| msgid "Kairouan"
 msgid "Kailua"
 msgstr "Kailua"
 
@@ -16018,12 +15217,10 @@ msgid "Kaiser"
 msgstr "کایزر"
 
 #. A city in Alaska in the United States
-#| msgid "Baker"
 msgid "Kake"
 msgstr "Kake"
 
 #. A city in Alaska in the United States
-#| msgid "Kastoria"
 msgid "Kaktovik"
 msgstr "Kaktovik"
 
@@ -16036,7 +15233,6 @@ msgid "Kalispell"
 msgstr "کلیسپل"
 
 #. A city in Alaska in the United States
-#| msgid "Salta"
 msgid "Kaltag"
 msgstr "Kaltag"
 
@@ -16055,12 +15251,10 @@ msgid "Kansas City"
 msgstr "کانزاس سیتی"
 
 #. A city in Hawaii in the United States
-#| msgid "Kavala"
 msgid "Kaumalapau"
 msgstr "Kaumalapau"
 
 #. A city in Hawaii in the United States
-#| msgid "Matsuyama"
 msgid "Kaunakakai"
 msgstr "Kaunakakai"
 
@@ -16073,7 +15267,6 @@ msgid "Keene"
 msgstr "کین"
 
 #. A city in Hawaii in the United States
-#| msgid "Kashan"
 msgid "Kekaha"
 msgstr "Kekaha"
 
@@ -16122,7 +15315,6 @@ msgid "Kimball"
 msgstr "کیمبل"
 
 #. A city in Alaska in the United States
-#| msgid "Salmon"
 msgid "King Salmon"
 msgstr "King Salmon"
 
@@ -16139,7 +15331,6 @@ msgid "Kingsville"
 msgstr "کینگزویل"
 
 #. A city in Michigan in the United States
-#| msgid "Kansas"
 msgid "Kinross"
 msgstr "Kinross"
 
@@ -16148,7 +15339,6 @@ msgid "Kinston"
 msgstr "کینستون"
 
 #. A city in Alaska in the United States
-#| msgid "Kirensk"
 msgid "Kipnuk"
 msgstr "Kipnuk"
 
@@ -16157,7 +15347,6 @@ msgid "Kirksville"
 msgstr "کرکسویل"
 
 #. A city in Alaska in the United States
-#| msgid "Salina"
 msgid "Kivalina"
 msgstr "Kivalina"
 
@@ -16170,7 +15359,6 @@ msgid "Klawock"
 msgstr "کلاوک"
 
 #. A city in Missouri in the United States
-#| msgid "Wooster"
 msgid "Knob Noster"
 msgstr "Knob Noster"
 
@@ -16197,7 +15385,6 @@ msgid "Kotzebue"
 msgstr "کاتسیبیو"
 
 #. A city in Alaska in the United States
-#| msgid "Keokuk"
 msgid "Koyuk"
 msgstr "Koyuk"
 
@@ -16206,7 +15393,6 @@ msgid "Kustatan"
 msgstr "کوستاتان"
 
 #. A city in Wisconsin in the United States
-#| msgid "Crossville"
 msgid "La Crosse"
 msgstr "La Crosse"
 
@@ -16225,7 +15411,6 @@ msgid "La Grange"
 msgstr "لاگرینج"
 
 #. A city in Colorado in the United States
-#| msgid "Las Vegas"
 msgid "La Junta"
 msgstr "La Junta"
 
@@ -16234,7 +15419,6 @@ msgid "La Verne"
 msgstr "لاورن"
 
 #. A city in Colorado in the United States
-#| msgid "Las Vegas"
 msgid "La Veta"
 msgstr "La Veta"
 
@@ -16261,7 +15445,6 @@ msgid "Lafayette"
 msgstr "لافِیت"
 
 #. A city in Hawaii in the United States
-#| msgid "Latina"
 msgid "Lahaina"
 msgstr "Lahaina"
 
@@ -16322,7 +15505,6 @@ msgid "Lancaster"
 msgstr "لنکستر"
 
 #. A city in Wisconsin in the United States
-#| msgid "Island Lake"
 msgid "Land O' Lakes"
 msgstr "Land O' Lakes"
 
@@ -16343,7 +15525,6 @@ msgid "Laredo"
 msgstr "لاریدو"
 
 #. A city in New Mexico in the United States
-#| msgid "Lake Charles"
 msgid "Las Cruces"
 msgstr "Las Cruces"
 
@@ -16449,7 +15630,6 @@ msgstr "لیبرال"
 
 # با توجه به ویکی‌پدیا
 #. A city in Hawaii in the United States
-#| msgid "Niue"
 msgid "Lihue"
 msgstr "Lihue"
 
@@ -16459,12 +15639,10 @@ msgid "Lima"
 msgstr "لیما"
 
 #. A city in Alaska in the United States
-#| msgid "Arctic Village"
 msgid "Lime Village"
 msgstr "Lime Village"
 
 #. A city in Colorado in the United States
-#| msgid "Lisbon"
 msgid "Limon"
 msgstr "Limon"
 
@@ -16526,7 +15704,6 @@ msgid "London"
 msgstr "لندن"
 
 #. A city in Wisconsin in the United States
-#| msgid "Lovelock"
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
@@ -16665,8 +15842,6 @@ msgid "Mankato"
 msgstr "منکیتو"
 
 #. A city in Alaska in the United States
-#| msgctxt "City in Arkansas, United States"
-#| msgid "Hot Springs"
 msgid "Manley Hot Springs"
 msgstr "Manley Hot Springs"
 
@@ -16728,13 +15903,10 @@ msgid "Marshall"
 msgstr "مارشال"
 
 #. A city in Iowa in the United States
-#| msgctxt "City in Michigan, United States"
-#| msgid "Marshall"
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
 #. A city in Wisconsin in the United States
-#| msgid "Mansfield"
 msgid "Marshfield"
 msgstr "Marshfield"
 
@@ -16777,7 +15949,6 @@ msgid "Maxton"
 msgstr "مکستون"
 
 #. A city in Florida in the United States
-#| msgid "Mayo"
 msgid "Mayport"
 msgstr "Mayport"
 
@@ -16790,7 +15961,6 @@ msgid "McAllen"
 msgstr "مک‌الین"
 
 #. A city in Idaho in the United States
-#| msgid "McClellan"
 msgid "McCall"
 msgstr "McCall"
 
@@ -16853,7 +16023,6 @@ msgid "Meeker"
 msgstr "میکر"
 
 #. A city in Alaska in the United States
-#| msgid "Meeker"
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
@@ -16863,7 +16032,6 @@ msgid "Melbourne"
 msgstr "ملبورن"
 
 #. A city in Virginia in the United States
-#| msgid "Alaska"
 msgid "Melfa"
 msgstr "Melfa"
 
@@ -16888,7 +16056,6 @@ msgid "Merced"
 msgstr "مرسد"
 
 #. A city in Nevada in the United States
-#| msgid "Perry"
 msgid "Mercury"
 msgstr "Mercury"
 
@@ -16913,7 +16080,6 @@ msgid "Mesquite"
 msgstr "مسکیت"
 
 #. A city in Alaska in the United States
-#| msgid "Alaska"
 msgid "Metlakatla"
 msgstr "Metlakatla"
 
@@ -16935,7 +16101,6 @@ msgid "Midland"
 msgstr "میدلند"
 
 #. A city in Texas in the United States
-#| msgid "Midland"
 msgid "Midlothian"
 msgstr "Midlothian"
 
@@ -16956,7 +16121,6 @@ msgid "Millington"
 msgstr "میلینگتون"
 
 #. A city in Maine in the United States
-#| msgid "Millington"
 msgid "Millinocket"
 msgstr "Millinocket"
 
@@ -17009,7 +16173,6 @@ msgid "Modesto"
 msgstr "مودستو"
 
 #. A city in Illinois in the United States
-#| msgid "Maine"
 msgid "Moline"
 msgstr "Moline"
 
@@ -17042,7 +16205,6 @@ msgid "Montauk"
 msgstr "مانتوک"
 
 #. A city in California in the United States
-#| msgid "Monterrey"
 msgid "Monterey"
 msgstr "Monterey"
 
@@ -17128,7 +16290,6 @@ msgid "Moses Lake"
 msgstr "موسس لیک"
 
 #. A city in Wisconsin in the United States
-#| msgid "Moosonee"
 msgid "Mosinee"
 msgstr "Mosinee"
 
@@ -17137,18 +16298,14 @@ msgid "Moultrie"
 msgstr "مولتری"
 
 #. A city in North Carolina in the United States
-#| msgid "Mostar"
 msgid "Mount Airy"
 msgstr "Mount Airy"
 
 #. A city in Illinois in the United States
-#| msgid "Mount Clemens"
 msgid "Mount Carmel"
 msgstr "Mount Carmel"
 
 #. A city in New Jersey in the United States
-#| msgctxt "City in Arkansas, United States"
-#| msgid "Mountain Home"
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
@@ -17172,13 +16329,10 @@ msgid "Mount Pleasant"
 msgstr "مونت پلزنت"
 
 #. A city in Pennsylvania in the United States
-#| msgid "Mount Vernon"
 msgid "Mount Pocono"
 msgstr "Mount Pocono"
 
 #. A city in California in the United States
-#| msgctxt "City in Iowa, United States"
-#| msgid "Mount Pleasant"
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
@@ -17205,7 +16359,6 @@ msgid "Mountain View"
 msgstr "مانتن ویو"
 
 #. A city in Kentucky in the United States
-#| msgid "Mildura"
 msgid "Muldraugh"
 msgstr "Muldraugh"
 
@@ -17214,17 +16367,14 @@ msgid "Mullan"
 msgstr "مالن"
 
 #. A city in Indiana in the United States
-#| msgid "Munich"
 msgid "Muncie"
 msgstr "Muncie"
 
 #. A city in Michigan in the United States
-#| msgid "Lansing"
 msgid "Munising"
 msgstr "Munising"
 
 #. A city in Iowa in the United States
-#| msgid "Murcia"
 msgid "Muscatine"
 msgstr "Muscatine"
 
@@ -17245,7 +16395,6 @@ msgid "Myrtle Beach"
 msgstr "مرتل بیچ"
 
 #. A city in Alaska in the United States
-#| msgid "Gabes"
 msgid "Nabesna"
 msgstr "Nabesna"
 
@@ -17262,12 +16411,10 @@ msgid "Napa"
 msgstr "نپا"
 
 #. A city in Illinois in the United States
-#| msgid "Waterville"
 msgid "Naperville"
 msgstr "Naperville"
 
 #. A city in Florida in the United States
-#| msgid "Naples"
 msgctxt "City in Florida, United States"
 msgid "Naples"
 msgstr "Naples"
@@ -17309,12 +16456,10 @@ msgid "New Bern"
 msgstr "نیوبرن"
 
 #. A city in Texas in the United States
-#| msgid "New Brunswick"
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
 #. A city in Pennsylvania in the United States
-#| msgid "Newcastle"
 msgid "New Castle"
 msgstr "New Castle"
 
@@ -17323,7 +16468,6 @@ msgid "New Haven"
 msgstr "نیوهیون"
 
 #. A city in Louisiana in the United States
-#| msgid "New Bern"
 msgid "New Iberia"
 msgstr "New Iberia"
 
@@ -17336,34 +16480,28 @@ msgid "New Philadelphia"
 msgstr "نیوفیلادلفیا"
 
 #. A city in Wisconsin in the United States
-#| msgid "Richmond"
 msgid "New Richmond"
 msgstr "New Richmond"
 
 #. A city in Florida in the United States
-#| msgid "Newport Beach"
 msgid "New Smyrna Beach"
 msgstr "New Smyrna Beach"
 
 #. A city in Minnesota in the United States
-#| msgid "New Philadelphia"
 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 "New York"
 
 #. A city in New Jersey in the United States
-#| msgid "Newark"
 msgctxt "City in New Jersey, United States"
 msgid "Newark"
 msgstr "Newark"
 
 #. A city in Ohio in the United States
-#| msgid "Newark"
 msgctxt "City in Ohio, United States"
 msgid "Newark"
 msgstr "Newark"
@@ -17377,17 +16515,14 @@ msgid "Newburgh"
 msgstr "نیوبرگ"
 
 #. A city in Alaska in the United States
-#| msgid "New Haven"
 msgid "Newhalen"
 msgstr "Newhalen"
 
 #. A city in California in the United States
-#| msgid "New Haven"
 msgid "Newhall"
 msgstr "Newhall"
 
 #. A city in Georgia in the United States
-#| msgid "Nenana"
 msgid "Newnan"
 msgstr "Newnan"
 
@@ -17445,7 +16580,6 @@ msgid "Norman"
 msgstr "نورمن"
 
 #. A city in Massachusetts in the United States
-#| msgid "Kamloops"
 msgid "North Adams"
 msgstr "North Adams"
 
@@ -17458,27 +16592,22 @@ msgid "North Las Vegas"
 msgstr "لاس وگاس شمالی"
 
 #. A city in South Carolina in the United States
-#| msgid "Myrtle Beach"
 msgid "North Myrtle Beach"
 msgstr "North Myrtle Beach"
 
 #. A city in Nebraska in the United States
-#| msgid "North Point"
 msgid "North Platte"
 msgstr "North Platte"
 
 #. A city in North Carolina in the United States
-#| msgid "Kamloops"
 msgid "North Wilkesboro"
 msgstr "North Wilkesboro"
 
 #. A city in Alaska in the United States
-#| msgid "Norway"
 msgid "Northway"
 msgstr "Northway"
 
 #. A city in California in the United States
-#| msgid "Norway"
 msgid "Norwalk"
 msgstr "Norwalk"
 
@@ -17495,7 +16624,6 @@ msgid "O'Neill"
 msgstr "اونیل"
 
 #. A city in Washington in the United States
-#| msgid "Bar Harbor"
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
@@ -17504,7 +16632,6 @@ msgid "Oak Island"
 msgstr "جزیره‌ی اوک"
 
 #. A city in Tennessee in the United States
-#| msgid "Pine Ridge"
 msgid "Oak Ridge"
 msgstr "Oak Ridge"
 
@@ -17533,12 +16660,10 @@ msgid "Odessa"
 msgstr "اودسا"
 
 #. A city in Iowa in the United States
-#| msgid "Olean"
 msgid "Oelwein"
 msgstr "Oelwein"
 
 #. A city in Nebraska in the United States
-#| msgid "Salalah"
 msgid "Ogallala"
 msgstr "Ogallala"
 
@@ -17563,7 +16688,6 @@ msgid "Olathe"
 msgstr "اولیتی"
 
 #. A city in Mississippi in the United States
-#| msgid "Fisher Branch"
 msgid "Olive Branch"
 msgstr "Olive Branch"
 
@@ -17572,7 +16696,6 @@ msgid "Olivia"
 msgstr "اولیویا"
 
 #. A city in Illinois in the United States
-#| msgid "Orly"
 msgid "Olney"
 msgstr "Olney"
 
@@ -17635,7 +16758,6 @@ msgid "Orlando"
 msgstr "اورلاندو"
 
 #. A city in Florida in the United States
-#| msgid "Long Beach"
 msgid "Ormond Beach"
 msgstr "Ormond Beach"
 
@@ -17644,7 +16766,6 @@ msgid "Oroville"
 msgstr "اوروویل"
 
 #. A city in Minnesota in the United States
-#| msgid "Ord"
 msgid "Orr"
 msgstr "Orr"
 
@@ -17665,7 +16786,6 @@ msgid "Oshkosh"
 msgstr "آشکوش"
 
 #. A city in Iowa in the United States
-#| msgid "Tuscaloosa"
 msgid "Oskaloosa"
 msgstr "Oskaloosa"
 
@@ -17674,7 +16794,6 @@ msgid "Ottumwa"
 msgstr "آتونوا"
 
 #. A city in Kansas in the United States
-#| msgid "Central Park"
 msgid "Overland Park"
 msgstr "Overland Park"
 
@@ -17687,7 +16806,6 @@ msgid "Owensboro"
 msgstr "اوئنزبرو"
 
 #. A city in Michigan in the United States
-#| msgid "Rosso"
 msgid "Owosso"
 msgstr "Owosso"
 
@@ -17723,7 +16841,6 @@ msgid "Page"
 msgstr "پیج"
 
 #. A city in Colorado in the United States
-#| msgid "Palm Springs"
 msgid "Pagosa Springs"
 msgstr "Pagosa Springs"
 
@@ -17770,7 +16887,6 @@ msgid "Paris"
 msgstr "پاریس"
 
 #. A city in Minnesota in the United States
-#| msgid "Cedar Rapids"
 msgid "Park Rapids"
 msgstr "Park Rapids"
 
@@ -17813,12 +16929,10 @@ msgid "Patterson"
 msgstr "پترسون"
 
 #. A city in Maryland in the United States
-#| msgid "Patuxent River"
 msgid "Patuxent"
 msgstr "Patuxent"
 
 #. A city in Oklahoma in the United States
-#| msgid "Trail Valley"
 msgid "Pauls Valley"
 msgstr "Pauls Valley"
 
@@ -17827,7 +16941,6 @@ msgid "Pawtucket"
 msgstr "پوتاکت"
 
 #. A city in Alaska in the United States
-#| msgid "Peason"
 msgid "Paxson"
 msgstr "Paxson"
 
@@ -17848,12 +16961,10 @@ msgid "Pella"
 msgstr "پلا"
 
 #. A city in Michigan in the United States
-#| msgid "Nelson"
 msgid "Pellston"
 msgstr "Pellston"
 
 #. A city in Florida in the United States
-#| msgid "Puerto Princesa"
 msgid "Pembroke Pines"
 msgstr "Pembroke Pines"
 
@@ -17933,7 +17044,6 @@ msgid "Pierre"
 msgstr "پیر"
 
 #. A city in Arkansas in the United States
-#| msgid "Pine Belt"
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
@@ -17954,7 +17064,6 @@ msgid "Pinedale"
 msgstr "پاین‌دیل"
 
 #. A city in North Carolina in the United States
-#| msgid "Lakehurst"
 msgid "Pinehurst"
 msgstr "Pinehurst"
 
@@ -17967,13 +17076,11 @@ msgid "Pittsburgh"
 msgstr "پیتسبرگ"
 
 #. A city in Illinois in the United States
-#| msgid "Pittsfield"
 msgctxt "City in Illinois, United States"
 msgid "Pittsfield"
 msgstr "Pittsfield"
 
 #. A city in Massachusetts in the United States
-#| msgid "Pittsfield"
 msgctxt "City in Massachusetts, United States"
 msgid "Pittsfield"
 msgstr "Pittsfield"
@@ -17991,7 +17098,6 @@ msgid "Plano"
 msgstr "پلانو"
 
 #. A city in Alaska in the United States
-#| msgid "Gatineau"
 msgid "Platinum"
 msgstr "Platinum"
 
@@ -18000,7 +17106,6 @@ msgid "Plattsburgh"
 msgstr "پلتسبرگ"
 
 #. A city in Nebraska in the United States
-#| msgid "Portsmouth"
 msgid "Plattsmouth"
 msgstr "Plattsmouth"
 
@@ -18023,18 +17128,14 @@ msgid "Pohick"
 msgstr "پوهیک"
 
 #. A city in Alaska in the United States
-#| msgid "Point Arena"
 msgid "Point Hope"
 msgstr "Point Hope"
 
 #. A city in Alaska in the United States
-#| msgid "Point Arena"
 msgid "Point Lay"
 msgstr "Point Lay"
 
 #. A city in West Virginia in the United States
-#| msgctxt "City in Iowa, United States"
-#| msgid "Mount Pleasant"
 msgid "Point Pleasant"
 msgstr "Point Pleasant"
 
@@ -18061,49 +17162,38 @@ msgid "Pontiac"
 msgstr "پونتیاک"
 
 #. A city in Missouri in the United States
-#| msgid "Council Bluffs"
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
 #. A city in Alaska in the United States
-#| msgctxt "City in Maine, United States"
-#| msgid "Portland"
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
 #. A city in Alaska in the United States
-#| msgctxt "City in New Hampshire, United States"
-#| msgid "Portsmouth"
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
 #. A city in Washington in the United States
-#| msgid "Los Angeles"
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
 #. A city in Texas in the United States
-#| msgid "Arkansas"
 msgid "Port Aransas"
 msgstr "Port Aransas"
 
 #. A city in Alaska in the United States
-#| msgid "Porterville"
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
 #. A city in Michigan in the United States
-#| msgid "Loreto"
 msgid "Port Hope"
 msgstr "Port Hope"
 
 #. A city in Texas in the United States
-#| msgid "Porter Lake"
 msgid "Port Isabel"
 msgstr "Port Isabel"
 
 #. A city in Texas in the United States
-#| msgid "Porter Lake"
 msgid "Port Lavaca"
 msgstr "Port Lavaca"
 
@@ -18144,7 +17234,6 @@ msgid "Poughkeepsie"
 msgstr "پوکیپسی"
 
 #. A city in Wisconsin in the United States
-#| msgid "Prairie Du Chien"
 msgid "Prairie du Chien"
 msgstr "Prairie du Chien"
 
@@ -18190,7 +17279,6 @@ msgid "Pueblo"
 msgstr "پوئبلو"
 
 #. A city in Florida in the United States
-#| msgid "Punta Arenas"
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
@@ -18203,7 +17291,6 @@ msgid "Quantico"
 msgstr "کوانتیکو"
 
 #. A city in Washington in the United States
-#| msgid "Stillwater"
 msgid "Quillayute"
 msgstr "Quillayute"
 
@@ -18284,7 +17371,6 @@ msgid "Rexburg"
 msgstr "رکسبرگ"
 
 #. A city in Wisconsin in the United States
-#| msgid "Finland"
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
@@ -18298,7 +17384,6 @@ msgid "Richmond"
 msgstr "ریچموند"
 
 #. A city in Colorado in the United States
-#| msgid "Recife"
 msgid "Rifle"
 msgstr "Rifle"
 
@@ -18315,12 +17400,10 @@ msgid "Roanoke"
 msgstr "روئنوک"
 
 #. A city in North Carolina in the United States
-#| msgid "Cedar Rapids"
 msgid "Roanoke Rapids"
 msgstr "Roanoke Rapids"
 
 #. A city in Illinois in the United States
-#| msgid "Kinston"
 msgid "Robinson"
 msgstr "Robinson"
 
@@ -18456,61 +17539,50 @@ msgid "Saguache"
 msgstr "سائوآچ"
 
 #. A city in Minnesota in the United States
-#| msgid "San Carlos"
 msgid "Saint Cloud"
 msgstr "Saint Cloud"
 
 #. A city in Alaska in the United States
-#| msgid "Saint Helena"
 msgctxt "City in Alaska, United States"
 msgid "Saint George"
 msgstr "Saint George"
 
 #. A city in Michigan in the United States
-#| msgid "St. James"
 msgctxt "City in Michigan, United States"
 msgid "Saint James"
 msgstr "Saint James"
 
 #. A city in Minnesota in the United States
-#| msgid "St. James"
 msgctxt "City in Minnesota, United States"
 msgid "Saint James"
 msgstr "Saint James"
 
 #. A city in Arizona in the United States
-#| msgid "Saint Joseph"
 msgid "Saint Johns"
 msgstr "Saint Johns"
 
 #. A city in Vermont in the United States
-#| msgid "Saint Joseph"
 msgid "Saint Johnsbury"
 msgstr "Saint Johnsbury"
 
 #. A city in Alaska in the United States
-#| msgid "San Marcos"
 msgid "Saint Marys"
 msgstr "Saint Marys"
 
 #. A city in Maryland in the United States
-#| msgid "Kansas City"
 msgid "Saint Marys City"
 msgstr "Saint Marys City"
 
 #. A city in Alaska in the United States
-#| msgid "Saint Lucia"
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
 #. A city in Illinois in the United States
-#| msgid "Salem"
 msgctxt "City in Illinois, United States"
 msgid "Salem"
 msgstr "Salem"
 
 #. A city in Oregon in the United States
-#| msgid "Salem"
 msgctxt "City in Oregon, United States"
 msgid "Salem"
 msgstr "Salem"
@@ -18528,13 +17600,11 @@ msgid "Salinas"
 msgstr "سالیناس"
 
 #. A city in Maryland in the United States
-#| msgid "Salisbury"
 msgctxt "City in Maryland, United States"
 msgid "Salisbury"
 msgstr "Salisbury"
 
 #. A city in North Carolina in the United States
-#| msgid "Salisbury"
 msgctxt "City in North Carolina, United States"
 msgid "Salisbury"
 msgstr "Salisbury"
@@ -18560,7 +17630,6 @@ msgid "San Antonio"
 msgstr "سان آنتونیو"
 
 #. A city in California in the United States
-#| msgid "San Fernando"
 msgid "San Bernardino"
 msgstr "San Bernardino"
 
@@ -18581,7 +17650,6 @@ msgid "San Jose"
 msgstr "سن هوزه"
 
 #. A city in California in the United States
-#| msgid "San Luis"
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
@@ -18606,13 +17674,11 @@ msgid "Sandwich"
 msgstr "سنویچ"
 
 #. A city in Maine in the United States
-#| msgid "Sanford"
 msgctxt "City in Maine, United States"
 msgid "Sanford"
 msgstr "Sanford"
 
 #. A city in North Carolina in the United States
-#| msgid "Sanford"
 msgctxt "City in North Carolina, United States"
 msgid "Sanford"
 msgstr "Sanford"
@@ -18626,13 +17692,11 @@ msgid "Santa Barbara"
 msgstr "سنتا باربرا"
 
 #. A city in California in the United States
-#| msgid "Santa Clara"
 msgctxt "City in California, United States"
 msgid "Santa Clara"
 msgstr "Santa Clara"
 
 #. A city in Utah in the United States
-#| msgid "Santa Clara"
 msgctxt "City in Utah, United States"
 msgid "Santa Clara"
 msgstr "Santa Clara"
@@ -18642,7 +17706,6 @@ msgid "Santa Fe"
 msgstr "سنتافه"
 
 #. A city in California in the United States
-#| msgid "Santa Maria"
 msgctxt "City in California, United States"
 msgid "Santa Maria"
 msgstr "Santa Maria"
@@ -18664,12 +17727,10 @@ msgid "Sarasota"
 msgstr "سراسوتا"
 
 #. A city in Michigan in the United States
-#| msgid "Santa Maria"
 msgid "Sault Ste. Marie"
 msgstr "Sault Ste. Marie"
 
 #. A city in Illinois in the United States
-#| msgid "Savannah"
 msgid "Savanna"
 msgstr "Savanna"
 
@@ -18678,12 +17739,10 @@ msgid "Savannah"
 msgstr "ساونا"
 
 #. A city in Alaska in the United States
-#| msgid "Savonlinna"
 msgid "Savoonga"
 msgstr "Savoonga"
 
 #. A city in Alaska in the United States
-#| msgid "Scampton"
 msgid "Scammon Bay"
 msgstr "Scammon Bay"
 
@@ -18700,7 +17759,6 @@ msgid "Scottsdale"
 msgstr "اسکاتسدیل"
 
 #. A city in Arkansas in the United States
-#| msgid "Kearney"
 msgid "Searcy"
 msgstr "Searcy"
 
@@ -18713,12 +17771,10 @@ msgid "Sedalia"
 msgstr "سیدیلیا"
 
 #. A city in Alaska in the United States
-#| msgid "Malawi"
 msgid "Selawik"
 msgstr "Selawik"
 
 #. A city in Alaska in the United States
-#| msgid "Slovakia"
 msgid "Seldovia"
 msgstr "Seldovia"
 
@@ -18727,19 +17783,16 @@ msgid "Selinsgrove"
 msgstr "سلینزگروو"
 
 #. A city in Oklahoma in the United States
-#| msgid "Seminole"
 msgctxt "City in Oklahoma, United States"
 msgid "Seminole"
 msgstr "Seminole"
 
 #. A city in Texas in the United States
-#| msgid "Seminole"
 msgctxt "City in Texas, United States"
 msgid "Seminole"
 msgstr "Seminole"
 
 #. A city in Alaska in the United States
-#| msgid "Sanandaj"
 msgid "Seward"
 msgstr "Seward"
 
@@ -18776,7 +17829,6 @@ msgid "Sheridan"
 msgstr "شریدن"
 
 #. A city in Texas in the United States
-#| msgid "Sheridan"
 msgid "Sherman"
 msgstr "Sherman"
 
@@ -18785,7 +17837,6 @@ msgid "Shirley"
 msgstr "شرلی"
 
 #. A city in Alaska in the United States
-#| msgid "Oshima"
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
@@ -18798,24 +17849,20 @@ msgid "Shreveport"
 msgstr "شریو‌پورت"
 
 #. A city in Montana in the United States
-#| msgid "Sidney"
 msgctxt "City in Montana, United States"
 msgid "Sidney"
 msgstr "Sidney"
 
 #. A city in Nebraska in the United States
-#| msgid "Sidney"
 msgctxt "City in Nebraska, United States"
 msgid "Sidney"
 msgstr "Sidney"
 
 #. A city in Arizona in the United States
-#| msgid "Boa Vista"
 msgid "Sierra Vista"
 msgstr "Sierra Vista"
 
 #. A city in Arkansas in the United States
-#| msgid "Soda Springs"
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
@@ -18828,7 +17875,6 @@ msgid "Silver City"
 msgstr "سیلور سیتی"
 
 #. A city in California in the United States
-#| msgid "Valley"
 msgid "Simi Valley"
 msgstr "Simi Valley"
 
@@ -18841,7 +17887,6 @@ msgid "Sioux Falls"
 msgstr "سو فالز"
 
 #. A city in Wisconsin in the United States
-#| msgid "Skive"
 msgid "Siren"
 msgstr "Siren"
 
@@ -18858,12 +17903,10 @@ msgid "Skagway"
 msgstr "اسکگ‌وی"
 
 #. A city in Minnesota in the United States
-#| msgid "Clayton"
 msgid "Slayton"
 msgstr "Slayton"
 
 #. A city in Alaska in the United States
-#| msgid "Sweetwater"
 msgid "Sleetmute"
 msgstr "Sleetmute"
 
@@ -18888,7 +17931,6 @@ msgid "Soda Springs"
 msgstr "سودا اسپرینگز"
 
 #. A city in Alaska in the United States
-#| msgid "Moldova"
 msgid "Soldotna"
 msgstr "Soldotna"
 
@@ -18901,39 +17943,32 @@ msgid "Somerville"
 msgstr "سامرویل"
 
 #. A city in Texas in the United States
-#| msgid "Sonora"
 msgctxt "City in Texas, United States"
 msgid "Sonora"
 msgstr "Sonora"
 
 #. A city in Indiana in the United States
-#| msgid "North Bend"
 msgid "South Bend"
 msgstr "South Bend"
 
 #. A city in Michigan in the United States
-#| msgid "South Kona"
 msgid "South Haven"
 msgstr "South Haven"
 
 #. A city in Virginia in the United States
-#| msgid "Forrest"
 msgid "South Hill"
 msgstr "South Hill"
 
 #. A city in California in the United States
-#| msgid "South Dakota"
 msgid "South Lake Tahoe"
 msgstr "South Lake Tahoe"
 
 #. 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"
@@ -18943,7 +17978,6 @@ msgid "Spencer"
 msgstr "اسپنسر"
 
 #. A city in Texas in the United States
-#| msgid "Safford"
 msgid "Spofford"
 msgstr "Spofford"
 
@@ -18956,49 +17990,41 @@ msgid "Springdale"
 msgstr "اسپرینگدیل"
 
 #. A city in Colorado in the United States
-#| msgid "Springfield"
 msgctxt "City in Colorado, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
 #. A city in Florida in the United States
-#| msgid "Springfield"
 msgctxt "City in Florida, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
 #. A city in Illinois in the United States
-#| msgid "Springfield"
 msgctxt "City in Illinois, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
 #. A city in Massachusetts in the United States
-#| msgid "Springfield"
 msgctxt "City in Massachusetts, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
 #. A city in Missouri in the United States
-#| msgid "Springfield"
 msgctxt "City in Missouri, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
 #. A city in Ohio in the United States
-#| msgid "Springfield"
 msgctxt "City in Ohio, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
 #. A city in Vermont in the United States
-#| msgid "Springfield"
 msgctxt "City in Vermont, United States"
 msgid "Springfield"
 msgstr "Springfield"
 
 #. A city in Missouri in the United States
-#| msgid "St Louis"
 msgid "St. Louis"
 msgstr "St. Louis"
 
@@ -19007,23 +18033,19 @@ msgid "Stafford"
 msgstr "استفورد"
 
 #. A city in Connecticut in the United States
-#| msgid "Stafford"
 msgid "Stamford"
 msgstr "Stamford"
 
 #. A city in Washington in the United States
-#| msgid "Staples"
 msgid "Stampede"
 msgstr "Stampede"
 
 #. A city in Idaho in the United States
-#| msgid "Stanley"
 msgctxt "City in Idaho, United States"
 msgid "Stanley"
 msgstr "Stanley"
 
 #. A city in Minnesota in the United States
-#| msgid "Staunton"
 msgid "Stanton"
 msgstr "Stanton"
 
@@ -19032,12 +18054,10 @@ msgid "Staples"
 msgstr "استیپلز"
 
 #. A city in Pennsylvania in the United States
-#| msgid "Statesville"
 msgid "State College"
 msgstr "State College"
 
 #. A city in Georgia in the United States
-#| msgid "Waynesboro"
 msgid "Statesboro"
 msgstr "Statesboro"
 
@@ -19050,23 +18070,19 @@ msgid "Staunton"
 msgstr "استنتون"
 
 #. A city in Colorado in the United States
-#| msgid "Soda Springs"
 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 "Stephenville"
 
 #. A city in Illinois in the United States
-#| msgid "Berlin"
 msgid "Sterling"
 msgstr "Sterling"
 
 #. A city in Michigan in the United States
-#| msgid "Berlin"
 msgid "Sterling Heights"
 msgstr "Sterling Heights"
 
@@ -19079,7 +18095,6 @@ msgid "Stillwater"
 msgstr "استیلواتر"
 
 #. A city in California in the United States
-#| msgid "Stockton"
 msgctxt "City in California, United States"
 msgid "Stockton"
 msgstr "Stockton"
@@ -19089,12 +18104,10 @@ msgid "Storm Lake"
 msgstr "استورم لیک"
 
 #. A city in Florida in the United States
-#| msgid "Stuttgart"
 msgid "Stuart"
 msgstr "Stuart"
 
 #. A city in Wisconsin in the United States
-#| msgid "Byron Bay"
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
@@ -19103,7 +18116,6 @@ msgid "Sturgis"
 msgstr "استرجیس"
 
 #. A city in Arkansas in the United States
-#| msgid "Stuttgart"
 msgctxt "City in Arkansas, United States"
 msgid "Stuttgart"
 msgstr "Stuttgart"
@@ -19113,17 +18125,14 @@ msgid "Suffolk"
 msgstr "سافوک"
 
 #. A city in Texas in the United States
-#| msgid "Camp Springs"
 msgid "Sulphur Springs"
 msgstr "Sulphur Springs"
 
 #. A city in California in the United States
-#| msgid "Susanville"
 msgid "Sunnyvale"
 msgstr "Sunnyvale"
 
 #. A city in Wisconsin in the United States
-#| msgid "Seminole"
 msgid "Superior"
 msgstr "Superior"
 
@@ -19132,13 +18141,11 @@ msgid "Sussex"
 msgstr "ساسکس"
 
 #. A city in Alaska in the United States
-#| msgid "Sutton"
 msgctxt "City in Alaska, United States"
 msgid "Sutton"
 msgstr "Sutton"
 
 #. A city in West Virginia in the United States
-#| msgid "Sutton"
 msgctxt "City in West Virginia, United States"
 msgid "Sutton"
 msgstr "Sutton"
@@ -19160,17 +18167,14 @@ msgid "Tacoma"
 msgstr "تاکوما"
 
 #. A city in Oklahoma in the United States
-#| msgid "Tahoua"
 msgid "Tahlequah"
 msgstr "Tahlequah"
 
 #. A city in Alaska in the United States
-#| msgid "Batna"
 msgid "Takotna"
 msgstr "Takotna"
 
 #. A city in Alaska in the United States
-#| msgid "Batna"
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
@@ -19183,7 +18187,6 @@ msgid "Tampa"
 msgstr "تمپا"
 
 #. A city in Alaska in the United States
-#| msgid "Tanzania"
 msgid "Tanana"
 msgstr "Tanana"
 
@@ -19192,7 +18195,6 @@ msgid "Taos"
 msgstr "تاوس"
 
 #. A city in Colorado in the United States
-#| msgid "Carroll"
 msgid "Tarryall"
 msgstr "Tarryall"
 
@@ -19201,17 +18203,14 @@ msgid "Taylorville"
 msgstr "تیلورویل"
 
 #. A city in Nebraska in the United States
-#| msgid "Farah"
 msgid "Tekamah"
 msgstr "Tekamah"
 
 #. A city in Colorado in the United States
-#| msgid "Meriden"
 msgid "Telluride"
 msgstr "Telluride"
 
 #. A city in Arizona in the United States
-#| msgid "Temple"
 msgid "Tempe"
 msgstr "Tempe"
 
@@ -19228,7 +18227,6 @@ msgid "Terrell"
 msgstr "ترل"
 
 #. A city in New Jersey in the United States
-#| msgid "Peterborough"
 msgid "Teterboro"
 msgstr "Teterboro"
 
@@ -19237,12 +18235,10 @@ msgid "Texarkana"
 msgstr "تکسارکنا"
 
 #. A city in Oregon in the United States
-#| msgid "Valley"
 msgid "The Dalles"
 msgstr "The Dalles"
 
 #. A city in Florida in the United States
-#| msgid "Arctic Village"
 msgid "The Villages"
 msgstr "The Villages"
 
@@ -19251,7 +18247,6 @@ msgid "Thedford"
 msgstr "تدفورد"
 
 #. A city in Minnesota in the United States
-#| msgid "Beaver Falls"
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
@@ -19264,17 +18259,14 @@ msgid "Thomson"
 msgstr "تامسون"
 
 #. A city in California in the United States
-#| msgid "Posadas"
 msgid "Thousand Oaks"
 msgstr "Thousand Oaks"
 
 #. A city in Washington in the United States
-#| msgid "Dilli"
 msgid "Tillicum"
 msgstr "Tillicum"
 
 #. A city in Alaska in the United States
-#| msgid "Tulip City"
 msgid "Tin City"
 msgstr "Tin City"
 
@@ -19283,7 +18275,6 @@ msgid "Titusville"
 msgstr "تایتس‌ویل"
 
 #. A city in Alaska in the United States
-#| msgid "Kodiak"
 msgid "Togiak"
 msgstr "Togiak"
 
@@ -19296,7 +18287,6 @@ msgid "Tomahawk"
 msgstr "تامهوک"
 
 #. A city in Nevada in the United States
-#| msgid "Tonga"
 msgid "Tonopah"
 msgstr "Tonopah"
 
@@ -19305,12 +18295,10 @@ msgid "Topeka"
 msgstr "توپیکا"
 
 #. A city in California in the United States
-#| msgid "France"
 msgid "Torrance"
 msgstr "Torrance"
 
 #. A city in New Mexico in the United States
-#| msgid "Torreón"
 msgid "Torreon"
 msgstr "Torreon"
 
@@ -19327,25 +18315,21 @@ msgid "Traverse City"
 msgstr "ترَورس سیتی"
 
 #. A city in New Jersey in the United States
-#| msgid "Trenton"
 msgctxt "City in New Jersey, United States"
 msgid "Trenton"
 msgstr "Trenton"
 
 #. A city in Colorado in the United States
-#| msgid "Trinidad"
 msgctxt "City in Colorado, United States"
 msgid "Trinidad"
 msgstr "Trinidad"
 
 #. A city in Alabama in the United States
-#| msgid "Troy"
 msgctxt "City in Alabama, United States"
 msgid "Troy"
 msgstr "Troy"
 
 #. A city in Michigan in the United States
-#| msgid "Troy"
 msgctxt "City in Michigan, United States"
 msgid "Troy"
 msgstr "Troy"
@@ -19371,7 +18355,6 @@ msgid "Tulsa"
 msgstr "تالسا"
 
 #. A city in Mississippi in the United States
-#| msgid "Tunisia"
 msgid "Tunica"
 msgstr "Tunica"
 
@@ -19384,7 +18367,6 @@ msgid "Tuscaloosa"
 msgstr "تاسکالوسا"
 
 #. A city in California in the United States
-#| msgid "Twin Falls"
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
@@ -19393,7 +18375,6 @@ msgid "Twin Falls"
 msgstr "توین فالز"
 
 #. A city in Minnesota in the United States
-#| msgid "Coral Harbour"
 msgid "Two Harbors"
 msgstr "Two Harbors"
 
@@ -19406,7 +18387,6 @@ msgid "Ukiah"
 msgstr "یوکایا"
 
 #. A city in Alaska in the United States
-#| msgid "Unalaska"
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
@@ -19415,12 +18395,10 @@ msgid "Unalaska"
 msgstr "آنالاسکا"
 
 #. A city in Missouri in the United States
-#| msgid "Arctic Village"
 msgid "Unity Village"
 msgstr "Unity Village"
 
 #. A city in Texas in the United States
-#| msgid "Silver City"
 msgid "Universal City"
 msgstr "Universal City"
 
@@ -19433,7 +18411,6 @@ msgid "Vacaville"
 msgstr "وکاویل"
 
 #. A city in Alaska in the United States
-#| msgid "Veracruz"
 msgid "Valdez"
 msgstr "Valdez"
 
@@ -19446,18 +18423,15 @@ msgid "Valentine"
 msgstr "ولنتاین"
 
 #. A city in California in the United States
-#| msgid "Valley"
 msgid "Vallejo"
 msgstr "Vallejo"
 
 #. A city in Florida in the United States
-#| msgid "Valparaiso"
 msgctxt "City in Florida, United States"
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
 #. A city in Indiana in the United States
-#| msgid "Valparaiso"
 msgctxt "City in Indiana, United States"
 msgid "Valparaiso"
 msgstr "Valparaiso"
@@ -19467,13 +18441,11 @@ msgid "Van Nuys"
 msgstr "ون نویز"
 
 #. A city in Washington in the United States
-#| msgid "Vancouver"
 msgctxt "City in Washington, United States"
 msgid "Vancouver"
 msgstr "Vancouver"
 
 #. A city in California in the United States
-#| msgid "Central"
 msgid "Ventura"
 msgstr "Ventura"
 
@@ -19482,18 +18454,15 @@ msgid "Vernal"
 msgstr "ورنل"
 
 #. A city in Texas in the United States
-#| msgid "Vernon"
 msgctxt "City in Texas, United States"
 msgid "Vernon"
 msgstr "Vernon"
 
 #. A city in Florida in the United States
-#| msgid "Long Beach"
 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 "Vichy"
@@ -19503,13 +18472,11 @@ msgid "Vicksburg"
 msgstr "ویکسبرگ"
 
 #. A city in Texas in the United States
-#| msgid "Victoria"
 msgctxt "City in Texas, United States"
 msgid "Victoria"
 msgstr "Victoria"
 
 #. A city in California in the United States
-#| msgid "Victoria"
 msgid "Victorville"
 msgstr "Victorville"
 
@@ -19518,12 +18485,10 @@ msgid "Vidalia"
 msgstr "وایدلیا"
 
 #. A city in Florida in the United States
-#| msgid "Pompano Beach"
 msgid "Vilano Beach"
 msgstr "Vilano Beach"
 
 #. A city in Massachusetts in the United States
-#| msgid "Winter Haven"
 msgid "Vineyard Haven"
 msgstr "Vineyard Haven"
 
@@ -19532,7 +18497,6 @@ msgid "Vinton"
 msgstr "وینتون"
 
 #. A city in Virginia in the United States
-#| msgid "Virginia"
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
@@ -19549,17 +18513,14 @@ msgid "Wadena"
 msgstr "وادینا"
 
 #. A city in North Carolina in the United States
-#| msgid "Waynesboro"
 msgid "Wadesboro"
 msgstr "Wadesboro"
 
 #. A city in Hawaii in the United States
-#| msgid "Bafia"
 msgid "Wahiawā"
 msgstr "Wahiawā"
 
 #. A city in North Dakota in the United States
-#| msgid "Wheaton"
 msgid "Wahpeton"
 msgstr "Wahpeton"
 
@@ -19580,27 +18541,22 @@ msgid "Walla Walla"
 msgstr "والا والا"
 
 #. A city in Arkansas in the United States
-#| msgid "Pine Ridge"
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
 #. A city in Georgia in the United States
-#| msgid "Barbers Point"
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
 #. A city in Michigan in the United States
-#| msgid "Barre"
 msgid "Warren"
 msgstr "Warren"
 
 #. A city in Minnesota in the United States
-#| msgid "Garoua"
 msgid "Warroad"
 msgstr "Warroad"
 
 #. A city in Indiana in the United States
-#| msgid "Waseca"
 msgctxt "City in Indiana, United States"
 msgid "Warsaw"
 msgstr "Warsaw"
@@ -19610,36 +18566,30 @@ msgid "Waseca"
 msgstr "واسیکا"
 
 #. The capital of the United States
-#| msgid "Washington"
 msgctxt "City in District of Columbia, United States"
 msgid "Washington"
 msgstr "Washington"
 
 #. A city in Iowa in the United States
-#| msgid "Washington"
 msgctxt "City in Iowa, United States"
 msgid "Washington"
 msgstr "Washington"
 
 #. A city in North Carolina in the United States
-#| msgid "Washington"
 msgctxt "City in North Carolina, United States"
 msgid "Washington"
 msgstr "Washington"
 
 #. A city in Pennsylvania in the United States
-#| msgid "Washington"
 msgctxt "City in Pennsylvania, United States"
 msgid "Washington"
 msgstr "Washington"
 
 #. A city in Alaska in the United States
-#| msgid "Willmar"
 msgid "Wasilla"
 msgstr "Wasilla"
 
 #. A city in Minnesota in the United States
-#| msgid "Waukesha"
 msgid "Waskish"
 msgstr "Waskish"
 
@@ -19648,25 +18598,21 @@ msgid "Waterbury"
 msgstr "واتربری"
 
 #. A city in Iowa in the United States
-#| msgid "Waterloo"
 msgctxt "City in Iowa, United States"
 msgid "Waterloo"
 msgstr "Waterloo"
 
 #. A city in New York in the United States
-#| msgid "Watertown"
 msgctxt "City in New York, United States"
 msgid "Watertown"
 msgstr "Watertown"
 
 #. A city in South Dakota in the United States
-#| msgid "Watertown"
 msgctxt "City in South Dakota, United States"
 msgid "Watertown"
 msgstr "Watertown"
 
 #. A city in Wisconsin in the United States
-#| msgid "Watertown"
 msgctxt "City in Wisconsin, United States"
 msgid "Watertown"
 msgstr "Watertown"
@@ -19696,27 +18642,22 @@ msgid "Wausau"
 msgstr "وسو"
 
 #. A city in Wisconsin in the United States
-#| msgid "Batman"
 msgid "Wautoma"
 msgstr "Wautoma"
 
 #. A city in Georgia in the United States
-#| msgid "Watrous"
 msgid "Waycross"
 msgstr "Waycross"
 
 #. A city in Nebraska in the United States
-#| msgid "Fort Wayne"
 msgid "Wayne"
 msgstr "Wayne"
 
 #. A city in Missouri in the United States
-#| msgid "Paynesville"
 msgid "Waynesville"
 msgstr "Waynesville"
 
 #. A city in Oklahoma in the United States
-#| msgid "Rutherfordton"
 msgid "Weatherford"
 msgstr "Weatherford"
 
@@ -19737,7 +18678,6 @@ msgid "Wendover"
 msgstr "وندوور"
 
 #. A city in Texas in the United States
-#| msgid "Waco"
 msgid "Weslaco"
 msgstr "Weslaco"
 
@@ -19750,7 +18690,6 @@ msgid "West Chicago"
 msgstr "غرب شیکاگو"
 
 #. A city in California in the United States
-#| msgid "West Point"
 msgid "West Covina"
 msgstr "West Covina"
 
@@ -19759,12 +18698,10 @@ msgid "West Memphis"
 msgstr "غرب ممفیس"
 
 #. A city in Florida in the United States
-#| msgid "Westhampton"
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
 #. A city in Missouri in the United States
-#| msgid "West Point"
 msgid "West Plains"
 msgstr "West Plains"
 
@@ -19773,12 +18710,10 @@ msgid "West Point"
 msgstr "وست پوینت"
 
 #. A city in Wyoming in the United States
-#| msgid "Webster City"
 msgid "West Thumb"
 msgstr "West Thumb"
 
 #. A city in Utah in the United States
-#| msgid "Webster City"
 msgid "West Valley City"
 msgstr "West Valley City"
 
@@ -19791,12 +18726,10 @@ msgid "Westfield"
 msgstr "وستفیلد"
 
 #. A city in New York in the United States
-#| msgid "Westhampton"
 msgid "Westhampton Beach"
 msgstr "Westhampton Beach"
 
 #. A city in Colorado in the United States
-#| msgid "West Point"
 msgid "Westminster"
 msgstr "Westminster"
 
@@ -19813,7 +18746,6 @@ msgid "Wheeling"
 msgstr "ویلینگ"
 
 #. A city in New York in the United States
-#| msgid "White Sands"
 msgid "White Plains"
 msgstr "White Plains"
 
@@ -19830,7 +18762,6 @@ msgid "Wichita"
 msgstr "ویچیتو"
 
 #. A city in Texas in the United States
-#| msgid "Little Falls"
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
@@ -19847,7 +18778,6 @@ msgid "Williamsport"
 msgstr "ویلیامزپورت"
 
 #. A city in North Dakota in the United States
-#| msgid "Williamtown"
 msgid "Williston"
 msgstr "Williston"
 
@@ -19856,24 +18786,20 @@ msgid "Willow"
 msgstr "ویلو"
 
 #. A city in Pennsylvania in the United States
-#| msgid "Willow Creek"
 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 "Wilmington"
 
 #. A city in North Carolina in the United States
-#| msgid "Wilmington"
 msgctxt "City in North Carolina, United States"
 msgid "Wilmington"
 msgstr "Wilmington"
 
 #. A city in Ohio in the United States
-#| msgid "Wilmington"
 msgctxt "City in Ohio, United States"
 msgid "Wilmington"
 msgstr "Wilmington"
@@ -19883,7 +18809,6 @@ msgid "Winchester"
 msgstr "وینچستر"
 
 #. A city in Georgia in the United States
-#| msgid "Windsor"
 msgid "Winder"
 msgstr "Winder"
 
@@ -19892,12 +18817,10 @@ msgid "Windom"
 msgstr "ویندم"
 
 #. A city in Arizona in the United States
-#| msgid "White Rock"
 msgid "Window Rock"
 msgstr "Window Rock"
 
 #. A city in Connecticut in the United States
-#| msgid "Windsor"
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
@@ -19906,12 +18829,10 @@ msgid "Winfield"
 msgstr "وینفیلد"
 
 #. A city in Texas in the United States
-#| msgid "Wittstock"
 msgid "Wink"
 msgstr "Wink"
 
 #. A city in Nevada in the United States
-#| msgid "Winona"
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
@@ -19932,17 +18853,14 @@ msgid "Winter Haven"
 msgstr "وینتر هیون"
 
 #. A city in North Carolina in the United States
-#| msgid "Waterville"
 msgid "Winterville"
 msgstr "Winterville"
 
 #. A city in Maine in the United States
-#| msgid "Biscarosse"
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
 #. A city in Wisconsin in the United States
-#| msgid "Wisconsin"
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
@@ -19951,12 +18869,10 @@ msgid "Wise"
 msgstr "وایز"
 
 #. A city in Montana in the United States
-#| msgid "West Point"
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
 #. A city in Wisconsin in the United States
-#| msgid "Woodring"
 msgid "Woodruff"
 msgstr "Woodruff"
 
@@ -19969,7 +18885,6 @@ msgid "Worcester"
 msgstr "ووستر"
 
 #. A city in Wyoming in the United States
-#| msgid "Woodland"
 msgid "Worland"
 msgstr "Worland"
 
@@ -19982,7 +18897,6 @@ msgid "Wrangell"
 msgstr "ورانگل"
 
 #. A city in Wyoming in the United States
-#| msgid "Wyoming"
 msgctxt "City in Wyoming, United States"
 msgid "Wyoming"
 msgstr "Wyoming"
@@ -19992,7 +18906,6 @@ msgid "Yakima"
 msgstr "یکیما"
 
 #. A city in Alaska in the United States
-#| msgid "Yakutsk"
 msgid "Yakutat"
 msgstr "Yakutat"
 
@@ -20001,18 +18914,15 @@ msgid "Yankton"
 msgstr "ینکتون"
 
 #. A city in New York in the United States
-#| msgid "Angers"
 msgid "Yonkers"
 msgstr "Yonkers"
 
 #. A city in Nebraska in the United States
-#| msgid "York"
 msgctxt "City in Nebraska, United States"
 msgid "York"
 msgstr "York"
 
 #. A city in Pennsylvania in the United States
-#| msgid "York"
 msgctxt "City in Pennsylvania, United States"
 msgid "York"
 msgstr "York"
@@ -20030,12 +18940,10 @@ msgid "Zanesville"
 msgstr "زینزویل"
 
 #. A city in the United States Minor Outlying Islands
-#| msgid "McClellan Airfield Airport"
 msgid "Wake Island, Wake Island Army Airfield Airport"
 msgstr "Wake Island, Wake Island Army Airfield Airport"
 
 #. A city in the United States Virgin Islands
-#| msgid "Charlotte Amalie St. Thomas"
 msgid "Charlotte Amalie"
 msgstr "Charlotte Amalie"
 
@@ -20044,7 +18952,6 @@ msgid "Christiansted"
 msgstr "کریسچنستد"
 
 #. A city in Uruguay
-#| msgid "Baracoa"
 msgid "Carrasco"
 msgstr "Carrasco"
 
@@ -20057,23 +18964,19 @@ msgid "Durazno"
 msgstr "دوراسنو"
 
 #. A city in Uruguay
-#| msgid "Macedonia"
 msgid "Maldonado"
 msgstr "Maldonado"
 
 #. The capital of Uruguay
-#| msgid "Montevideo"
 msgctxt "City in Uruguay"
 msgid "Montevideo"
 msgstr "Montevideo"
 
 #. A city in Uzbekistan
-#| msgid "Nauru"
 msgid "Nukus"
 msgstr "Nukus"
 
 #. A city in Uzbekistan
-#| msgid "Samarkand"
 msgid "Samarqand"
 msgstr "Samarqand"
 
@@ -20085,12 +18988,10 @@ msgid "Tashkent"
 msgstr "تاشکند"
 
 #. A city in Uzbekistan
-#| msgid "Termez"
 msgid "Termiz"
 msgstr "Termiz"
 
 #. A city in Uzbekistan
-#| msgid "France"
 msgid "Urganch"
 msgstr "Urganch"
 
@@ -20099,7 +19000,6 @@ msgid "Acarigua"
 msgstr "آکاری‌گوا"
 
 #. A city in Venezuela
-#| msgid "Barcelona"
 msgctxt "City in Venezuela"
 msgid "Barcelona"
 msgstr "Barcelona"
@@ -20117,7 +19017,6 @@ msgid "Calabozo"
 msgstr "کالابوتسو"
 
 #. The capital of Venezuela
-#| msgid "Caravelas"
 msgid "Caracas"
 msgstr "Caracas"
 
@@ -20130,12 +19029,10 @@ msgid "Coro"
 msgstr "کورلو"
 
 #. A city in Venezuela
-#| msgid "El Monte"
 msgid "El Variante"
 msgstr "El Variante"
 
 #. A city in Venezuela
-#| msgid "El Monte"
 msgid "El Vigía"
 msgstr "El Vigía"
 
@@ -20144,73 +19041,59 @@ msgid "Guanare"
 msgstr "گواناره"
 
 #. A city in Venezuela
-#| msgid "Guanare"
 msgid "Guaricure"
 msgstr "Guaricure"
 
 #. A city in Venezuela
-#| msgid "Guadeloupe"
 msgid "Guasdalito"
 msgstr "Guasdalito"
 
 #. A city in Venezuela
-#| msgid "Guiria"
 msgid "Güiria"
 msgstr "Güiria"
 
 #. A city in Venezuela
-#| msgid "La Ceiba"
 msgid "La Chica"
 msgstr "La Chica"
 
 #. A city in Venezuela
-#| msgid "Maribor"
 msgid "Maracaibo"
 msgstr "Maracaibo"
 
 #. A city in Venezuela
-#| msgid "Mackay"
 msgid "Maracay"
 msgstr "Maracay"
 
 #. A city in Venezuela
-#| msgid "Maturin"
 msgid "Maturín"
 msgstr "Maturín"
 
 #. A city in Venezuela
-#| msgid "La Grande"
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
 #. A city in Venezuela
-#| msgid "Monroe"
 msgid "Morocure"
 msgstr "Morocure"
 
 #. A city in Venezuela
-#| msgid "Merida"
 msgctxt "City in Venezuela"
 msgid "Mérida"
 msgstr "Mérida"
 
 #. A city in Venezuela
-#| msgid "Amarillo"
 msgid "Paramillo"
 msgstr "Paramillo"
 
 #. A city in Venezuela
-#| msgid "Ayacucho"
 msgid "Puerto Ayacucho"
 msgstr "Puerto Ayacucho"
 
 #. A city in Venezuela
-#| msgid "Iguazú"
 msgid "Puerto Borburata"
 msgstr "Puerto Borburata"
 
 #. A city in Venezuela
-#| msgid "San Antonio"
 msgid "San Antonio del Táchira"
 msgstr "San Antonio del Táchira"
 
@@ -20219,7 +19102,6 @@ msgid "San Felipe"
 msgstr "سن فلیپه"
 
 #. A city in Venezuela
-#| msgid "San Fernando"
 msgctxt "City in Venezuela"
 msgid "San Fernando"
 msgstr "San Fernando"
@@ -20229,17 +19111,14 @@ msgid "San Juan de los Morros"
 msgstr "سن جوآن د لاس موروس"
 
 #. A city in Venezuela
-#| msgid "San Jose"
 msgid "San Tomé"
 msgstr "San Tomé"
 
 #. A city in Venezuela
-#| msgid "Santa Barbara"
 msgid "Santa Bárbara"
 msgstr "Santa Bárbara"
 
 #. A city in Venezuela
-#| msgid "Valencia"
 msgctxt "City in Venezuela"
 msgid "Valencia"
 msgstr "Valencia"
@@ -20256,7 +19135,6 @@ msgstr "دانانگ"
 #. "Hanoi" is the traditional English name.
 #. The local name in Vietnamese is "Ha Noi".
 #.
-#| msgid "Ha Noi"
 msgid "Hanoi"
 msgstr "Hanoi"
 
@@ -20264,42 +19142,34 @@ msgstr "Hanoi"
 #. "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 "Ho Chi Minh City"
 
 #. A city in Wallis and Futuna
-#| msgid "Macau"
 msgid "Mata'utu"
 msgstr "Mata'utu"
 
 #. A city in Yemen
-#| msgid "Ada"
 msgid "'Adan"
 msgstr "'Adan"
 
 #. A city in Yemen
-#| msgid "Ataq"
 msgid "'Ataq"
 msgstr "'Ataq"
 
 #. A city in Yemen
-#| msgid "Al Qaysumah"
 msgid "Al Hudaydah"
 msgstr "Al Hudaydah"
 
 #. A city in Yemen
-#| msgid "Maribor"
 msgid "Ma'rib"
 msgstr "Ma'rib"
 
 #. A city in Yemen
-#| msgid "Morris"
 msgid "Mori"
 msgstr "Mori"
 
 #. A city in Yemen
-#| msgid "Sa'Ada/Sadah"
 msgid "Sa'dah"
 msgstr "Sa'dah"
 
@@ -20307,22 +19177,18 @@ msgstr "Sa'dah"
 #. "Sanaa" is the traditional English name.
 #. The local name in Arabic is "San'a'".
 #.
-#| msgid "Sanandaj"
 msgid "Sanaa"
 msgstr "Sanaa"
 
 #. A city in Yemen
-#| msgid "San"
 msgid "Say'un"
 msgstr "Say'un"
 
 #. A city in Yemen
-#| msgid "Tabriz"
 msgid "Ta'izz"
 msgstr "Ta'izz"
 
 #. A city in Zambia
-#| msgid "Chinandega"
 msgid "Chinganze"
 msgstr "Chinganze"
 
@@ -20331,12 +19197,10 @@ msgid "Livingstone"
 msgstr "لیوینگستون"
 
 #. The capital of Zambia
-#| msgid "Osaka"
 msgid "Lusaka"
 msgstr "Lusaka"
 
 #. A city in Zambia
-#| msgid "Yola"
 msgid "Ndola"
 msgstr "Ndola"
 
diff --git a/po/fa.po b/po/fa.po
index 23e873c..de6edfd 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,21 +7,22 @@
 # Farzaneh Sarafraz <farzaneh farsiweb info>, 2006.
 # Mahyar Moghimi <mahyar moqimi gmail com>, 2010.
 # Mohammad Javad Badiee <m j badiee gmail com>, 2010.
-# Arash Mousavi <mousavi arash gmail com>, 2012.
+# Arash Mousavi <mousavi arash gmail com>, 2012, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-applets gnome-2-12\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=libgweather&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-27 19:56+0000\n"
-"PO-Revision-Date: 2012-09-08 02:12+0330\n"
+"POT-Creation-Date: 2013-03-04 21:50+0000\n"
+"PO-Revision-Date: 2013-03-23 18:18+0330\n"
 "Last-Translator: Arash Mousavi <mousavi arash gmail com>\n"
 "Language-Team: Persian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: ../libgweather/gweather-timezone.c:316
 msgid "Greenwich Mean Time"
@@ -32,470 +33,499 @@ msgctxt "timezone"
 msgid "Unknown"
 msgstr "ناشناخته"
 
-#: ../libgweather/weather.c:200
+#: ../libgweather/weather.c:129
 msgid "Variable"
 msgstr "متغیر"
 
-#: ../libgweather/weather.c:201
+#: ../libgweather/weather.c:130
 msgid "North"
 msgstr "شمال"
 
-#: ../libgweather/weather.c:201
+#: ../libgweather/weather.c:130
 msgid "North - NorthEast"
 msgstr "شمال ‐ شمال شرقی"
 
-#: ../libgweather/weather.c:201
+#: ../libgweather/weather.c:130
 msgid "Northeast"
 msgstr "شمال شرقی"
 
-#: ../libgweather/weather.c:201
+#: ../libgweather/weather.c:130
 msgid "East - NorthEast"
 msgstr "شرق ‐ شمال شرقی"
 
-#: ../libgweather/weather.c:202
+#: ../libgweather/weather.c:131
 msgid "East"
 msgstr "شرق"
 
-#: ../libgweather/weather.c:202
+#: ../libgweather/weather.c:131
 msgid "East - Southeast"
 msgstr "شرق ‐ جنوب شرقی"
 
-#: ../libgweather/weather.c:202
+#: ../libgweather/weather.c:131
 msgid "Southeast"
 msgstr "جنوب شرقی"
 
-#: ../libgweather/weather.c:202
+#: ../libgweather/weather.c:131
 msgid "South - Southeast"
 msgstr "جنوب ‐ جنوب شرقی"
 
-#: ../libgweather/weather.c:203
+#: ../libgweather/weather.c:132
 msgid "South"
 msgstr "جنوب"
 
-#: ../libgweather/weather.c:203
+#: ../libgweather/weather.c:132
 msgid "South - Southwest"
 msgstr "جنوب ‐ جنوب غربی"
 
-#: ../libgweather/weather.c:203
+#: ../libgweather/weather.c:132
 msgid "Southwest"
 msgstr "جنوب غربی"
 
-#: ../libgweather/weather.c:203
+#: ../libgweather/weather.c:132
 msgid "West - Southwest"
 msgstr "غرب ‐ جنوب غربی"
 
-#: ../libgweather/weather.c:204
+#: ../libgweather/weather.c:133
 msgid "West"
 msgstr "غرب"
 
-#: ../libgweather/weather.c:204
+#: ../libgweather/weather.c:133
 msgid "West - Northwest"
 msgstr "غرب ‐ شمال غربی"
 
-#: ../libgweather/weather.c:204
+#: ../libgweather/weather.c:133
 msgid "Northwest"
 msgstr "شمال غربی"
 
-#: ../libgweather/weather.c:204
+#: ../libgweather/weather.c:133
 msgid "North - Northwest"
 msgstr "شمال ‐ شمال غربی"
 
-#: ../libgweather/weather.c:211 ../libgweather/weather.c:228
-#: ../libgweather/weather.c:300
+#: ../libgweather/weather.c:140
+#| msgid "Invalid"
+msgctxt "wind direction"
 msgid "Invalid"
 msgstr "نامعتبر"
 
-#: ../libgweather/weather.c:217
+#: ../libgweather/weather.c:146
 msgid "Clear Sky"
 msgstr "آسمان صاف"
 
-#: ../libgweather/weather.c:218
+#: ../libgweather/weather.c:147
 msgid "Broken clouds"
 msgstr "نیمه‌ابری"
 
-#: ../libgweather/weather.c:219
+#: ../libgweather/weather.c:148
 msgid "Scattered clouds"
 msgstr "ابرهای پراکنده"
 
-#: ../libgweather/weather.c:220
+#: ../libgweather/weather.c:149
 msgid "Few clouds"
 msgstr "ابرهای اندک"
 
-#: ../libgweather/weather.c:221
+#: ../libgweather/weather.c:150
 msgid "Overcast"
 msgstr "ابری"
 
+#: ../libgweather/weather.c:157 ../libgweather/weather.c:229
+#| msgid "Invalid"
+msgctxt "sky conditions"
+msgid "Invalid"
+msgstr "نامعتبر"
+
 #. TRANSLATOR: If you want to know what "blowing" "shallow" "partial"
 #. * etc means, you can go to http://www.weather.com/glossary/ and
 #. * http://www.crh.noaa.gov/arx/wx.tbl.php
 #. NONE
-#: ../libgweather/weather.c:260 ../libgweather/weather.c:262
+#: ../libgweather/weather.c:189 ../libgweather/weather.c:191
 msgid "Thunderstorm"
 msgstr "طوفان و رعد و برق"
 
 #. DRIZZLE
-#: ../libgweather/weather.c:261
+#: ../libgweather/weather.c:190
 msgid "Drizzle"
 msgstr "باران ریز"
 
-#: ../libgweather/weather.c:261
+#: ../libgweather/weather.c:190
 msgid "Light drizzle"
 msgstr "باران ریز سبک"
 
-#: ../libgweather/weather.c:261
+#: ../libgweather/weather.c:190
 msgid "Moderate drizzle"
 msgstr "باران ریز متوسط"
 
-#: ../libgweather/weather.c:261
+#: ../libgweather/weather.c:190
 msgid "Heavy drizzle"
 msgstr "باران ریز سنگین"
 
-#: ../libgweather/weather.c:261
+#: ../libgweather/weather.c:190
 msgid "Freezing drizzle"
 msgstr "باران ریز یخ زده"
 
 #. RAIN
-#: ../libgweather/weather.c:262
+#: ../libgweather/weather.c:191
 msgid "Rain"
 msgstr "باران"
 
-#: ../libgweather/weather.c:262
+#: ../libgweather/weather.c:191
 msgid "Light rain"
 msgstr "باران سبک"
 
-#: ../libgweather/weather.c:262
+#: ../libgweather/weather.c:191
 msgid "Moderate rain"
 msgstr "باران معتدل"
 
-#: ../libgweather/weather.c:262
+#: ../libgweather/weather.c:191
 msgid "Heavy rain"
 msgstr "باران سنگین"
 
-#: ../libgweather/weather.c:262
+#: ../libgweather/weather.c:191
 msgid "Rain showers"
 msgstr "رگبار باران"
 
-#: ../libgweather/weather.c:262
+#: ../libgweather/weather.c:191
 msgid "Freezing rain"
 msgstr "باران یخ زده"
 
 #. SNOW
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:192
 msgid "Snow"
 msgstr "برف"
 
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:192
 msgid "Light snow"
 msgstr "برف سبک"
 
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:192
 msgid "Moderate snow"
 msgstr "برف معتدل"
 
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:192
 msgid "Heavy snow"
 msgstr "برف سنگین"
 
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:192
 msgid "Snowstorm"
 msgstr "کولاک"
 
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:192
 msgid "Blowing snowfall"
 msgstr "ریزش برف همراه با باد"
 
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:192
 msgid "Snow showers"
 msgstr "رگبار برف"
 
-#: ../libgweather/weather.c:263
+#: ../libgweather/weather.c:192
 msgid "Drifting snow"
 msgstr "برف خیزان"
 
 #. SNOW_GRAINS
-#: ../libgweather/weather.c:264
+#: ../libgweather/weather.c:193
 msgid "Snow grains"
 msgstr "برف یخ‌زده"
 
-#: ../libgweather/weather.c:264
+#: ../libgweather/weather.c:193
 msgid "Light snow grains"
 msgstr "برف یخ‌زده‌ی سبک"
 
-#: ../libgweather/weather.c:264
+#: ../libgweather/weather.c:193
 msgid "Moderate snow grains"
 msgstr "برف یخ‌زده‌ی متوسط"
 
-#: ../libgweather/weather.c:264
+#: ../libgweather/weather.c:193
 msgid "Heavy snow grains"
 msgstr "برف یخ‌زده‌ی سنگین"
 
 #. ICE_CRYSTALS
-#: ../libgweather/weather.c:265
+#: ../libgweather/weather.c:194
 msgid "Ice crystals"
 msgstr "بلور‌های یخ"
 
 #. ICE_PELLETS
-#: ../libgweather/weather.c:266
+#: ../libgweather/weather.c:195
 msgid "Ice pellets"
 msgstr "گلوله‌های یخ"
 
-#: ../libgweather/weather.c:266
+#: ../libgweather/weather.c:195
 msgid "Few ice pellets"
 msgstr "گلوله‌های یخ با تعداد کم"
 
-#: ../libgweather/weather.c:266
+#: ../libgweather/weather.c:195
 msgid "Moderate ice pellets"
 msgstr "گلوله‌های یخ با تعداد متوسط"
 
-#: ../libgweather/weather.c:266
+#: ../libgweather/weather.c:195
 msgid "Heavy ice pellets"
 msgstr "گلوله‌های یخ با تعداد زیاد"
 
-#: ../libgweather/weather.c:266
+#: ../libgweather/weather.c:195
 msgid "Ice pellet storm"
 msgstr "کولاک گلوله‌های یخ"
 
-#: ../libgweather/weather.c:266
+#: ../libgweather/weather.c:195
 msgid "Showers of ice pellets"
 msgstr "دوش گلوله‌های یخ"
 
 #. HAIL
-#: ../libgweather/weather.c:267
+#: ../libgweather/weather.c:196
 msgid "Hail"
 msgstr "تگرگ"
 
-#: ../libgweather/weather.c:267
+#: ../libgweather/weather.c:196
 msgid "Hailstorm"
 msgstr "طوفان تگرگ"
 
-#: ../libgweather/weather.c:267
+#: ../libgweather/weather.c:196
 msgid "Hail showers"
 msgstr "رگبار تگرگ"
 
 #. SMALL_HAIL
-#: ../libgweather/weather.c:268
+#: ../libgweather/weather.c:197
 msgid "Small hail"
 msgstr "تگرگ ریز"
 
-#: ../libgweather/weather.c:268
+#: ../libgweather/weather.c:197
 msgid "Small hailstorm"
 msgstr "طوفان تگرگ ریز"
 
-#: ../libgweather/weather.c:268
+#: ../libgweather/weather.c:197
 msgid "Showers of small hail"
 msgstr "رگبار تگرگ ریز"
 
 #. PRECIPITATION
-#: ../libgweather/weather.c:269
+#: ../libgweather/weather.c:198
 msgid "Unknown precipitation"
 msgstr "بارش نامعلوم"
 
 #. MIST
-#: ../libgweather/weather.c:270
+#: ../libgweather/weather.c:199
 msgid "Mist"
 msgstr "مه رقیق"
 
 #. FOG
-#: ../libgweather/weather.c:271
+#: ../libgweather/weather.c:200
 msgid "Fog"
 msgstr "مه"
 
-#: ../libgweather/weather.c:271
+#: ../libgweather/weather.c:200
 msgid "Fog in the vicinity"
 msgstr "مه در حوالی"
 
-#: ../libgweather/weather.c:271
+#: ../libgweather/weather.c:200
 msgid "Shallow fog"
 msgstr "مه کم عمق"
 
-#: ../libgweather/weather.c:271
+#: ../libgweather/weather.c:200
 msgid "Patches of fog"
 msgstr "مه تکه تکه"
 
-#: ../libgweather/weather.c:271
+#: ../libgweather/weather.c:200
 msgid "Partial fog"
 msgstr "مه ناتمام"
 
-#: ../libgweather/weather.c:271
+#: ../libgweather/weather.c:200
 msgid "Freezing fog"
 msgstr "مه یخ زده"
 
 #. SMOKE
-#: ../libgweather/weather.c:272
+#: ../libgweather/weather.c:201
 msgid "Smoke"
 msgstr "دود"
 
 #. VOLCANIC_ASH
-#: ../libgweather/weather.c:273
+#: ../libgweather/weather.c:202
 msgid "Volcanic ash"
 msgstr "خاکستر آتشفشانی"
 
 #. SAND
-#: ../libgweather/weather.c:274
+#: ../libgweather/weather.c:203
 msgid "Sand"
 msgstr "شن"
 
-#: ../libgweather/weather.c:274
+#: ../libgweather/weather.c:203
 msgid "Blowing sand"
 msgstr "شن‌باد"
 
-#: ../libgweather/weather.c:274
+#: ../libgweather/weather.c:203
 msgid "Drifting sand"
 msgstr "شن خیزان"
 
 #. HAZE
-#: ../libgweather/weather.c:275
+#: ../libgweather/weather.c:204
 msgid "Haze"
 msgstr "تیرگی هوا"
 
 #. SPRAY
-#: ../libgweather/weather.c:276
+#: ../libgweather/weather.c:205
 msgid "Blowing sprays"
 msgstr "قطرات ریز باران همراه با باد"
 
 #. DUST
-#: ../libgweather/weather.c:277
+#: ../libgweather/weather.c:206
 msgid "Dust"
 msgstr "غبار"
 
-#: ../libgweather/weather.c:277
+#: ../libgweather/weather.c:206
 msgid "Blowing dust"
 msgstr "گرد و خاک با باد"
 
-#: ../libgweather/weather.c:277
+#: ../libgweather/weather.c:206
 msgid "Drifting dust"
 msgstr "غبار خیزان"
 
 #. SQUALL
-#: ../libgweather/weather.c:278
+#: ../libgweather/weather.c:207
 msgid "Squall"
 msgstr "باد و بوران"
 
 #. SANDSTORM
-#: ../libgweather/weather.c:279
+#: ../libgweather/weather.c:208
 msgid "Sandstorm"
 msgstr "توفان شن"
 
-#: ../libgweather/weather.c:279
+#: ../libgweather/weather.c:208
 msgid "Sandstorm in the vicinity"
 msgstr "توفان شن در حوالی"
 
-#: ../libgweather/weather.c:279
+#: ../libgweather/weather.c:208
 msgid "Heavy sandstorm"
 msgstr "توفان شن سنگین"
 
 #. DUSTSTORM
-#: ../libgweather/weather.c:280
+#: ../libgweather/weather.c:209
 msgid "Duststorm"
 msgstr "دیوباد"
 
-#: ../libgweather/weather.c:280
+#: ../libgweather/weather.c:209
 msgid "Duststorm in the vicinity"
 msgstr "دیوباد در حومه"
 
-#: ../libgweather/weather.c:280
+#: ../libgweather/weather.c:209
 msgid "Heavy duststorm"
 msgstr "دیوباد سنگین"
 
 #. FUNNEL_CLOUD
-#: ../libgweather/weather.c:281
+#: ../libgweather/weather.c:210
 msgid "Funnel cloud"
 msgstr "ابر فونل(دودکشی)"
 
 #. TORNADO
-#: ../libgweather/weather.c:282
+#: ../libgweather/weather.c:211
 msgid "Tornado"
 msgstr "توفان پیچنده"
 
 #. DUST_WHIRLS
-#: ../libgweather/weather.c:283
+#: ../libgweather/weather.c:212
 msgid "Dust whirls"
 msgstr "گرداب‌های گرد و خاک"
 
-#: ../libgweather/weather.c:283
+#: ../libgweather/weather.c:212
 msgid "Dust whirls in the vicinity"
 msgstr "گرداب‌های گرد و خاک در حومه"
 
-#: ../libgweather/weather.c:612
-msgid "%a, %b %d / %H:%M"
+#: ../libgweather/weather.c:552
+#| msgid "%a, %b %d / %H:%M"
+msgid "%a, %b %d / %H∶%M"
 msgstr "%A %Od %B / %OH:%OM"
 
-#: ../libgweather/weather.c:618
+#: ../libgweather/weather.c:558
 msgid "Unknown observation time"
 msgstr "زمان رصد نامشخص"
 
-#: ../libgweather/weather.c:630 ../libgweather/weather.c:679
-#: ../libgweather/weather.c:694 ../libgweather/weather.c:710
-#: ../libgweather/weather.c:726 ../libgweather/weather.c:742
-#: ../libgweather/weather.c:759 ../libgweather/weather.c:779
-#: ../libgweather/weather.c:814 ../libgweather/weather.c:832
-#: ../libgweather/weather.c:861 ../libgweather/weather.c:893
-#: ../libgweather/weather.c:910 ../libgweather/weather.c:930
+#: ../libgweather/weather.c:570
+#| msgid "Unknown"
+msgctxt "sky conditions"
 msgid "Unknown"
 msgstr "نامعلوم"
 
 #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
-#: ../libgweather/weather.c:650
+#: ../libgweather/weather.c:590
 #, c-format
 msgid "%.1f °F"
 msgstr "‏%I.1f درجه‌ی فارنهایت‬"
 
 #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
-#: ../libgweather/weather.c:653
+#: ../libgweather/weather.c:593
 #, c-format
 msgid "%d °F"
 msgstr "‎%Id °F‬"
 
 #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
-#: ../libgweather/weather.c:659
+#: ../libgweather/weather.c:599
 #, c-format
 msgid "%.1f °C"
 msgstr "‏%I.1f درجه‌ی سلسیوس‬"
 
 #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
-#: ../libgweather/weather.c:662
+#: ../libgweather/weather.c:602
 #, c-format
 msgid "%d °C"
 msgstr "‎%Id ‬°C"
 
 #. TRANSLATOR: This is the temperature in kelvin
-#: ../libgweather/weather.c:668
+#: ../libgweather/weather.c:608
 #, c-format
 msgid "%.1f K"
 msgstr "‏%I.1f درجه‌ی کلوین‬"
 
 #. TRANSLATOR: This is the temperature in kelvin
-#: ../libgweather/weather.c:671
+#: ../libgweather/weather.c:611
 #, c-format
 msgid "%d K"
 msgstr "‎%Id K"
 
+#: ../libgweather/weather.c:619
+#| msgid "Unknown"
+msgctxt "temperature unit"
+msgid "Unknown"
+msgstr "نامعلوم"
+
+#: ../libgweather/weather.c:634 ../libgweather/weather.c:650
+#: ../libgweather/weather.c:666 ../libgweather/weather.c:719
+#| msgid "Unknown"
+msgctxt "temperature"
+msgid "Unknown"
+msgstr "نامعلوم"
+
+#: ../libgweather/weather.c:682
+#| msgid "Unknown"
+msgctxt "dew"
+msgid "Unknown"
+msgstr "نامعلوم"
+
+#: ../libgweather/weather.c:699
+#| msgid "Unknown"
+msgctxt "humidity"
+msgid "Unknown"
+msgstr "نامعلوم"
+
 #. TRANSLATOR: This is the humidity in percent
-#: ../libgweather/weather.c:762
+#: ../libgweather/weather.c:702
 #, c-format
 msgid "%.f%%"
 msgstr "‪٪%I.f‬"
 
 #. TRANSLATOR: This is the wind speed in knots
-#: ../libgweather/weather.c:790
+#: ../libgweather/weather.c:730
 #, c-format
 msgid "%0.1f knots"
 msgstr "%I0.1f گره‌"
 
 #. TRANSLATOR: This is the wind speed in miles per hour
-#: ../libgweather/weather.c:794
+#: ../libgweather/weather.c:733
 #, c-format
 msgid "%.1f mph"
 msgstr "%I.1f مایل بر ساعت"
 
 #. TRANSLATOR: This is the wind speed in kilometers per hour
-#: ../libgweather/weather.c:798
+#: ../libgweather/weather.c:736
 #, c-format
 msgid "%.1f km/h"
 msgstr "%I.1f کیلومتر بر ساعت"
 
 #. TRANSLATOR: This is the wind speed in meters per second
-#: ../libgweather/weather.c:802
+#: ../libgweather/weather.c:739
 #, c-format
 msgid "%.1f m/s"
 msgstr "%I.1f متر بر ساعت"
@@ -503,80 +533,116 @@ msgstr "%I.1f متر بر ساعت"
 #. TRANSLATOR: This is the wind speed as a Beaufort force factor
 #. * (commonly used in nautical wind estimation).
 #.
-#: ../libgweather/weather.c:808
+#: ../libgweather/weather.c:744
 #, c-format
 msgid "Beaufort force %.1f"
 msgstr "نیروی بوفورت %.1f"
 
-#: ../libgweather/weather.c:834
+#: ../libgweather/weather.c:749
+#| msgid "Unknown"
+msgctxt "speed unit"
+msgid "Unknown"
+msgstr "نامعلوم"
+
+#: ../libgweather/weather.c:767
+#| msgid "Unknown"
+msgctxt "wind speed"
+msgid "Unknown"
+msgstr "نامعلوم"
+
+#: ../libgweather/weather.c:769
 msgid "Calm"
 msgstr "آرام"
 
 #. TRANSLATOR: This is 'wind direction' / 'wind speed'
-#: ../libgweather/weather.c:842
+#: ../libgweather/weather.c:777
 #, c-format
 msgid "%s / %s"
 msgstr "‏%s‏ / ‏%s‏"
 
+#: ../libgweather/weather.c:796
+#| msgid "Unknown"
+msgctxt "pressure"
+msgid "Unknown"
+msgstr "نامعلوم"
+
 #. TRANSLATOR: This is pressure in inches of mercury
-#: ../libgweather/weather.c:866
+#: ../libgweather/weather.c:801
 #, c-format
 msgid "%.2f inHg"
 msgstr "%I.2f اینچ جیوه"
 
 #. TRANSLATOR: This is pressure in millimeters of mercury
-#: ../libgweather/weather.c:870
+#: ../libgweather/weather.c:804
 #, c-format
 msgid "%.1f mmHg"
 msgstr "%I.1f میلی‌متر جیوه"
 
 #. TRANSLATOR: This is pressure in kiloPascals
-#: ../libgweather/weather.c:874
+#: ../libgweather/weather.c:807
 #, c-format
 msgid "%.2f kPa"
 msgstr "%I.2f کیلوپاسکال"
 
 #. TRANSLATOR: This is pressure in hectoPascals
-#: ../libgweather/weather.c:878
+#: ../libgweather/weather.c:810
 #, c-format
 msgid "%.2f hPa"
 msgstr "%I.2f هکتوپاسکال"
 
 #. TRANSLATOR: This is pressure in millibars
-#: ../libgweather/weather.c:882
+#: ../libgweather/weather.c:813
 #, c-format
 msgid "%.2f mb"
 msgstr "%I.2f میلی‌بار"
 
 #. TRANSLATOR: This is pressure in atmospheres
-#: ../libgweather/weather.c:886
+#: ../libgweather/weather.c:816
 #, c-format
 msgid "%.3f atm"
 msgstr "%I.3f اتمسفر"
 
+#: ../libgweather/weather.c:822
+#| msgid "Unknown"
+msgctxt "pressure unit"
+msgid "Unknown"
+msgstr "نامعلوم"
+
+#: ../libgweather/weather.c:839
+#| msgid "Unknown"
+msgctxt "visibility"
+msgid "Unknown"
+msgstr "نامعلوم"
+
 #. TRANSLATOR: This is the visibility in miles
-#: ../libgweather/weather.c:915
+#: ../libgweather/weather.c:844
 #, c-format
 msgid "%.1f miles"
 msgstr "%I.1f مایل"
 
 #. TRANSLATOR: This is the visibility in kilometers
-#: ../libgweather/weather.c:919
+#: ../libgweather/weather.c:847
 #, c-format
 msgid "%.1f km"
 msgstr "%I.1f کیلومتر"
 
 #. TRANSLATOR: This is the visibility in meters
-#: ../libgweather/weather.c:923
+#: ../libgweather/weather.c:850
 #, c-format
 msgid "%.0fm"
 msgstr "%I.0f متر"
 
-#: ../libgweather/weather.c:957 ../libgweather/weather.c:985
-msgid "%H:%M"
-msgstr "%OH:%OM"
+#: ../libgweather/weather.c:856
+#| msgid "Unknown"
+msgctxt "visibility unit"
+msgid "Unknown"
+msgstr "نامعلوم"
 
-#: ../libgweather/weather.c:1066
+#: ../libgweather/weather.c:880 ../libgweather/weather.c:905
+msgid "%H∶%M"
+msgstr "%OH∶%OM"
+
+#: ../libgweather/weather.c:1006
 msgid "Retrieval failed"
 msgstr "بازیابی شکست خورد"
 
@@ -586,17 +652,23 @@ msgstr "بازیابی شکست خورد"
 msgid "Failed to get METAR data: %d %s.\n"
 msgstr "گرفتن داده‌های METAR شکست خورد: %Id %s.\n"
 
-#: ../libgweather/weather-metar.c:571
-msgid "WeatherInfo missing location"
-msgstr "مکان در WeatherInfo نیست"
+#. The new (documented but not advertised) API is less strict in the
+#. format of the attribution, and just requires a generic CC-BY compatible
+#. attribution with a link to their service.
+#.
+#. That's very nice of them!
+#.
+#: ../libgweather/weather-yrno.c:416
+msgid ""
+"Weather data from the <a href=\"http://yr.no/\";>Norwegian Meteorological "
+"Institute</a>"
+msgstr "اطلاعات هوا از طریق <a href=\"http://yr.no/\";>سازمان هواشناسی نروژ</a>"
 
-#: ../data/org.gnome.GWeather.gschema.xml.h:1
-#| msgid "Url for the radar map"
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:1
 msgid "URL for the radar map"
 msgstr "نشانی اینترنتی نقشه‌ی رادار"
 
-#: ../data/org.gnome.GWeather.gschema.xml.h:2
-#| msgid "The custom url from where to retrieve a radar map."
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:2
 msgid ""
 "The custom URL from where to retrieve a radar map, or empty for disabling "
 "radar maps."
@@ -606,16 +678,15 @@ msgstr ""
 
 #. TRANSLATORS: pick a temperature unit that should be used by default in your
 #. locale; values must be quoted
-#: ../data/org.gnome.GWeather.gschema.xml.h:5
-#| msgid "Fahrenheit"
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:5
 msgid "'fahrenheit'"
 msgstr "'centigrade'"
 
-#: ../data/org.gnome.GWeather.gschema.xml.h:6
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:6
 msgid "Temperature unit"
 msgstr "واحد دما"
 
-#: ../data/org.gnome.GWeather.gschema.xml.h:7
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:7
 msgid ""
 "The unit of temperature used for showing weather. Valid values are 'kelvin', "
 "'centigrade' and 'fahrenheit'."
@@ -625,16 +696,15 @@ msgstr ""
 
 #. TRANSLATORS: pick a default distance unit for your locale, see key description
 #. for valid values
-#: ../data/org.gnome.GWeather.gschema.xml.h:10
-#| msgid "miles"
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:10
 msgid "'miles'"
 msgstr "'km'"
 
-#: ../data/org.gnome.GWeather.gschema.xml.h:11
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:11
 msgid "Distance unit"
 msgstr "واحد فاصله"
 
-#: ../data/org.gnome.GWeather.gschema.xml.h:12
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:12
 msgid ""
 "The unit of distance used for showing weather (for example for visibility or "
 "for distance of important events). Valid values are 'meters', 'km' and "
@@ -645,16 +715,15 @@ msgstr ""
 
 #. TRANSLATORS: pick a default speed unit for your locale, see key description
 #. for valid values
-#: ../data/org.gnome.GWeather.gschema.xml.h:15
-#| msgid "knots"
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:15
 msgid "'knots'"
 msgstr "'kph'"
 
-#: ../data/org.gnome.GWeather.gschema.xml.h:16
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:16
 msgid "Speed unit"
 msgstr "واحد سرعت"
 
-#: ../data/org.gnome.GWeather.gschema.xml.h:17
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:17
 msgid ""
 "The unit of speed used for showing weather (for example for wind speed). "
 "Valid values are 'ms' (meters per second), 'kph' (kilometers per hour), "
@@ -666,15 +735,15 @@ msgstr ""
 
 #. TRANSLATORS: pick a default pressure unit for your locale, see key description
 #. for valid values
-#: ../data/org.gnome.GWeather.gschema.xml.h:20
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:20
 msgid "'inch-hg'"
 msgstr "'atm'"
 
-#: ../data/org.gnome.GWeather.gschema.xml.h:21
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:21
 msgid "Pressure unit"
 msgstr "واحد فشار"
 
-#: ../data/org.gnome.GWeather.gschema.xml.h:22
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:22
 msgid ""
 "The unit of pressure used for showing weather. Valid values are "
 "'kpa' (kilopascal), 'hpa' (hectopascal), 'mb' (millibar, mathematically "
@@ -686,12 +755,11 @@ msgstr ""
 "ریاضی معادل ۱ هکتوپاسکال است اما به شکل متفاوتی نمایش داده می‌شود), 'mm-"
 "hg' (میلی‌متر جیوه), 'inch-hg' (اینچ جیوه), 'atm' (اتموسفر)."
 
-#: ../data/org.gnome.GWeather.gschema.xml.h:23
-#| msgid "Zone location"
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:23
 msgid "Default location"
 msgstr "مکان پیش‌فرض"
 
-#: ../data/org.gnome.GWeather.gschema.xml.h:24
+#: ../schemas/org.gnome.GWeather.gschema.xml.h:24
 msgid ""
 "The default location for the weather applet. The first field is the name "
 "that will be shown. If empty, it will be taken from the locations database. "
@@ -709,6 +777,12 @@ msgstr ""
 "تنها فقط برای محاسبات غروب و حالت ماه استفاده می‌شود و در پیش‌بینی هوا تاثیری "
 "ندارد."
 
+#~ msgid "%H:%M"
+#~ msgstr "%OH:%OM"
+
+#~ msgid "WeatherInfo missing location"
+#~ msgstr "مکان در WeatherInfo نیست"
+
 #~ msgid "DEFAULT_LOCATION"
 #~ msgstr "Tehran"
 
@@ -821,8 +895,8 @@ msgstr ""
 #~ "شود."
 
 #~ msgid ""
-#~ "Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-SS"
-#~ "[EW]."
+#~ "Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-"
+#~ "SS[EW]."
 #~ msgstr ""
 #~ "طول و عرض جغرافیایی مکان شما که به شکل DD-MM-SS[NS] DD-MM-SS[EW]‎ مشخص شده "
 #~ "است"