Update translation template.

author: Automated System <[email protected]> 2021-07-07 22:34:53 +0000
committer: TDE Gitea <[email protected]> 2021-07-07 22:34:53 +0000
commit: 7a6b3830304e3cdef4015378de3c1ea9ad479113 (patch)
tree: e6bc9a824cbda725ff3f8ca70dbe76ef49aa93d9 /template/messages/tdeedu
parent: 44f5bf1bb27c8650acc7d05c39db48fa1f1fbe88 (diff)
download: tde-i18n-7a6b3830304e3cdef4015378de3c1ea9ad479113.tar.gz
tde-i18n-7a6b3830304e3cdef4015378de3c1ea9ad479113.zip
13 files changed, 2355 insertions, 3608 deletions
diff --git a/template/messages/tdeedu/kalzium.pot b/template/messages/tdeedu/kalzium.pot
index 720027a0b35..13cdfe75aa4 100644
--- a/template/messages/tdeedu/kalzium.pot
+++ b/template/messages/tdeedu/kalzium.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-11 13:06+0200\n"
+"POT-Creation-Date: 2021-07-07 22:21+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -150,8 +150,8 @@ msgstr ""
 msgid "Isotope-Table"
 msgstr ""
 
-#: data/knowledge.xml:70 data/knowledge.xml:135
-#: detailinfodlg.cpp:245 plotsetupwidget.ui:200
+#: data/knowledge.xml:70 data/knowledge.xml:135 detailinfodlg.cpp:245
+#: plotsetupwidget.ui:200
 #, no-c-format
 msgid "Mass"
 msgstr ""
@@ -488,16 +488,14 @@ msgstr ""
 msgid "Show &Crystal Structures"
 msgstr ""
 
-#: data/knowledge.xml:252 data/knowledge.xml:261
-#: data/knowledge.xml:266 data/knowledge.xml:278
-#: kalzium.cpp:121 plotsetupwidget.ui:230
+#: data/knowledge.xml:252 data/knowledge.xml:261 data/knowledge.xml:266
+#: data/knowledge.xml:278 kalzium.cpp:121 plotsetupwidget.ui:230
 #, no-c-format
 msgid "Atomic Radius"
 msgstr ""
 
-#: data/knowledge.xml:251 data/knowledge.xml:260
-#: data/knowledge.xml:269 data/knowledge.xml:275
-#: kalzium.cpp:122 plotsetupwidget.ui:235
+#: data/knowledge.xml:251 data/knowledge.xml:260 data/knowledge.xml:269
+#: data/knowledge.xml:275 kalzium.cpp:122 plotsetupwidget.ui:235
 #, no-c-format
 msgid "Covalent Radius"
 msgstr ""
@@ -1623,8 +1621,7 @@ msgid ""
 "One, two, or three letter abbreviation; set through international convention."
 msgstr ""
 
-#: data/knowledge.xml:15 data/knowledge.xml:27
-#: data/knowledge.xml:117
+#: data/knowledge.xml:15 data/knowledge.xml:27 data/knowledge.xml:117
 #, no-c-format
 msgid "Element"
 msgstr ""
@@ -1875,9 +1872,8 @@ msgid ""
 "neutrons that are emitted from the Atoms of certain radioactive elements."
 msgstr ""
 
-#: data/knowledge.xml:114 data/knowledge.xml:127
-#: data/knowledge.xml:134 data/knowledge.xml:142
-#: data/knowledge.xml:219 data/knowledge.xml:226
+#: data/knowledge.xml:114 data/knowledge.xml:127 data/knowledge.xml:134
+#: data/knowledge.xml:142 data/knowledge.xml:219 data/knowledge.xml:226
 #: data/knowledge.xml:235
 #, no-c-format
 msgid "Atom"
@@ -1890,21 +1886,18 @@ msgid ""
 "kind are called an Element."
 msgstr ""
 
-#: data/knowledge.xml:118 data/knowledge.xml:215
-#: data/knowledge.xml:227 data/knowledge.xml:236
-#: data/knowledge.xml:244
+#: data/knowledge.xml:118 data/knowledge.xml:215 data/knowledge.xml:227
+#: data/knowledge.xml:236 data/knowledge.xml:244
 #, no-c-format
 msgid "Electron"
 msgstr ""
 
-#: data/knowledge.xml:119 data/knowledge.xml:223
-#: data/knowledge.xml:237
+#: data/knowledge.xml:119 data/knowledge.xml:223 data/knowledge.xml:237
 #, no-c-format
 msgid "Proton"
 msgstr ""
 
-#: data/knowledge.xml:120 data/knowledge.xml:228
-#: data/knowledge.xml:232
+#: data/knowledge.xml:120 data/knowledge.xml:228 data/knowledge.xml:232
 #, no-c-format
 msgid "Neutron"
 msgstr ""
@@ -1929,11 +1922,9 @@ msgid ""
 "the isotope mix is given."
 msgstr ""
 
-#: data/knowledge.xml:139 data/knowledge.xml:149
-#: data/knowledge.xml:156 data/knowledge.xml:163
-#: data/knowledge.xml:170 data/knowledge.xml:177
-#: data/knowledge.xml:187 data/knowledge.xml:196
-#: data/knowledge.xml:205
+#: data/knowledge.xml:139 data/knowledge.xml:149 data/knowledge.xml:156
+#: data/knowledge.xml:163 data/knowledge.xml:170 data/knowledge.xml:177
+#: data/knowledge.xml:187 data/knowledge.xml:196 data/knowledge.xml:205
 #, no-c-format
 msgid "Isotope"
 msgstr ""
@@ -2007,14 +1998,14 @@ msgstr ""
 msgid "[i]see isotopes[/i]"
 msgstr ""
 
-#: data/knowledge.xml:178 data/knowledge.xml:184
-#: data/knowledge.xml:197 data/knowledge.xml:207
+#: data/knowledge.xml:178 data/knowledge.xml:184 data/knowledge.xml:197
+#: data/knowledge.xml:207
 #, no-c-format
 msgid "Isotone"
 msgstr ""
 
-#: data/knowledge.xml:179 data/knowledge.xml:188
-#: data/knowledge.xml:198 data/knowledge.xml:202
+#: data/knowledge.xml:179 data/knowledge.xml:188 data/knowledge.xml:198
+#: data/knowledge.xml:202
 #, no-c-format
 msgid "Nuclear Isomer"
 msgstr ""
@@ -2029,8 +2020,7 @@ msgstr ""
 msgid "Two nuclides are isotones if they have the same number N of neutrons."
 msgstr ""
 
-#: data/knowledge.xml:189 data/knowledge.xml:193
-#: data/knowledge.xml:206
+#: data/knowledge.xml:189 data/knowledge.xml:193 data/knowledge.xml:206
 #, no-c-format
 msgid "Isobar"
 msgstr ""
@@ -2085,9 +2075,9 @@ msgstr ""
 #, no-c-format
 msgid ""
 "The proton is a subatomic particle with a mass of m[sub]e[/sub]=(1.6726231 "
-"&#177; 0.0000010) 10[sup]-27[/sup] kg and a positive charge of "
-"[i]e[/i]=(1.60217733 &#177; 0.00000049) 10[sup]-19[/sup] C which occurs in "
-"the nucleus of an atom."
+"&#177; 0.0000010) 10[sup]-27[/sup] kg and a positive charge of [i]e[/"
+"i]=(1.60217733 &#177; 0.00000049) 10[sup]-19[/sup] C which occurs in the "
+"nucleus of an atom."
 msgstr ""
 
 #: data/knowledge.xml:233
@@ -2111,8 +2101,8 @@ msgid ""
 "configuration known as a diode."
 msgstr ""
 
-#: data/knowledge.xml:248 data/knowledge.xml:262
-#: data/knowledge.xml:271 data/knowledge.xml:279
+#: data/knowledge.xml:248 data/knowledge.xml:262 data/knowledge.xml:271
+#: data/knowledge.xml:279
 #, no-c-format
 msgid "Ionic Radius"
 msgstr ""
@@ -2127,8 +2117,8 @@ msgid ""
 "postive ion has a smaller radius than its atom and vice versa."
 msgstr ""
 
-#: data/knowledge.xml:253 data/knowledge.xml:257
-#: data/knowledge.xml:270 data/knowledge.xml:280
+#: data/knowledge.xml:253 data/knowledge.xml:257 data/knowledge.xml:270
+#: data/knowledge.xml:280
 #, no-c-format
 msgid "Van der Waals Radius"
 msgstr ""
@@ -2583,9 +2573,9 @@ msgstr ""
 #, no-c-format
 msgid ""
 "In a laboratory you often have to weigh out very precise amounts of "
-"reagents. High precise scales can measure masses down to 1/10000 "
-"gram.Therefor they stand on granite blocks to avoid vibrancies and are "
-"protected against blasts by a dome."
+"reagents. High precise scales can measure masses down to 1/10000 gram."
+"Therefor they stand on granite blocks to avoid vibrancies and are protected "
+"against blasts by a dome."
 msgstr ""
 
 #: data/tools.xml:163
@@ -2719,9 +2709,9 @@ msgstr ""
 msgid ""
 "A buret is used to titrate liquids. The buret is filled with a specified "
 "volume of a liquid. Below it a container like an Erlenmeyer flask is placed. "
-"By opening the valve the liquid in the container will be titrated. "
-"High-quality buret have a venting-mechanism with which they can be very "
-"easily refilled with the exact volume for which the buret is calibrated."
+"By opening the valve the liquid in the container will be titrated. High-"
+"quality buret have a venting-mechanism with which they can be very easily "
+"refilled with the exact volume for which the buret is calibrated."
 msgstr ""
 
 #: data/tools.xml:214
diff --git a/template/messages/tdeedu/kbruch.pot b/template/messages/tdeedu/kbruch.pot
index e6295245b43..3df9e52b33e 100644
--- a/template/messages/tdeedu/kbruch.pot
+++ b/template/messages/tdeedu/kbruch.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-11 13:06+0200\n"
+"POT-Creation-Date: 2021-07-07 22:21+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -40,8 +40,7 @@ msgstr ""
 #: exercisecompare.cpp:123 exercisecompare.cpp:165 exercisecompare.cpp:293
 #: exerciseconvert.cpp:157 exerciseconvert.cpp:199 exerciseconvert.cpp:462
 #: exercisefactorize.cpp:155 exercisefactorize.cpp:202
-#: exercisefactorize.cpp:566 taskview.cpp:152 taskview.cpp:228
-#: taskview.cpp:384
+#: exercisefactorize.cpp:566 taskview.cpp:152 taskview.cpp:228 taskview.cpp:384
 msgid "&Check Task"
 msgstr ""
 
@@ -293,9 +292,9 @@ msgstr ""
 
 #: mainqtwidget.cpp:238
 msgid ""
-"Choose the type of operations you want for calculating fractions: "
-"Addition/Substraction, Multiplication/Division or All Operations Mixed. If "
-"you choose All Operations Mixed, the program will randomly choose addition, "
+"Choose the type of operations you want for calculating fractions: Addition/"
+"Substraction, Multiplication/Division or All Operations Mixed. If you choose "
+"All Operations Mixed, the program will randomly choose addition, "
 "substraction, multiplication and/or division."
 msgstr ""
 
diff --git a/template/messages/tdeedu/keduca.pot b/template/messages/tdeedu/keduca.pot
index 635ebc3285c..9b83b44aba0 100644
--- a/template/messages/tdeedu/keduca.pot
+++ b/template/messages/tdeedu/keduca.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-11 13:06+0200\n"
+"POT-Creation-Date: 2021-07-07 22:21+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -263,82 +263,69 @@ msgstr ""
 msgid "Document Information"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:77
-#: keducabuilder/kcontrolheaderbase.ui:119
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
 #, no-c-format
 msgid "Description and rules of the project."
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:83
-#: keducabuilder/kcontrolheaderbase.ui:129
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
 #: libkeduca/kgallerydialogbase.ui:190
 #, no-c-format
 msgid "Description"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:97
-#: keducabuilder/kcontrolheaderbase.ui:173
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
 #, no-c-format
 msgid "Type:"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:110
-#: keducabuilder/kcontrolheaderbase.ui:224
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
 #, no-c-format
 msgid "Level:"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:119
-#: keducabuilder/kcontrolheaderbase.ui:151
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
 #, no-c-format
 msgid "Language:"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:128
-#: keducabuilder/kcontrolheaderbase.ui:162
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
 #, no-c-format
 msgid "Category:"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:140
-#: keducabuilder/kcontrolheaderbase.ui:140
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
 #, no-c-format
 msgid "Title:"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:148
-#: keducabuilder/kcontrolheaderbase.ui:252
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
 #, no-c-format
 msgid "Picture"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:158
-#: keducabuilder/kcontrolheaderbase.ui:263
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
 #, no-c-format
 msgid "Default picture:"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:166
-#: keducabuilder/kcontrolheaderbase.ui:281
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
 #: libkeduca/kgallerydialogbase.ui:234
 #, no-c-format
 msgid "Author"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:184
-#: keducabuilder/kcontrolheaderbase.ui:318
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
 #, no-c-format
 msgid "Web page:"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:190
-#: keducabuilder/kcontrolheaderbase.ui:329
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
 #, no-c-format
 msgid "Email:"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:196
-#: keducabuilder/kcontrolheaderbase.ui:292
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
 #: libkeduca/kgallerydialogbase.ui:46
 #, no-c-format
 msgid "Name:"
@@ -708,8 +695,7 @@ msgstr ""
 msgid "Servers"
 msgstr ""
 
-#: libkeduca/kgallerydialogbase.ui:168
-#: libkeduca/kgallerydialogbase.ui:245
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr ""
diff --git a/template/messages/tdeedu/khangman.pot b/template/messages/tdeedu/khangman.pot
index ca634875f5d..67070e8078f 100644
--- a/template/messages/tdeedu/khangman.pot
+++ b/template/messages/tdeedu/khangman.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-11-29 20:44+0100\n"
+"POT-Creation-Date: 2021-07-07 22:21+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -373,9 +373,9 @@ msgid ""
 "Default is that accented letters will be shown when the corresponding "
 "unaccented letter is guessed.<br>\n"
 "For example, in Catalan, if this is unchecked and you type \"o\", the o and "
-"ò will be displayed in the word <b>xenofòbia</b>. If this option is "
-"checked, when you type \"o\", only \"o\" will be displayed and you will then "
-"have to type \"ò\" for this letter to be displayed."
+"ò will be displayed in the word <b>xenofòbia</b>. If this option is checked, "
+"when you type \"o\", only \"o\" will be displayed and you will then have to "
+"type \"ò\" for this letter to be displayed."
 msgstr ""
 
 #: khangman.kcfg:10
diff --git a/template/messages/tdeedu/kig.pot b/template/messages/tdeedu/kig.pot
index 560950069b1..294c70a791c 100644
--- a/template/messages/tdeedu/kig.pot
+++ b/template/messages/tdeedu/kig.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-12-11 21:52+0900\n"
+"POT-Creation-Date: 2021-07-07 22:21+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -206,8 +206,8 @@ msgstr ""
 #: misc/object_hierarchy.cpp:543 objects/object_imp_factory.cpp:503
 msgid ""
 "This Kig file uses an object of type \"%1\", which this Kig version does not "
-"support.Perhaps you have compiled Kig without support for this object "
-"type,or perhaps you are using an older Kig version."
+"support.Perhaps you have compiled Kig without support for this object type,"
+"or perhaps you are using an older Kig version."
 msgstr ""
 
 #: filters/svgexporter.cpp:45
@@ -343,15 +343,13 @@ msgstr ""
 msgid "Kig Options"
 msgstr ""
 
-#: filters/imageexporteroptionsbase.ui:132
-#: filters/latexexporteroptions.ui:41
+#: filters/imageexporteroptionsbase.ui:132 filters/latexexporteroptions.ui:41
 #: filters/svgexporteroptions.ui:41 kig/kig_part.cpp:134
 #, no-c-format
 msgid "Show grid"
 msgstr ""
 
-#: filters/imageexporteroptionsbase.ui:140
-#: filters/latexexporteroptions.ui:49
+#: filters/imageexporteroptionsbase.ui:140 filters/latexexporteroptions.ui:49
 #: filters/svgexporteroptions.ui:49 kig/kig_part.cpp:137
 #, no-c-format
 msgid "Show axes"
@@ -471,8 +469,8 @@ msgstr ""
 msgid ""
 "You tried to open a document of type \"%1\"; unfortunately, Kig does not "
 "support this format. If you think the format in question would be worth "
-"implementing support for, you can always ask us nicely on "
-"mailto:[email protected] or do the work yourself and send me a patch."
+"implementing support for, you can always ask us nicely on mailto:toscano."
+"[email protected] or do the work yourself and send me a patch."
 msgstr ""
 
 #: kig/kig_part.cpp:394 kig/kig_part.cpp:437
@@ -1048,8 +1046,8 @@ msgstr ""
 
 #: misc/coordinate_system.cpp:370
 msgid ""
-"Enter coordinates in the following format: <b>\"r; θ°\"</b>, where r and "
-"θ are the polar coordinates."
+"Enter coordinates in the following format: <b>\"r; θ°\"</b>, where r and θ "
+"are the polar coordinates."
 msgstr ""
 
 #: misc/coordinate_system.cpp:522
@@ -1515,8 +1513,7 @@ msgstr ""
 msgid "The name of the macro can not be empty."
 msgstr ""
 
-#: modes/label.cpp:136 modes/macrowizardbase.ui:96
-#: modes/typesdialogbase.ui:53
+#: modes/label.cpp:136 modes/macrowizardbase.ui:96 modes/typesdialogbase.ui:53
 #, no-c-format
 msgid "Name"
 msgstr ""
@@ -1866,15 +1863,13 @@ msgstr ""
 
 #: macros/circle_by_center_and_line.kigt:14
 #: macros/circle_by_point_and_diameter.kigt:10
-#: macros/circle_by_point_and_segment.kigt:10
-#: objects/circle_type.cpp:31
+#: macros/circle_by_point_and_segment.kigt:10 objects/circle_type.cpp:31
 msgid "Construct a circle with this center"
 msgstr ""
 
 #: macros/circle_by_center_and_line.kigt:15
 #: macros/circle_by_point_and_diameter.kigt:11
-#: macros/circle_by_point_and_segment.kigt:11
-#: objects/circle_type.cpp:36
+#: macros/circle_by_point_and_segment.kigt:11 objects/circle_type.cpp:36
 msgid "Select the center of the new circle..."
 msgstr ""
 
@@ -2159,8 +2154,7 @@ msgid "Hide a Cubic Curve"
 msgstr ""
 
 #: objects/cubic_imp.cpp:419
-msgid ""
-"%6 x³ + %9 y³ + %7 x²y + %8 xy² + %5 y² + %3 x² + %4 xy + %1 x + %2 y"
+msgid "%6 x³ + %9 y³ + %7 x²y + %8 xy² + %5 y² + %3 x² + %4 xy + %1 x + %2 y"
 msgstr ""
 
 #: objects/cubic_imp.cpp:430
@@ -4210,8 +4204,7 @@ msgstr ""
 msgid "Show text in a frame"
 msgstr ""
 
-#: modes/textlabelwizardbase.ui:61
-#: scripting/newscriptwizardbase.ui:23
+#: modes/textlabelwizardbase.ui:61 scripting/newscriptwizardbase.ui:23
 #, no-c-format
 msgid "Select Arguments"
 msgstr ""
diff --git a/template/messages/tdeedu/kiten.pot b/template/messages/tdeedu/kiten.pot
index e4d1aca259d..8105f4a9cbf 100644
--- a/template/messages/tdeedu/kiten.pot
+++ b/template/messages/tdeedu/kiten.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-11 13:07+0200\n"
+"POT-Creation-Date: 2021-07-07 22:21+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -272,8 +272,7 @@ msgstr ""
 msgid "&Quiz"
 msgstr ""
 
-#: configlearn.ui:85 configlearn.ui:113 learn.cpp:88
-#: widgets.cpp:302
+#: configlearn.ui:85 configlearn.ui:113 learn.cpp:88 widgets.cpp:302
 #, no-c-format
 msgid "Kanji"
 msgstr ""
@@ -583,14 +582,12 @@ msgstr ""
 msgid "Use preinstalled edict"
 msgstr ""
 
-#: configdictionariesbase.ui:94
-#: configdictionariesbase.ui:232
+#: configdictionariesbase.ui:94 configdictionariesbase.ui:232
 #, no-c-format
 msgid "Name"
 msgstr ""
 
-#: configdictionariesbase.ui:131
-#: configdictionariesbase.ui:269
+#: configdictionariesbase.ui:131 configdictionariesbase.ui:269
 #, no-c-format
 msgid "Add..."
 msgstr ""
diff --git a/template/messages/tdeedu/klatin.pot b/template/messages/tdeedu/klatin.pot
index fa85d6125e0..54175b3dd74 100644
--- a/template/messages/tdeedu/klatin.pot
+++ b/template/messages/tdeedu/klatin.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-11 13:07+0200\n"
+"POT-Creation-Date: 2021-07-07 22:21+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -292,8 +292,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr ""
 
-#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16
-#: klatinvocabwidget.ui:16 main.cpp:35
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr ""
@@ -475,27 +475,24 @@ msgstr ""
 msgid "The question will appear here"
 msgstr ""
 
-#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232
-#: klatinvocabwidget.ui:153
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr ""
 
 #: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
-#: klatinverbswidget.ui:273 klatinverbswidget.ui:299
-#: klatinvocabwidget.ui:194 klatinvocabwidget.ui:220
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr ""
 
-#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286
-#: klatinvocabwidget.ui:207
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr ""
 
-#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314
-#: klatinvocabwidget.ui:235
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr ""
@@ -520,14 +517,12 @@ msgstr ""
 msgid "Check answer"
 msgstr ""
 
-#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398
-#: klatinvocabwidget.ui:364
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr ""
 
-#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401
-#: klatinvocabwidget.ui:367
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr ""
@@ -780,8 +775,8 @@ msgstr ""
 msgid "Answer 1"
 msgstr ""
 
-#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285
-#: klatinvocabwidget.ui:312 klatinvocabwidget.ui:329
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr ""
diff --git a/template/messages/tdeedu/kmplot.pot b/template/messages/tdeedu/kmplot.pot
index 44645118e5c..48c19191a3e 100644
--- a/template/messages/tdeedu/kmplot.pot
+++ b/template/messages/tdeedu/kmplot.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-11 13:07+0200\n"
+"POT-Creation-Date: 2021-07-07 22:21+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -430,8 +430,8 @@ msgstr ""
 msgid "Lower boundary of the plot range"
 msgstr ""
 
-#: editfunctionpage.ui:241 kminmax.cpp:75 kminmax.cpp:101
-#: kminmax.cpp:119 qeditparametric.ui:478 qeditpolar.ui:314
+#: editfunctionpage.ui:241 kminmax.cpp:75 kminmax.cpp:101 kminmax.cpp:119
+#: qeditparametric.ui:478 qeditpolar.ui:314
 #, no-c-format
 msgid ""
 "Enter the lower boundary of the plot range. Expressions like 2*pi are "
@@ -908,15 +908,13 @@ msgstr ""
 msgid "Ne&w Function Plot..."
 msgstr ""
 
-#: FktDlgData.ui:205 FktDlgData.ui:227
-#: FktDlgData.ui:249 FktDlgData.ui:291
+#: FktDlgData.ui:205 FktDlgData.ui:227 FktDlgData.ui:249 FktDlgData.ui:291
 #: FktDlgData.ui:316
 #, no-c-format
 msgid "define a new function"
 msgstr ""
 
-#: FktDlgData.ui:208 FktDlgData.ui:230
-#: FktDlgData.ui:252 FktDlgData.ui:294
+#: FktDlgData.ui:208 FktDlgData.ui:230 FktDlgData.ui:252 FktDlgData.ui:294
 #: FktDlgData.ui:319
 #, no-c-format
 msgid ""
@@ -950,23 +948,20 @@ msgstr ""
 msgid "Edit Derivatives"
 msgstr ""
 
-#: editderivativespage.ui:47 editderivativespage.ui:152
-#: editfunctionpage.ui:318 editintegralpage.ui:181
-#: qeditparametric.ui:264 qeditpolar.ui:142
+#: editderivativespage.ui:47 editderivativespage.ui:152 editfunctionpage.ui:318
+#: editintegralpage.ui:181 qeditparametric.ui:264 qeditpolar.ui:142
 #, no-c-format
 msgid "color of the plot line"
 msgstr ""
 
-#: editderivativespage.ui:50 editderivativespage.ui:155
-#: editfunctionpage.ui:321 editintegralpage.ui:184
-#: qeditparametric.ui:267 qeditpolar.ui:145
+#: editderivativespage.ui:50 editderivativespage.ui:155 editfunctionpage.ui:321
+#: editintegralpage.ui:184 qeditparametric.ui:267 qeditpolar.ui:145
 #, no-c-format
 msgid "Click this button to choose a color for the plot line."
 msgstr ""
 
-#: editderivativespage.ui:58 editderivativespage.ui:191
-#: editfunctionpage.ui:354 editintegralpage.ui:217
-#: qeditparametric.ui:300 qeditpolar.ui:178
+#: editderivativespage.ui:58 editderivativespage.ui:191 editfunctionpage.ui:354
+#: editintegralpage.ui:217 qeditparametric.ui:300 qeditpolar.ui:178
 #, no-c-format
 msgid "0.1mm"
 msgstr ""
@@ -976,16 +971,14 @@ msgstr ""
 msgid "&Color:"
 msgstr ""
 
-#: editderivativespage.ui:83 editderivativespage.ui:180
-#: editfunctionpage.ui:343 editintegralpage.ui:206
-#: qeditparametric.ui:289 qeditpolar.ui:167
+#: editderivativespage.ui:83 editderivativespage.ui:180 editfunctionpage.ui:343
+#: editintegralpage.ui:206 qeditparametric.ui:289 qeditpolar.ui:167
 #, no-c-format
 msgid "width of the plot line"
 msgstr ""
 
-#: editderivativespage.ui:86 editderivativespage.ui:183
-#: editfunctionpage.ui:346 editintegralpage.ui:209
-#: qeditparametric.ui:292 qeditpolar.ui:170
+#: editderivativespage.ui:86 editderivativespage.ui:183 editfunctionpage.ui:346
+#: editintegralpage.ui:209 qeditparametric.ui:292 qeditpolar.ui:170
 #, no-c-format
 msgid "Change the width of the plot line in steps of 0.1mm."
 msgstr ""
@@ -1010,15 +1003,13 @@ msgstr ""
 msgid "&Line width:"
 msgstr ""
 
-#: editderivativespage.ui:135 qeditparametric.ui:250
-#: qeditpolar.ui:128
+#: editderivativespage.ui:135 qeditparametric.ui:250 qeditpolar.ui:128
 #, no-c-format
 msgid "Colo&r:"
 msgstr ""
 
-#: editderivativespage.ui:163 editfunctionpage.ui:329
-#: qeditparametric.ui:275 qeditpolar.ui:153
-#: settingspagecoords.ui:640
+#: editderivativespage.ui:163 editfunctionpage.ui:329 qeditparametric.ui:275
+#: qeditpolar.ui:153 settingspagecoords.ui:640
 #, no-c-format
 msgid "Line &width:"
 msgstr ""
@@ -1033,8 +1024,7 @@ msgstr ""
 msgid "Show second derivative"
 msgstr ""
 
-#: editfunctionpage.ui:36 qeditparametric.ui:38
-#: qeditpolar.ui:38
+#: editfunctionpage.ui:36 qeditparametric.ui:38 qeditpolar.ui:38
 #, no-c-format
 msgid "Definition"
 msgstr ""
@@ -1056,20 +1046,19 @@ msgid ""
 "Example: f(x)=x^2"
 msgstr ""
 
-#: editfunctionpage.ui:80 qeditparametric.ui:209
-#: qeditpolar.ui:87
+#: editfunctionpage.ui:80 qeditparametric.ui:209 qeditpolar.ui:87
 #, no-c-format
 msgid "Extensions"
 msgstr ""
 
-#: editfunctionpage.ui:94 editintegralpage.ui:30
-#: qeditparametric.ui:223 qeditpolar.ui:101
+#: editfunctionpage.ui:94 editintegralpage.ui:30 qeditparametric.ui:223
+#: qeditpolar.ui:101
 #, no-c-format
 msgid "hide the plot"
 msgstr ""
 
-#: editfunctionpage.ui:97 editintegralpage.ui:33
-#: qeditparametric.ui:226 qeditpolar.ui:104
+#: editfunctionpage.ui:97 editintegralpage.ui:33 qeditparametric.ui:226
+#: qeditpolar.ui:104
 #, no-c-format
 msgid "Check this box if you want to hide the plot of the function."
 msgstr ""
@@ -1179,8 +1168,7 @@ msgstr ""
 msgid "&Min:"
 msgstr ""
 
-#: editfunctionpage.ui:238 qeditparametric.ui:475
-#: qeditpolar.ui:311
+#: editfunctionpage.ui:238 qeditparametric.ui:475 qeditpolar.ui:311
 #, no-c-format
 msgid "lower boundary of the plot range"
 msgstr ""
@@ -1190,14 +1178,12 @@ msgstr ""
 msgid "Custom plot m&aximum-range:"
 msgstr ""
 
-#: editfunctionpage.ui:252 qeditparametric.ui:433
-#: qeditpolar.ui:353
+#: editfunctionpage.ui:252 qeditparametric.ui:433 qeditpolar.ui:353
 #, no-c-format
 msgid "Customize the maximum plot range"
 msgstr ""
 
-#: editfunctionpage.ui:266 qeditparametric.ui:461
-#: qeditpolar.ui:325
+#: editfunctionpage.ui:266 qeditparametric.ui:461 qeditpolar.ui:325
 #, no-c-format
 msgid "upper boundary of the plot range"
 msgstr ""
@@ -1861,8 +1847,7 @@ msgid ""
 "Example: cos(t)"
 msgstr ""
 
-#: qeditparametric.ui:84 qeditparametric.ui:123
-#: qeditparametric.ui:189
+#: qeditparametric.ui:84 qeditparametric.ui:123 qeditparametric.ui:189
 #, no-c-format
 msgid "f"
 msgstr ""
@@ -1986,14 +1971,12 @@ msgstr ""
 msgid "Equation:"
 msgstr ""
 
-#: qeditpolar.ui:286 settingspagecoords.ui:145
-#: settingspagecoords.ui:291
+#: qeditpolar.ui:286 settingspagecoords.ui:145 settingspagecoords.ui:291
 #, no-c-format
 msgid "Max:"
 msgstr ""
 
-#: qeditpolar.ui:297 settingspagecoords.ui:153
-#: settingspagecoords.ui:299
+#: qeditpolar.ui:297 settingspagecoords.ui:153 settingspagecoords.ui:299
 #, no-c-format
 msgid "Min:"
 msgstr ""
@@ -2362,18 +2345,18 @@ msgstr ""
 msgid "[-8 | +8]"
 msgstr ""
 
-#: settingspagecoords.ui:64 settingspagecoords.ui:81
-#: settingspagecoords.ui:98 settingspagecoords.ui:115
-#: settingspagecoords.ui:210 settingspagecoords.ui:227
-#: settingspagecoords.ui:244 settingspagecoords.ui:261
+#: settingspagecoords.ui:64 settingspagecoords.ui:81 settingspagecoords.ui:98
+#: settingspagecoords.ui:115 settingspagecoords.ui:210
+#: settingspagecoords.ui:227 settingspagecoords.ui:244
+#: settingspagecoords.ui:261
 #, no-c-format
 msgid "Predefined plot ranges"
 msgstr ""
 
-#: settingspagecoords.ui:67 settingspagecoords.ui:84
-#: settingspagecoords.ui:101 settingspagecoords.ui:118
-#: settingspagecoords.ui:213 settingspagecoords.ui:230
-#: settingspagecoords.ui:247 settingspagecoords.ui:264
+#: settingspagecoords.ui:67 settingspagecoords.ui:84 settingspagecoords.ui:101
+#: settingspagecoords.ui:118 settingspagecoords.ui:213
+#: settingspagecoords.ui:230 settingspagecoords.ui:247
+#: settingspagecoords.ui:264
 #, no-c-format
 msgid "Select one of the predefined plot ranges."
 msgstr ""
diff --git a/template/messages/tdeedu/kstars.pot b/template/messages/tdeedu/kstars.pot
index aa40d5cd585..721d2c8f20d 100644
--- a/template/messages/tdeedu/kstars.pot
+++ b/template/messages/tdeedu/kstars.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-11 13:09+0200\n"
+"POT-Creation-Date: 2021-07-07 22:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -375,10 +375,9 @@ msgid "General"
 msgstr ""
 
 #: detaildialog.cpp:137 kspopupmenu.cpp:55 kspopupmenu.cpp:237
-#: kstarsdata.cpp:128 kstarsinit.cpp:526 kstarsinit.cpp:542
-#: skymapdraw.cpp:1226 skymapdraw.cpp:1394 starobject.cpp:243
-#: tools/observinglist.cpp:187 tools/observinglist.cpp:233
-#: tools/observinglist.cpp:272
+#: kstarsdata.cpp:128 kstarsinit.cpp:526 kstarsinit.cpp:542 skymapdraw.cpp:1226
+#: skymapdraw.cpp:1394 starobject.cpp:243 tools/observinglist.cpp:187
+#: tools/observinglist.cpp:233 tools/observinglist.cpp:272
 msgid "star"
 msgstr ""
 
@@ -533,9 +532,9 @@ msgstr ""
 #: dmsbox.cpp:95
 msgid ""
 "Enter an angle value in degrees.  The angle can be expressed as a simple "
-"integer (\"45\") or floating-point (\"45.333\") value, or as space- or "
-"colon-delimited values specifying degrees, arcminutes and arcseconds "
-"(\"45:20\", \"45:20:00\", \"45:20\", \"45 20.0\", etc.)."
+"integer (\"45\") or floating-point (\"45.333\") value, or as space- or colon-"
+"delimited values specifying degrees, arcminutes and arcseconds (\"45:20\", "
+"\"45:20:00\", \"45:20\", \"45 20.0\", etc.)."
 msgstr ""
 
 #: dmsbox.cpp:97
@@ -548,8 +547,8 @@ msgstr ""
 #: dmsbox.cpp:98
 msgid ""
 "Enter an angle value in hours.  The angle can be expressed as a simple "
-"integer (\"12\") or floating-point (\"12.333\") value, or as space- or "
-"colon-delimited values specifying hours, minutes and seconds (\"12:20\", "
+"integer (\"12\") or floating-point (\"12.333\") value, or as space- or colon-"
+"delimited values specifying hours, minutes and seconds (\"12:20\", "
 "\"12:20:00\", \"12:20\", \"12 20.0\", etc.)."
 msgstr ""
 
@@ -602,18 +601,16 @@ msgstr ""
 msgid "Galaxies"
 msgstr ""
 
-#: finddialog.cpp:66 opssolarsystemui.ui:291
-#: tools/obslistwizard.cpp:222 tools/obslistwizard.cpp:242
-#: tools/obslistwizard.cpp:383 tools/obslistwizardui.ui:186
-#: tools/wutdialog.cpp:110
+#: finddialog.cpp:66 opssolarsystemui.ui:291 tools/obslistwizard.cpp:222
+#: tools/obslistwizard.cpp:242 tools/obslistwizard.cpp:383
+#: tools/obslistwizardui.ui:186 tools/wutdialog.cpp:110
 #, no-c-format
 msgid "Comets"
 msgstr ""
 
-#: finddialog.cpp:67 opssolarsystemui.ui:354
-#: tools/obslistwizard.cpp:223 tools/obslistwizard.cpp:244
-#: tools/obslistwizard.cpp:391 tools/obslistwizardui.ui:191
-#: tools/wutdialog.cpp:111
+#: finddialog.cpp:67 opssolarsystemui.ui:354 tools/obslistwizard.cpp:223
+#: tools/obslistwizard.cpp:244 tools/obslistwizard.cpp:391
+#: tools/obslistwizardui.ui:191 tools/wutdialog.cpp:111
 #, no-c-format
 msgid "Asteroids"
 msgstr ""
@@ -688,8 +685,8 @@ msgstr ""
 msgid "Image Reduction Process..."
 msgstr ""
 
-#: fitsprocess.cpp:349 fitsviewer.cpp:134 fitsviewer.cpp:138
-#: fitsviewer.cpp:996 imagereductionui.ui:16
+#: fitsprocess.cpp:349 fitsviewer.cpp:134 fitsviewer.cpp:138 fitsviewer.cpp:996
+#: imagereductionui.ui:16
 #, no-c-format
 msgid "Image Reduction"
 msgstr ""
@@ -1092,8 +1089,7 @@ msgid ""
 "Callisto"
 msgstr ""
 
-#: ksmoon.cpp:30 tools/modcalcplanets.cpp:385
-#: tools/modcalcplanetsdlg.ui:129
+#: ksmoon.cpp:30 tools/modcalcplanets.cpp:385 tools/modcalcplanetsdlg.ui:129
 #: tools/modcalcplanetsdlg.ui:982
 #, no-c-format
 msgid "Moon"
@@ -1171,9 +1167,8 @@ msgstr ""
 msgid "unnamed"
 msgstr ""
 
-#: kspluto.cpp:33 opssolarsystemui.ui:102
-#: tools/modcalcplanets.cpp:383 tools/modcalcplanetsdlg.ui:124
-#: tools/modcalcplanetsdlg.ui:977
+#: kspluto.cpp:33 opssolarsystemui.ui:102 tools/modcalcplanets.cpp:383
+#: tools/modcalcplanetsdlg.ui:124 tools/modcalcplanetsdlg.ui:977
 #, no-c-format
 msgid "Pluto"
 msgstr ""
@@ -1298,8 +1293,7 @@ msgstr ""
 msgid "Transit time: %1"
 msgstr ""
 
-#: kssun.cpp:26 tools/modcalcplanets.cpp:384
-#: tools/modcalcplanetsdlg.ui:134
+#: kssun.cpp:26 tools/modcalcplanets.cpp:384 tools/modcalcplanetsdlg.ui:134
 #: tools/modcalcplanetsdlg.ui:987
 #, no-c-format
 msgid "Sun"
@@ -2198,8 +2192,7 @@ msgstr ""
 msgid "Country filter:"
 msgstr ""
 
-#: kswizardui.ui:278 locationdialog.cpp:90
-#: tools/argsetgeolocation.ui:67
+#: kswizardui.ui:278 locationdialog.cpp:90 tools/argsetgeolocation.ui:67
 #, no-c-format
 msgid "City:"
 msgstr ""
@@ -2208,35 +2201,27 @@ msgstr ""
 msgid "State/Province:"
 msgstr ""
 
-#: kswizardui.ui:262 locationdialog.cpp:92
-#: tools/argsetgeolocation.ui:75
+#: kswizardui.ui:262 locationdialog.cpp:92 tools/argsetgeolocation.ui:75
 #, no-c-format
 msgid "Country:"
 msgstr ""
 
-#: kswizardui.ui:351 locationdialog.cpp:93
-#: tools/modcalcazeldlg.ui:128 tools/modcalcazeldlg.ui:695
-#: tools/modcalcdaylengthdlg.ui:74
-#: tools/modcalceclipticcoordsdlg.ui:360
-#: tools/modcalcgalcoorddlg.ui:360
+#: kswizardui.ui:351 locationdialog.cpp:93 tools/modcalcazeldlg.ui:128
+#: tools/modcalcazeldlg.ui:695 tools/modcalcdaylengthdlg.ui:74
+#: tools/modcalceclipticcoordsdlg.ui:360 tools/modcalcgalcoorddlg.ui:360
 #: tools/modcalcgeoddlg.ui:302 tools/modcalcgeoddlg.ui:436
-#: tools/modcalcplanetsdlg.ui:257
-#: tools/modcalcplanetsdlg.ui:900
-#: tools/modcalcsidtimedlg.ui:107
-#: tools/modcalcsidtimedlg.ui:420
+#: tools/modcalcplanetsdlg.ui:257 tools/modcalcplanetsdlg.ui:900
+#: tools/modcalcsidtimedlg.ui:107 tools/modcalcsidtimedlg.ui:420
 #: tools/modcalcvlsrdlg.ui:195 tools/modcalcvlsrdlg.ui:754
 #, no-c-format
 msgid "Longitude:"
 msgstr ""
 
-#: kswizardui.ui:359 locationdialog.cpp:94
-#: tools/modcalcazeldlg.ui:150 tools/modcalcazeldlg.ui:667
-#: tools/modcalcdaylengthdlg.ui:52
-#: tools/modcalceclipticcoordsdlg.ui:352
-#: tools/modcalcgalcoorddlg.ui:352
+#: kswizardui.ui:359 locationdialog.cpp:94 tools/modcalcazeldlg.ui:150
+#: tools/modcalcazeldlg.ui:667 tools/modcalcdaylengthdlg.ui:52
+#: tools/modcalceclipticcoordsdlg.ui:352 tools/modcalcgalcoorddlg.ui:352
 #: tools/modcalcgeoddlg.ui:294 tools/modcalcgeoddlg.ui:447
-#: tools/modcalcplanetsdlg.ui:279
-#: tools/modcalcplanetsdlg.ui:872
+#: tools/modcalcplanetsdlg.ui:279 tools/modcalcplanetsdlg.ui:872
 #: tools/modcalcvlsrdlg.ui:187 tools/modcalcvlsrdlg.ui:782
 #, no-c-format
 msgid "Latitude:"
@@ -2598,63 +2583,55 @@ msgstr ""
 
 #: planetcatalog.cpp:49 tools/modcalcplanets.cpp:101
 #: tools/modcalcplanets.cpp:377 tools/modcalcplanets.cpp:514
-#: tools/modcalcplanetsdlg.ui:94
-#: tools/modcalcplanetsdlg.ui:947
+#: tools/modcalcplanetsdlg.ui:94 tools/modcalcplanetsdlg.ui:947
 #, no-c-format
 msgid "Earth"
 msgstr ""
 
-#: opssolarsystemui.ui:200 planetcatalog.cpp:61
-#: tools/modcalcplanets.cpp:106 tools/modcalcplanets.cpp:375
-#: tools/modcalcplanetsdlg.ui:84
+#: opssolarsystemui.ui:200 planetcatalog.cpp:61 tools/modcalcplanets.cpp:106
+#: tools/modcalcplanets.cpp:375 tools/modcalcplanetsdlg.ui:84
 #: tools/modcalcplanetsdlg.ui:937
 #, no-c-format
 msgid "Mercury"
 msgstr ""
 
-#: opssolarsystemui.ui:144 planetcatalog.cpp:66
-#: tools/modcalcplanets.cpp:112 tools/modcalcplanets.cpp:376
-#: tools/modcalcplanetsdlg.ui:89
+#: opssolarsystemui.ui:144 planetcatalog.cpp:66 tools/modcalcplanets.cpp:112
+#: tools/modcalcplanets.cpp:376 tools/modcalcplanetsdlg.ui:89
 #: tools/modcalcplanetsdlg.ui:942
 #, no-c-format
 msgid "Venus"
 msgstr ""
 
-#: opssolarsystemui.ui:74 planetcatalog.cpp:71
-#: tools/modcalcplanets.cpp:121 tools/modcalcplanets.cpp:378
-#: tools/modcalcplanetsdlg.ui:99
+#: opssolarsystemui.ui:74 planetcatalog.cpp:71 tools/modcalcplanets.cpp:121
+#: tools/modcalcplanets.cpp:378 tools/modcalcplanetsdlg.ui:99
 #: tools/modcalcplanetsdlg.ui:952
 #, no-c-format
 msgid "Mars"
 msgstr ""
 
-#: opssolarsystemui.ui:172 planetcatalog.cpp:76
-#: tools/modcalcplanets.cpp:127 tools/modcalcplanets.cpp:379
-#: tools/modcalcplanetsdlg.ui:104
+#: opssolarsystemui.ui:172 planetcatalog.cpp:76 tools/modcalcplanets.cpp:127
+#: tools/modcalcplanets.cpp:379 tools/modcalcplanetsdlg.ui:104
 #: tools/modcalcplanetsdlg.ui:957
 #, no-c-format
 msgid "Jupiter"
 msgstr ""
 
-#: opssolarsystemui.ui:46 planetcatalog.cpp:81
-#: tools/modcalcplanets.cpp:133 tools/modcalcplanets.cpp:380
-#: tools/modcalcplanetsdlg.ui:109
+#: opssolarsystemui.ui:46 planetcatalog.cpp:81 tools/modcalcplanets.cpp:133
+#: tools/modcalcplanets.cpp:380 tools/modcalcplanetsdlg.ui:109
 #: tools/modcalcplanetsdlg.ui:962
 #, no-c-format
 msgid "Saturn"
 msgstr ""
 
-#: opssolarsystemui.ui:245 planetcatalog.cpp:86
-#: tools/modcalcplanets.cpp:139 tools/modcalcplanets.cpp:381
-#: tools/modcalcplanetsdlg.ui:114
+#: opssolarsystemui.ui:245 planetcatalog.cpp:86 tools/modcalcplanets.cpp:139
+#: tools/modcalcplanets.cpp:381 tools/modcalcplanetsdlg.ui:114
 #: tools/modcalcplanetsdlg.ui:967
 #, no-c-format
 msgid "Uranus"
 msgstr ""
 
-#: opssolarsystemui.ui:214 planetcatalog.cpp:91
-#: tools/modcalcplanets.cpp:145 tools/modcalcplanets.cpp:382
-#: tools/modcalcplanetsdlg.ui:119
+#: opssolarsystemui.ui:214 planetcatalog.cpp:91 tools/modcalcplanets.cpp:145
+#: tools/modcalcplanets.cpp:382 tools/modcalcplanetsdlg.ui:119
 #: tools/modcalcplanetsdlg.ui:972
 #, no-c-format
 msgid "Neptune"
@@ -2867,8 +2844,8 @@ msgstr ""
 
 #: skyobject.cpp:363
 msgid ""
-"%1: National Optical Astronomy Observatories and AURA [free for "
-"non-commercial use]"
+"%1: National Optical Astronomy Observatories and AURA [free for non-"
+"commercial use]"
 msgstr ""
 
 #: skyobject.cpp:367
@@ -3262,14 +3239,13 @@ msgstr ""
 msgid "Time Calculators"
 msgstr ""
 
-#: tools/astrocalc.cpp:70 tools/astrocalc.cpp:116
-#: tools/modcalcjddlg.ui:16 tools/modcalcjddlg.ui:114
+#: tools/astrocalc.cpp:70 tools/astrocalc.cpp:116 tools/modcalcjddlg.ui:16
+#: tools/modcalcjddlg.ui:114
 #, no-c-format
 msgid "Julian Day"
 msgstr ""
 
-#: tools/astrocalc.cpp:73 tools/astrocalc.cpp:112
-#: tools/modcalcsidtimedlg.ui:16
+#: tools/astrocalc.cpp:73 tools/astrocalc.cpp:112 tools/modcalcsidtimedlg.ui:16
 #: tools/modcalcsidtimedlg.ui:292
 #, no-c-format
 msgid "Sidereal Time"
@@ -3288,47 +3264,41 @@ msgid "Celestial Coordinates"
 msgstr ""
 
 #: tools/astrocalc.cpp:79 tools/astrocalc.cpp:118
-#: tools/modcalcgalcoorddlg.ui:16
-#: tools/modcalcgalcoorddlg.ui:333
+#: tools/modcalcgalcoorddlg.ui:16 tools/modcalcgalcoorddlg.ui:333
 #, no-c-format
 msgid "Galactic Coordinates"
 msgstr ""
 
-#: tools/astrocalc.cpp:80 tools/astrocalc.cpp:120
-#: tools/modcalcprecdlg.ui:16
+#: tools/astrocalc.cpp:80 tools/astrocalc.cpp:120 tools/modcalcprecdlg.ui:16
 #, no-c-format
 msgid "Precession"
 msgstr ""
 
-#: tools/astrocalc.cpp:81 tools/astrocalc.cpp:122
-#: tools/modcalcapcoorddlg.ui:16
+#: tools/astrocalc.cpp:81 tools/astrocalc.cpp:122 tools/modcalcapcoorddlg.ui:16
 #: tools/modcalcapcoorddlg.ui:275
 #, no-c-format
 msgid "Apparent Coordinates"
 msgstr ""
 
-#: tools/astrocalc.cpp:82 tools/astrocalc.cpp:124
-#: tools/modcalcazeldlg.ui:19 tools/modcalcazeldlg.ui:376
+#: tools/astrocalc.cpp:82 tools/astrocalc.cpp:124 tools/modcalcazeldlg.ui:19
+#: tools/modcalcazeldlg.ui:376
 #, no-c-format
 msgid "Horizontal Coordinates"
 msgstr ""
 
 #: tools/astrocalc.cpp:83 tools/astrocalc.cpp:126
-#: tools/modcalceclipticcoordsdlg.ui:333
-#: tools/modcalcplanetsdlg.ui:490
+#: tools/modcalceclipticcoordsdlg.ui:333 tools/modcalcplanetsdlg.ui:490
 #, no-c-format
 msgid "Ecliptic Coordinates"
 msgstr ""
 
-#: tools/astrocalc.cpp:84 tools/astrocalc.cpp:140
-#: tools/modcalcangdistdlg.ui:16
+#: tools/astrocalc.cpp:84 tools/astrocalc.cpp:140 tools/modcalcangdistdlg.ui:16
 #: tools/modcalcangdistdlg.ui:243
 #, no-c-format
 msgid "Angular Distance"
 msgstr ""
 
-#: tools/astrocalc.cpp:85 tools/astrocalc.cpp:142
-#: tools/modcalcvlsrdlg.ui:16
+#: tools/astrocalc.cpp:85 tools/astrocalc.cpp:142 tools/modcalcvlsrdlg.ui:16
 #, no-c-format
 msgid "LSR Velocity"
 msgstr ""
@@ -3337,8 +3307,7 @@ msgstr ""
 msgid "Earth Coordinates"
 msgstr ""
 
-#: tools/astrocalc.cpp:89 tools/astrocalc.cpp:130
-#: tools/modcalcgeoddlg.ui:16
+#: tools/astrocalc.cpp:89 tools/astrocalc.cpp:130 tools/modcalcgeoddlg.ui:16
 #, no-c-format
 msgid "Geodetic Coordinates"
 msgstr ""
@@ -3349,12 +3318,11 @@ msgstr ""
 
 #: tools/astrocalc.cpp:158
 msgid ""
-"<QT>Section for time-related astronomical calculations<UL><LI><B>Julian "
-"Day:</B> Julian Day/Calendar conversion</LI><LI><B>Sidereal Time:</B> "
-"Sidereal/Universal time conversion</LI><LI><B>Day duration:</B> Sunrise, "
-"Sunset and noon time and positions for those events</LI><LI><B>Equinoxes & "
-"Solstices:</B> Equinoxes, Solstices and duration of the "
-"seasons</LI></UL></QT>"
+"<QT>Section for time-related astronomical calculations<UL><LI><B>Julian Day:"
+"</B> Julian Day/Calendar conversion</LI><LI><B>Sidereal Time:</B> Sidereal/"
+"Universal time conversion</LI><LI><B>Day duration:</B> Sunrise, Sunset and "
+"noon time and positions for those events</LI><LI><B>Equinoxes & Solstices:</"
+"B> Equinoxes, Solstices and duration of the seasons</LI></UL></QT>"
 msgstr ""
 
 #: tools/astrocalc.cpp:185
@@ -3365,12 +3333,11 @@ msgid ""
 "conversion</LI><LI><B>Apparent:</B> Computation of current equatorial "
 "coordinates from a given epoch</LI><LI><B>Ecliptic:</B> Ecliptic/Equatorial "
 "coordinates conversion</LI><LI><B>Horizontal:</B> Computation of azimuth and "
-"elevation for a given source, time, and location on the "
-"Earth</LI><LI><B>Angular Distance:</B> Computation of angular distance "
-"between two objects whose positions are given in equatorial "
-"coordinates</LI><LI><B>LSR Velocity:</B> Computation of the heliocentric, "
-"geocentric and topocentric radial velocity of a source from its LSR "
-"velocity</LI></UL></QT>"
+"elevation for a given source, time, and location on the Earth</"
+"LI><LI><B>Angular Distance:</B> Computation of angular distance between two "
+"objects whose positions are given in equatorial coordinates</LI><LI><B>LSR "
+"Velocity:</B> Computation of the heliocentric, geocentric and topocentric "
+"radial velocity of a source from its LSR velocity</LI></UL></QT>"
 msgstr ""
 
 #: tools/astrocalc.cpp:221
@@ -3384,8 +3351,8 @@ msgstr ""
 msgid ""
 "<QT>Section with algorithms regarding information on solar system bodies "
 "coordinates and times<UL><LI><B>Planets Coordinates:</B> Coordinates for the "
-"planets, moon and sun  at a given time and from a given position on Earth "
-"</LI></UL></QT>"
+"planets, moon and sun  at a given time and from a given position on Earth </"
+"LI></UL></QT>"
 msgstr ""
 
 #: tools/jmoontool.cpp:34
@@ -3683,9 +3650,8 @@ msgstr ""
 msgid "Scope"
 msgstr ""
 
-#: imagereductionui.ui:132 imagereductionui.ui:310
-#: imagereductionui.ui:478 tools/observinglist.cpp:708
-#: tools/observinglistui.ui:287
+#: imagereductionui.ui:132 imagereductionui.ui:310 imagereductionui.ui:478
+#: tools/observinglist.cpp:708 tools/observinglistui.ui:287
 #, no-c-format
 msgid "Details"
 msgstr ""
@@ -5048,55 +5014,40 @@ msgid ""
 "Aabenraa"
 msgstr ""
 
-#: data/Cities.dat:1 data/Cities.dat:3
-#: data/Cities.dat:4 data/Cities.dat:283
-#: data/Cities.dat:766 data/Cities.dat:853
-#: data/Cities.dat:858 data/Cities.dat:931
-#: data/Cities.dat:972 data/Cities.dat:999
-#: data/Cities.dat:1025 data/Cities.dat:1067
-#: data/Cities.dat:1081 data/Cities.dat:1083
-#: data/Cities.dat:1085 data/Cities.dat:1094
-#: data/Cities.dat:1105 data/Cities.dat:1297
-#: data/Cities.dat:1402 data/Cities.dat:2142
-#: data/Cities.dat:2170 data/Cities.dat:2181
-#: data/Cities.dat:2357 data/Cities.dat:2372
-#: data/Cities.dat:2375 data/Cities.dat:2385
-#: data/Cities.dat:2460 data/Cities.dat:2527
-#: data/Cities.dat:2544 data/Cities.dat:2643
-#: data/Cities.dat:2647 data/Cities.dat:2655
+#: data/Cities.dat:1 data/Cities.dat:3 data/Cities.dat:4 data/Cities.dat:283
+#: data/Cities.dat:766 data/Cities.dat:853 data/Cities.dat:858
+#: data/Cities.dat:931 data/Cities.dat:972 data/Cities.dat:999
+#: data/Cities.dat:1025 data/Cities.dat:1067 data/Cities.dat:1081
+#: data/Cities.dat:1083 data/Cities.dat:1085 data/Cities.dat:1094
+#: data/Cities.dat:1105 data/Cities.dat:1297 data/Cities.dat:1402
+#: data/Cities.dat:2142 data/Cities.dat:2170 data/Cities.dat:2181
+#: data/Cities.dat:2357 data/Cities.dat:2372 data/Cities.dat:2375
+#: data/Cities.dat:2385 data/Cities.dat:2460 data/Cities.dat:2527
+#: data/Cities.dat:2544 data/Cities.dat:2643 data/Cities.dat:2647
+#: data/Cities.dat:2655
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Jylland"
 msgstr ""
 
-#: data/Cities.dat:1 data/Cities.dat:3
-#: data/Cities.dat:4 data/Cities.dat:283
-#: data/Cities.dat:500 data/Cities.dat:562
-#: data/Cities.dat:766 data/Cities.dat:853
-#: data/Cities.dat:858 data/Cities.dat:859
-#: data/Cities.dat:903 data/Cities.dat:931
-#: data/Cities.dat:972 data/Cities.dat:999
-#: data/Cities.dat:1025 data/Cities.dat:1059
-#: data/Cities.dat:1067 data/Cities.dat:1077
-#: data/Cities.dat:1081 data/Cities.dat:1083
-#: data/Cities.dat:1085 data/Cities.dat:1086
-#: data/Cities.dat:1094 data/Cities.dat:1105
-#: data/Cities.dat:1215 data/Cities.dat:1292
-#: data/Cities.dat:1297 data/Cities.dat:1303
-#: data/Cities.dat:1402 data/Cities.dat:1635
-#: data/Cities.dat:1760 data/Cities.dat:1766
-#: data/Cities.dat:1870 data/Cities.dat:1871
-#: data/Cities.dat:1889 data/Cities.dat:2142
-#: data/Cities.dat:2170 data/Cities.dat:2181
-#: data/Cities.dat:2182 data/Cities.dat:2204
-#: data/Cities.dat:2212 data/Cities.dat:2357
-#: data/Cities.dat:2372 data/Cities.dat:2375
-#: data/Cities.dat:2378 data/Cities.dat:2384
-#: data/Cities.dat:2385 data/Cities.dat:2460
-#: data/Cities.dat:2476 data/Cities.dat:2527
-#: data/Cities.dat:2544 data/Cities.dat:2643
-#: data/Cities.dat:2647 data/Cities.dat:2655
-#: data/Cities.dat:2675
+#: data/Cities.dat:1 data/Cities.dat:3 data/Cities.dat:4 data/Cities.dat:283
+#: data/Cities.dat:500 data/Cities.dat:562 data/Cities.dat:766
+#: data/Cities.dat:853 data/Cities.dat:858 data/Cities.dat:859
+#: data/Cities.dat:903 data/Cities.dat:931 data/Cities.dat:972
+#: data/Cities.dat:999 data/Cities.dat:1025 data/Cities.dat:1059
+#: data/Cities.dat:1067 data/Cities.dat:1077 data/Cities.dat:1081
+#: data/Cities.dat:1083 data/Cities.dat:1085 data/Cities.dat:1086
+#: data/Cities.dat:1094 data/Cities.dat:1105 data/Cities.dat:1215
+#: data/Cities.dat:1292 data/Cities.dat:1297 data/Cities.dat:1303
+#: data/Cities.dat:1402 data/Cities.dat:1635 data/Cities.dat:1760
+#: data/Cities.dat:1766 data/Cities.dat:1870 data/Cities.dat:1871
+#: data/Cities.dat:1889 data/Cities.dat:2142 data/Cities.dat:2170
+#: data/Cities.dat:2181 data/Cities.dat:2182 data/Cities.dat:2204
+#: data/Cities.dat:2212 data/Cities.dat:2357 data/Cities.dat:2372
+#: data/Cities.dat:2375 data/Cities.dat:2378 data/Cities.dat:2384
+#: data/Cities.dat:2385 data/Cities.dat:2460 data/Cities.dat:2476
+#: data/Cities.dat:2527 data/Cities.dat:2544 data/Cities.dat:2643
+#: data/Cities.dat:2647 data/Cities.dat:2655 data/Cities.dat:2675
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Denmark"
@@ -5108,80 +5059,55 @@ msgid ""
 "Aachen"
 msgstr ""
 
-#: data/Cities.dat:2 data/Cities.dat:69
-#: data/Cities.dat:101 data/Cities.dat:112
-#: data/Cities.dat:156 data/Cities.dat:174
-#: data/Cities.dat:186 data/Cities.dat:257
-#: data/Cities.dat:259 data/Cities.dat:282
-#: data/Cities.dat:298 data/Cities.dat:309
-#: data/Cities.dat:320 data/Cities.dat:338
-#: data/Cities.dat:340 data/Cities.dat:341
-#: data/Cities.dat:373 data/Cities.dat:470
-#: data/Cities.dat:528 data/Cities.dat:539
-#: data/Cities.dat:574 data/Cities.dat:616
-#: data/Cities.dat:646 data/Cities.dat:670
-#: data/Cities.dat:679 data/Cities.dat:681
-#: data/Cities.dat:688 data/Cities.dat:700
-#: data/Cities.dat:727 data/Cities.dat:762
-#: data/Cities.dat:763 data/Cities.dat:765
-#: data/Cities.dat:770 data/Cities.dat:849
-#: data/Cities.dat:863 data/Cities.dat:873
-#: data/Cities.dat:895 data/Cities.dat:904
-#: data/Cities.dat:905 data/Cities.dat:915
-#: data/Cities.dat:990 data/Cities.dat:994
-#: data/Cities.dat:995 data/Cities.dat:996
-#: data/Cities.dat:1002 data/Cities.dat:1010
-#: data/Cities.dat:1011 data/Cities.dat:1016
-#: data/Cities.dat:1024 data/Cities.dat:1055
-#: data/Cities.dat:1056 data/Cities.dat:1058
-#: data/Cities.dat:1066 data/Cities.dat:1178
-#: data/Cities.dat:1207 data/Cities.dat:1233
-#: data/Cities.dat:1235 data/Cities.dat:1261
-#: data/Cities.dat:1289 data/Cities.dat:1298
-#: data/Cities.dat:1310 data/Cities.dat:1346
-#: data/Cities.dat:1394 data/Cities.dat:1400
-#: data/Cities.dat:1405 data/Cities.dat:1471
-#: data/Cities.dat:1485 data/Cities.dat:1490
-#: data/Cities.dat:1501 data/Cities.dat:1503
-#: data/Cities.dat:1504 data/Cities.dat:1511
-#: data/Cities.dat:1512 data/Cities.dat:1526
-#: data/Cities.dat:1532 data/Cities.dat:1533
-#: data/Cities.dat:1540 data/Cities.dat:1541
-#: data/Cities.dat:1544 data/Cities.dat:1545
-#: data/Cities.dat:1546 data/Cities.dat:1547
-#: data/Cities.dat:1548 data/Cities.dat:1549
-#: data/Cities.dat:1563 data/Cities.dat:1588
-#: data/Cities.dat:1589 data/Cities.dat:1590
-#: data/Cities.dat:1591 data/Cities.dat:1592
-#: data/Cities.dat:1598 data/Cities.dat:1599
-#: data/Cities.dat:1600 data/Cities.dat:1604
-#: data/Cities.dat:1606 data/Cities.dat:1611
-#: data/Cities.dat:1614 data/Cities.dat:1615
-#: data/Cities.dat:1616 data/Cities.dat:1624
-#: data/Cities.dat:1625 data/Cities.dat:1628
-#: data/Cities.dat:1632 data/Cities.dat:1642
-#: data/Cities.dat:1645 data/Cities.dat:1651
-#: data/Cities.dat:1678 data/Cities.dat:1739
-#: data/Cities.dat:1755 data/Cities.dat:1756
-#: data/Cities.dat:1757 data/Cities.dat:1793
-#: data/Cities.dat:1872 data/Cities.dat:1879
-#: data/Cities.dat:1881 data/Cities.dat:1892
-#: data/Cities.dat:1902 data/Cities.dat:1903
-#: data/Cities.dat:1932 data/Cities.dat:1954
-#: data/Cities.dat:2019 data/Cities.dat:2089
-#: data/Cities.dat:2140 data/Cities.dat:2148
-#: data/Cities.dat:2154 data/Cities.dat:2158
-#: data/Cities.dat:2163 data/Cities.dat:2213
-#: data/Cities.dat:2233 data/Cities.dat:2257
-#: data/Cities.dat:2311 data/Cities.dat:2315
-#: data/Cities.dat:2326 data/Cities.dat:2354
-#: data/Cities.dat:2388 data/Cities.dat:2394
-#: data/Cities.dat:2453 data/Cities.dat:2462
-#: data/Cities.dat:2598 data/Cities.dat:2606
-#: data/Cities.dat:2753 data/Cities.dat:2780
-#: data/Cities.dat:2781 data/Cities.dat:2792
-#: data/Cities.dat:2793 data/Cities.dat:2838
-#: data/Cities.dat:2839
+#: data/Cities.dat:2 data/Cities.dat:69 data/Cities.dat:101 data/Cities.dat:112
+#: data/Cities.dat:156 data/Cities.dat:174 data/Cities.dat:186
+#: data/Cities.dat:257 data/Cities.dat:259 data/Cities.dat:282
+#: data/Cities.dat:298 data/Cities.dat:309 data/Cities.dat:320
+#: data/Cities.dat:338 data/Cities.dat:340 data/Cities.dat:341
+#: data/Cities.dat:373 data/Cities.dat:470 data/Cities.dat:528
+#: data/Cities.dat:539 data/Cities.dat:574 data/Cities.dat:616
+#: data/Cities.dat:646 data/Cities.dat:670 data/Cities.dat:679
+#: data/Cities.dat:681 data/Cities.dat:688 data/Cities.dat:700
+#: data/Cities.dat:727 data/Cities.dat:762 data/Cities.dat:763
+#: data/Cities.dat:765 data/Cities.dat:770 data/Cities.dat:849
+#: data/Cities.dat:863 data/Cities.dat:873 data/Cities.dat:895
+#: data/Cities.dat:904 data/Cities.dat:905 data/Cities.dat:915
+#: data/Cities.dat:990 data/Cities.dat:994 data/Cities.dat:995
+#: data/Cities.dat:996 data/Cities.dat:1002 data/Cities.dat:1010
+#: data/Cities.dat:1011 data/Cities.dat:1016 data/Cities.dat:1024
+#: data/Cities.dat:1055 data/Cities.dat:1056 data/Cities.dat:1058
+#: data/Cities.dat:1066 data/Cities.dat:1178 data/Cities.dat:1207
+#: data/Cities.dat:1233 data/Cities.dat:1235 data/Cities.dat:1261
+#: data/Cities.dat:1289 data/Cities.dat:1298 data/Cities.dat:1310
+#: data/Cities.dat:1346 data/Cities.dat:1394 data/Cities.dat:1400
+#: data/Cities.dat:1405 data/Cities.dat:1471 data/Cities.dat:1485
+#: data/Cities.dat:1490 data/Cities.dat:1501 data/Cities.dat:1503
+#: data/Cities.dat:1504 data/Cities.dat:1511 data/Cities.dat:1512
+#: data/Cities.dat:1526 data/Cities.dat:1532 data/Cities.dat:1533
+#: data/Cities.dat:1540 data/Cities.dat:1541 data/Cities.dat:1544
+#: data/Cities.dat:1545 data/Cities.dat:1546 data/Cities.dat:1547
+#: data/Cities.dat:1548 data/Cities.dat:1549 data/Cities.dat:1563
+#: data/Cities.dat:1588 data/Cities.dat:1589 data/Cities.dat:1590
+#: data/Cities.dat:1591 data/Cities.dat:1592 data/Cities.dat:1598
+#: data/Cities.dat:1599 data/Cities.dat:1600 data/Cities.dat:1604
+#: data/Cities.dat:1606 data/Cities.dat:1611 data/Cities.dat:1614
+#: data/Cities.dat:1615 data/Cities.dat:1616 data/Cities.dat:1624
+#: data/Cities.dat:1625 data/Cities.dat:1628 data/Cities.dat:1632
+#: data/Cities.dat:1642 data/Cities.dat:1645 data/Cities.dat:1651
+#: data/Cities.dat:1678 data/Cities.dat:1739 data/Cities.dat:1755
+#: data/Cities.dat:1756 data/Cities.dat:1757 data/Cities.dat:1793
+#: data/Cities.dat:1872 data/Cities.dat:1879 data/Cities.dat:1881
+#: data/Cities.dat:1892 data/Cities.dat:1902 data/Cities.dat:1903
+#: data/Cities.dat:1932 data/Cities.dat:1954 data/Cities.dat:2019
+#: data/Cities.dat:2089 data/Cities.dat:2140 data/Cities.dat:2148
+#: data/Cities.dat:2154 data/Cities.dat:2158 data/Cities.dat:2163
+#: data/Cities.dat:2213 data/Cities.dat:2233 data/Cities.dat:2257
+#: data/Cities.dat:2311 data/Cities.dat:2315 data/Cities.dat:2326
+#: data/Cities.dat:2354 data/Cities.dat:2388 data/Cities.dat:2394
+#: data/Cities.dat:2453 data/Cities.dat:2462 data/Cities.dat:2598
+#: data/Cities.dat:2606 data/Cities.dat:2753 data/Cities.dat:2780
+#: data/Cities.dat:2781 data/Cities.dat:2792 data/Cities.dat:2793
+#: data/Cities.dat:2838 data/Cities.dat:2839
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Germany"
@@ -5205,60 +5131,43 @@ msgid ""
 "Abakan"
 msgstr ""
 
-#: data/Cities.dat:5 data/Cities.dat:30
-#: data/Cities.dat:203 data/Cities.dat:336
-#: data/Cities.dat:495 data/Cities.dat:687
-#: data/Cities.dat:941 data/Cities.dat:1145
-#: data/Cities.dat:1248 data/Cities.dat:1309
-#: data/Cities.dat:1325 data/Cities.dat:1869
-#: data/Cities.dat:1907 data/Cities.dat:2551
-#: data/Cities.dat:2603 data/Cities.dat:2618
+#: data/Cities.dat:5 data/Cities.dat:30 data/Cities.dat:203 data/Cities.dat:336
+#: data/Cities.dat:495 data/Cities.dat:687 data/Cities.dat:941
+#: data/Cities.dat:1145 data/Cities.dat:1248 data/Cities.dat:1309
+#: data/Cities.dat:1325 data/Cities.dat:1869 data/Cities.dat:1907
+#: data/Cities.dat:2551 data/Cities.dat:2603 data/Cities.dat:2618
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Siberia"
 msgstr ""
 
-#: data/Cities.dat:5 data/Cities.dat:30
-#: data/Cities.dat:84 data/Cities.dat:120
-#: data/Cities.dat:203 data/Cities.dat:238
-#: data/Cities.dat:278 data/Cities.dat:336
-#: data/Cities.dat:369 data/Cities.dat:467
-#: data/Cities.dat:469 data/Cities.dat:475
-#: data/Cities.dat:495 data/Cities.dat:687
-#: data/Cities.dat:729 data/Cities.dat:730
-#: data/Cities.dat:941 data/Cities.dat:979
-#: data/Cities.dat:1145 data/Cities.dat:1155
-#: data/Cities.dat:1157 data/Cities.dat:1211
-#: data/Cities.dat:1214 data/Cities.dat:1239
-#: data/Cities.dat:1248 data/Cities.dat:1257
-#: data/Cities.dat:1259 data/Cities.dat:1305
-#: data/Cities.dat:1308 data/Cities.dat:1309
-#: data/Cities.dat:1319 data/Cities.dat:1320
-#: data/Cities.dat:1325 data/Cities.dat:1427
-#: data/Cities.dat:1499 data/Cities.dat:1508
-#: data/Cities.dat:1569 data/Cities.dat:1664
-#: data/Cities.dat:1715 data/Cities.dat:1741
-#: data/Cities.dat:1767 data/Cities.dat:1836
-#: data/Cities.dat:1867 data/Cities.dat:1869
-#: data/Cities.dat:1907 data/Cities.dat:1922
-#: data/Cities.dat:1924 data/Cities.dat:1948
-#: data/Cities.dat:1960 data/Cities.dat:2000
-#: data/Cities.dat:2003 data/Cities.dat:2015
-#: data/Cities.dat:2016 data/Cities.dat:2018
-#: data/Cities.dat:2111 data/Cities.dat:2114
-#: data/Cities.dat:2119 data/Cities.dat:2214
-#: data/Cities.dat:2231 data/Cities.dat:2258
-#: data/Cities.dat:2299 data/Cities.dat:2301
-#: data/Cities.dat:2380 data/Cities.dat:2382
-#: data/Cities.dat:2439 data/Cities.dat:2447
-#: data/Cities.dat:2481 data/Cities.dat:2495
-#: data/Cities.dat:2551 data/Cities.dat:2581
-#: data/Cities.dat:2588 data/Cities.dat:2591
-#: data/Cities.dat:2599 data/Cities.dat:2603
-#: data/Cities.dat:2618 data/Cities.dat:2669
-#: data/Cities.dat:2670 data/Cities.dat:2671
-#: data/Cities.dat:2672 data/Cities.dat:2673
-#: data/Cities.dat:2799 data/Cities.dat:2821
+#: data/Cities.dat:5 data/Cities.dat:30 data/Cities.dat:84 data/Cities.dat:120
+#: data/Cities.dat:203 data/Cities.dat:238 data/Cities.dat:278
+#: data/Cities.dat:336 data/Cities.dat:369 data/Cities.dat:467
+#: data/Cities.dat:469 data/Cities.dat:475 data/Cities.dat:495
+#: data/Cities.dat:687 data/Cities.dat:729 data/Cities.dat:730
+#: data/Cities.dat:941 data/Cities.dat:979 data/Cities.dat:1145
+#: data/Cities.dat:1155 data/Cities.dat:1157 data/Cities.dat:1211
+#: data/Cities.dat:1214 data/Cities.dat:1239 data/Cities.dat:1248
+#: data/Cities.dat:1257 data/Cities.dat:1259 data/Cities.dat:1305
+#: data/Cities.dat:1308 data/Cities.dat:1309 data/Cities.dat:1319
+#: data/Cities.dat:1320 data/Cities.dat:1325 data/Cities.dat:1427
+#: data/Cities.dat:1499 data/Cities.dat:1508 data/Cities.dat:1569
+#: data/Cities.dat:1664 data/Cities.dat:1715 data/Cities.dat:1741
+#: data/Cities.dat:1767 data/Cities.dat:1836 data/Cities.dat:1867
+#: data/Cities.dat:1869 data/Cities.dat:1907 data/Cities.dat:1922
+#: data/Cities.dat:1924 data/Cities.dat:1948 data/Cities.dat:1960
+#: data/Cities.dat:2000 data/Cities.dat:2003 data/Cities.dat:2015
+#: data/Cities.dat:2016 data/Cities.dat:2018 data/Cities.dat:2111
+#: data/Cities.dat:2114 data/Cities.dat:2119 data/Cities.dat:2214
+#: data/Cities.dat:2231 data/Cities.dat:2258 data/Cities.dat:2299
+#: data/Cities.dat:2301 data/Cities.dat:2380 data/Cities.dat:2382
+#: data/Cities.dat:2439 data/Cities.dat:2447 data/Cities.dat:2481
+#: data/Cities.dat:2495 data/Cities.dat:2551 data/Cities.dat:2581
+#: data/Cities.dat:2588 data/Cities.dat:2591 data/Cities.dat:2599
+#: data/Cities.dat:2603 data/Cities.dat:2618 data/Cities.dat:2669
+#: data/Cities.dat:2670 data/Cities.dat:2671 data/Cities.dat:2672
+#: data/Cities.dat:2673 data/Cities.dat:2799 data/Cities.dat:2821
 #: data/Cities.dat:2827 data/Cities.dat:2834
 msgid ""
 "_: Country name (optional, but should be translated)\n"
@@ -5271,921 +5180,626 @@ msgid ""
 "Abbotsford"
 msgstr ""
 
-#: data/Cities.dat:6 data/Cities.dat:552
-#: data/Cities.dat:578 data/Cities.dat:832
-#: data/Cities.dat:1216 data/Cities.dat:2101
-#: data/Cities.dat:2102 data/Cities.dat:2639
-#: data/Cities.dat:2659
+#: data/Cities.dat:6 data/Cities.dat:552 data/Cities.dat:578
+#: data/Cities.dat:832 data/Cities.dat:1216 data/Cities.dat:2101
+#: data/Cities.dat:2102 data/Cities.dat:2639 data/Cities.dat:2659
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "British Columbia"
 msgstr ""
 
-#: data/Cities.dat:6 data/Cities.dat:51
-#: data/Cities.dat:58 data/Cities.dat:178
-#: data/Cities.dat:191 data/Cities.dat:333
-#: data/Cities.dat:392 data/Cities.dat:405
-#: data/Cities.dat:461 data/Cities.dat:464
-#: data/Cities.dat:465 data/Cities.dat:482
-#: data/Cities.dat:506 data/Cities.dat:536
-#: data/Cities.dat:552 data/Cities.dat:578
-#: data/Cities.dat:667 data/Cities.dat:682
-#: data/Cities.dat:723 data/Cities.dat:724
-#: data/Cities.dat:829 data/Cities.dat:830
-#: data/Cities.dat:832 data/Cities.dat:838
-#: data/Cities.dat:857 data/Cities.dat:885
-#: data/Cities.dat:897 data/Cities.dat:937
-#: data/Cities.dat:984 data/Cities.dat:1009
-#: data/Cities.dat:1015 data/Cities.dat:1140
-#: data/Cities.dat:1144 data/Cities.dat:1171
-#: data/Cities.dat:1216 data/Cities.dat:1231
-#: data/Cities.dat:1253 data/Cities.dat:1273
-#: data/Cities.dat:1282 data/Cities.dat:1380
-#: data/Cities.dat:1404 data/Cities.dat:1452
-#: data/Cities.dat:1587 data/Cities.dat:1639
-#: data/Cities.dat:1668 data/Cities.dat:1685
-#: data/Cities.dat:1688 data/Cities.dat:1703
-#: data/Cities.dat:1705 data/Cities.dat:1844
-#: data/Cities.dat:1934 data/Cities.dat:1935
-#: data/Cities.dat:1992 data/Cities.dat:2100
-#: data/Cities.dat:2101 data/Cities.dat:2102
-#: data/Cities.dat:2128 data/Cities.dat:2160
-#: data/Cities.dat:2184 data/Cities.dat:2303
-#: data/Cities.dat:2310 data/Cities.dat:2331
-#: data/Cities.dat:2346 data/Cities.dat:2367
-#: data/Cities.dat:2368 data/Cities.dat:2419
-#: data/Cities.dat:2421 data/Cities.dat:2427
-#: data/Cities.dat:2429 data/Cities.dat:2463
-#: data/Cities.dat:2478 data/Cities.dat:2480
-#: data/Cities.dat:2523 data/Cities.dat:2532
-#: data/Cities.dat:2537 data/Cities.dat:2554
-#: data/Cities.dat:2570 data/Cities.dat:2624
-#: data/Cities.dat:2639 data/Cities.dat:2659
-#: data/Cities.dat:2712 data/Cities.dat:2748
-#: data/Cities.dat:2769 data/Cities.dat:2774
-#: data/Cities.dat:2810
+#: data/Cities.dat:6 data/Cities.dat:51 data/Cities.dat:58 data/Cities.dat:178
+#: data/Cities.dat:191 data/Cities.dat:333 data/Cities.dat:392
+#: data/Cities.dat:405 data/Cities.dat:461 data/Cities.dat:464
+#: data/Cities.dat:465 data/Cities.dat:482 data/Cities.dat:506
+#: data/Cities.dat:536 data/Cities.dat:552 data/Cities.dat:578
+#: data/Cities.dat:667 data/Cities.dat:682 data/Cities.dat:723
+#: data/Cities.dat:724 data/Cities.dat:829 data/Cities.dat:830
+#: data/Cities.dat:832 data/Cities.dat:838 data/Cities.dat:857
+#: data/Cities.dat:885 data/Cities.dat:897 data/Cities.dat:937
+#: data/Cities.dat:984 data/Cities.dat:1009 data/Cities.dat:1015
+#: data/Cities.dat:1140 data/Cities.dat:1144 data/Cities.dat:1171
+#: data/Cities.dat:1216 data/Cities.dat:1231 data/Cities.dat:1253
+#: data/Cities.dat:1273 data/Cities.dat:1282 data/Cities.dat:1380
+#: data/Cities.dat:1404 data/Cities.dat:1452 data/Cities.dat:1587
+#: data/Cities.dat:1639 data/Cities.dat:1668 data/Cities.dat:1685
+#: data/Cities.dat:1688 data/Cities.dat:1703 data/Cities.dat:1705
+#: data/Cities.dat:1844 data/Cities.dat:1934 data/Cities.dat:1935
+#: data/Cities.dat:1992 data/Cities.dat:2100 data/Cities.dat:2101
+#: data/Cities.dat:2102 data/Cities.dat:2128 data/Cities.dat:2160
+#: data/Cities.dat:2184 data/Cities.dat:2303 data/Cities.dat:2310
+#: data/Cities.dat:2331 data/Cities.dat:2346 data/Cities.dat:2367
+#: data/Cities.dat:2368 data/Cities.dat:2419 data/Cities.dat:2421
+#: data/Cities.dat:2427 data/Cities.dat:2429 data/Cities.dat:2463
+#: data/Cities.dat:2478 data/Cities.dat:2480 data/Cities.dat:2523
+#: data/Cities.dat:2532 data/Cities.dat:2537 data/Cities.dat:2554
+#: data/Cities.dat:2570 data/Cities.dat:2624 data/Cities.dat:2639
+#: data/Cities.dat:2659 data/Cities.dat:2712 data/Cities.dat:2748
+#: data/Cities.dat:2769 data/Cities.dat:2774 data/Cities.dat:2810
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Canada"
 msgstr ""
 
-#: data/Cities.dat:7 data/Cities.dat:8
-#: data/Cities.dat:9 data/Cities.dat:10
+#: data/Cities.dat:7 data/Cities.dat:8 data/Cities.dat:9 data/Cities.dat:10
 #: data/Cities.dat:11
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Aberdeen"
 msgstr ""
 
-#: data/Cities.dat:7 data/Cities.dat:46
-#: data/Cities.dat:75 data/Cities.dat:303
-#: data/Cities.dat:404 data/Cities.dat:575
-#: data/Cities.dat:927 data/Cities.dat:951
-#: data/Cities.dat:1006 data/Cities.dat:1130
-#: data/Cities.dat:1408 data/Cities.dat:1491
-#: data/Cities.dat:1716 data/Cities.dat:1771
-#: data/Cities.dat:1810 data/Cities.dat:2050
-#: data/Cities.dat:2097 data/Cities.dat:2167
-#: data/Cities.dat:2253 data/Cities.dat:2280
-#: data/Cities.dat:2349 data/Cities.dat:2383
-#: data/Cities.dat:2589 data/Cities.dat:2694
-#: data/Cities.dat:2755 data/Cities.dat:2762
+#: data/Cities.dat:7 data/Cities.dat:46 data/Cities.dat:75 data/Cities.dat:303
+#: data/Cities.dat:404 data/Cities.dat:575 data/Cities.dat:927
+#: data/Cities.dat:951 data/Cities.dat:1006 data/Cities.dat:1130
+#: data/Cities.dat:1408 data/Cities.dat:1491 data/Cities.dat:1716
+#: data/Cities.dat:1771 data/Cities.dat:1810 data/Cities.dat:2050
+#: data/Cities.dat:2097 data/Cities.dat:2167 data/Cities.dat:2253
+#: data/Cities.dat:2280 data/Cities.dat:2349 data/Cities.dat:2383
+#: data/Cities.dat:2589 data/Cities.dat:2694 data/Cities.dat:2755
+#: data/Cities.dat:2762
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Idaho"
 msgstr ""
 
-#: data/Cities.dat:7 data/Cities.dat:8
-#: data/Cities.dat:10 data/Cities.dat:11
-#: data/Cities.dat:13 data/Cities.dat:14
-#: data/Cities.dat:18 data/Cities.dat:19
-#: data/Cities.dat:20 data/Cities.dat:25
-#: data/Cities.dat:26 data/Cities.dat:31
-#: data/Cities.dat:32 data/Cities.dat:33
-#: data/Cities.dat:35 data/Cities.dat:36
-#: data/Cities.dat:39 data/Cities.dat:40
-#: data/Cities.dat:41 data/Cities.dat:43
-#: data/Cities.dat:44 data/Cities.dat:45
-#: data/Cities.dat:46 data/Cities.dat:47
-#: data/Cities.dat:49 data/Cities.dat:53
-#: data/Cities.dat:55 data/Cities.dat:56
-#: data/Cities.dat:59 data/Cities.dat:62
-#: data/Cities.dat:63 data/Cities.dat:64
-#: data/Cities.dat:67 data/Cities.dat:68
-#: data/Cities.dat:70 data/Cities.dat:72
-#: data/Cities.dat:73 data/Cities.dat:74
-#: data/Cities.dat:75 data/Cities.dat:76
-#: data/Cities.dat:77 data/Cities.dat:78
-#: data/Cities.dat:83 data/Cities.dat:85
-#: data/Cities.dat:86 data/Cities.dat:88
-#: data/Cities.dat:89 data/Cities.dat:95
-#: data/Cities.dat:97 data/Cities.dat:99
-#: data/Cities.dat:100 data/Cities.dat:103
-#: data/Cities.dat:108 data/Cities.dat:110
-#: data/Cities.dat:113 data/Cities.dat:114
-#: data/Cities.dat:117 data/Cities.dat:119
-#: data/Cities.dat:121 data/Cities.dat:122
-#: data/Cities.dat:123 data/Cities.dat:124
-#: data/Cities.dat:126 data/Cities.dat:129
-#: data/Cities.dat:130 data/Cities.dat:131
-#: data/Cities.dat:132 data/Cities.dat:133
-#: data/Cities.dat:134 data/Cities.dat:135
-#: data/Cities.dat:138 data/Cities.dat:140
-#: data/Cities.dat:146 data/Cities.dat:147
-#: data/Cities.dat:148 data/Cities.dat:149
-#: data/Cities.dat:150 data/Cities.dat:151
-#: data/Cities.dat:152 data/Cities.dat:153
-#: data/Cities.dat:154 data/Cities.dat:157
-#: data/Cities.dat:158 data/Cities.dat:159
-#: data/Cities.dat:160 data/Cities.dat:161
-#: data/Cities.dat:162 data/Cities.dat:163
-#: data/Cities.dat:164 data/Cities.dat:167
-#: data/Cities.dat:169 data/Cities.dat:179
-#: data/Cities.dat:180 data/Cities.dat:182
-#: data/Cities.dat:184 data/Cities.dat:195
-#: data/Cities.dat:198 data/Cities.dat:199
-#: data/Cities.dat:204 data/Cities.dat:206
-#: data/Cities.dat:207 data/Cities.dat:208
-#: data/Cities.dat:209 data/Cities.dat:210
-#: data/Cities.dat:211 data/Cities.dat:215
-#: data/Cities.dat:216 data/Cities.dat:217
-#: data/Cities.dat:218 data/Cities.dat:219
-#: data/Cities.dat:220 data/Cities.dat:222
-#: data/Cities.dat:224 data/Cities.dat:225
-#: data/Cities.dat:226 data/Cities.dat:227
-#: data/Cities.dat:228 data/Cities.dat:229
-#: data/Cities.dat:230 data/Cities.dat:236
-#: data/Cities.dat:241 data/Cities.dat:242
-#: data/Cities.dat:243 data/Cities.dat:244
-#: data/Cities.dat:245 data/Cities.dat:246
-#: data/Cities.dat:248 data/Cities.dat:252
-#: data/Cities.dat:253 data/Cities.dat:258
-#: data/Cities.dat:260 data/Cities.dat:262
-#: data/Cities.dat:263 data/Cities.dat:264
-#: data/Cities.dat:265 data/Cities.dat:266
-#: data/Cities.dat:267 data/Cities.dat:268
-#: data/Cities.dat:269 data/Cities.dat:270
-#: data/Cities.dat:272 data/Cities.dat:273
-#: data/Cities.dat:274 data/Cities.dat:277
-#: data/Cities.dat:280 data/Cities.dat:286
-#: data/Cities.dat:289 data/Cities.dat:290
-#: data/Cities.dat:291 data/Cities.dat:292
-#: data/Cities.dat:293 data/Cities.dat:294
-#: data/Cities.dat:297 data/Cities.dat:301
-#: data/Cities.dat:303 data/Cities.dat:304
-#: data/Cities.dat:310 data/Cities.dat:311
-#: data/Cities.dat:313 data/Cities.dat:314
-#: data/Cities.dat:316 data/Cities.dat:318
-#: data/Cities.dat:319 data/Cities.dat:321
-#: data/Cities.dat:322 data/Cities.dat:323
-#: data/Cities.dat:325 data/Cities.dat:327
-#: data/Cities.dat:328 data/Cities.dat:329
-#: data/Cities.dat:331 data/Cities.dat:334
-#: data/Cities.dat:337 data/Cities.dat:342
-#: data/Cities.dat:346 data/Cities.dat:347
-#: data/Cities.dat:349 data/Cities.dat:353
-#: data/Cities.dat:354 data/Cities.dat:355
-#: data/Cities.dat:356 data/Cities.dat:358
-#: data/Cities.dat:359 data/Cities.dat:360
-#: data/Cities.dat:361 data/Cities.dat:362
-#: data/Cities.dat:363 data/Cities.dat:364
-#: data/Cities.dat:365 data/Cities.dat:366
-#: data/Cities.dat:367 data/Cities.dat:375
-#: data/Cities.dat:377 data/Cities.dat:378
-#: data/Cities.dat:382 data/Cities.dat:384
-#: data/Cities.dat:385 data/Cities.dat:386
-#: data/Cities.dat:387 data/Cities.dat:388
-#: data/Cities.dat:389 data/Cities.dat:390
-#: data/Cities.dat:394 data/Cities.dat:404
-#: data/Cities.dat:406 data/Cities.dat:408
-#: data/Cities.dat:409 data/Cities.dat:410
-#: data/Cities.dat:414 data/Cities.dat:416
-#: data/Cities.dat:417 data/Cities.dat:418
-#: data/Cities.dat:419 data/Cities.dat:420
-#: data/Cities.dat:423 data/Cities.dat:424
-#: data/Cities.dat:426 data/Cities.dat:427
-#: data/Cities.dat:428 data/Cities.dat:429
-#: data/Cities.dat:430 data/Cities.dat:431
-#: data/Cities.dat:433 data/Cities.dat:434
-#: data/Cities.dat:435 data/Cities.dat:438
-#: data/Cities.dat:440 data/Cities.dat:444
-#: data/Cities.dat:446 data/Cities.dat:447
-#: data/Cities.dat:448 data/Cities.dat:449
-#: data/Cities.dat:450 data/Cities.dat:451
-#: data/Cities.dat:456 data/Cities.dat:457
-#: data/Cities.dat:458 data/Cities.dat:459
-#: data/Cities.dat:460 data/Cities.dat:462
-#: data/Cities.dat:463 data/Cities.dat:466
-#: data/Cities.dat:468 data/Cities.dat:473
-#: data/Cities.dat:476 data/Cities.dat:477
-#: data/Cities.dat:478 data/Cities.dat:479
-#: data/Cities.dat:480 data/Cities.dat:483
-#: data/Cities.dat:485 data/Cities.dat:486
-#: data/Cities.dat:487 data/Cities.dat:488
-#: data/Cities.dat:489 data/Cities.dat:491
-#: data/Cities.dat:492 data/Cities.dat:493
-#: data/Cities.dat:502 data/Cities.dat:508
-#: data/Cities.dat:509 data/Cities.dat:510
-#: data/Cities.dat:511 data/Cities.dat:513
-#: data/Cities.dat:514 data/Cities.dat:515
-#: data/Cities.dat:516 data/Cities.dat:517
-#: data/Cities.dat:518 data/Cities.dat:519
-#: data/Cities.dat:520 data/Cities.dat:521
-#: data/Cities.dat:522 data/Cities.dat:524
-#: data/Cities.dat:525 data/Cities.dat:526
-#: data/Cities.dat:527 data/Cities.dat:529
-#: data/Cities.dat:531 data/Cities.dat:533
-#: data/Cities.dat:535 data/Cities.dat:537
-#: data/Cities.dat:538 data/Cities.dat:542
-#: data/Cities.dat:543 data/Cities.dat:544
-#: data/Cities.dat:545 data/Cities.dat:546
-#: data/Cities.dat:547 data/Cities.dat:548
-#: data/Cities.dat:549 data/Cities.dat:550
-#: data/Cities.dat:553 data/Cities.dat:556
-#: data/Cities.dat:557 data/Cities.dat:558
-#: data/Cities.dat:560 data/Cities.dat:561
-#: data/Cities.dat:563 data/Cities.dat:564
-#: data/Cities.dat:565 data/Cities.dat:566
-#: data/Cities.dat:567 data/Cities.dat:568
-#: data/Cities.dat:569 data/Cities.dat:570
-#: data/Cities.dat:572 data/Cities.dat:575
-#: data/Cities.dat:576 data/Cities.dat:577
-#: data/Cities.dat:579 data/Cities.dat:580
-#: data/Cities.dat:581 data/Cities.dat:582
-#: data/Cities.dat:583 data/Cities.dat:584
-#: data/Cities.dat:585 data/Cities.dat:586
-#: data/Cities.dat:587 data/Cities.dat:588
-#: data/Cities.dat:592 data/Cities.dat:593
-#: data/Cities.dat:594 data/Cities.dat:604
-#: data/Cities.dat:606 data/Cities.dat:609
-#: data/Cities.dat:610 data/Cities.dat:611
-#: data/Cities.dat:612 data/Cities.dat:618
-#: data/Cities.dat:619 data/Cities.dat:620
-#: data/Cities.dat:621 data/Cities.dat:623
-#: data/Cities.dat:624 data/Cities.dat:625
-#: data/Cities.dat:626 data/Cities.dat:627
-#: data/Cities.dat:628 data/Cities.dat:630
-#: data/Cities.dat:632 data/Cities.dat:633
-#: data/Cities.dat:634 data/Cities.dat:635
-#: data/Cities.dat:636 data/Cities.dat:637
-#: data/Cities.dat:638 data/Cities.dat:639
-#: data/Cities.dat:640 data/Cities.dat:642
-#: data/Cities.dat:643 data/Cities.dat:644
-#: data/Cities.dat:645 data/Cities.dat:647
-#: data/Cities.dat:648 data/Cities.dat:650
-#: data/Cities.dat:651 data/Cities.dat:652
-#: data/Cities.dat:653 data/Cities.dat:656
-#: data/Cities.dat:657 data/Cities.dat:658
-#: data/Cities.dat:663 data/Cities.dat:671
-#: data/Cities.dat:675 data/Cities.dat:676
-#: data/Cities.dat:677 data/Cities.dat:678
-#: data/Cities.dat:686 data/Cities.dat:689
-#: data/Cities.dat:690 data/Cities.dat:692
-#: data/Cities.dat:694 data/Cities.dat:696
-#: data/Cities.dat:697 data/Cities.dat:699
-#: data/Cities.dat:701 data/Cities.dat:702
-#: data/Cities.dat:703 data/Cities.dat:704
-#: data/Cities.dat:705 data/Cities.dat:706
-#: data/Cities.dat:707 data/Cities.dat:709
-#: data/Cities.dat:710 data/Cities.dat:711
-#: data/Cities.dat:712 data/Cities.dat:713
-#: data/Cities.dat:714 data/Cities.dat:715
-#: data/Cities.dat:716 data/Cities.dat:717
-#: data/Cities.dat:719 data/Cities.dat:721
-#: data/Cities.dat:722 data/Cities.dat:725
-#: data/Cities.dat:728 data/Cities.dat:732
-#: data/Cities.dat:733 data/Cities.dat:735
-#: data/Cities.dat:736 data/Cities.dat:738
-#: data/Cities.dat:741 data/Cities.dat:742
-#: data/Cities.dat:743 data/Cities.dat:744
-#: data/Cities.dat:745 data/Cities.dat:746
-#: data/Cities.dat:747 data/Cities.dat:748
-#: data/Cities.dat:749 data/Cities.dat:750
-#: data/Cities.dat:751 data/Cities.dat:752
-#: data/Cities.dat:753 data/Cities.dat:755
-#: data/Cities.dat:756 data/Cities.dat:757
-#: data/Cities.dat:758 data/Cities.dat:759
-#: data/Cities.dat:761 data/Cities.dat:764
-#: data/Cities.dat:767 data/Cities.dat:771
-#: data/Cities.dat:772 data/Cities.dat:773
-#: data/Cities.dat:774 data/Cities.dat:775
-#: data/Cities.dat:776 data/Cities.dat:777
-#: data/Cities.dat:778 data/Cities.dat:779
-#: data/Cities.dat:780 data/Cities.dat:781
-#: data/Cities.dat:782 data/Cities.dat:783
-#: data/Cities.dat:784 data/Cities.dat:787
-#: data/Cities.dat:788 data/Cities.dat:789
-#: data/Cities.dat:790 data/Cities.dat:791
-#: data/Cities.dat:792 data/Cities.dat:793
-#: data/Cities.dat:794 data/Cities.dat:795
-#: data/Cities.dat:796 data/Cities.dat:797
-#: data/Cities.dat:798 data/Cities.dat:799
-#: data/Cities.dat:800 data/Cities.dat:802
-#: data/Cities.dat:803 data/Cities.dat:805
-#: data/Cities.dat:808 data/Cities.dat:809
-#: data/Cities.dat:810 data/Cities.dat:811
-#: data/Cities.dat:812 data/Cities.dat:814
-#: data/Cities.dat:815 data/Cities.dat:816
-#: data/Cities.dat:817 data/Cities.dat:819
-#: data/Cities.dat:820 data/Cities.dat:821
-#: data/Cities.dat:823 data/Cities.dat:824
-#: data/Cities.dat:825 data/Cities.dat:826
-#: data/Cities.dat:827 data/Cities.dat:828
-#: data/Cities.dat:831 data/Cities.dat:833
-#: data/Cities.dat:834 data/Cities.dat:835
-#: data/Cities.dat:836 data/Cities.dat:837
-#: data/Cities.dat:840 data/Cities.dat:841
-#: data/Cities.dat:842 data/Cities.dat:843
-#: data/Cities.dat:844 data/Cities.dat:845
-#: data/Cities.dat:848 data/Cities.dat:850
-#: data/Cities.dat:851 data/Cities.dat:852
-#: data/Cities.dat:854 data/Cities.dat:855
-#: data/Cities.dat:856 data/Cities.dat:860
-#: data/Cities.dat:864 data/Cities.dat:865
-#: data/Cities.dat:866 data/Cities.dat:867
-#: data/Cities.dat:868 data/Cities.dat:871
-#: data/Cities.dat:878 data/Cities.dat:879
-#: data/Cities.dat:880 data/Cities.dat:881
-#: data/Cities.dat:882 data/Cities.dat:883
-#: data/Cities.dat:884 data/Cities.dat:890
-#: data/Cities.dat:891 data/Cities.dat:892
-#: data/Cities.dat:893 data/Cities.dat:894
-#: data/Cities.dat:896 data/Cities.dat:898
-#: data/Cities.dat:899 data/Cities.dat:914
-#: data/Cities.dat:919 data/Cities.dat:920
-#: data/Cities.dat:922 data/Cities.dat:924
-#: data/Cities.dat:925 data/Cities.dat:926
-#: data/Cities.dat:927 data/Cities.dat:928
-#: data/Cities.dat:929 data/Cities.dat:930
-#: data/Cities.dat:934 data/Cities.dat:935
-#: data/Cities.dat:936 data/Cities.dat:938
-#: data/Cities.dat:939 data/Cities.dat:944
-#: data/Cities.dat:945 data/Cities.dat:946
-#: data/Cities.dat:947 data/Cities.dat:948
-#: data/Cities.dat:949 data/Cities.dat:950
-#: data/Cities.dat:951 data/Cities.dat:952
-#: data/Cities.dat:953 data/Cities.dat:954
-#: data/Cities.dat:955 data/Cities.dat:956
-#: data/Cities.dat:957 data/Cities.dat:958
-#: data/Cities.dat:959 data/Cities.dat:960
-#: data/Cities.dat:961 data/Cities.dat:962
-#: data/Cities.dat:963 data/Cities.dat:964
-#: data/Cities.dat:965 data/Cities.dat:966
-#: data/Cities.dat:967 data/Cities.dat:969
-#: data/Cities.dat:970 data/Cities.dat:971
-#: data/Cities.dat:974 data/Cities.dat:977
-#: data/Cities.dat:978 data/Cities.dat:985
-#: data/Cities.dat:986 data/Cities.dat:991
-#: data/Cities.dat:1003 data/Cities.dat:1005
-#: data/Cities.dat:1006 data/Cities.dat:1007
-#: data/Cities.dat:1008 data/Cities.dat:1012
-#: data/Cities.dat:1014 data/Cities.dat:1017
-#: data/Cities.dat:1018 data/Cities.dat:1019
-#: data/Cities.dat:1020 data/Cities.dat:1021
-#: data/Cities.dat:1022 data/Cities.dat:1023
-#: data/Cities.dat:1031 data/Cities.dat:1032
-#: data/Cities.dat:1033 data/Cities.dat:1034
-#: data/Cities.dat:1035 data/Cities.dat:1036
-#: data/Cities.dat:1037 data/Cities.dat:1038
-#: data/Cities.dat:1040 data/Cities.dat:1041
-#: data/Cities.dat:1043 data/Cities.dat:1044
-#: data/Cities.dat:1046 data/Cities.dat:1047
-#: data/Cities.dat:1049 data/Cities.dat:1050
-#: data/Cities.dat:1051 data/Cities.dat:1052
-#: data/Cities.dat:1053 data/Cities.dat:1054
-#: data/Cities.dat:1057 data/Cities.dat:1062
-#: data/Cities.dat:1063 data/Cities.dat:1064
-#: data/Cities.dat:1065 data/Cities.dat:1070
-#: data/Cities.dat:1071 data/Cities.dat:1073
-#: data/Cities.dat:1074 data/Cities.dat:1075
-#: data/Cities.dat:1076 data/Cities.dat:1078
-#: data/Cities.dat:1079 data/Cities.dat:1080
-#: data/Cities.dat:1082 data/Cities.dat:1084
-#: data/Cities.dat:1087 data/Cities.dat:1088
-#: data/Cities.dat:1089 data/Cities.dat:1090
-#: data/Cities.dat:1091 data/Cities.dat:1092
-#: data/Cities.dat:1095 data/Cities.dat:1096
-#: data/Cities.dat:1101 data/Cities.dat:1102
-#: data/Cities.dat:1103 data/Cities.dat:1104
-#: data/Cities.dat:1107 data/Cities.dat:1108
-#: data/Cities.dat:1109 data/Cities.dat:1115
-#: data/Cities.dat:1117 data/Cities.dat:1118
-#: data/Cities.dat:1119 data/Cities.dat:1120
-#: data/Cities.dat:1121 data/Cities.dat:1122
-#: data/Cities.dat:1123 data/Cities.dat:1124
-#: data/Cities.dat:1130 data/Cities.dat:1134
-#: data/Cities.dat:1135 data/Cities.dat:1136
-#: data/Cities.dat:1138 data/Cities.dat:1142
-#: data/Cities.dat:1146 data/Cities.dat:1147
-#: data/Cities.dat:1148 data/Cities.dat:1149
-#: data/Cities.dat:1159 data/Cities.dat:1160
-#: data/Cities.dat:1161 data/Cities.dat:1162
-#: data/Cities.dat:1163 data/Cities.dat:1166
-#: data/Cities.dat:1167 data/Cities.dat:1176
-#: data/Cities.dat:1179 data/Cities.dat:1183
-#: data/Cities.dat:1189 data/Cities.dat:1191
-#: data/Cities.dat:1192 data/Cities.dat:1193
-#: data/Cities.dat:1194 data/Cities.dat:1195
-#: data/Cities.dat:1196 data/Cities.dat:1202
-#: data/Cities.dat:1204 data/Cities.dat:1205
-#: data/Cities.dat:1208 data/Cities.dat:1209
-#: data/Cities.dat:1210 data/Cities.dat:1212
-#: data/Cities.dat:1218 data/Cities.dat:1219
-#: data/Cities.dat:1220 data/Cities.dat:1221
-#: data/Cities.dat:1223 data/Cities.dat:1225
-#: data/Cities.dat:1226 data/Cities.dat:1229
-#: data/Cities.dat:1230 data/Cities.dat:1238
-#: data/Cities.dat:1240 data/Cities.dat:1241
-#: data/Cities.dat:1242 data/Cities.dat:1246
-#: data/Cities.dat:1247 data/Cities.dat:1249
-#: data/Cities.dat:1251 data/Cities.dat:1252
-#: data/Cities.dat:1254 data/Cities.dat:1255
-#: data/Cities.dat:1256 data/Cities.dat:1265
-#: data/Cities.dat:1267 data/Cities.dat:1268
-#: data/Cities.dat:1269 data/Cities.dat:1271
-#: data/Cities.dat:1279 data/Cities.dat:1281
-#: data/Cities.dat:1283 data/Cities.dat:1286
-#: data/Cities.dat:1287 data/Cities.dat:1288
-#: data/Cities.dat:1291 data/Cities.dat:1293
-#: data/Cities.dat:1295 data/Cities.dat:1296
-#: data/Cities.dat:1299 data/Cities.dat:1300
-#: data/Cities.dat:1307 data/Cities.dat:1317
-#: data/Cities.dat:1329 data/Cities.dat:1330
-#: data/Cities.dat:1331 data/Cities.dat:1333
-#: data/Cities.dat:1339 data/Cities.dat:1340
-#: data/Cities.dat:1341 data/Cities.dat:1342
-#: data/Cities.dat:1343 data/Cities.dat:1349
-#: data/Cities.dat:1350 data/Cities.dat:1351
-#: data/Cities.dat:1352 data/Cities.dat:1353
-#: data/Cities.dat:1354 data/Cities.dat:1355
-#: data/Cities.dat:1356 data/Cities.dat:1357
-#: data/Cities.dat:1358 data/Cities.dat:1359
-#: data/Cities.dat:1362 data/Cities.dat:1363
-#: data/Cities.dat:1364 data/Cities.dat:1365
-#: data/Cities.dat:1366 data/Cities.dat:1367
-#: data/Cities.dat:1368 data/Cities.dat:1369
-#: data/Cities.dat:1371 data/Cities.dat:1373
-#: data/Cities.dat:1376 data/Cities.dat:1377
-#: data/Cities.dat:1378 data/Cities.dat:1381
-#: data/Cities.dat:1382 data/Cities.dat:1383
-#: data/Cities.dat:1384 data/Cities.dat:1387
-#: data/Cities.dat:1388 data/Cities.dat:1389
-#: data/Cities.dat:1390 data/Cities.dat:1391
-#: data/Cities.dat:1401 data/Cities.dat:1406
-#: data/Cities.dat:1407 data/Cities.dat:1408
-#: data/Cities.dat:1409 data/Cities.dat:1410
-#: data/Cities.dat:1411 data/Cities.dat:1412
-#: data/Cities.dat:1416 data/Cities.dat:1417
-#: data/Cities.dat:1421 data/Cities.dat:1422
-#: data/Cities.dat:1423 data/Cities.dat:1424
-#: data/Cities.dat:1425 data/Cities.dat:1429
-#: data/Cities.dat:1430 data/Cities.dat:1431
-#: data/Cities.dat:1432 data/Cities.dat:1434
-#: data/Cities.dat:1435 data/Cities.dat:1437
-#: data/Cities.dat:1442 data/Cities.dat:1443
-#: data/Cities.dat:1447 data/Cities.dat:1449
-#: data/Cities.dat:1453 data/Cities.dat:1454
-#: data/Cities.dat:1455 data/Cities.dat:1456
-#: data/Cities.dat:1457 data/Cities.dat:1458
-#: data/Cities.dat:1459 data/Cities.dat:1460
-#: data/Cities.dat:1461 data/Cities.dat:1462
-#: data/Cities.dat:1464 data/Cities.dat:1465
-#: data/Cities.dat:1466 data/Cities.dat:1467
-#: data/Cities.dat:1469 data/Cities.dat:1479
-#: data/Cities.dat:1480 data/Cities.dat:1481
-#: data/Cities.dat:1482 data/Cities.dat:1491
-#: data/Cities.dat:1492 data/Cities.dat:1493
-#: data/Cities.dat:1494 data/Cities.dat:1495
-#: data/Cities.dat:1496 data/Cities.dat:1500
-#: data/Cities.dat:1502 data/Cities.dat:1513
-#: data/Cities.dat:1517 data/Cities.dat:1522
-#: data/Cities.dat:1523 data/Cities.dat:1525
-#: data/Cities.dat:1527 data/Cities.dat:1528
-#: data/Cities.dat:1529 data/Cities.dat:1531
-#: data/Cities.dat:1534 data/Cities.dat:1535
-#: data/Cities.dat:1536 data/Cities.dat:1542
-#: data/Cities.dat:1543 data/Cities.dat:1550
-#: data/Cities.dat:1551 data/Cities.dat:1554
-#: data/Cities.dat:1555 data/Cities.dat:1556
-#: data/Cities.dat:1559 data/Cities.dat:1560
-#: data/Cities.dat:1566 data/Cities.dat:1567
-#: data/Cities.dat:1568 data/Cities.dat:1570
-#: data/Cities.dat:1574 data/Cities.dat:1575
-#: data/Cities.dat:1576 data/Cities.dat:1577
-#: data/Cities.dat:1578 data/Cities.dat:1579
-#: data/Cities.dat:1580 data/Cities.dat:1581
-#: data/Cities.dat:1582 data/Cities.dat:1583
-#: data/Cities.dat:1585 data/Cities.dat:1586
-#: data/Cities.dat:1594 data/Cities.dat:1601
-#: data/Cities.dat:1602 data/Cities.dat:1603
-#: data/Cities.dat:1607 data/Cities.dat:1608
-#: data/Cities.dat:1609 data/Cities.dat:1610
-#: data/Cities.dat:1612 data/Cities.dat:1613
-#: data/Cities.dat:1617 data/Cities.dat:1618
-#: data/Cities.dat:1620 data/Cities.dat:1626
-#: data/Cities.dat:1630 data/Cities.dat:1631
-#: data/Cities.dat:1633 data/Cities.dat:1636
-#: data/Cities.dat:1637 data/Cities.dat:1638
-#: data/Cities.dat:1641 data/Cities.dat:1644
-#: data/Cities.dat:1646 data/Cities.dat:1647
-#: data/Cities.dat:1648 data/Cities.dat:1649
-#: data/Cities.dat:1652 data/Cities.dat:1653
-#: data/Cities.dat:1654 data/Cities.dat:1655
-#: data/Cities.dat:1656 data/Cities.dat:1657
-#: data/Cities.dat:1658 data/Cities.dat:1659
-#: data/Cities.dat:1660 data/Cities.dat:1661
-#: data/Cities.dat:1663 data/Cities.dat:1666
-#: data/Cities.dat:1669 data/Cities.dat:1670
-#: data/Cities.dat:1673 data/Cities.dat:1674
-#: data/Cities.dat:1676 data/Cities.dat:1677
-#: data/Cities.dat:1681 data/Cities.dat:1682
-#: data/Cities.dat:1686 data/Cities.dat:1690
-#: data/Cities.dat:1692 data/Cities.dat:1693
-#: data/Cities.dat:1695 data/Cities.dat:1696
-#: data/Cities.dat:1697 data/Cities.dat:1698
-#: data/Cities.dat:1699 data/Cities.dat:1700
-#: data/Cities.dat:1701 data/Cities.dat:1704
-#: data/Cities.dat:1706 data/Cities.dat:1707
-#: data/Cities.dat:1708 data/Cities.dat:1711
-#: data/Cities.dat:1712 data/Cities.dat:1713
-#: data/Cities.dat:1716 data/Cities.dat:1717
-#: data/Cities.dat:1721 data/Cities.dat:1722
-#: data/Cities.dat:1724 data/Cities.dat:1726
-#: data/Cities.dat:1729 data/Cities.dat:1730
-#: data/Cities.dat:1731 data/Cities.dat:1732
-#: data/Cities.dat:1733 data/Cities.dat:1736
-#: data/Cities.dat:1737 data/Cities.dat:1740
-#: data/Cities.dat:1742 data/Cities.dat:1743
-#: data/Cities.dat:1744 data/Cities.dat:1749
-#: data/Cities.dat:1759 data/Cities.dat:1771
-#: data/Cities.dat:1777 data/Cities.dat:1778
-#: data/Cities.dat:1780 data/Cities.dat:1783
-#: data/Cities.dat:1784 data/Cities.dat:1786
-#: data/Cities.dat:1788 data/Cities.dat:1790
-#: data/Cities.dat:1791 data/Cities.dat:1792
-#: data/Cities.dat:1794 data/Cities.dat:1795
-#: data/Cities.dat:1796 data/Cities.dat:1797
-#: data/Cities.dat:1798 data/Cities.dat:1799
-#: data/Cities.dat:1800 data/Cities.dat:1801
-#: data/Cities.dat:1803 data/Cities.dat:1805
-#: data/Cities.dat:1806 data/Cities.dat:1807
-#: data/Cities.dat:1808 data/Cities.dat:1809
-#: data/Cities.dat:1810 data/Cities.dat:1811
-#: data/Cities.dat:1812 data/Cities.dat:1813
-#: data/Cities.dat:1814 data/Cities.dat:1815
-#: data/Cities.dat:1816 data/Cities.dat:1817
-#: data/Cities.dat:1819 data/Cities.dat:1820
-#: data/Cities.dat:1821 data/Cities.dat:1822
-#: data/Cities.dat:1823 data/Cities.dat:1824
-#: data/Cities.dat:1825 data/Cities.dat:1826
-#: data/Cities.dat:1827 data/Cities.dat:1828
-#: data/Cities.dat:1830 data/Cities.dat:1835
-#: data/Cities.dat:1838 data/Cities.dat:1839
-#: data/Cities.dat:1840 data/Cities.dat:1841
-#: data/Cities.dat:1842 data/Cities.dat:1843
-#: data/Cities.dat:1845 data/Cities.dat:1846
-#: data/Cities.dat:1847 data/Cities.dat:1848
-#: data/Cities.dat:1849 data/Cities.dat:1850
-#: data/Cities.dat:1851 data/Cities.dat:1852
-#: data/Cities.dat:1853 data/Cities.dat:1854
-#: data/Cities.dat:1855 data/Cities.dat:1856
-#: data/Cities.dat:1857 data/Cities.dat:1858
-#: data/Cities.dat:1859 data/Cities.dat:1860
-#: data/Cities.dat:1861 data/Cities.dat:1862
-#: data/Cities.dat:1868 data/Cities.dat:1873
-#: data/Cities.dat:1874 data/Cities.dat:1875
-#: data/Cities.dat:1876 data/Cities.dat:1877
-#: data/Cities.dat:1878 data/Cities.dat:1880
-#: data/Cities.dat:1885 data/Cities.dat:1886
-#: data/Cities.dat:1887 data/Cities.dat:1888
-#: data/Cities.dat:1891 data/Cities.dat:1893
-#: data/Cities.dat:1894 data/Cities.dat:1899
-#: data/Cities.dat:1900 data/Cities.dat:1904
-#: data/Cities.dat:1905 data/Cities.dat:1906
-#: data/Cities.dat:1910 data/Cities.dat:1913
-#: data/Cities.dat:1914 data/Cities.dat:1917
-#: data/Cities.dat:1918 data/Cities.dat:1920
-#: data/Cities.dat:1921 data/Cities.dat:1923
-#: data/Cities.dat:1926 data/Cities.dat:1929
-#: data/Cities.dat:1930 data/Cities.dat:1936
-#: data/Cities.dat:1940 data/Cities.dat:1942
-#: data/Cities.dat:1943 data/Cities.dat:1945
-#: data/Cities.dat:1946 data/Cities.dat:1947
-#: data/Cities.dat:1949 data/Cities.dat:1951
-#: data/Cities.dat:1952 data/Cities.dat:1953
-#: data/Cities.dat:1956 data/Cities.dat:1965
-#: data/Cities.dat:1967 data/Cities.dat:1968
-#: data/Cities.dat:1969 data/Cities.dat:1972
-#: data/Cities.dat:1975 data/Cities.dat:1977
-#: data/Cities.dat:1979 data/Cities.dat:1980
-#: data/Cities.dat:1981 data/Cities.dat:1984
-#: data/Cities.dat:1985 data/Cities.dat:1986
-#: data/Cities.dat:1987 data/Cities.dat:1988
-#: data/Cities.dat:1989 data/Cities.dat:1991
-#: data/Cities.dat:1996 data/Cities.dat:1998
-#: data/Cities.dat:1999 data/Cities.dat:2001
-#: data/Cities.dat:2002 data/Cities.dat:2006
-#: data/Cities.dat:2007 data/Cities.dat:2013
-#: data/Cities.dat:2014 data/Cities.dat:2020
-#: data/Cities.dat:2021 data/Cities.dat:2022
-#: data/Cities.dat:2023 data/Cities.dat:2027
-#: data/Cities.dat:2028 data/Cities.dat:2030
-#: data/Cities.dat:2031 data/Cities.dat:2032
-#: data/Cities.dat:2033 data/Cities.dat:2034
-#: data/Cities.dat:2036 data/Cities.dat:2037
-#: data/Cities.dat:2039 data/Cities.dat:2040
-#: data/Cities.dat:2042 data/Cities.dat:2045
-#: data/Cities.dat:2047 data/Cities.dat:2048
-#: data/Cities.dat:2049 data/Cities.dat:2050
-#: data/Cities.dat:2051 data/Cities.dat:2055
-#: data/Cities.dat:2057 data/Cities.dat:2058
-#: data/Cities.dat:2059 data/Cities.dat:2060
-#: data/Cities.dat:2061 data/Cities.dat:2063
-#: data/Cities.dat:2064 data/Cities.dat:2065
-#: data/Cities.dat:2067 data/Cities.dat:2068
-#: data/Cities.dat:2072 data/Cities.dat:2074
-#: data/Cities.dat:2076 data/Cities.dat:2079
-#: data/Cities.dat:2080 data/Cities.dat:2083
-#: data/Cities.dat:2084 data/Cities.dat:2085
-#: data/Cities.dat:2088 data/Cities.dat:2090
-#: data/Cities.dat:2091 data/Cities.dat:2095
-#: data/Cities.dat:2096 data/Cities.dat:2097
-#: data/Cities.dat:2099 data/Cities.dat:2103
-#: data/Cities.dat:2104 data/Cities.dat:2105
-#: data/Cities.dat:2106 data/Cities.dat:2108
-#: data/Cities.dat:2109 data/Cities.dat:2110
-#: data/Cities.dat:2112 data/Cities.dat:2113
-#: data/Cities.dat:2115 data/Cities.dat:2117
-#: data/Cities.dat:2121 data/Cities.dat:2122
-#: data/Cities.dat:2127 data/Cities.dat:2130
-#: data/Cities.dat:2136 data/Cities.dat:2138
-#: data/Cities.dat:2141 data/Cities.dat:2143
-#: data/Cities.dat:2144 data/Cities.dat:2146
-#: data/Cities.dat:2151 data/Cities.dat:2152
-#: data/Cities.dat:2155 data/Cities.dat:2156
-#: data/Cities.dat:2157 data/Cities.dat:2165
-#: data/Cities.dat:2166 data/Cities.dat:2167
-#: data/Cities.dat:2169 data/Cities.dat:2171
-#: data/Cities.dat:2172 data/Cities.dat:2173
-#: data/Cities.dat:2174 data/Cities.dat:2176
-#: data/Cities.dat:2177 data/Cities.dat:2178
-#: data/Cities.dat:2185 data/Cities.dat:2186
-#: data/Cities.dat:2188 data/Cities.dat:2189
-#: data/Cities.dat:2192 data/Cities.dat:2193
-#: data/Cities.dat:2194 data/Cities.dat:2195
-#: data/Cities.dat:2196 data/Cities.dat:2197
-#: data/Cities.dat:2198 data/Cities.dat:2199
-#: data/Cities.dat:2200 data/Cities.dat:2201
-#: data/Cities.dat:2202 data/Cities.dat:2203
-#: data/Cities.dat:2205 data/Cities.dat:2207
-#: data/Cities.dat:2209 data/Cities.dat:2210
-#: data/Cities.dat:2211 data/Cities.dat:2215
-#: data/Cities.dat:2216 data/Cities.dat:2220
-#: data/Cities.dat:2221 data/Cities.dat:2222
-#: data/Cities.dat:2223 data/Cities.dat:2224
-#: data/Cities.dat:2225 data/Cities.dat:2226
-#: data/Cities.dat:2227 data/Cities.dat:2229
-#: data/Cities.dat:2235 data/Cities.dat:2236
-#: data/Cities.dat:2237 data/Cities.dat:2238
-#: data/Cities.dat:2243 data/Cities.dat:2244
-#: data/Cities.dat:2245 data/Cities.dat:2246
-#: data/Cities.dat:2248 data/Cities.dat:2249
-#: data/Cities.dat:2250 data/Cities.dat:2251
-#: data/Cities.dat:2252 data/Cities.dat:2253
-#: data/Cities.dat:2254 data/Cities.dat:2255
-#: data/Cities.dat:2260 data/Cities.dat:2261
-#: data/Cities.dat:2262 data/Cities.dat:2263
-#: data/Cities.dat:2265 data/Cities.dat:2267
-#: data/Cities.dat:2268 data/Cities.dat:2269
-#: data/Cities.dat:2270 data/Cities.dat:2271
-#: data/Cities.dat:2277 data/Cities.dat:2278
-#: data/Cities.dat:2280 data/Cities.dat:2281
-#: data/Cities.dat:2282 data/Cities.dat:2283
-#: data/Cities.dat:2284 data/Cities.dat:2288
-#: data/Cities.dat:2289 data/Cities.dat:2291
-#: data/Cities.dat:2292 data/Cities.dat:2293
-#: data/Cities.dat:2300 data/Cities.dat:2302
-#: data/Cities.dat:2307 data/Cities.dat:2308
-#: data/Cities.dat:2312 data/Cities.dat:2313
-#: data/Cities.dat:2314 data/Cities.dat:2316
-#: data/Cities.dat:2317 data/Cities.dat:2318
-#: data/Cities.dat:2319 data/Cities.dat:2320
-#: data/Cities.dat:2321 data/Cities.dat:2322
-#: data/Cities.dat:2325 data/Cities.dat:2333
-#: data/Cities.dat:2334 data/Cities.dat:2338
-#: data/Cities.dat:2339 data/Cities.dat:2341
-#: data/Cities.dat:2342 data/Cities.dat:2343
-#: data/Cities.dat:2344 data/Cities.dat:2345
-#: data/Cities.dat:2347 data/Cities.dat:2349
-#: data/Cities.dat:2350 data/Cities.dat:2351
-#: data/Cities.dat:2359 data/Cities.dat:2360
-#: data/Cities.dat:2365 data/Cities.dat:2366
-#: data/Cities.dat:2370 data/Cities.dat:2376
-#: data/Cities.dat:2379 data/Cities.dat:2381
-#: data/Cities.dat:2383 data/Cities.dat:2389
-#: data/Cities.dat:2390 data/Cities.dat:2391
-#: data/Cities.dat:2392 data/Cities.dat:2395
-#: data/Cities.dat:2398 data/Cities.dat:2399
-#: data/Cities.dat:2400 data/Cities.dat:2402
-#: data/Cities.dat:2403 data/Cities.dat:2404
-#: data/Cities.dat:2407 data/Cities.dat:2408
-#: data/Cities.dat:2409 data/Cities.dat:2410
-#: data/Cities.dat:2411 data/Cities.dat:2412
-#: data/Cities.dat:2413 data/Cities.dat:2414
-#: data/Cities.dat:2415 data/Cities.dat:2416
-#: data/Cities.dat:2417 data/Cities.dat:2418
-#: data/Cities.dat:2420 data/Cities.dat:2422
-#: data/Cities.dat:2423 data/Cities.dat:2424
-#: data/Cities.dat:2426 data/Cities.dat:2430
-#: data/Cities.dat:2432 data/Cities.dat:2434
-#: data/Cities.dat:2436 data/Cities.dat:2438
-#: data/Cities.dat:2441 data/Cities.dat:2444
-#: data/Cities.dat:2445 data/Cities.dat:2448
-#: data/Cities.dat:2449 data/Cities.dat:2450
-#: data/Cities.dat:2451 data/Cities.dat:2452
-#: data/Cities.dat:2455 data/Cities.dat:2456
-#: data/Cities.dat:2457 data/Cities.dat:2459
-#: data/Cities.dat:2461 data/Cities.dat:2465
-#: data/Cities.dat:2467 data/Cities.dat:2468
-#: data/Cities.dat:2470 data/Cities.dat:2471
-#: data/Cities.dat:2472 data/Cities.dat:2477
-#: data/Cities.dat:2482 data/Cities.dat:2485
-#: data/Cities.dat:2492 data/Cities.dat:2496
-#: data/Cities.dat:2507 data/Cities.dat:2512
-#: data/Cities.dat:2514 data/Cities.dat:2515
-#: data/Cities.dat:2518 data/Cities.dat:2520
-#: data/Cities.dat:2521 data/Cities.dat:2525
-#: data/Cities.dat:2528 data/Cities.dat:2529
-#: data/Cities.dat:2530 data/Cities.dat:2533
-#: data/Cities.dat:2536 data/Cities.dat:2546
-#: data/Cities.dat:2550 data/Cities.dat:2553
-#: data/Cities.dat:2555 data/Cities.dat:2556
-#: data/Cities.dat:2563 data/Cities.dat:2565
-#: data/Cities.dat:2568 data/Cities.dat:2572
-#: data/Cities.dat:2573 data/Cities.dat:2574
-#: data/Cities.dat:2577 data/Cities.dat:2578
-#: data/Cities.dat:2579 data/Cities.dat:2580
-#: data/Cities.dat:2582 data/Cities.dat:2584
-#: data/Cities.dat:2587 data/Cities.dat:2589
-#: data/Cities.dat:2590 data/Cities.dat:2594
-#: data/Cities.dat:2608 data/Cities.dat:2610
-#: data/Cities.dat:2611 data/Cities.dat:2612
-#: data/Cities.dat:2613 data/Cities.dat:2614
-#: data/Cities.dat:2617 data/Cities.dat:2619
-#: data/Cities.dat:2622 data/Cities.dat:2625
-#: data/Cities.dat:2626 data/Cities.dat:2627
-#: data/Cities.dat:2628 data/Cities.dat:2630
-#: data/Cities.dat:2632 data/Cities.dat:2637
-#: data/Cities.dat:2638 data/Cities.dat:2640
-#: data/Cities.dat:2646 data/Cities.dat:2649
-#: data/Cities.dat:2650 data/Cities.dat:2651
-#: data/Cities.dat:2652 data/Cities.dat:2654
-#: data/Cities.dat:2657 data/Cities.dat:2660
-#: data/Cities.dat:2665 data/Cities.dat:2666
-#: data/Cities.dat:2667 data/Cities.dat:2678
-#: data/Cities.dat:2679 data/Cities.dat:2683
-#: data/Cities.dat:2684 data/Cities.dat:2685
-#: data/Cities.dat:2686 data/Cities.dat:2687
-#: data/Cities.dat:2688 data/Cities.dat:2690
-#: data/Cities.dat:2691 data/Cities.dat:2692
-#: data/Cities.dat:2693 data/Cities.dat:2694
-#: data/Cities.dat:2695 data/Cities.dat:2696
-#: data/Cities.dat:2697 data/Cities.dat:2700
-#: data/Cities.dat:2701 data/Cities.dat:2702
-#: data/Cities.dat:2703 data/Cities.dat:2705
-#: data/Cities.dat:2706 data/Cities.dat:2707
-#: data/Cities.dat:2708 data/Cities.dat:2709
-#: data/Cities.dat:2710 data/Cities.dat:2711
-#: data/Cities.dat:2713 data/Cities.dat:2714
-#: data/Cities.dat:2715 data/Cities.dat:2716
-#: data/Cities.dat:2717 data/Cities.dat:2718
-#: data/Cities.dat:2719 data/Cities.dat:2720
-#: data/Cities.dat:2721 data/Cities.dat:2722
-#: data/Cities.dat:2723 data/Cities.dat:2724
-#: data/Cities.dat:2725 data/Cities.dat:2727
-#: data/Cities.dat:2728 data/Cities.dat:2729
-#: data/Cities.dat:2730 data/Cities.dat:2731
-#: data/Cities.dat:2732 data/Cities.dat:2733
-#: data/Cities.dat:2734 data/Cities.dat:2735
-#: data/Cities.dat:2737 data/Cities.dat:2738
-#: data/Cities.dat:2739 data/Cities.dat:2740
-#: data/Cities.dat:2741 data/Cities.dat:2742
-#: data/Cities.dat:2743 data/Cities.dat:2744
-#: data/Cities.dat:2746 data/Cities.dat:2747
-#: data/Cities.dat:2749 data/Cities.dat:2750
-#: data/Cities.dat:2751 data/Cities.dat:2752
-#: data/Cities.dat:2754 data/Cities.dat:2755
-#: data/Cities.dat:2756 data/Cities.dat:2757
-#: data/Cities.dat:2759 data/Cities.dat:2760
-#: data/Cities.dat:2761 data/Cities.dat:2762
-#: data/Cities.dat:2763 data/Cities.dat:2764
-#: data/Cities.dat:2765 data/Cities.dat:2766
-#: data/Cities.dat:2770 data/Cities.dat:2771
-#: data/Cities.dat:2772 data/Cities.dat:2773
-#: data/Cities.dat:2775 data/Cities.dat:2776
-#: data/Cities.dat:2777 data/Cities.dat:2778
-#: data/Cities.dat:2779 data/Cities.dat:2785
-#: data/Cities.dat:2786 data/Cities.dat:2787
-#: data/Cities.dat:2788 data/Cities.dat:2789
-#: data/Cities.dat:2790 data/Cities.dat:2794
-#: data/Cities.dat:2795 data/Cities.dat:2796
-#: data/Cities.dat:2797 data/Cities.dat:2798
-#: data/Cities.dat:2800 data/Cities.dat:2804
-#: data/Cities.dat:2807 data/Cities.dat:2816
-#: data/Cities.dat:2817 data/Cities.dat:2819
-#: data/Cities.dat:2820 data/Cities.dat:2822
-#: data/Cities.dat:2823 data/Cities.dat:2824
-#: data/Cities.dat:2825 data/Cities.dat:2829
+#: data/Cities.dat:7 data/Cities.dat:8 data/Cities.dat:10 data/Cities.dat:11
+#: data/Cities.dat:13 data/Cities.dat:14 data/Cities.dat:18 data/Cities.dat:19
+#: data/Cities.dat:20 data/Cities.dat:25 data/Cities.dat:26 data/Cities.dat:31
+#: data/Cities.dat:32 data/Cities.dat:33 data/Cities.dat:35 data/Cities.dat:36
+#: data/Cities.dat:39 data/Cities.dat:40 data/Cities.dat:41 data/Cities.dat:43
+#: data/Cities.dat:44 data/Cities.dat:45 data/Cities.dat:46 data/Cities.dat:47
+#: data/Cities.dat:49 data/Cities.dat:53 data/Cities.dat:55 data/Cities.dat:56
+#: data/Cities.dat:59 data/Cities.dat:62 data/Cities.dat:63 data/Cities.dat:64
+#: data/Cities.dat:67 data/Cities.dat:68 data/Cities.dat:70 data/Cities.dat:72
+#: data/Cities.dat:73 data/Cities.dat:74 data/Cities.dat:75 data/Cities.dat:76
+#: data/Cities.dat:77 data/Cities.dat:78 data/Cities.dat:83 data/Cities.dat:85
+#: data/Cities.dat:86 data/Cities.dat:88 data/Cities.dat:89 data/Cities.dat:95
+#: data/Cities.dat:97 data/Cities.dat:99 data/Cities.dat:100
+#: data/Cities.dat:103 data/Cities.dat:108 data/Cities.dat:110
+#: data/Cities.dat:113 data/Cities.dat:114 data/Cities.dat:117
+#: data/Cities.dat:119 data/Cities.dat:121 data/Cities.dat:122
+#: data/Cities.dat:123 data/Cities.dat:124 data/Cities.dat:126
+#: data/Cities.dat:129 data/Cities.dat:130 data/Cities.dat:131
+#: data/Cities.dat:132 data/Cities.dat:133 data/Cities.dat:134
+#: data/Cities.dat:135 data/Cities.dat:138 data/Cities.dat:140
+#: data/Cities.dat:146 data/Cities.dat:147 data/Cities.dat:148
+#: data/Cities.dat:149 data/Cities.dat:150 data/Cities.dat:151
+#: data/Cities.dat:152 data/Cities.dat:153 data/Cities.dat:154
+#: data/Cities.dat:157 data/Cities.dat:158 data/Cities.dat:159
+#: data/Cities.dat:160 data/Cities.dat:161 data/Cities.dat:162
+#: data/Cities.dat:163 data/Cities.dat:164 data/Cities.dat:167
+#: data/Cities.dat:169 data/Cities.dat:179 data/Cities.dat:180
+#: data/Cities.dat:182 data/Cities.dat:184 data/Cities.dat:195
+#: data/Cities.dat:198 data/Cities.dat:199 data/Cities.dat:204
+#: data/Cities.dat:206 data/Cities.dat:207 data/Cities.dat:208
+#: data/Cities.dat:209 data/Cities.dat:210 data/Cities.dat:211
+#: data/Cities.dat:215 data/Cities.dat:216 data/Cities.dat:217
+#: data/Cities.dat:218 data/Cities.dat:219 data/Cities.dat:220
+#: data/Cities.dat:222 data/Cities.dat:224 data/Cities.dat:225
+#: data/Cities.dat:226 data/Cities.dat:227 data/Cities.dat:228
+#: data/Cities.dat:229 data/Cities.dat:230 data/Cities.dat:236
+#: data/Cities.dat:241 data/Cities.dat:242 data/Cities.dat:243
+#: data/Cities.dat:244 data/Cities.dat:245 data/Cities.dat:246
+#: data/Cities.dat:248 data/Cities.dat:252 data/Cities.dat:253
+#: data/Cities.dat:258 data/Cities.dat:260 data/Cities.dat:262
+#: data/Cities.dat:263 data/Cities.dat:264 data/Cities.dat:265
+#: data/Cities.dat:266 data/Cities.dat:267 data/Cities.dat:268
+#: data/Cities.dat:269 data/Cities.dat:270 data/Cities.dat:272
+#: data/Cities.dat:273 data/Cities.dat:274 data/Cities.dat:277
+#: data/Cities.dat:280 data/Cities.dat:286 data/Cities.dat:289
+#: data/Cities.dat:290 data/Cities.dat:291 data/Cities.dat:292
+#: data/Cities.dat:293 data/Cities.dat:294 data/Cities.dat:297
+#: data/Cities.dat:301 data/Cities.dat:303 data/Cities.dat:304
+#: data/Cities.dat:310 data/Cities.dat:311 data/Cities.dat:313
+#: data/Cities.dat:314 data/Cities.dat:316 data/Cities.dat:318
+#: data/Cities.dat:319 data/Cities.dat:321 data/Cities.dat:322
+#: data/Cities.dat:323 data/Cities.dat:325 data/Cities.dat:327
+#: data/Cities.dat:328 data/Cities.dat:329 data/Cities.dat:331
+#: data/Cities.dat:334 data/Cities.dat:337 data/Cities.dat:342
+#: data/Cities.dat:346 data/Cities.dat:347 data/Cities.dat:349
+#: data/Cities.dat:353 data/Cities.dat:354 data/Cities.dat:355
+#: data/Cities.dat:356 data/Cities.dat:358 data/Cities.dat:359
+#: data/Cities.dat:360 data/Cities.dat:361 data/Cities.dat:362
+#: data/Cities.dat:363 data/Cities.dat:364 data/Cities.dat:365
+#: data/Cities.dat:366 data/Cities.dat:367 data/Cities.dat:375
+#: data/Cities.dat:377 data/Cities.dat:378 data/Cities.dat:382
+#: data/Cities.dat:384 data/Cities.dat:385 data/Cities.dat:386
+#: data/Cities.dat:387 data/Cities.dat:388 data/Cities.dat:389
+#: data/Cities.dat:390 data/Cities.dat:394 data/Cities.dat:404
+#: data/Cities.dat:406 data/Cities.dat:408 data/Cities.dat:409
+#: data/Cities.dat:410 data/Cities.dat:414 data/Cities.dat:416
+#: data/Cities.dat:417 data/Cities.dat:418 data/Cities.dat:419
+#: data/Cities.dat:420 data/Cities.dat:423 data/Cities.dat:424
+#: data/Cities.dat:426 data/Cities.dat:427 data/Cities.dat:428
+#: data/Cities.dat:429 data/Cities.dat:430 data/Cities.dat:431
+#: data/Cities.dat:433 data/Cities.dat:434 data/Cities.dat:435
+#: data/Cities.dat:438 data/Cities.dat:440 data/Cities.dat:444
+#: data/Cities.dat:446 data/Cities.dat:447 data/Cities.dat:448
+#: data/Cities.dat:449 data/Cities.dat:450 data/Cities.dat:451
+#: data/Cities.dat:456 data/Cities.dat:457 data/Cities.dat:458
+#: data/Cities.dat:459 data/Cities.dat:460 data/Cities.dat:462
+#: data/Cities.dat:463 data/Cities.dat:466 data/Cities.dat:468
+#: data/Cities.dat:473 data/Cities.dat:476 data/Cities.dat:477
+#: data/Cities.dat:478 data/Cities.dat:479 data/Cities.dat:480
+#: data/Cities.dat:483 data/Cities.dat:485 data/Cities.dat:486
+#: data/Cities.dat:487 data/Cities.dat:488 data/Cities.dat:489
+#: data/Cities.dat:491 data/Cities.dat:492 data/Cities.dat:493
+#: data/Cities.dat:502 data/Cities.dat:508 data/Cities.dat:509
+#: data/Cities.dat:510 data/Cities.dat:511 data/Cities.dat:513
+#: data/Cities.dat:514 data/Cities.dat:515 data/Cities.dat:516
+#: data/Cities.dat:517 data/Cities.dat:518 data/Cities.dat:519
+#: data/Cities.dat:520 data/Cities.dat:521 data/Cities.dat:522
+#: data/Cities.dat:524 data/Cities.dat:525 data/Cities.dat:526
+#: data/Cities.dat:527 data/Cities.dat:529 data/Cities.dat:531
+#: data/Cities.dat:533 data/Cities.dat:535 data/Cities.dat:537
+#: data/Cities.dat:538 data/Cities.dat:542 data/Cities.dat:543
+#: data/Cities.dat:544 data/Cities.dat:545 data/Cities.dat:546
+#: data/Cities.dat:547 data/Cities.dat:548 data/Cities.dat:549
+#: data/Cities.dat:550 data/Cities.dat:553 data/Cities.dat:556
+#: data/Cities.dat:557 data/Cities.dat:558 data/Cities.dat:560
+#: data/Cities.dat:561 data/Cities.dat:563 data/Cities.dat:564
+#: data/Cities.dat:565 data/Cities.dat:566 data/Cities.dat:567
+#: data/Cities.dat:568 data/Cities.dat:569 data/Cities.dat:570
+#: data/Cities.dat:572 data/Cities.dat:575 data/Cities.dat:576
+#: data/Cities.dat:577 data/Cities.dat:579 data/Cities.dat:580
+#: data/Cities.dat:581 data/Cities.dat:582 data/Cities.dat:583
+#: data/Cities.dat:584 data/Cities.dat:585 data/Cities.dat:586
+#: data/Cities.dat:587 data/Cities.dat:588 data/Cities.dat:592
+#: data/Cities.dat:593 data/Cities.dat:594 data/Cities.dat:604
+#: data/Cities.dat:606 data/Cities.dat:609 data/Cities.dat:610
+#: data/Cities.dat:611 data/Cities.dat:612 data/Cities.dat:618
+#: data/Cities.dat:619 data/Cities.dat:620 data/Cities.dat:621
+#: data/Cities.dat:623 data/Cities.dat:624 data/Cities.dat:625
+#: data/Cities.dat:626 data/Cities.dat:627 data/Cities.dat:628
+#: data/Cities.dat:630 data/Cities.dat:632 data/Cities.dat:633
+#: data/Cities.dat:634 data/Cities.dat:635 data/Cities.dat:636
+#: data/Cities.dat:637 data/Cities.dat:638 data/Cities.dat:639
+#: data/Cities.dat:640 data/Cities.dat:642 data/Cities.dat:643
+#: data/Cities.dat:644 data/Cities.dat:645 data/Cities.dat:647
+#: data/Cities.dat:648 data/Cities.dat:650 data/Cities.dat:651
+#: data/Cities.dat:652 data/Cities.dat:653 data/Cities.dat:656
+#: data/Cities.dat:657 data/Cities.dat:658 data/Cities.dat:663
+#: data/Cities.dat:671 data/Cities.dat:675 data/Cities.dat:676
+#: data/Cities.dat:677 data/Cities.dat:678 data/Cities.dat:686
+#: data/Cities.dat:689 data/Cities.dat:690 data/Cities.dat:692
+#: data/Cities.dat:694 data/Cities.dat:696 data/Cities.dat:697
+#: data/Cities.dat:699 data/Cities.dat:701 data/Cities.dat:702
+#: data/Cities.dat:703 data/Cities.dat:704 data/Cities.dat:705
+#: data/Cities.dat:706 data/Cities.dat:707 data/Cities.dat:709
+#: data/Cities.dat:710 data/Cities.dat:711 data/Cities.dat:712
+#: data/Cities.dat:713 data/Cities.dat:714 data/Cities.dat:715
+#: data/Cities.dat:716 data/Cities.dat:717 data/Cities.dat:719
+#: data/Cities.dat:721 data/Cities.dat:722 data/Cities.dat:725
+#: data/Cities.dat:728 data/Cities.dat:732 data/Cities.dat:733
+#: data/Cities.dat:735 data/Cities.dat:736 data/Cities.dat:738
+#: data/Cities.dat:741 data/Cities.dat:742 data/Cities.dat:743
+#: data/Cities.dat:744 data/Cities.dat:745 data/Cities.dat:746
+#: data/Cities.dat:747 data/Cities.dat:748 data/Cities.dat:749
+#: data/Cities.dat:750 data/Cities.dat:751 data/Cities.dat:752
+#: data/Cities.dat:753 data/Cities.dat:755 data/Cities.dat:756
+#: data/Cities.dat:757 data/Cities.dat:758 data/Cities.dat:759
+#: data/Cities.dat:761 data/Cities.dat:764 data/Cities.dat:767
+#: data/Cities.dat:771 data/Cities.dat:772 data/Cities.dat:773
+#: data/Cities.dat:774 data/Cities.dat:775 data/Cities.dat:776
+#: data/Cities.dat:777 data/Cities.dat:778 data/Cities.dat:779
+#: data/Cities.dat:780 data/Cities.dat:781 data/Cities.dat:782
+#: data/Cities.dat:783 data/Cities.dat:784 data/Cities.dat:787
+#: data/Cities.dat:788 data/Cities.dat:789 data/Cities.dat:790
+#: data/Cities.dat:791 data/Cities.dat:792 data/Cities.dat:793
+#: data/Cities.dat:794 data/Cities.dat:795 data/Cities.dat:796
+#: data/Cities.dat:797 data/Cities.dat:798 data/Cities.dat:799
+#: data/Cities.dat:800 data/Cities.dat:802 data/Cities.dat:803
+#: data/Cities.dat:805 data/Cities.dat:808 data/Cities.dat:809
+#: data/Cities.dat:810 data/Cities.dat:811 data/Cities.dat:812
+#: data/Cities.dat:814 data/Cities.dat:815 data/Cities.dat:816
+#: data/Cities.dat:817 data/Cities.dat:819 data/Cities.dat:820
+#: data/Cities.dat:821 data/Cities.dat:823 data/Cities.dat:824
+#: data/Cities.dat:825 data/Cities.dat:826 data/Cities.dat:827
+#: data/Cities.dat:828 data/Cities.dat:831 data/Cities.dat:833
+#: data/Cities.dat:834 data/Cities.dat:835 data/Cities.dat:836
+#: data/Cities.dat:837 data/Cities.dat:840 data/Cities.dat:841
+#: data/Cities.dat:842 data/Cities.dat:843 data/Cities.dat:844
+#: data/Cities.dat:845 data/Cities.dat:848 data/Cities.dat:850
+#: data/Cities.dat:851 data/Cities.dat:852 data/Cities.dat:854
+#: data/Cities.dat:855 data/Cities.dat:856 data/Cities.dat:860
+#: data/Cities.dat:864 data/Cities.dat:865 data/Cities.dat:866
+#: data/Cities.dat:867 data/Cities.dat:868 data/Cities.dat:871
+#: data/Cities.dat:878 data/Cities.dat:879 data/Cities.dat:880
+#: data/Cities.dat:881 data/Cities.dat:882 data/Cities.dat:883
+#: data/Cities.dat:884 data/Cities.dat:890 data/Cities.dat:891
+#: data/Cities.dat:892 data/Cities.dat:893 data/Cities.dat:894
+#: data/Cities.dat:896 data/Cities.dat:898 data/Cities.dat:899
+#: data/Cities.dat:914 data/Cities.dat:919 data/Cities.dat:920
+#: data/Cities.dat:922 data/Cities.dat:924 data/Cities.dat:925
+#: data/Cities.dat:926 data/Cities.dat:927 data/Cities.dat:928
+#: data/Cities.dat:929 data/Cities.dat:930 data/Cities.dat:934
+#: data/Cities.dat:935 data/Cities.dat:936 data/Cities.dat:938
+#: data/Cities.dat:939 data/Cities.dat:944 data/Cities.dat:945
+#: data/Cities.dat:946 data/Cities.dat:947 data/Cities.dat:948
+#: data/Cities.dat:949 data/Cities.dat:950 data/Cities.dat:951
+#: data/Cities.dat:952 data/Cities.dat:953 data/Cities.dat:954
+#: data/Cities.dat:955 data/Cities.dat:956 data/Cities.dat:957
+#: data/Cities.dat:958 data/Cities.dat:959 data/Cities.dat:960
+#: data/Cities.dat:961 data/Cities.dat:962 data/Cities.dat:963
+#: data/Cities.dat:964 data/Cities.dat:965 data/Cities.dat:966
+#: data/Cities.dat:967 data/Cities.dat:969 data/Cities.dat:970
+#: data/Cities.dat:971 data/Cities.dat:974 data/Cities.dat:977
+#: data/Cities.dat:978 data/Cities.dat:985 data/Cities.dat:986
+#: data/Cities.dat:991 data/Cities.dat:1003 data/Cities.dat:1005
+#: data/Cities.dat:1006 data/Cities.dat:1007 data/Cities.dat:1008
+#: data/Cities.dat:1012 data/Cities.dat:1014 data/Cities.dat:1017
+#: data/Cities.dat:1018 data/Cities.dat:1019 data/Cities.dat:1020
+#: data/Cities.dat:1021 data/Cities.dat:1022 data/Cities.dat:1023
+#: data/Cities.dat:1031 data/Cities.dat:1032 data/Cities.dat:1033
+#: data/Cities.dat:1034 data/Cities.dat:1035 data/Cities.dat:1036
+#: data/Cities.dat:1037 data/Cities.dat:1038 data/Cities.dat:1040
+#: data/Cities.dat:1041 data/Cities.dat:1043 data/Cities.dat:1044
+#: data/Cities.dat:1046 data/Cities.dat:1047 data/Cities.dat:1049
+#: data/Cities.dat:1050 data/Cities.dat:1051 data/Cities.dat:1052
+#: data/Cities.dat:1053 data/Cities.dat:1054 data/Cities.dat:1057
+#: data/Cities.dat:1062 data/Cities.dat:1063 data/Cities.dat:1064
+#: data/Cities.dat:1065 data/Cities.dat:1070 data/Cities.dat:1071
+#: data/Cities.dat:1073 data/Cities.dat:1074 data/Cities.dat:1075
+#: data/Cities.dat:1076 data/Cities.dat:1078 data/Cities.dat:1079
+#: data/Cities.dat:1080 data/Cities.dat:1082 data/Cities.dat:1084
+#: data/Cities.dat:1087 data/Cities.dat:1088 data/Cities.dat:1089
+#: data/Cities.dat:1090 data/Cities.dat:1091 data/Cities.dat:1092
+#: data/Cities.dat:1095 data/Cities.dat:1096 data/Cities.dat:1101
+#: data/Cities.dat:1102 data/Cities.dat:1103 data/Cities.dat:1104
+#: data/Cities.dat:1107 data/Cities.dat:1108 data/Cities.dat:1109
+#: data/Cities.dat:1115 data/Cities.dat:1117 data/Cities.dat:1118
+#: data/Cities.dat:1119 data/Cities.dat:1120 data/Cities.dat:1121
+#: data/Cities.dat:1122 data/Cities.dat:1123 data/Cities.dat:1124
+#: data/Cities.dat:1130 data/Cities.dat:1134 data/Cities.dat:1135
+#: data/Cities.dat:1136 data/Cities.dat:1138 data/Cities.dat:1142
+#: data/Cities.dat:1146 data/Cities.dat:1147 data/Cities.dat:1148
+#: data/Cities.dat:1149 data/Cities.dat:1159 data/Cities.dat:1160
+#: data/Cities.dat:1161 data/Cities.dat:1162 data/Cities.dat:1163
+#: data/Cities.dat:1166 data/Cities.dat:1167 data/Cities.dat:1176
+#: data/Cities.dat:1179 data/Cities.dat:1183 data/Cities.dat:1189
+#: data/Cities.dat:1191 data/Cities.dat:1192 data/Cities.dat:1193
+#: data/Cities.dat:1194 data/Cities.dat:1195 data/Cities.dat:1196
+#: data/Cities.dat:1202 data/Cities.dat:1204 data/Cities.dat:1205
+#: data/Cities.dat:1208 data/Cities.dat:1209 data/Cities.dat:1210
+#: data/Cities.dat:1212 data/Cities.dat:1218 data/Cities.dat:1219
+#: data/Cities.dat:1220 data/Cities.dat:1221 data/Cities.dat:1223
+#: data/Cities.dat:1225 data/Cities.dat:1226 data/Cities.dat:1229
+#: data/Cities.dat:1230 data/Cities.dat:1238 data/Cities.dat:1240
+#: data/Cities.dat:1241 data/Cities.dat:1242 data/Cities.dat:1246
+#: data/Cities.dat:1247 data/Cities.dat:1249 data/Cities.dat:1251
+#: data/Cities.dat:1252 data/Cities.dat:1254 data/Cities.dat:1255
+#: data/Cities.dat:1256 data/Cities.dat:1265 data/Cities.dat:1267
+#: data/Cities.dat:1268 data/Cities.dat:1269 data/Cities.dat:1271
+#: data/Cities.dat:1279 data/Cities.dat:1281 data/Cities.dat:1283
+#: data/Cities.dat:1286 data/Cities.dat:1287 data/Cities.dat:1288
+#: data/Cities.dat:1291 data/Cities.dat:1293 data/Cities.dat:1295
+#: data/Cities.dat:1296 data/Cities.dat:1299 data/Cities.dat:1300
+#: data/Cities.dat:1307 data/Cities.dat:1317 data/Cities.dat:1329
+#: data/Cities.dat:1330 data/Cities.dat:1331 data/Cities.dat:1333
+#: data/Cities.dat:1339 data/Cities.dat:1340 data/Cities.dat:1341
+#: data/Cities.dat:1342 data/Cities.dat:1343 data/Cities.dat:1349
+#: data/Cities.dat:1350 data/Cities.dat:1351 data/Cities.dat:1352
+#: data/Cities.dat:1353 data/Cities.dat:1354 data/Cities.dat:1355
+#: data/Cities.dat:1356 data/Cities.dat:1357 data/Cities.dat:1358
+#: data/Cities.dat:1359 data/Cities.dat:1362 data/Cities.dat:1363
+#: data/Cities.dat:1364 data/Cities.dat:1365 data/Cities.dat:1366
+#: data/Cities.dat:1367 data/Cities.dat:1368 data/Cities.dat:1369
+#: data/Cities.dat:1371 data/Cities.dat:1373 data/Cities.dat:1376
+#: data/Cities.dat:1377 data/Cities.dat:1378 data/Cities.dat:1381
+#: data/Cities.dat:1382 data/Cities.dat:1383 data/Cities.dat:1384
+#: data/Cities.dat:1387 data/Cities.dat:1388 data/Cities.dat:1389
+#: data/Cities.dat:1390 data/Cities.dat:1391 data/Cities.dat:1401
+#: data/Cities.dat:1406 data/Cities.dat:1407 data/Cities.dat:1408
+#: data/Cities.dat:1409 data/Cities.dat:1410 data/Cities.dat:1411
+#: data/Cities.dat:1412 data/Cities.dat:1416 data/Cities.dat:1417
+#: data/Cities.dat:1421 data/Cities.dat:1422 data/Cities.dat:1423
+#: data/Cities.dat:1424 data/Cities.dat:1425 data/Cities.dat:1429
+#: data/Cities.dat:1430 data/Cities.dat:1431 data/Cities.dat:1432
+#: data/Cities.dat:1434 data/Cities.dat:1435 data/Cities.dat:1437
+#: data/Cities.dat:1442 data/Cities.dat:1443 data/Cities.dat:1447
+#: data/Cities.dat:1449 data/Cities.dat:1453 data/Cities.dat:1454
+#: data/Cities.dat:1455 data/Cities.dat:1456 data/Cities.dat:1457
+#: data/Cities.dat:1458 data/Cities.dat:1459 data/Cities.dat:1460
+#: data/Cities.dat:1461 data/Cities.dat:1462 data/Cities.dat:1464
+#: data/Cities.dat:1465 data/Cities.dat:1466 data/Cities.dat:1467
+#: data/Cities.dat:1469 data/Cities.dat:1479 data/Cities.dat:1480
+#: data/Cities.dat:1481 data/Cities.dat:1482 data/Cities.dat:1491
+#: data/Cities.dat:1492 data/Cities.dat:1493 data/Cities.dat:1494
+#: data/Cities.dat:1495 data/Cities.dat:1496 data/Cities.dat:1500
+#: data/Cities.dat:1502 data/Cities.dat:1513 data/Cities.dat:1517
+#: data/Cities.dat:1522 data/Cities.dat:1523 data/Cities.dat:1525
+#: data/Cities.dat:1527 data/Cities.dat:1528 data/Cities.dat:1529
+#: data/Cities.dat:1531 data/Cities.dat:1534 data/Cities.dat:1535
+#: data/Cities.dat:1536 data/Cities.dat:1542 data/Cities.dat:1543
+#: data/Cities.dat:1550 data/Cities.dat:1551 data/Cities.dat:1554
+#: data/Cities.dat:1555 data/Cities.dat:1556 data/Cities.dat:1559
+#: data/Cities.dat:1560 data/Cities.dat:1566 data/Cities.dat:1567
+#: data/Cities.dat:1568 data/Cities.dat:1570 data/Cities.dat:1574
+#: data/Cities.dat:1575 data/Cities.dat:1576 data/Cities.dat:1577
+#: data/Cities.dat:1578 data/Cities.dat:1579 data/Cities.dat:1580
+#: data/Cities.dat:1581 data/Cities.dat:1582 data/Cities.dat:1583
+#: data/Cities.dat:1585 data/Cities.dat:1586 data/Cities.dat:1594
+#: data/Cities.dat:1601 data/Cities.dat:1602 data/Cities.dat:1603
+#: data/Cities.dat:1607 data/Cities.dat:1608 data/Cities.dat:1609
+#: data/Cities.dat:1610 data/Cities.dat:1612 data/Cities.dat:1613
+#: data/Cities.dat:1617 data/Cities.dat:1618 data/Cities.dat:1620
+#: data/Cities.dat:1626 data/Cities.dat:1630 data/Cities.dat:1631
+#: data/Cities.dat:1633 data/Cities.dat:1636 data/Cities.dat:1637
+#: data/Cities.dat:1638 data/Cities.dat:1641 data/Cities.dat:1644
+#: data/Cities.dat:1646 data/Cities.dat:1647 data/Cities.dat:1648
+#: data/Cities.dat:1649 data/Cities.dat:1652 data/Cities.dat:1653
+#: data/Cities.dat:1654 data/Cities.dat:1655 data/Cities.dat:1656
+#: data/Cities.dat:1657 data/Cities.dat:1658 data/Cities.dat:1659
+#: data/Cities.dat:1660 data/Cities.dat:1661 data/Cities.dat:1663
+#: data/Cities.dat:1666 data/Cities.dat:1669 data/Cities.dat:1670
+#: data/Cities.dat:1673 data/Cities.dat:1674 data/Cities.dat:1676
+#: data/Cities.dat:1677 data/Cities.dat:1681 data/Cities.dat:1682
+#: data/Cities.dat:1686 data/Cities.dat:1690 data/Cities.dat:1692
+#: data/Cities.dat:1693 data/Cities.dat:1695 data/Cities.dat:1696
+#: data/Cities.dat:1697 data/Cities.dat:1698 data/Cities.dat:1699
+#: data/Cities.dat:1700 data/Cities.dat:1701 data/Cities.dat:1704
+#: data/Cities.dat:1706 data/Cities.dat:1707 data/Cities.dat:1708
+#: data/Cities.dat:1711 data/Cities.dat:1712 data/Cities.dat:1713
+#: data/Cities.dat:1716 data/Cities.dat:1717 data/Cities.dat:1721
+#: data/Cities.dat:1722 data/Cities.dat:1724 data/Cities.dat:1726
+#: data/Cities.dat:1729 data/Cities.dat:1730 data/Cities.dat:1731
+#: data/Cities.dat:1732 data/Cities.dat:1733 data/Cities.dat:1736
+#: data/Cities.dat:1737 data/Cities.dat:1740 data/Cities.dat:1742
+#: data/Cities.dat:1743 data/Cities.dat:1744 data/Cities.dat:1749
+#: data/Cities.dat:1759 data/Cities.dat:1771 data/Cities.dat:1777
+#: data/Cities.dat:1778 data/Cities.dat:1780 data/Cities.dat:1783
+#: data/Cities.dat:1784 data/Cities.dat:1786 data/Cities.dat:1788
+#: data/Cities.dat:1790 data/Cities.dat:1791 data/Cities.dat:1792
+#: data/Cities.dat:1794 data/Cities.dat:1795 data/Cities.dat:1796
+#: data/Cities.dat:1797 data/Cities.dat:1798 data/Cities.dat:1799
+#: data/Cities.dat:1800 data/Cities.dat:1801 data/Cities.dat:1803
+#: data/Cities.dat:1805 data/Cities.dat:1806 data/Cities.dat:1807
+#: data/Cities.dat:1808 data/Cities.dat:1809 data/Cities.dat:1810
+#: data/Cities.dat:1811 data/Cities.dat:1812 data/Cities.dat:1813
+#: data/Cities.dat:1814 data/Cities.dat:1815 data/Cities.dat:1816
+#: data/Cities.dat:1817 data/Cities.dat:1819 data/Cities.dat:1820
+#: data/Cities.dat:1821 data/Cities.dat:1822 data/Cities.dat:1823
+#: data/Cities.dat:1824 data/Cities.dat:1825 data/Cities.dat:1826
+#: data/Cities.dat:1827 data/Cities.dat:1828 data/Cities.dat:1830
+#: data/Cities.dat:1835 data/Cities.dat:1838 data/Cities.dat:1839
+#: data/Cities.dat:1840 data/Cities.dat:1841 data/Cities.dat:1842
+#: data/Cities.dat:1843 data/Cities.dat:1845 data/Cities.dat:1846
+#: data/Cities.dat:1847 data/Cities.dat:1848 data/Cities.dat:1849
+#: data/Cities.dat:1850 data/Cities.dat:1851 data/Cities.dat:1852
+#: data/Cities.dat:1853 data/Cities.dat:1854 data/Cities.dat:1855
+#: data/Cities.dat:1856 data/Cities.dat:1857 data/Cities.dat:1858
+#: data/Cities.dat:1859 data/Cities.dat:1860 data/Cities.dat:1861
+#: data/Cities.dat:1862 data/Cities.dat:1868 data/Cities.dat:1873
+#: data/Cities.dat:1874 data/Cities.dat:1875 data/Cities.dat:1876
+#: data/Cities.dat:1877 data/Cities.dat:1878 data/Cities.dat:1880
+#: data/Cities.dat:1885 data/Cities.dat:1886 data/Cities.dat:1887
+#: data/Cities.dat:1888 data/Cities.dat:1891 data/Cities.dat:1893
+#: data/Cities.dat:1894 data/Cities.dat:1899 data/Cities.dat:1900
+#: data/Cities.dat:1904 data/Cities.dat:1905 data/Cities.dat:1906
+#: data/Cities.dat:1910 data/Cities.dat:1913 data/Cities.dat:1914
+#: data/Cities.dat:1917 data/Cities.dat:1918 data/Cities.dat:1920
+#: data/Cities.dat:1921 data/Cities.dat:1923 data/Cities.dat:1926
+#: data/Cities.dat:1929 data/Cities.dat:1930 data/Cities.dat:1936
+#: data/Cities.dat:1940 data/Cities.dat:1942 data/Cities.dat:1943
+#: data/Cities.dat:1945 data/Cities.dat:1946 data/Cities.dat:1947
+#: data/Cities.dat:1949 data/Cities.dat:1951 data/Cities.dat:1952
+#: data/Cities.dat:1953 data/Cities.dat:1956 data/Cities.dat:1965
+#: data/Cities.dat:1967 data/Cities.dat:1968 data/Cities.dat:1969
+#: data/Cities.dat:1972 data/Cities.dat:1975 data/Cities.dat:1977
+#: data/Cities.dat:1979 data/Cities.dat:1980 data/Cities.dat:1981
+#: data/Cities.dat:1984 data/Cities.dat:1985 data/Cities.dat:1986
+#: data/Cities.dat:1987 data/Cities.dat:1988 data/Cities.dat:1989
+#: data/Cities.dat:1991 data/Cities.dat:1996 data/Cities.dat:1998
+#: data/Cities.dat:1999 data/Cities.dat:2001 data/Cities.dat:2002
+#: data/Cities.dat:2006 data/Cities.dat:2007 data/Cities.dat:2013
+#: data/Cities.dat:2014 data/Cities.dat:2020 data/Cities.dat:2021
+#: data/Cities.dat:2022 data/Cities.dat:2023 data/Cities.dat:2027
+#: data/Cities.dat:2028 data/Cities.dat:2030 data/Cities.dat:2031
+#: data/Cities.dat:2032 data/Cities.dat:2033 data/Cities.dat:2034
+#: data/Cities.dat:2036 data/Cities.dat:2037 data/Cities.dat:2039
+#: data/Cities.dat:2040 data/Cities.dat:2042 data/Cities.dat:2045
+#: data/Cities.dat:2047 data/Cities.dat:2048 data/Cities.dat:2049
+#: data/Cities.dat:2050 data/Cities.dat:2051 data/Cities.dat:2055
+#: data/Cities.dat:2057 data/Cities.dat:2058 data/Cities.dat:2059
+#: data/Cities.dat:2060 data/Cities.dat:2061 data/Cities.dat:2063
+#: data/Cities.dat:2064 data/Cities.dat:2065 data/Cities.dat:2067
+#: data/Cities.dat:2068 data/Cities.dat:2072 data/Cities.dat:2074
+#: data/Cities.dat:2076 data/Cities.dat:2079 data/Cities.dat:2080
+#: data/Cities.dat:2083 data/Cities.dat:2084 data/Cities.dat:2085
+#: data/Cities.dat:2088 data/Cities.dat:2090 data/Cities.dat:2091
+#: data/Cities.dat:2095 data/Cities.dat:2096 data/Cities.dat:2097
+#: data/Cities.dat:2099 data/Cities.dat:2103 data/Cities.dat:2104
+#: data/Cities.dat:2105 data/Cities.dat:2106 data/Cities.dat:2108
+#: data/Cities.dat:2109 data/Cities.dat:2110 data/Cities.dat:2112
+#: data/Cities.dat:2113 data/Cities.dat:2115 data/Cities.dat:2117
+#: data/Cities.dat:2121 data/Cities.dat:2122 data/Cities.dat:2127
+#: data/Cities.dat:2130 data/Cities.dat:2136 data/Cities.dat:2138
+#: data/Cities.dat:2141 data/Cities.dat:2143 data/Cities.dat:2144
+#: data/Cities.dat:2146 data/Cities.dat:2151 data/Cities.dat:2152
+#: data/Cities.dat:2155 data/Cities.dat:2156 data/Cities.dat:2157
+#: data/Cities.dat:2165 data/Cities.dat:2166 data/Cities.dat:2167
+#: data/Cities.dat:2169 data/Cities.dat:2171 data/Cities.dat:2172
+#: data/Cities.dat:2173 data/Cities.dat:2174 data/Cities.dat:2176
+#: data/Cities.dat:2177 data/Cities.dat:2178 data/Cities.dat:2185
+#: data/Cities.dat:2186 data/Cities.dat:2188 data/Cities.dat:2189
+#: data/Cities.dat:2192 data/Cities.dat:2193 data/Cities.dat:2194
+#: data/Cities.dat:2195 data/Cities.dat:2196 data/Cities.dat:2197
+#: data/Cities.dat:2198 data/Cities.dat:2199 data/Cities.dat:2200
+#: data/Cities.dat:2201 data/Cities.dat:2202 data/Cities.dat:2203
+#: data/Cities.dat:2205 data/Cities.dat:2207 data/Cities.dat:2209
+#: data/Cities.dat:2210 data/Cities.dat:2211 data/Cities.dat:2215
+#: data/Cities.dat:2216 data/Cities.dat:2220 data/Cities.dat:2221
+#: data/Cities.dat:2222 data/Cities.dat:2223 data/Cities.dat:2224
+#: data/Cities.dat:2225 data/Cities.dat:2226 data/Cities.dat:2227
+#: data/Cities.dat:2229 data/Cities.dat:2235 data/Cities.dat:2236
+#: data/Cities.dat:2237 data/Cities.dat:2238 data/Cities.dat:2243
+#: data/Cities.dat:2244 data/Cities.dat:2245 data/Cities.dat:2246
+#: data/Cities.dat:2248 data/Cities.dat:2249 data/Cities.dat:2250
+#: data/Cities.dat:2251 data/Cities.dat:2252 data/Cities.dat:2253
+#: data/Cities.dat:2254 data/Cities.dat:2255 data/Cities.dat:2260
+#: data/Cities.dat:2261 data/Cities.dat:2262 data/Cities.dat:2263
+#: data/Cities.dat:2265 data/Cities.dat:2267 data/Cities.dat:2268
+#: data/Cities.dat:2269 data/Cities.dat:2270 data/Cities.dat:2271
+#: data/Cities.dat:2277 data/Cities.dat:2278 data/Cities.dat:2280
+#: data/Cities.dat:2281 data/Cities.dat:2282 data/Cities.dat:2283
+#: data/Cities.dat:2284 data/Cities.dat:2288 data/Cities.dat:2289
+#: data/Cities.dat:2291 data/Cities.dat:2292 data/Cities.dat:2293
+#: data/Cities.dat:2300 data/Cities.dat:2302 data/Cities.dat:2307
+#: data/Cities.dat:2308 data/Cities.dat:2312 data/Cities.dat:2313
+#: data/Cities.dat:2314 data/Cities.dat:2316 data/Cities.dat:2317
+#: data/Cities.dat:2318 data/Cities.dat:2319 data/Cities.dat:2320
+#: data/Cities.dat:2321 data/Cities.dat:2322 data/Cities.dat:2325
+#: data/Cities.dat:2333 data/Cities.dat:2334 data/Cities.dat:2338
+#: data/Cities.dat:2339 data/Cities.dat:2341 data/Cities.dat:2342
+#: data/Cities.dat:2343 data/Cities.dat:2344 data/Cities.dat:2345
+#: data/Cities.dat:2347 data/Cities.dat:2349 data/Cities.dat:2350
+#: data/Cities.dat:2351 data/Cities.dat:2359 data/Cities.dat:2360
+#: data/Cities.dat:2365 data/Cities.dat:2366 data/Cities.dat:2370
+#: data/Cities.dat:2376 data/Cities.dat:2379 data/Cities.dat:2381
+#: data/Cities.dat:2383 data/Cities.dat:2389 data/Cities.dat:2390
+#: data/Cities.dat:2391 data/Cities.dat:2392 data/Cities.dat:2395
+#: data/Cities.dat:2398 data/Cities.dat:2399 data/Cities.dat:2400
+#: data/Cities.dat:2402 data/Cities.dat:2403 data/Cities.dat:2404
+#: data/Cities.dat:2407 data/Cities.dat:2408 data/Cities.dat:2409
+#: data/Cities.dat:2410 data/Cities.dat:2411 data/Cities.dat:2412
+#: data/Cities.dat:2413 data/Cities.dat:2414 data/Cities.dat:2415
+#: data/Cities.dat:2416 data/Cities.dat:2417 data/Cities.dat:2418
+#: data/Cities.dat:2420 data/Cities.dat:2422 data/Cities.dat:2423
+#: data/Cities.dat:2424 data/Cities.dat:2426 data/Cities.dat:2430
+#: data/Cities.dat:2432 data/Cities.dat:2434 data/Cities.dat:2436
+#: data/Cities.dat:2438 data/Cities.dat:2441 data/Cities.dat:2444
+#: data/Cities.dat:2445 data/Cities.dat:2448 data/Cities.dat:2449
+#: data/Cities.dat:2450 data/Cities.dat:2451 data/Cities.dat:2452
+#: data/Cities.dat:2455 data/Cities.dat:2456 data/Cities.dat:2457
+#: data/Cities.dat:2459 data/Cities.dat:2461 data/Cities.dat:2465
+#: data/Cities.dat:2467 data/Cities.dat:2468 data/Cities.dat:2470
+#: data/Cities.dat:2471 data/Cities.dat:2472 data/Cities.dat:2477
+#: data/Cities.dat:2482 data/Cities.dat:2485 data/Cities.dat:2492
+#: data/Cities.dat:2496 data/Cities.dat:2507 data/Cities.dat:2512
+#: data/Cities.dat:2514 data/Cities.dat:2515 data/Cities.dat:2518
+#: data/Cities.dat:2520 data/Cities.dat:2521 data/Cities.dat:2525
+#: data/Cities.dat:2528 data/Cities.dat:2529 data/Cities.dat:2530
+#: data/Cities.dat:2533 data/Cities.dat:2536 data/Cities.dat:2546
+#: data/Cities.dat:2550 data/Cities.dat:2553 data/Cities.dat:2555
+#: data/Cities.dat:2556 data/Cities.dat:2563 data/Cities.dat:2565
+#: data/Cities.dat:2568 data/Cities.dat:2572 data/Cities.dat:2573
+#: data/Cities.dat:2574 data/Cities.dat:2577 data/Cities.dat:2578
+#: data/Cities.dat:2579 data/Cities.dat:2580 data/Cities.dat:2582
+#: data/Cities.dat:2584 data/Cities.dat:2587 data/Cities.dat:2589
+#: data/Cities.dat:2590 data/Cities.dat:2594 data/Cities.dat:2608
+#: data/Cities.dat:2610 data/Cities.dat:2611 data/Cities.dat:2612
+#: data/Cities.dat:2613 data/Cities.dat:2614 data/Cities.dat:2617
+#: data/Cities.dat:2619 data/Cities.dat:2622 data/Cities.dat:2625
+#: data/Cities.dat:2626 data/Cities.dat:2627 data/Cities.dat:2628
+#: data/Cities.dat:2630 data/Cities.dat:2632 data/Cities.dat:2637
+#: data/Cities.dat:2638 data/Cities.dat:2640 data/Cities.dat:2646
+#: data/Cities.dat:2649 data/Cities.dat:2650 data/Cities.dat:2651
+#: data/Cities.dat:2652 data/Cities.dat:2654 data/Cities.dat:2657
+#: data/Cities.dat:2660 data/Cities.dat:2665 data/Cities.dat:2666
+#: data/Cities.dat:2667 data/Cities.dat:2678 data/Cities.dat:2679
+#: data/Cities.dat:2683 data/Cities.dat:2684 data/Cities.dat:2685
+#: data/Cities.dat:2686 data/Cities.dat:2687 data/Cities.dat:2688
+#: data/Cities.dat:2690 data/Cities.dat:2691 data/Cities.dat:2692
+#: data/Cities.dat:2693 data/Cities.dat:2694 data/Cities.dat:2695
+#: data/Cities.dat:2696 data/Cities.dat:2697 data/Cities.dat:2700
+#: data/Cities.dat:2701 data/Cities.dat:2702 data/Cities.dat:2703
+#: data/Cities.dat:2705 data/Cities.dat:2706 data/Cities.dat:2707
+#: data/Cities.dat:2708 data/Cities.dat:2709 data/Cities.dat:2710
+#: data/Cities.dat:2711 data/Cities.dat:2713 data/Cities.dat:2714
+#: data/Cities.dat:2715 data/Cities.dat:2716 data/Cities.dat:2717
+#: data/Cities.dat:2718 data/Cities.dat:2719 data/Cities.dat:2720
+#: data/Cities.dat:2721 data/Cities.dat:2722 data/Cities.dat:2723
+#: data/Cities.dat:2724 data/Cities.dat:2725 data/Cities.dat:2727
+#: data/Cities.dat:2728 data/Cities.dat:2729 data/Cities.dat:2730
+#: data/Cities.dat:2731 data/Cities.dat:2732 data/Cities.dat:2733
+#: data/Cities.dat:2734 data/Cities.dat:2735 data/Cities.dat:2737
+#: data/Cities.dat:2738 data/Cities.dat:2739 data/Cities.dat:2740
+#: data/Cities.dat:2741 data/Cities.dat:2742 data/Cities.dat:2743
+#: data/Cities.dat:2744 data/Cities.dat:2746 data/Cities.dat:2747
+#: data/Cities.dat:2749 data/Cities.dat:2750 data/Cities.dat:2751
+#: data/Cities.dat:2752 data/Cities.dat:2754 data/Cities.dat:2755
+#: data/Cities.dat:2756 data/Cities.dat:2757 data/Cities.dat:2759
+#: data/Cities.dat:2760 data/Cities.dat:2761 data/Cities.dat:2762
+#: data/Cities.dat:2763 data/Cities.dat:2764 data/Cities.dat:2765
+#: data/Cities.dat:2766 data/Cities.dat:2770 data/Cities.dat:2771
+#: data/Cities.dat:2772 data/Cities.dat:2773 data/Cities.dat:2775
+#: data/Cities.dat:2776 data/Cities.dat:2777 data/Cities.dat:2778
+#: data/Cities.dat:2779 data/Cities.dat:2785 data/Cities.dat:2786
+#: data/Cities.dat:2787 data/Cities.dat:2788 data/Cities.dat:2789
+#: data/Cities.dat:2790 data/Cities.dat:2794 data/Cities.dat:2795
+#: data/Cities.dat:2796 data/Cities.dat:2797 data/Cities.dat:2798
+#: data/Cities.dat:2800 data/Cities.dat:2804 data/Cities.dat:2807
+#: data/Cities.dat:2816 data/Cities.dat:2817 data/Cities.dat:2819
+#: data/Cities.dat:2820 data/Cities.dat:2822 data/Cities.dat:2823
+#: data/Cities.dat:2824 data/Cities.dat:2825 data/Cities.dat:2829
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "USA"
 msgstr ""
 
-#: data/Cities.dat:8 data/Cities.dat:97
-#: data/Cities.dat:184 data/Cities.dat:263
-#: data/Cities.dat:327 data/Cities.dat:408
-#: data/Cities.dat:417 data/Cities.dat:450
-#: data/Cities.dat:531 data/Cities.dat:537
-#: data/Cities.dat:593 data/Cities.dat:690
-#: data/Cities.dat:854 data/Cities.dat:881
-#: data/Cities.dat:962 data/Cities.dat:1003
-#: data/Cities.dat:1377 data/Cities.dat:1799
-#: data/Cities.dat:1886 data/Cities.dat:2051
-#: data/Cities.dat:2088 data/Cities.dat:2201
-#: data/Cities.dat:2251 data/Cities.dat:2359
-#: data/Cities.dat:2434 data/Cities.dat:2741
-#: data/Cities.dat:2743
+#: data/Cities.dat:8 data/Cities.dat:97 data/Cities.dat:184 data/Cities.dat:263
+#: data/Cities.dat:327 data/Cities.dat:408 data/Cities.dat:417
+#: data/Cities.dat:450 data/Cities.dat:531 data/Cities.dat:537
+#: data/Cities.dat:593 data/Cities.dat:690 data/Cities.dat:854
+#: data/Cities.dat:881 data/Cities.dat:962 data/Cities.dat:1003
+#: data/Cities.dat:1377 data/Cities.dat:1799 data/Cities.dat:1886
+#: data/Cities.dat:2051 data/Cities.dat:2088 data/Cities.dat:2201
+#: data/Cities.dat:2251 data/Cities.dat:2359 data/Cities.dat:2434
+#: data/Cities.dat:2741 data/Cities.dat:2743
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Maryland"
 msgstr ""
 
-#: data/Cities.dat:9 data/Cities.dat:720
-#: data/Cities.dat:923
+#: data/Cities.dat:9 data/Cities.dat:720 data/Cities.dat:923
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Scotland"
 msgstr ""
 
-#: data/Cities.dat:9 data/Cities.dat:50
-#: data/Cities.dat:125 data/Cities.dat:237
-#: data/Cities.dat:276 data/Cities.dat:285
-#: data/Cities.dat:332 data/Cities.dat:352
-#: data/Cities.dat:357 data/Cities.dat:407
-#: data/Cities.dat:425 data/Cities.dat:641
-#: data/Cities.dat:674 data/Cities.dat:720
-#: data/Cities.dat:801 data/Cities.dat:807
-#: data/Cities.dat:917 data/Cities.dat:923
-#: data/Cities.dat:968 data/Cities.dat:1068
-#: data/Cities.dat:1100 data/Cities.dat:1158
-#: data/Cities.dat:1187 data/Cities.dat:1396
-#: data/Cities.dat:1433 data/Cities.dat:1451
-#: data/Cities.dat:1521 data/Cities.dat:1597
-#: data/Cities.dat:1735 data/Cities.dat:1818
-#: data/Cities.dat:1863 data/Cities.dat:1944
-#: data/Cities.dat:2046 data/Cities.dat:2082
-#: data/Cities.dat:2191 data/Cities.dat:2228
-#: data/Cities.dat:2279 data/Cities.dat:2340
-#: data/Cities.dat:2401 data/Cities.dat:2437
+#: data/Cities.dat:9 data/Cities.dat:50 data/Cities.dat:125 data/Cities.dat:237
+#: data/Cities.dat:276 data/Cities.dat:285 data/Cities.dat:332
+#: data/Cities.dat:352 data/Cities.dat:357 data/Cities.dat:407
+#: data/Cities.dat:425 data/Cities.dat:641 data/Cities.dat:674
+#: data/Cities.dat:720 data/Cities.dat:801 data/Cities.dat:807
+#: data/Cities.dat:917 data/Cities.dat:923 data/Cities.dat:968
+#: data/Cities.dat:1068 data/Cities.dat:1100 data/Cities.dat:1158
+#: data/Cities.dat:1187 data/Cities.dat:1396 data/Cities.dat:1433
+#: data/Cities.dat:1451 data/Cities.dat:1521 data/Cities.dat:1597
+#: data/Cities.dat:1735 data/Cities.dat:1818 data/Cities.dat:1863
+#: data/Cities.dat:1944 data/Cities.dat:2046 data/Cities.dat:2082
+#: data/Cities.dat:2191 data/Cities.dat:2228 data/Cities.dat:2279
+#: data/Cities.dat:2340 data/Cities.dat:2401 data/Cities.dat:2437
 #: data/Cities.dat:2510 data/Cities.dat:2818
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "United Kingdom"
 msgstr ""
 
-#: data/Cities.dat:10 data/Cities.dat:126
-#: data/Cities.dat:361 data/Cities.dat:748
-#: data/Cities.dat:794 data/Cities.dat:977
-#: data/Cities.dat:1035 data/Cities.dat:1075
-#: data/Cities.dat:1122 data/Cities.dat:1401
-#: data/Cities.dat:1495 data/Cities.dat:1644
-#: data/Cities.dat:1653 data/Cities.dat:1670
-#: data/Cities.dat:1674 data/Cities.dat:1819
-#: data/Cities.dat:2022 data/Cities.dat:2031
-#: data/Cities.dat:2146 data/Cities.dat:2366
-#: data/Cities.dat:2651 data/Cities.dat:2714
-#: data/Cities.dat:2771 data/Cities.dat:2789
+#: data/Cities.dat:10 data/Cities.dat:126 data/Cities.dat:361
+#: data/Cities.dat:748 data/Cities.dat:794 data/Cities.dat:977
+#: data/Cities.dat:1035 data/Cities.dat:1075 data/Cities.dat:1122
+#: data/Cities.dat:1401 data/Cities.dat:1495 data/Cities.dat:1644
+#: data/Cities.dat:1653 data/Cities.dat:1670 data/Cities.dat:1674
+#: data/Cities.dat:1819 data/Cities.dat:2022 data/Cities.dat:2031
+#: data/Cities.dat:2146 data/Cities.dat:2366 data/Cities.dat:2651
+#: data/Cities.dat:2714 data/Cities.dat:2771 data/Cities.dat:2789
 #: data/Cities.dat:2804
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "South Dakota"
 msgstr ""
 
-#: data/Cities.dat:11 data/Cities.dat:243
-#: data/Cities.dat:245 data/Cities.dat:342
-#: data/Cities.dat:389 data/Cities.dat:423
-#: data/Cities.dat:440 data/Cities.dat:714
-#: data/Cities.dat:722 data/Cities.dat:781
-#: data/Cities.dat:1247 data/Cities.dat:1388
-#: data/Cities.dat:1455 data/Cities.dat:1480
-#: data/Cities.dat:1717 data/Cities.dat:1855
-#: data/Cities.dat:1905 data/Cities.dat:2109
-#: data/Cities.dat:2122 data/Cities.dat:2172
-#: data/Cities.dat:2321 data/Cities.dat:2411
-#: data/Cities.dat:2485 data/Cities.dat:2514
-#: data/Cities.dat:2640 data/Cities.dat:2693
-#: data/Cities.dat:2715 data/Cities.dat:2746
-#: data/Cities.dat:2797
+#: data/Cities.dat:11 data/Cities.dat:243 data/Cities.dat:245
+#: data/Cities.dat:342 data/Cities.dat:389 data/Cities.dat:423
+#: data/Cities.dat:440 data/Cities.dat:714 data/Cities.dat:722
+#: data/Cities.dat:781 data/Cities.dat:1247 data/Cities.dat:1388
+#: data/Cities.dat:1455 data/Cities.dat:1480 data/Cities.dat:1717
+#: data/Cities.dat:1855 data/Cities.dat:1905 data/Cities.dat:2109
+#: data/Cities.dat:2122 data/Cities.dat:2172 data/Cities.dat:2321
+#: data/Cities.dat:2411 data/Cities.dat:2485 data/Cities.dat:2514
+#: data/Cities.dat:2640 data/Cities.dat:2693 data/Cities.dat:2715
+#: data/Cities.dat:2746 data/Cities.dat:2797
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Washington"
@@ -6209,44 +5823,33 @@ msgid ""
 "Abilene"
 msgstr ""
 
-#: data/Cities.dat:13 data/Cities.dat:132
-#: data/Cities.dat:663 data/Cities.dat:835
-#: data/Cities.dat:837 data/Cities.dat:890
-#: data/Cities.dat:1123 data/Cities.dat:1134
-#: data/Cities.dat:1225 data/Cities.dat:1381
-#: data/Cities.dat:1387 data/Cities.dat:1422
-#: data/Cities.dat:1528 data/Cities.dat:1858
-#: data/Cities.dat:1878 data/Cities.dat:1900
-#: data/Cities.dat:1929 data/Cities.dat:1940
-#: data/Cities.dat:2095 data/Cities.dat:2226
-#: data/Cities.dat:2248 data/Cities.dat:2338
-#: data/Cities.dat:2553 data/Cities.dat:2750
+#: data/Cities.dat:13 data/Cities.dat:132 data/Cities.dat:663
+#: data/Cities.dat:835 data/Cities.dat:837 data/Cities.dat:890
+#: data/Cities.dat:1123 data/Cities.dat:1134 data/Cities.dat:1225
+#: data/Cities.dat:1381 data/Cities.dat:1387 data/Cities.dat:1422
+#: data/Cities.dat:1528 data/Cities.dat:1858 data/Cities.dat:1878
+#: data/Cities.dat:1900 data/Cities.dat:1929 data/Cities.dat:1940
+#: data/Cities.dat:2095 data/Cities.dat:2226 data/Cities.dat:2248
+#: data/Cities.dat:2338 data/Cities.dat:2553 data/Cities.dat:2750
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Kansas"
 msgstr ""
 
-#: data/Cities.dat:14 data/Cities.dat:72
-#: data/Cities.dat:122 data/Cities.dat:164
-#: data/Cities.dat:222 data/Cities.dat:227
-#: data/Cities.dat:365 data/Cities.dat:520
-#: data/Cities.dat:568 data/Cities.dat:604
-#: data/Cities.dat:633 data/Cities.dat:639
-#: data/Cities.dat:653 data/Cities.dat:725
-#: data/Cities.dat:738 data/Cities.dat:817
-#: data/Cities.dat:842 data/Cities.dat:884
-#: data/Cities.dat:892 data/Cities.dat:948
-#: data/Cities.dat:1109 data/Cities.dat:1148
-#: data/Cities.dat:1368 data/Cities.dat:1454
-#: data/Cities.dat:1469 data/Cities.dat:1554
-#: data/Cities.dat:1575 data/Cities.dat:1578
-#: data/Cities.dat:1618 data/Cities.dat:1638
-#: data/Cities.dat:1891 data/Cities.dat:1987
-#: data/Cities.dat:2042 data/Cities.dat:2068
-#: data/Cities.dat:2171 data/Cities.dat:2238
-#: data/Cities.dat:2260 data/Cities.dat:2261
-#: data/Cities.dat:2318 data/Cities.dat:2521
-#: data/Cities.dat:2590 data/Cities.dat:2660
+#: data/Cities.dat:14 data/Cities.dat:72 data/Cities.dat:122
+#: data/Cities.dat:164 data/Cities.dat:222 data/Cities.dat:227
+#: data/Cities.dat:365 data/Cities.dat:520 data/Cities.dat:568
+#: data/Cities.dat:604 data/Cities.dat:633 data/Cities.dat:639
+#: data/Cities.dat:653 data/Cities.dat:725 data/Cities.dat:738
+#: data/Cities.dat:817 data/Cities.dat:842 data/Cities.dat:884
+#: data/Cities.dat:892 data/Cities.dat:948 data/Cities.dat:1109
+#: data/Cities.dat:1148 data/Cities.dat:1368 data/Cities.dat:1454
+#: data/Cities.dat:1469 data/Cities.dat:1554 data/Cities.dat:1575
+#: data/Cities.dat:1578 data/Cities.dat:1618 data/Cities.dat:1638
+#: data/Cities.dat:1891 data/Cities.dat:1987 data/Cities.dat:2042
+#: data/Cities.dat:2068 data/Cities.dat:2171 data/Cities.dat:2238
+#: data/Cities.dat:2260 data/Cities.dat:2261 data/Cities.dat:2318
+#: data/Cities.dat:2521 data/Cities.dat:2590 data/Cities.dat:2660
 #: data/Cities.dat:2679 data/Cities.dat:2751
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
@@ -6259,9 +5862,8 @@ msgid ""
 "Abuja"
 msgstr ""
 
-#: data/Cities.dat:15 data/Cities.dat:1128
-#: data/Cities.dat:1201 data/Cities.dat:1224
-#: data/Cities.dat:1344 data/Cities.dat:2071
+#: data/Cities.dat:15 data/Cities.dat:1128 data/Cities.dat:1201
+#: data/Cities.dat:1224 data/Cities.dat:1344 data/Cities.dat:2071
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Nigeria"
@@ -6273,8 +5875,8 @@ msgid ""
 "Acapulco"
 msgstr ""
 
-#: data/Cities.dat:16 data/Cities.dat:1627
-#: data/Cities.dat:2272 data/Cities.dat:2433
+#: data/Cities.dat:16 data/Cities.dat:1627 data/Cities.dat:2272
+#: data/Cities.dat:2433
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Mexico"
@@ -6286,8 +5888,7 @@ msgid ""
 "Accra"
 msgstr ""
 
-#: data/Cities.dat:17 data/Cities.dat:305
-#: data/Cities.dat:2490
+#: data/Cities.dat:17 data/Cities.dat:305 data/Cities.dat:2490
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Ghana"
@@ -6299,20 +5900,15 @@ msgid ""
 "Ada"
 msgstr ""
 
-#: data/Cities.dat:18 data/Cities.dat:117
-#: data/Cities.dat:162 data/Cities.dat:292
-#: data/Cities.dat:363 data/Cities.dat:426
-#: data/Cities.dat:689 data/Cities.dat:701
-#: data/Cities.dat:719 data/Cities.dat:789
-#: data/Cities.dat:929 data/Cities.dat:952
-#: data/Cities.dat:1076 data/Cities.dat:1124
-#: data/Cities.dat:1493 data/Cities.dat:1536
-#: data/Cities.dat:1659 data/Cities.dat:1660
-#: data/Cities.dat:1854 data/Cities.dat:1979
-#: data/Cities.dat:2034 data/Cities.dat:2048
-#: data/Cities.dat:2192 data/Cities.dat:2424
-#: data/Cities.dat:2436 data/Cities.dat:2707
-#: data/Cities.dat:2775
+#: data/Cities.dat:18 data/Cities.dat:117 data/Cities.dat:162
+#: data/Cities.dat:292 data/Cities.dat:363 data/Cities.dat:426
+#: data/Cities.dat:689 data/Cities.dat:701 data/Cities.dat:719
+#: data/Cities.dat:789 data/Cities.dat:929 data/Cities.dat:952
+#: data/Cities.dat:1076 data/Cities.dat:1124 data/Cities.dat:1493
+#: data/Cities.dat:1536 data/Cities.dat:1659 data/Cities.dat:1660
+#: data/Cities.dat:1854 data/Cities.dat:1979 data/Cities.dat:2034
+#: data/Cities.dat:2048 data/Cities.dat:2192 data/Cities.dat:2424
+#: data/Cities.dat:2436 data/Cities.dat:2707 data/Cities.dat:2775
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Minnesota"
@@ -6324,32 +5920,23 @@ msgid ""
 "Adak"
 msgstr ""
 
-#: data/Cities.dat:19 data/Cities.dat:73
-#: data/Cities.dat:74 data/Cities.dat:86
-#: data/Cities.dat:99 data/Cities.dat:208
-#: data/Cities.dat:262 data/Cities.dat:266
-#: data/Cities.dat:269 data/Cities.dat:270
-#: data/Cities.dat:486 data/Cities.dat:510
-#: data/Cities.dat:519 data/Cities.dat:535
-#: data/Cities.dat:565 data/Cities.dat:624
-#: data/Cities.dat:637 data/Cities.dat:638
-#: data/Cities.dat:697 data/Cities.dat:702
-#: data/Cities.dat:703 data/Cities.dat:788
-#: data/Cities.dat:827 data/Cities.dat:834
-#: data/Cities.dat:843 data/Cities.dat:882
-#: data/Cities.dat:986 data/Cities.dat:1007
-#: data/Cities.dat:1096 data/Cities.dat:1103
-#: data/Cities.dat:1196 data/Cities.dat:1249
-#: data/Cities.dat:1255 data/Cities.dat:1268
-#: data/Cities.dat:1291 data/Cities.dat:1307
-#: data/Cities.dat:1580 data/Cities.dat:1791
-#: data/Cities.dat:1839 data/Cities.dat:1857
-#: data/Cities.dat:1968 data/Cities.dat:2013
-#: data/Cities.dat:2055 data/Cities.dat:2113
-#: data/Cities.dat:2223 data/Cities.dat:2333
-#: data/Cities.dat:2345 data/Cities.dat:2351
-#: data/Cities.dat:2370 data/Cities.dat:2409
-#: data/Cities.dat:2608 data/Cities.dat:2625
+#: data/Cities.dat:19 data/Cities.dat:73 data/Cities.dat:74 data/Cities.dat:86
+#: data/Cities.dat:99 data/Cities.dat:208 data/Cities.dat:262
+#: data/Cities.dat:266 data/Cities.dat:269 data/Cities.dat:270
+#: data/Cities.dat:486 data/Cities.dat:510 data/Cities.dat:519
+#: data/Cities.dat:535 data/Cities.dat:565 data/Cities.dat:624
+#: data/Cities.dat:637 data/Cities.dat:638 data/Cities.dat:697
+#: data/Cities.dat:702 data/Cities.dat:703 data/Cities.dat:788
+#: data/Cities.dat:827 data/Cities.dat:834 data/Cities.dat:843
+#: data/Cities.dat:882 data/Cities.dat:986 data/Cities.dat:1007
+#: data/Cities.dat:1096 data/Cities.dat:1103 data/Cities.dat:1196
+#: data/Cities.dat:1249 data/Cities.dat:1255 data/Cities.dat:1268
+#: data/Cities.dat:1291 data/Cities.dat:1307 data/Cities.dat:1580
+#: data/Cities.dat:1791 data/Cities.dat:1839 data/Cities.dat:1857
+#: data/Cities.dat:1968 data/Cities.dat:2013 data/Cities.dat:2055
+#: data/Cities.dat:2113 data/Cities.dat:2223 data/Cities.dat:2333
+#: data/Cities.dat:2345 data/Cities.dat:2351 data/Cities.dat:2370
+#: data/Cities.dat:2409 data/Cities.dat:2608 data/Cities.dat:2625
 #: data/Cities.dat:2798
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
@@ -6362,24 +5949,18 @@ msgid ""
 "Adams"
 msgstr ""
 
-#: data/Cities.dat:20 data/Cities.dat:78
-#: data/Cities.dat:121 data/Cities.dat:152
-#: data/Cities.dat:319 data/Cities.dat:358
-#: data/Cities.dat:362 data/Cities.dat:409
-#: data/Cities.dat:485 data/Cities.dat:704
-#: data/Cities.dat:796 data/Cities.dat:809
-#: data/Cities.dat:845 data/Cities.dat:1040
-#: data/Cities.dat:1052 data/Cities.dat:1089
-#: data/Cities.dat:1095 data/Cities.dat:1382
-#: data/Cities.dat:1466 data/Cities.dat:1481
-#: data/Cities.dat:1513 data/Cities.dat:1559
-#: data/Cities.dat:1585 data/Cities.dat:1796
-#: data/Cities.dat:1827 data/Cities.dat:1875
-#: data/Cities.dat:2037 data/Cities.dat:2047
-#: data/Cities.dat:2130 data/Cities.dat:2243
-#: data/Cities.dat:2391 data/Cities.dat:2414
-#: data/Cities.dat:2690 data/Cities.dat:2697
-#: data/Cities.dat:2742 data/Cities.dat:2790
+#: data/Cities.dat:20 data/Cities.dat:78 data/Cities.dat:121
+#: data/Cities.dat:152 data/Cities.dat:319 data/Cities.dat:358
+#: data/Cities.dat:362 data/Cities.dat:409 data/Cities.dat:485
+#: data/Cities.dat:704 data/Cities.dat:796 data/Cities.dat:809
+#: data/Cities.dat:845 data/Cities.dat:1040 data/Cities.dat:1052
+#: data/Cities.dat:1089 data/Cities.dat:1095 data/Cities.dat:1382
+#: data/Cities.dat:1466 data/Cities.dat:1481 data/Cities.dat:1513
+#: data/Cities.dat:1559 data/Cities.dat:1585 data/Cities.dat:1796
+#: data/Cities.dat:1827 data/Cities.dat:1875 data/Cities.dat:2037
+#: data/Cities.dat:2047 data/Cities.dat:2130 data/Cities.dat:2243
+#: data/Cities.dat:2391 data/Cities.dat:2414 data/Cities.dat:2690
+#: data/Cities.dat:2697 data/Cities.dat:2742 data/Cities.dat:2790
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Massachusetts"
@@ -6421,21 +6002,16 @@ msgid ""
 "South Australia"
 msgstr ""
 
-#: data/Cities.dat:23 data/Cities.dat:61
-#: data/Cities.dat:165 data/Cities.dat:250
-#: data/Cities.dat:351 data/Cities.dat:412
-#: data/Cities.dat:501 data/Cities.dat:532
-#: data/Cities.dat:559 data/Cities.dat:591
-#: data/Cities.dat:617 data/Cities.dat:1143
-#: data/Cities.dat:1270 data/Cities.dat:1374
-#: data/Cities.dat:1386 data/Cities.dat:1595
-#: data/Cities.dat:1683 data/Cities.dat:1727
-#: data/Cities.dat:1728 data/Cities.dat:1802
-#: data/Cities.dat:1982 data/Cities.dat:1993
-#: data/Cities.dat:2005 data/Cities.dat:2175
-#: data/Cities.dat:2242 data/Cities.dat:2353
-#: data/Cities.dat:2479 data/Cities.dat:2559
-#: data/Cities.dat:2616
+#: data/Cities.dat:23 data/Cities.dat:61 data/Cities.dat:165
+#: data/Cities.dat:250 data/Cities.dat:351 data/Cities.dat:412
+#: data/Cities.dat:501 data/Cities.dat:532 data/Cities.dat:559
+#: data/Cities.dat:591 data/Cities.dat:617 data/Cities.dat:1143
+#: data/Cities.dat:1270 data/Cities.dat:1374 data/Cities.dat:1386
+#: data/Cities.dat:1595 data/Cities.dat:1683 data/Cities.dat:1727
+#: data/Cities.dat:1728 data/Cities.dat:1802 data/Cities.dat:1982
+#: data/Cities.dat:1993 data/Cities.dat:2005 data/Cities.dat:2175
+#: data/Cities.dat:2242 data/Cities.dat:2353 data/Cities.dat:2479
+#: data/Cities.dat:2559 data/Cities.dat:2616
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Australia"
@@ -6459,32 +6035,25 @@ msgid ""
 "Afton"
 msgstr ""
 
-#: data/Cities.dat:25 data/Cities.dat:103
-#: data/Cities.dat:113 data/Cities.dat:210
-#: data/Cities.dat:286 data/Cities.dat:304
-#: data/Cities.dat:359 data/Cities.dat:476
-#: data/Cities.dat:721 data/Cities.dat:747
-#: data/Cities.dat:759 data/Cities.dat:991
-#: data/Cities.dat:1102 data/Cities.dat:1383
-#: data/Cities.dat:1527 data/Cities.dat:1574
-#: data/Cities.dat:1641 data/Cities.dat:1704
-#: data/Cities.dat:1744 data/Cities.dat:1843
-#: data/Cities.dat:1899 data/Cities.dat:2060
-#: data/Cities.dat:2252 data/Cities.dat:2582
+#: data/Cities.dat:25 data/Cities.dat:103 data/Cities.dat:113
+#: data/Cities.dat:210 data/Cities.dat:286 data/Cities.dat:304
+#: data/Cities.dat:359 data/Cities.dat:476 data/Cities.dat:721
+#: data/Cities.dat:747 data/Cities.dat:759 data/Cities.dat:991
+#: data/Cities.dat:1102 data/Cities.dat:1383 data/Cities.dat:1527
+#: data/Cities.dat:1574 data/Cities.dat:1641 data/Cities.dat:1704
+#: data/Cities.dat:1744 data/Cities.dat:1843 data/Cities.dat:1899
+#: data/Cities.dat:2060 data/Cities.dat:2252 data/Cities.dat:2582
 #: data/Cities.dat:2787
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Oklahoma"
 msgstr ""
 
-#: data/Cities.dat:26 data/Cities.dat:378
-#: data/Cities.dat:438 data/Cities.dat:480
-#: data/Cities.dat:533 data/Cities.dat:779
-#: data/Cities.dat:920 data/Cities.dat:950
-#: data/Cities.dat:961 data/Cities.dat:1365
-#: data/Cities.dat:1367 data/Cities.dat:2151
-#: data/Cities.dat:2186 data/Cities.dat:2197
-#: data/Cities.dat:2347
+#: data/Cities.dat:26 data/Cities.dat:378 data/Cities.dat:438
+#: data/Cities.dat:480 data/Cities.dat:533 data/Cities.dat:779
+#: data/Cities.dat:920 data/Cities.dat:950 data/Cities.dat:961
+#: data/Cities.dat:1365 data/Cities.dat:1367 data/Cities.dat:2151
+#: data/Cities.dat:2186 data/Cities.dat:2197 data/Cities.dat:2347
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Wyoming"
@@ -6496,8 +6065,7 @@ msgid ""
 "Agadez"
 msgstr ""
 
-#: data/Cities.dat:27 data/Cities.dat:901
-#: data/Cities.dat:1831
+#: data/Cities.dat:27 data/Cities.dat:901 data/Cities.dat:1831
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Niger"
@@ -6509,11 +6077,9 @@ msgid ""
 "Agadir"
 msgstr ""
 
-#: data/Cities.dat:28 data/Cities.dat:247
-#: data/Cities.dat:436 data/Cities.dat:806
-#: data/Cities.dat:1552 data/Cities.dat:1593
-#: data/Cities.dat:1938 data/Cities.dat:2135
-#: data/Cities.dat:2499
+#: data/Cities.dat:28 data/Cities.dat:247 data/Cities.dat:436
+#: data/Cities.dat:806 data/Cities.dat:1552 data/Cities.dat:1593
+#: data/Cities.dat:1938 data/Cities.dat:2135 data/Cities.dat:2499
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Morocco"
@@ -6543,80 +6109,55 @@ msgid ""
 "Ahwahnee"
 msgstr ""
 
-#: data/Cities.dat:31 data/Cities.dat:39
-#: data/Cities.dat:59 data/Cities.dat:68
-#: data/Cities.dat:85 data/Cities.dat:110
-#: data/Cities.dat:180 data/Cities.dat:182
-#: data/Cities.dat:209 data/Cities.dat:244
-#: data/Cities.dat:258 data/Cities.dat:268
-#: data/Cities.dat:323 data/Cities.dat:375
-#: data/Cities.dat:382 data/Cities.dat:414
-#: data/Cities.dat:427 data/Cities.dat:430
-#: data/Cities.dat:451 data/Cities.dat:491
-#: data/Cities.dat:492 data/Cities.dat:502
-#: data/Cities.dat:521 data/Cities.dat:553
-#: data/Cities.dat:556 data/Cities.dat:572
-#: data/Cities.dat:592 data/Cities.dat:606
-#: data/Cities.dat:628 data/Cities.dat:650
-#: data/Cities.dat:651 data/Cities.dat:678
-#: data/Cities.dat:709 data/Cities.dat:732
-#: data/Cities.dat:736 data/Cities.dat:767
-#: data/Cities.dat:775 data/Cities.dat:791
-#: data/Cities.dat:844 data/Cities.dat:864
-#: data/Cities.dat:866 data/Cities.dat:867
-#: data/Cities.dat:871 data/Cities.dat:891
-#: data/Cities.dat:925 data/Cities.dat:926
-#: data/Cities.dat:936 data/Cities.dat:944
-#: data/Cities.dat:954 data/Cities.dat:1044
-#: data/Cities.dat:1050 data/Cities.dat:1053
-#: data/Cities.dat:1091 data/Cities.dat:1118
-#: data/Cities.dat:1138 data/Cities.dat:1147
-#: data/Cities.dat:1195 data/Cities.dat:1333
-#: data/Cities.dat:1339 data/Cities.dat:1355
-#: data/Cities.dat:1416 data/Cities.dat:1442
-#: data/Cities.dat:1449 data/Cities.dat:1453
-#: data/Cities.dat:1459 data/Cities.dat:1460
-#: data/Cities.dat:1529 data/Cities.dat:1535
-#: data/Cities.dat:1656 data/Cities.dat:1676
-#: data/Cities.dat:1690 data/Cities.dat:1692
-#: data/Cities.dat:1693 data/Cities.dat:1726
-#: data/Cities.dat:1730 data/Cities.dat:1732
-#: data/Cities.dat:1777 data/Cities.dat:1790
-#: data/Cities.dat:1814 data/Cities.dat:1825
-#: data/Cities.dat:1840 data/Cities.dat:1848
-#: data/Cities.dat:1860 data/Cities.dat:1877
-#: data/Cities.dat:1888 data/Cities.dat:1910
-#: data/Cities.dat:1917 data/Cities.dat:1942
-#: data/Cities.dat:1947 data/Cities.dat:1953
-#: data/Cities.dat:1967 data/Cities.dat:1969
-#: data/Cities.dat:1986 data/Cities.dat:2028
-#: data/Cities.dat:2032 data/Cities.dat:2039
-#: data/Cities.dat:2058 data/Cities.dat:2141
-#: data/Cities.dat:2155 data/Cities.dat:2156
-#: data/Cities.dat:2157 data/Cities.dat:2166
-#: data/Cities.dat:2173 data/Cities.dat:2185
-#: data/Cities.dat:2209 data/Cities.dat:2210
-#: data/Cities.dat:2221 data/Cities.dat:2236
-#: data/Cities.dat:2250 data/Cities.dat:2255
-#: data/Cities.dat:2262 data/Cities.dat:2263
-#: data/Cities.dat:2265 data/Cities.dat:2267
-#: data/Cities.dat:2269 data/Cities.dat:2270
-#: data/Cities.dat:2271 data/Cities.dat:2282
-#: data/Cities.dat:2283 data/Cities.dat:2284
-#: data/Cities.dat:2289 data/Cities.dat:2291
-#: data/Cities.dat:2292 data/Cities.dat:2320
-#: data/Cities.dat:2344 data/Cities.dat:2360
-#: data/Cities.dat:2395 data/Cities.dat:2399
-#: data/Cities.dat:2456 data/Cities.dat:2468
-#: data/Cities.dat:2470 data/Cities.dat:2530
-#: data/Cities.dat:2555 data/Cities.dat:2622
-#: data/Cities.dat:2632 data/Cities.dat:2638
-#: data/Cities.dat:2649 data/Cities.dat:2650
-#: data/Cities.dat:2667 data/Cities.dat:2696
-#: data/Cities.dat:2730 data/Cities.dat:2732
-#: data/Cities.dat:2739 data/Cities.dat:2749
-#: data/Cities.dat:2754 data/Cities.dat:2785
-#: data/Cities.dat:2823
+#: data/Cities.dat:31 data/Cities.dat:39 data/Cities.dat:59 data/Cities.dat:68
+#: data/Cities.dat:85 data/Cities.dat:110 data/Cities.dat:180
+#: data/Cities.dat:182 data/Cities.dat:209 data/Cities.dat:244
+#: data/Cities.dat:258 data/Cities.dat:268 data/Cities.dat:323
+#: data/Cities.dat:375 data/Cities.dat:382 data/Cities.dat:414
+#: data/Cities.dat:427 data/Cities.dat:430 data/Cities.dat:451
+#: data/Cities.dat:491 data/Cities.dat:492 data/Cities.dat:502
+#: data/Cities.dat:521 data/Cities.dat:553 data/Cities.dat:556
+#: data/Cities.dat:572 data/Cities.dat:592 data/Cities.dat:606
+#: data/Cities.dat:628 data/Cities.dat:650 data/Cities.dat:651
+#: data/Cities.dat:678 data/Cities.dat:709 data/Cities.dat:732
+#: data/Cities.dat:736 data/Cities.dat:767 data/Cities.dat:775
+#: data/Cities.dat:791 data/Cities.dat:844 data/Cities.dat:864
+#: data/Cities.dat:866 data/Cities.dat:867 data/Cities.dat:871
+#: data/Cities.dat:891 data/Cities.dat:925 data/Cities.dat:926
+#: data/Cities.dat:936 data/Cities.dat:944 data/Cities.dat:954
+#: data/Cities.dat:1044 data/Cities.dat:1050 data/Cities.dat:1053
+#: data/Cities.dat:1091 data/Cities.dat:1118 data/Cities.dat:1138
+#: data/Cities.dat:1147 data/Cities.dat:1195 data/Cities.dat:1333
+#: data/Cities.dat:1339 data/Cities.dat:1355 data/Cities.dat:1416
+#: data/Cities.dat:1442 data/Cities.dat:1449 data/Cities.dat:1453
+#: data/Cities.dat:1459 data/Cities.dat:1460 data/Cities.dat:1529
+#: data/Cities.dat:1535 data/Cities.dat:1656 data/Cities.dat:1676
+#: data/Cities.dat:1690 data/Cities.dat:1692 data/Cities.dat:1693
+#: data/Cities.dat:1726 data/Cities.dat:1730 data/Cities.dat:1732
+#: data/Cities.dat:1777 data/Cities.dat:1790 data/Cities.dat:1814
+#: data/Cities.dat:1825 data/Cities.dat:1840 data/Cities.dat:1848
+#: data/Cities.dat:1860 data/Cities.dat:1877 data/Cities.dat:1888
+#: data/Cities.dat:1910 data/Cities.dat:1917 data/Cities.dat:1942
+#: data/Cities.dat:1947 data/Cities.dat:1953 data/Cities.dat:1967
+#: data/Cities.dat:1969 data/Cities.dat:1986 data/Cities.dat:2028
+#: data/Cities.dat:2032 data/Cities.dat:2039 data/Cities.dat:2058
+#: data/Cities.dat:2141 data/Cities.dat:2155 data/Cities.dat:2156
+#: data/Cities.dat:2157 data/Cities.dat:2166 data/Cities.dat:2173
+#: data/Cities.dat:2185 data/Cities.dat:2209 data/Cities.dat:2210
+#: data/Cities.dat:2221 data/Cities.dat:2236 data/Cities.dat:2250
+#: data/Cities.dat:2255 data/Cities.dat:2262 data/Cities.dat:2263
+#: data/Cities.dat:2265 data/Cities.dat:2267 data/Cities.dat:2269
+#: data/Cities.dat:2270 data/Cities.dat:2271 data/Cities.dat:2282
+#: data/Cities.dat:2283 data/Cities.dat:2284 data/Cities.dat:2289
+#: data/Cities.dat:2291 data/Cities.dat:2292 data/Cities.dat:2320
+#: data/Cities.dat:2344 data/Cities.dat:2360 data/Cities.dat:2395
+#: data/Cities.dat:2399 data/Cities.dat:2456 data/Cities.dat:2468
+#: data/Cities.dat:2470 data/Cities.dat:2530 data/Cities.dat:2555
+#: data/Cities.dat:2622 data/Cities.dat:2632 data/Cities.dat:2638
+#: data/Cities.dat:2649 data/Cities.dat:2650 data/Cities.dat:2667
+#: data/Cities.dat:2696 data/Cities.dat:2730 data/Cities.dat:2732
+#: data/Cities.dat:2739 data/Cities.dat:2749 data/Cities.dat:2754
+#: data/Cities.dat:2785 data/Cities.dat:2823
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "California"
@@ -6628,17 +6169,13 @@ msgid ""
 "Aiken"
 msgstr ""
 
-#: data/Cities.dat:32 data/Cities.dat:89
-#: data/Cities.dat:215 data/Cities.dat:226
-#: data/Cities.dat:459 data/Cities.dat:473
-#: data/Cities.dat:544 data/Cities.dat:658
-#: data/Cities.dat:790 data/Cities.dat:815
-#: data/Cities.dat:938 data/Cities.dat:956
-#: data/Cities.dat:966 data/Cities.dat:971
-#: data/Cities.dat:1566 data/Cities.dat:1749
-#: data/Cities.dat:1847 data/Cities.dat:1921
-#: data/Cities.dat:2196 data/Cities.dat:2408
-#: data/Cities.dat:2467
+#: data/Cities.dat:32 data/Cities.dat:89 data/Cities.dat:215
+#: data/Cities.dat:226 data/Cities.dat:459 data/Cities.dat:473
+#: data/Cities.dat:544 data/Cities.dat:658 data/Cities.dat:790
+#: data/Cities.dat:815 data/Cities.dat:938 data/Cities.dat:956
+#: data/Cities.dat:966 data/Cities.dat:971 data/Cities.dat:1566
+#: data/Cities.dat:1749 data/Cities.dat:1847 data/Cities.dat:1921
+#: data/Cities.dat:2196 data/Cities.dat:2408 data/Cities.dat:2467
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "South Carolina"
@@ -6650,18 +6187,14 @@ msgid ""
 "Ainsworth"
 msgstr ""
 
-#: data/Cities.dat:33 data/Cities.dat:64
-#: data/Cities.dat:148 data/Cities.dat:242
-#: data/Cities.dat:549 data/Cities.dat:581
-#: data/Cities.dat:588 data/Cities.dat:865
-#: data/Cities.dat:946 data/Cities.dat:1043
-#: data/Cities.dat:1115 data/Cities.dat:1241
-#: data/Cities.dat:1265 data/Cities.dat:1424
-#: data/Cities.dat:1576 data/Cities.dat:1841
-#: data/Cities.dat:1853 data/Cities.dat:1893
-#: data/Cities.dat:1906 data/Cities.dat:2030
-#: data/Cities.dat:2302 data/Cities.dat:2314
-#: data/Cities.dat:2628 data/Cities.dat:2721
+#: data/Cities.dat:33 data/Cities.dat:64 data/Cities.dat:148
+#: data/Cities.dat:242 data/Cities.dat:549 data/Cities.dat:581
+#: data/Cities.dat:588 data/Cities.dat:865 data/Cities.dat:946
+#: data/Cities.dat:1043 data/Cities.dat:1115 data/Cities.dat:1241
+#: data/Cities.dat:1265 data/Cities.dat:1424 data/Cities.dat:1576
+#: data/Cities.dat:1841 data/Cities.dat:1853 data/Cities.dat:1893
+#: data/Cities.dat:1906 data/Cities.dat:2030 data/Cities.dat:2302
+#: data/Cities.dat:2314 data/Cities.dat:2628 data/Cities.dat:2721
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Nebraska"
@@ -6679,29 +6212,21 @@ msgid ""
 "Corse du Sud"
 msgstr ""
 
-#: data/Cities.dat:34 data/Cities.dat:79
-#: data/Cities.dat:98 data/Cities.dat:213
-#: data/Cities.dat:221 data/Cities.dat:312
-#: data/Cities.dat:324 data/Cities.dat:326
-#: data/Cities.dat:345 data/Cities.dat:398
-#: data/Cities.dat:401 data/Cities.dat:413
-#: data/Cities.dat:474 data/Cities.dat:523
-#: data/Cities.dat:655 data/Cities.dat:973
-#: data/Cities.dat:1336 data/Cities.dat:1385
-#: data/Cities.dat:1418 data/Cities.dat:1483
-#: data/Cities.dat:1518 data/Cities.dat:1553
-#: data/Cities.dat:1622 data/Cities.dat:1623
-#: data/Cities.dat:1662 data/Cities.dat:1702
-#: data/Cities.dat:1774 data/Cities.dat:1776
-#: data/Cities.dat:1832 data/Cities.dat:1865
-#: data/Cities.dat:1884 data/Cities.dat:1919
-#: data/Cities.dat:1927 data/Cities.dat:1978
-#: data/Cities.dat:1990 data/Cities.dat:2004
-#: data/Cities.dat:2026 data/Cities.dat:2043
-#: data/Cities.dat:2044 data/Cities.dat:2162
-#: data/Cities.dat:2164 data/Cities.dat:2219
-#: data/Cities.dat:2239 data/Cities.dat:2435
-#: data/Cities.dat:2458 data/Cities.dat:2557
+#: data/Cities.dat:34 data/Cities.dat:79 data/Cities.dat:98 data/Cities.dat:213
+#: data/Cities.dat:221 data/Cities.dat:312 data/Cities.dat:324
+#: data/Cities.dat:326 data/Cities.dat:345 data/Cities.dat:398
+#: data/Cities.dat:401 data/Cities.dat:413 data/Cities.dat:474
+#: data/Cities.dat:523 data/Cities.dat:655 data/Cities.dat:973
+#: data/Cities.dat:1336 data/Cities.dat:1385 data/Cities.dat:1418
+#: data/Cities.dat:1483 data/Cities.dat:1518 data/Cities.dat:1553
+#: data/Cities.dat:1622 data/Cities.dat:1623 data/Cities.dat:1662
+#: data/Cities.dat:1702 data/Cities.dat:1774 data/Cities.dat:1776
+#: data/Cities.dat:1832 data/Cities.dat:1865 data/Cities.dat:1884
+#: data/Cities.dat:1919 data/Cities.dat:1927 data/Cities.dat:1978
+#: data/Cities.dat:1990 data/Cities.dat:2004 data/Cities.dat:2026
+#: data/Cities.dat:2043 data/Cities.dat:2044 data/Cities.dat:2162
+#: data/Cities.dat:2164 data/Cities.dat:2219 data/Cities.dat:2239
+#: data/Cities.dat:2435 data/Cities.dat:2458 data/Cities.dat:2557
 #: data/Cities.dat:2558 data/Cities.dat:2575
 msgid ""
 "_: Country name (optional, but should be translated)\n"
@@ -6714,21 +6239,16 @@ msgid ""
 "Ajo"
 msgstr ""
 
-#: data/Cities.dat:35 data/Cities.dat:130
-#: data/Cities.dat:435 data/Cities.dat:444
-#: data/Cities.dat:735 data/Cities.dat:810
-#: data/Cities.dat:852 data/Cities.dat:919
-#: data/Cities.dat:924 data/Cities.dat:1087
-#: data/Cities.dat:1269 data/Cities.dat:1283
-#: data/Cities.dat:1467 data/Cities.dat:1582
-#: data/Cities.dat:1617 data/Cities.dat:1677
-#: data/Cities.dat:1722 data/Cities.dat:1724
-#: data/Cities.dat:1838 data/Cities.dat:2023
-#: data/Cities.dat:2096 data/Cities.dat:2277
-#: data/Cities.dat:2316 data/Cities.dat:2512
-#: data/Cities.dat:2550 data/Cities.dat:2579
-#: data/Cities.dat:2752 data/Cities.dat:2757
-#: data/Cities.dat:2824
+#: data/Cities.dat:35 data/Cities.dat:130 data/Cities.dat:435
+#: data/Cities.dat:444 data/Cities.dat:735 data/Cities.dat:810
+#: data/Cities.dat:852 data/Cities.dat:919 data/Cities.dat:924
+#: data/Cities.dat:1087 data/Cities.dat:1269 data/Cities.dat:1283
+#: data/Cities.dat:1467 data/Cities.dat:1582 data/Cities.dat:1617
+#: data/Cities.dat:1677 data/Cities.dat:1722 data/Cities.dat:1724
+#: data/Cities.dat:1838 data/Cities.dat:2023 data/Cities.dat:2096
+#: data/Cities.dat:2277 data/Cities.dat:2316 data/Cities.dat:2512
+#: data/Cities.dat:2550 data/Cities.dat:2579 data/Cities.dat:2752
+#: data/Cities.dat:2757 data/Cities.dat:2824
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Arizona"
@@ -6740,23 +6260,18 @@ msgid ""
 "Akron"
 msgstr ""
 
-#: data/Cities.dat:36 data/Cities.dat:77
-#: data/Cities.dat:204 data/Cities.dat:349
-#: data/Cities.dat:416 data/Cities.dat:456
-#: data/Cities.dat:489 data/Cities.dat:509
-#: data/Cities.dat:511 data/Cities.dat:524
-#: data/Cities.dat:546 data/Cities.dat:550
-#: data/Cities.dat:619 data/Cities.dat:756
-#: data/Cities.dat:772 data/Cities.dat:1014
-#: data/Cities.dat:1256 data/Cities.dat:1357
-#: data/Cities.dat:1421 data/Cities.dat:1456
-#: data/Cities.dat:1534 data/Cities.dat:1786
-#: data/Cities.dat:1852 data/Cities.dat:1880
-#: data/Cities.dat:1984 data/Cities.dat:2002
-#: data/Cities.dat:2084 data/Cities.dat:2341
-#: data/Cities.dat:2416 data/Cities.dat:2452
-#: data/Cities.dat:2546 data/Cities.dat:2702
-#: data/Cities.dat:2822 data/Cities.dat:2829
+#: data/Cities.dat:36 data/Cities.dat:77 data/Cities.dat:204
+#: data/Cities.dat:349 data/Cities.dat:416 data/Cities.dat:456
+#: data/Cities.dat:489 data/Cities.dat:509 data/Cities.dat:511
+#: data/Cities.dat:524 data/Cities.dat:546 data/Cities.dat:550
+#: data/Cities.dat:619 data/Cities.dat:756 data/Cities.dat:772
+#: data/Cities.dat:1014 data/Cities.dat:1256 data/Cities.dat:1357
+#: data/Cities.dat:1421 data/Cities.dat:1456 data/Cities.dat:1534
+#: data/Cities.dat:1786 data/Cities.dat:1852 data/Cities.dat:1880
+#: data/Cities.dat:1984 data/Cities.dat:2002 data/Cities.dat:2084
+#: data/Cities.dat:2341 data/Cities.dat:2416 data/Cities.dat:2452
+#: data/Cities.dat:2546 data/Cities.dat:2702 data/Cities.dat:2822
+#: data/Cities.dat:2829
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Ohio"
@@ -6768,8 +6283,8 @@ msgid ""
 "Al Jawf"
 msgstr ""
 
-#: data/Cities.dat:37 data/Cities.dat:251
-#: data/Cities.dat:1667 data/Cities.dat:2543
+#: data/Cities.dat:37 data/Cities.dat:251 data/Cities.dat:1667
+#: data/Cities.dat:2543
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Lybia"
@@ -6799,18 +6314,14 @@ msgid ""
 "Alamo"
 msgstr ""
 
-#: data/Cities.dat:40 data/Cities.dat:163
-#: data/Cities.dat:225 data/Cities.dat:322
-#: data/Cities.dat:406 data/Cities.dat:431
-#: data/Cities.dat:707 data/Cities.dat:751
-#: data/Cities.dat:776 data/Cities.dat:797
-#: data/Cities.dat:934 data/Cities.dat:1051
-#: data/Cities.dat:1063 data/Cities.dat:1373
-#: data/Cities.dat:1465 data/Cities.dat:1579
-#: data/Cities.dat:1633 data/Cities.dat:1849
-#: data/Cities.dat:1975 data/Cities.dat:2165
-#: data/Cities.dat:2407 data/Cities.dat:2727
-#: data/Cities.dat:2770
+#: data/Cities.dat:40 data/Cities.dat:163 data/Cities.dat:225
+#: data/Cities.dat:322 data/Cities.dat:406 data/Cities.dat:431
+#: data/Cities.dat:707 data/Cities.dat:751 data/Cities.dat:776
+#: data/Cities.dat:797 data/Cities.dat:934 data/Cities.dat:1051
+#: data/Cities.dat:1063 data/Cities.dat:1373 data/Cities.dat:1465
+#: data/Cities.dat:1579 data/Cities.dat:1633 data/Cities.dat:1849
+#: data/Cities.dat:1975 data/Cities.dat:2165 data/Cities.dat:2407
+#: data/Cities.dat:2727 data/Cities.dat:2770
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Nevada"
@@ -6822,18 +6333,14 @@ msgid ""
 "Alamogordo"
 msgstr ""
 
-#: data/Cities.dat:41 data/Cities.dat:47
-#: data/Cities.dat:169 data/Cities.dat:236
-#: data/Cities.dat:428 data/Cities.dat:529
-#: data/Cities.dat:800 data/Cities.dat:819
-#: data/Cities.dat:883 data/Cities.dat:1084
-#: data/Cities.dat:1371 data/Cities.dat:1457
-#: data/Cities.dat:1458 data/Cities.dat:1500
-#: data/Cities.dat:1856 data/Cities.dat:1980
-#: data/Cities.dat:2216 data/Cities.dat:2288
-#: data/Cities.dat:2293 data/Cities.dat:2577
-#: data/Cities.dat:2580 data/Cities.dat:2646
-#: data/Cities.dat:2654
+#: data/Cities.dat:41 data/Cities.dat:47 data/Cities.dat:169
+#: data/Cities.dat:236 data/Cities.dat:428 data/Cities.dat:529
+#: data/Cities.dat:800 data/Cities.dat:819 data/Cities.dat:883
+#: data/Cities.dat:1084 data/Cities.dat:1371 data/Cities.dat:1457
+#: data/Cities.dat:1458 data/Cities.dat:1500 data/Cities.dat:1856
+#: data/Cities.dat:1980 data/Cities.dat:2216 data/Cities.dat:2288
+#: data/Cities.dat:2293 data/Cities.dat:2577 data/Cities.dat:2580
+#: data/Cities.dat:2646 data/Cities.dat:2654
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "New Mexico"
@@ -6845,113 +6352,84 @@ msgid ""
 "Albacete"
 msgstr ""
 
-#: data/Cities.dat:42 data/Cities.dat:48
-#: data/Cities.dat:60 data/Cities.dat:66
-#: data/Cities.dat:127 data/Cities.dat:172
-#: data/Cities.dat:173 data/Cities.dat:200
-#: data/Cities.dat:271 data/Cities.dat:383
-#: data/Cities.dat:402 data/Cities.dat:432
-#: data/Cities.dat:439 data/Cities.dat:454
-#: data/Cities.dat:512 data/Cities.dat:590
-#: data/Cities.dat:595 data/Cities.dat:596
-#: data/Cities.dat:597 data/Cities.dat:718
-#: data/Cities.dat:740 data/Cities.dat:786
-#: data/Cities.dat:916 data/Cities.dat:918
-#: data/Cities.dat:943 data/Cities.dat:980
-#: data/Cities.dat:1106 data/Cities.dat:1112
-#: data/Cities.dat:1113 data/Cities.dat:1156
-#: data/Cities.dat:1173 data/Cities.dat:1182
-#: data/Cities.dat:1328 data/Cities.dat:1334
-#: data/Cities.dat:1372 data/Cities.dat:1397
-#: data/Cities.dat:1413 data/Cities.dat:1444
-#: data/Cities.dat:1473 data/Cities.dat:1484
-#: data/Cities.dat:1498 data/Cities.dat:1596
-#: data/Cities.dat:1714 data/Cities.dat:1751
-#: data/Cities.dat:1752 data/Cities.dat:1754
-#: data/Cities.dat:1882 data/Cities.dat:1925
-#: data/Cities.dat:1941 data/Cities.dat:1963
-#: data/Cities.dat:1966 data/Cities.dat:1970
-#: data/Cities.dat:2029 data/Cities.dat:2062
-#: data/Cities.dat:2118 data/Cities.dat:2133
-#: data/Cities.dat:2190 data/Cities.dat:2208
-#: data/Cities.dat:2234 data/Cities.dat:2241
-#: data/Cities.dat:2264 data/Cities.dat:2274
-#: data/Cities.dat:2275 data/Cities.dat:2286
-#: data/Cities.dat:2287 data/Cities.dat:2294
-#: data/Cities.dat:2324 data/Cities.dat:2332
-#: data/Cities.dat:2396 data/Cities.dat:2503
-#: data/Cities.dat:2517 data/Cities.dat:2519
-#: data/Cities.dat:2547 data/Cities.dat:2609
-#: data/Cities.dat:2631 data/Cities.dat:2635
-#: data/Cities.dat:2636 data/Cities.dat:2662
-#: data/Cities.dat:2668 data/Cities.dat:2808
-#: data/Cities.dat:2828 data/Cities.dat:2831
+#: data/Cities.dat:42 data/Cities.dat:48 data/Cities.dat:60 data/Cities.dat:66
+#: data/Cities.dat:127 data/Cities.dat:172 data/Cities.dat:173
+#: data/Cities.dat:200 data/Cities.dat:271 data/Cities.dat:383
+#: data/Cities.dat:402 data/Cities.dat:432 data/Cities.dat:439
+#: data/Cities.dat:454 data/Cities.dat:512 data/Cities.dat:590
+#: data/Cities.dat:595 data/Cities.dat:596 data/Cities.dat:597
+#: data/Cities.dat:718 data/Cities.dat:740 data/Cities.dat:786
+#: data/Cities.dat:916 data/Cities.dat:918 data/Cities.dat:943
+#: data/Cities.dat:980 data/Cities.dat:1106 data/Cities.dat:1112
+#: data/Cities.dat:1113 data/Cities.dat:1156 data/Cities.dat:1173
+#: data/Cities.dat:1182 data/Cities.dat:1328 data/Cities.dat:1334
+#: data/Cities.dat:1372 data/Cities.dat:1397 data/Cities.dat:1413
+#: data/Cities.dat:1444 data/Cities.dat:1473 data/Cities.dat:1484
+#: data/Cities.dat:1498 data/Cities.dat:1596 data/Cities.dat:1714
+#: data/Cities.dat:1751 data/Cities.dat:1752 data/Cities.dat:1754
+#: data/Cities.dat:1882 data/Cities.dat:1925 data/Cities.dat:1941
+#: data/Cities.dat:1963 data/Cities.dat:1966 data/Cities.dat:1970
+#: data/Cities.dat:2029 data/Cities.dat:2062 data/Cities.dat:2118
+#: data/Cities.dat:2133 data/Cities.dat:2190 data/Cities.dat:2208
+#: data/Cities.dat:2234 data/Cities.dat:2241 data/Cities.dat:2264
+#: data/Cities.dat:2274 data/Cities.dat:2275 data/Cities.dat:2286
+#: data/Cities.dat:2287 data/Cities.dat:2294 data/Cities.dat:2324
+#: data/Cities.dat:2332 data/Cities.dat:2396 data/Cities.dat:2503
+#: data/Cities.dat:2517 data/Cities.dat:2519 data/Cities.dat:2547
+#: data/Cities.dat:2609 data/Cities.dat:2631 data/Cities.dat:2635
+#: data/Cities.dat:2636 data/Cities.dat:2662 data/Cities.dat:2668
+#: data/Cities.dat:2808 data/Cities.dat:2828 data/Cities.dat:2831
 #: data/Cities.dat:2841
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Spain"
 msgstr ""
 
-#: data/Cities.dat:43 data/Cities.dat:44
-#: data/Cities.dat:45
+#: data/Cities.dat:43 data/Cities.dat:44 data/Cities.dat:45
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Albany"
 msgstr ""
 
-#: data/Cities.dat:43 data/Cities.dat:67
-#: data/Cities.dat:146 data/Cities.dat:149
-#: data/Cities.dat:158 data/Cities.dat:366
-#: data/Cities.dat:429 data/Cities.dat:433
-#: data/Cities.dat:547 data/Cities.dat:711
-#: data/Cities.dat:716 data/Cities.dat:880
-#: data/Cities.dat:1331 data/Cities.dat:1461
-#: data/Cities.dat:1492 data/Cities.dat:1542
-#: data/Cities.dat:1652 data/Cities.dat:1713
-#: data/Cities.dat:2215 data/Cities.dat:2278
-#: data/Cities.dat:2308 data/Cities.dat:2533
-#: data/Cities.dat:2578 data/Cities.dat:2626
+#: data/Cities.dat:43 data/Cities.dat:67 data/Cities.dat:146
+#: data/Cities.dat:149 data/Cities.dat:158 data/Cities.dat:366
+#: data/Cities.dat:429 data/Cities.dat:433 data/Cities.dat:547
+#: data/Cities.dat:711 data/Cities.dat:716 data/Cities.dat:880
+#: data/Cities.dat:1331 data/Cities.dat:1461 data/Cities.dat:1492
+#: data/Cities.dat:1542 data/Cities.dat:1652 data/Cities.dat:1713
+#: data/Cities.dat:2215 data/Cities.dat:2278 data/Cities.dat:2308
+#: data/Cities.dat:2533 data/Cities.dat:2578 data/Cities.dat:2626
 #: data/Cities.dat:2700 data/Cities.dat:2720
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Georgia"
 msgstr ""
 
-#: data/Cities.dat:44 data/Cities.dat:274
-#: data/Cities.dat:377 data/Cities.dat:449
-#: data/Cities.dat:752 data/Cities.dat:836
-#: data/Cities.dat:928 data/Cities.dat:1088
-#: data/Cities.dat:1119 data/Cities.dat:1410
-#: data/Cities.dat:1425 data/Cities.dat:1517
-#: data/Cities.dat:1699 data/Cities.dat:1729
-#: data/Cities.dat:1792 data/Cities.dat:1812
-#: data/Cities.dat:1815 data/Cities.dat:1830
-#: data/Cities.dat:1845 data/Cities.dat:1904
-#: data/Cities.dat:2045 data/Cities.dat:2091
-#: data/Cities.dat:2194 data/Cities.dat:2313
-#: data/Cities.dat:2402 data/Cities.dat:2444
-#: data/Cities.dat:2457 data/Cities.dat:2482
-#: data/Cities.dat:2536 data/Cities.dat:2574
-#: data/Cities.dat:2619 data/Cities.dat:2630
-#: data/Cities.dat:2713 data/Cities.dat:2747
-#: data/Cities.dat:2817 data/Cities.dat:2820
+#: data/Cities.dat:44 data/Cities.dat:274 data/Cities.dat:377
+#: data/Cities.dat:449 data/Cities.dat:752 data/Cities.dat:836
+#: data/Cities.dat:928 data/Cities.dat:1088 data/Cities.dat:1119
+#: data/Cities.dat:1410 data/Cities.dat:1425 data/Cities.dat:1517
+#: data/Cities.dat:1699 data/Cities.dat:1729 data/Cities.dat:1792
+#: data/Cities.dat:1812 data/Cities.dat:1815 data/Cities.dat:1830
+#: data/Cities.dat:1845 data/Cities.dat:1904 data/Cities.dat:2045
+#: data/Cities.dat:2091 data/Cities.dat:2194 data/Cities.dat:2313
+#: data/Cities.dat:2402 data/Cities.dat:2444 data/Cities.dat:2457
+#: data/Cities.dat:2482 data/Cities.dat:2536 data/Cities.dat:2574
+#: data/Cities.dat:2619 data/Cities.dat:2630 data/Cities.dat:2713
+#: data/Cities.dat:2747 data/Cities.dat:2817 data/Cities.dat:2820
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "New York"
 msgstr ""
 
-#: data/Cities.dat:45 data/Cities.dat:140
-#: data/Cities.dat:229 data/Cities.dat:248
-#: data/Cities.dat:360 data/Cities.dat:390
-#: data/Cities.dat:558 data/Cities.dat:570
-#: data/Cities.dat:774 data/Cities.dat:953
-#: data/Cities.dat:974 data/Cities.dat:1079
-#: data/Cities.dat:1286 data/Cities.dat:1330
-#: data/Cities.dat:1351 data/Cities.dat:1586
-#: data/Cities.dat:1822 data/Cities.dat:1998
-#: data/Cities.dat:2080 data/Cities.dat:2245
-#: data/Cities.dat:2417 data/Cities.dat:2627
-#: data/Cities.dat:2695 data/Cities.dat:2706
+#: data/Cities.dat:45 data/Cities.dat:140 data/Cities.dat:229
+#: data/Cities.dat:248 data/Cities.dat:360 data/Cities.dat:390
+#: data/Cities.dat:558 data/Cities.dat:570 data/Cities.dat:774
+#: data/Cities.dat:953 data/Cities.dat:974 data/Cities.dat:1079
+#: data/Cities.dat:1286 data/Cities.dat:1330 data/Cities.dat:1351
+#: data/Cities.dat:1586 data/Cities.dat:1822 data/Cities.dat:1998
+#: data/Cities.dat:2080 data/Cities.dat:2245 data/Cities.dat:2417
+#: data/Cities.dat:2627 data/Cities.dat:2695 data/Cities.dat:2706
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Oregon"
@@ -6981,18 +6459,14 @@ msgid ""
 "Alcoa"
 msgstr ""
 
-#: data/Cities.dat:49 data/Cities.dat:147
-#: data/Cities.dat:355 data/Cities.dat:466
-#: data/Cities.dat:517 data/Cities.dat:525
-#: data/Cities.dat:538 data/Cities.dat:545
-#: data/Cities.dat:620 data/Cities.dat:699
-#: data/Cities.dat:851 data/Cities.dat:967
-#: data/Cities.dat:1064 data/Cities.dat:1161
-#: data/Cities.dat:1189 data/Cities.dat:1271
-#: data/Cities.dat:1288 data/Cities.dat:1602
-#: data/Cities.dat:1712 data/Cities.dat:1740
-#: data/Cities.dat:1784 data/Cities.dat:1874
-#: data/Cities.dat:2334 data/Cities.dat:2342
+#: data/Cities.dat:49 data/Cities.dat:147 data/Cities.dat:355
+#: data/Cities.dat:466 data/Cities.dat:517 data/Cities.dat:525
+#: data/Cities.dat:538 data/Cities.dat:545 data/Cities.dat:620
+#: data/Cities.dat:699 data/Cities.dat:851 data/Cities.dat:967
+#: data/Cities.dat:1064 data/Cities.dat:1161 data/Cities.dat:1189
+#: data/Cities.dat:1271 data/Cities.dat:1288 data/Cities.dat:1602
+#: data/Cities.dat:1712 data/Cities.dat:1740 data/Cities.dat:1784
+#: data/Cities.dat:1874 data/Cities.dat:2334 data/Cities.dat:2342
 #: data/Cities.dat:2611
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
@@ -7023,50 +6497,35 @@ msgid ""
 "Alessandria"
 msgstr ""
 
-#: data/Cities.dat:52 data/Cities.dat:87
-#: data/Cities.dat:92 data/Cities.dat:107
-#: data/Cities.dat:111 data/Cities.dat:115
-#: data/Cities.dat:116 data/Cities.dat:136
-#: data/Cities.dat:166 data/Cities.dat:201
-#: data/Cities.dat:202 data/Cities.dat:255
-#: data/Cities.dat:306 data/Cities.dat:307
-#: data/Cities.dat:343 data/Cities.dat:344
-#: data/Cities.dat:350 data/Cities.dat:399
-#: data/Cities.dat:411 data/Cities.dat:437
-#: data/Cities.dat:442 data/Cities.dat:443
-#: data/Cities.dat:551 data/Cities.dat:571
-#: data/Cities.dat:608 data/Cities.dat:631
-#: data/Cities.dat:804 data/Cities.dat:813
-#: data/Cities.dat:818 data/Cities.dat:822
-#: data/Cities.dat:907 data/Cities.dat:976
-#: data/Cities.dat:1150 data/Cities.dat:1153
-#: data/Cities.dat:1327 data/Cities.dat:1338
-#: data/Cities.dat:1361 data/Cities.dat:1375
-#: data/Cities.dat:1392 data/Cities.dat:1393
-#: data/Cities.dat:1438 data/Cities.dat:1445
-#: data/Cities.dat:1470 data/Cities.dat:1561
-#: data/Cities.dat:1619 data/Cities.dat:1643
-#: data/Cities.dat:1675 data/Cities.dat:1719
-#: data/Cities.dat:1725 data/Cities.dat:1779
-#: data/Cities.dat:1866 data/Cities.dat:1883
-#: data/Cities.dat:1895 data/Cities.dat:1901
-#: data/Cities.dat:1933 data/Cities.dat:1955
-#: data/Cities.dat:1964 data/Cities.dat:1973
-#: data/Cities.dat:1983 data/Cities.dat:2008
-#: data/Cities.dat:2009 data/Cities.dat:2010
-#: data/Cities.dat:2025 data/Cities.dat:2035
-#: data/Cities.dat:2087 data/Cities.dat:2094
-#: data/Cities.dat:2107 data/Cities.dat:2149
-#: data/Cities.dat:2159 data/Cities.dat:2180
-#: data/Cities.dat:2206 data/Cities.dat:2247
-#: data/Cities.dat:2290 data/Cities.dat:2304
-#: data/Cities.dat:2309 data/Cities.dat:2355
-#: data/Cities.dat:2356 data/Cities.dat:2369
-#: data/Cities.dat:2502 data/Cities.dat:2516
-#: data/Cities.dat:2562 data/Cities.dat:2564
-#: data/Cities.dat:2566 data/Cities.dat:2567
-#: data/Cities.dat:2585 data/Cities.dat:2596
-#: data/Cities.dat:2648 data/Cities.dat:2653
+#: data/Cities.dat:52 data/Cities.dat:87 data/Cities.dat:92 data/Cities.dat:107
+#: data/Cities.dat:111 data/Cities.dat:115 data/Cities.dat:116
+#: data/Cities.dat:136 data/Cities.dat:166 data/Cities.dat:201
+#: data/Cities.dat:202 data/Cities.dat:255 data/Cities.dat:306
+#: data/Cities.dat:307 data/Cities.dat:343 data/Cities.dat:344
+#: data/Cities.dat:350 data/Cities.dat:399 data/Cities.dat:411
+#: data/Cities.dat:437 data/Cities.dat:442 data/Cities.dat:443
+#: data/Cities.dat:551 data/Cities.dat:571 data/Cities.dat:608
+#: data/Cities.dat:631 data/Cities.dat:804 data/Cities.dat:813
+#: data/Cities.dat:818 data/Cities.dat:822 data/Cities.dat:907
+#: data/Cities.dat:976 data/Cities.dat:1150 data/Cities.dat:1153
+#: data/Cities.dat:1327 data/Cities.dat:1338 data/Cities.dat:1361
+#: data/Cities.dat:1375 data/Cities.dat:1392 data/Cities.dat:1393
+#: data/Cities.dat:1438 data/Cities.dat:1445 data/Cities.dat:1470
+#: data/Cities.dat:1561 data/Cities.dat:1619 data/Cities.dat:1643
+#: data/Cities.dat:1675 data/Cities.dat:1719 data/Cities.dat:1725
+#: data/Cities.dat:1779 data/Cities.dat:1866 data/Cities.dat:1883
+#: data/Cities.dat:1895 data/Cities.dat:1901 data/Cities.dat:1933
+#: data/Cities.dat:1955 data/Cities.dat:1964 data/Cities.dat:1973
+#: data/Cities.dat:1983 data/Cities.dat:2008 data/Cities.dat:2009
+#: data/Cities.dat:2010 data/Cities.dat:2025 data/Cities.dat:2035
+#: data/Cities.dat:2087 data/Cities.dat:2094 data/Cities.dat:2107
+#: data/Cities.dat:2149 data/Cities.dat:2159 data/Cities.dat:2180
+#: data/Cities.dat:2206 data/Cities.dat:2247 data/Cities.dat:2290
+#: data/Cities.dat:2304 data/Cities.dat:2309 data/Cities.dat:2355
+#: data/Cities.dat:2356 data/Cities.dat:2369 data/Cities.dat:2502
+#: data/Cities.dat:2516 data/Cities.dat:2562 data/Cities.dat:2564
+#: data/Cities.dat:2566 data/Cities.dat:2567 data/Cities.dat:2585
+#: data/Cities.dat:2596 data/Cities.dat:2648 data/Cities.dat:2653
 #: data/Cities.dat:2656
 msgid ""
 "_: Country name (optional, but should be translated)\n"
@@ -7079,69 +6538,55 @@ msgid ""
 "Alexander City"
 msgstr ""
 
-#: data/Cities.dat:53 data/Cities.dat:100
-#: data/Cities.dat:151 data/Cities.dat:153
-#: data/Cities.dat:277 data/Cities.dat:671
-#: data/Cities.dat:812 data/Cities.dat:814
-#: data/Cities.dat:833 data/Cities.dat:878
-#: data/Cities.dat:1120 data/Cities.dat:1434
-#: data/Cities.dat:1494 data/Cities.dat:1610
-#: data/Cities.dat:1673 data/Cities.dat:1695
-#: data/Cities.dat:1731 data/Cities.dat:1913
-#: data/Cities.dat:2020 data/Cities.dat:2325
-#: data/Cities.dat:2528 data/Cities.dat:2587
+#: data/Cities.dat:53 data/Cities.dat:100 data/Cities.dat:151
+#: data/Cities.dat:153 data/Cities.dat:277 data/Cities.dat:671
+#: data/Cities.dat:812 data/Cities.dat:814 data/Cities.dat:833
+#: data/Cities.dat:878 data/Cities.dat:1120 data/Cities.dat:1434
+#: data/Cities.dat:1494 data/Cities.dat:1610 data/Cities.dat:1673
+#: data/Cities.dat:1695 data/Cities.dat:1731 data/Cities.dat:1913
+#: data/Cities.dat:2020 data/Cities.dat:2325 data/Cities.dat:2528
+#: data/Cities.dat:2587
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Alabama"
 msgstr ""
 
-#: data/Cities.dat:54 data/Cities.dat:55
-#: data/Cities.dat:56
+#: data/Cities.dat:54 data/Cities.dat:55 data/Cities.dat:56
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Alexandria"
 msgstr ""
 
-#: data/Cities.dat:54 data/Cities.dat:142
-#: data/Cities.dat:143 data/Cities.dat:400
-#: data/Cities.dat:739 data/Cities.dat:1061
+#: data/Cities.dat:54 data/Cities.dat:142 data/Cities.dat:143
+#: data/Cities.dat:400 data/Cities.dat:739 data/Cities.dat:1061
 #: data/Cities.dat:1463 data/Cities.dat:2464
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Egypt"
 msgstr ""
 
-#: data/Cities.dat:55 data/Cities.dat:216
-#: data/Cities.dat:301 data/Cities.dat:318
-#: data/Cities.dat:635 data/Cities.dat:805
-#: data/Cities.dat:808 data/Cities.dat:1108
-#: data/Cities.dat:1252 data/Cities.dat:1343
-#: data/Cities.dat:1349 data/Cities.dat:1583
-#: data/Cities.dat:1620 data/Cities.dat:1686
-#: data/Cities.dat:1707 data/Cities.dat:1808
-#: data/Cities.dat:1811 data/Cities.dat:2076
-#: data/Cities.dat:2227 data/Cities.dat:2350
-#: data/Cities.dat:2379 data/Cities.dat:2525
-#: data/Cities.dat:2692 data/Cities.dat:2773
+#: data/Cities.dat:55 data/Cities.dat:216 data/Cities.dat:301
+#: data/Cities.dat:318 data/Cities.dat:635 data/Cities.dat:805
+#: data/Cities.dat:808 data/Cities.dat:1108 data/Cities.dat:1252
+#: data/Cities.dat:1343 data/Cities.dat:1349 data/Cities.dat:1583
+#: data/Cities.dat:1620 data/Cities.dat:1686 data/Cities.dat:1707
+#: data/Cities.dat:1808 data/Cities.dat:1811 data/Cities.dat:2076
+#: data/Cities.dat:2227 data/Cities.dat:2350 data/Cities.dat:2379
+#: data/Cities.dat:2525 data/Cities.dat:2692 data/Cities.dat:2773
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Louisiana"
 msgstr ""
 
-#: data/Cities.dat:56 data/Cities.dat:123
-#: data/Cities.dat:463 data/Cities.dat:477
-#: data/Cities.dat:612 data/Cities.dat:855
-#: data/Cities.dat:1018 data/Cities.dat:1037
-#: data/Cities.dat:1065 data/Cities.dat:1267
-#: data/Cities.dat:1479 data/Cities.dat:1543
-#: data/Cities.dat:1556 data/Cities.dat:1577
-#: data/Cities.dat:1826 data/Cities.dat:1842
-#: data/Cities.dat:1859 data/Cities.dat:2014
-#: data/Cities.dat:2085 data/Cities.dat:2177
-#: data/Cities.dat:2188 data/Cities.dat:2450
-#: data/Cities.dat:2465 data/Cities.dat:2666
-#: data/Cities.dat:2722 data/Cities.dat:2765
-#: data/Cities.dat:2796
+#: data/Cities.dat:56 data/Cities.dat:123 data/Cities.dat:463
+#: data/Cities.dat:477 data/Cities.dat:612 data/Cities.dat:855
+#: data/Cities.dat:1018 data/Cities.dat:1037 data/Cities.dat:1065
+#: data/Cities.dat:1267 data/Cities.dat:1479 data/Cities.dat:1543
+#: data/Cities.dat:1556 data/Cities.dat:1577 data/Cities.dat:1826
+#: data/Cities.dat:1842 data/Cities.dat:1859 data/Cities.dat:2014
+#: data/Cities.dat:2085 data/Cities.dat:2177 data/Cities.dat:2188
+#: data/Cities.dat:2450 data/Cities.dat:2465 data/Cities.dat:2666
+#: data/Cities.dat:2722 data/Cities.dat:2765 data/Cities.dat:2796
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Virginia"
@@ -7153,11 +6598,10 @@ msgid ""
 "Algiers"
 msgstr ""
 
-#: data/Cities.dat:57 data/Cities.dat:96
-#: data/Cities.dat:889 data/Cities.dat:1042
-#: data/Cities.dat:1916 data/Cities.dat:2132
-#: data/Cities.dat:2305 data/Cities.dat:2494
-#: data/Cities.dat:2539 data/Cities.dat:2541
+#: data/Cities.dat:57 data/Cities.dat:96 data/Cities.dat:889
+#: data/Cities.dat:1042 data/Cities.dat:1916 data/Cities.dat:2132
+#: data/Cities.dat:2305 data/Cities.dat:2494 data/Cities.dat:2539
+#: data/Cities.dat:2541
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Algeria"
@@ -7199,20 +6643,15 @@ msgid ""
 "Allegheny Obs."
 msgstr ""
 
-#: data/Cities.dat:62 data/Cities.dat:63
-#: data/Cities.dat:70 data/Cities.dat:264
-#: data/Cities.dat:468 data/Cities.dat:479
-#: data/Cities.dat:713 data/Cities.dat:755
-#: data/Cities.dat:761 data/Cities.dat:764
-#: data/Cities.dat:1034 data/Cities.dat:1191
-#: data/Cities.dat:1364 data/Cities.dat:1581
-#: data/Cities.dat:1737 data/Cities.dat:1803
-#: data/Cities.dat:2021 data/Cities.dat:2036
-#: data/Cities.dat:2090 data/Cities.dat:2127
-#: data/Cities.dat:2152 data/Cities.dat:2317
-#: data/Cities.dat:2703 data/Cities.dat:2723
-#: data/Cities.dat:2756 data/Cities.dat:2794
-#: data/Cities.dat:2807 data/Cities.dat:2819
+#: data/Cities.dat:62 data/Cities.dat:63 data/Cities.dat:70 data/Cities.dat:264
+#: data/Cities.dat:468 data/Cities.dat:479 data/Cities.dat:713
+#: data/Cities.dat:755 data/Cities.dat:761 data/Cities.dat:764
+#: data/Cities.dat:1034 data/Cities.dat:1191 data/Cities.dat:1364
+#: data/Cities.dat:1581 data/Cities.dat:1737 data/Cities.dat:1803
+#: data/Cities.dat:2021 data/Cities.dat:2036 data/Cities.dat:2090
+#: data/Cities.dat:2127 data/Cities.dat:2152 data/Cities.dat:2317
+#: data/Cities.dat:2703 data/Cities.dat:2723 data/Cities.dat:2756
+#: data/Cities.dat:2794 data/Cities.dat:2807 data/Cities.dat:2819
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Pennsylvania"
@@ -7278,15 +6717,12 @@ msgid ""
 "Amami Island"
 msgstr ""
 
-#: data/Cities.dat:71 data/Cities.dat:168
-#: data/Cities.dat:496 data/Cities.dat:869
-#: data/Cities.dat:870 data/Cities.dat:1072
-#: data/Cities.dat:1278 data/Cities.dat:1323
-#: data/Cities.dat:1324 data/Cities.dat:1672
-#: data/Cities.dat:1761 data/Cities.dat:1762
-#: data/Cities.dat:1837 data/Cities.dat:1897
-#: data/Cities.dat:1898 data/Cities.dat:1928
-#: data/Cities.dat:2297 data/Cities.dat:2466
+#: data/Cities.dat:71 data/Cities.dat:168 data/Cities.dat:496
+#: data/Cities.dat:869 data/Cities.dat:870 data/Cities.dat:1072
+#: data/Cities.dat:1278 data/Cities.dat:1323 data/Cities.dat:1324
+#: data/Cities.dat:1672 data/Cities.dat:1761 data/Cities.dat:1762
+#: data/Cities.dat:1837 data/Cities.dat:1897 data/Cities.dat:1898
+#: data/Cities.dat:1928 data/Cities.dat:2297 data/Cities.dat:2466
 #: data/Cities.dat:2545 data/Cities.dat:2560
 msgid ""
 "_: Country name (optional, but should be translated)\n"
@@ -7323,18 +6759,14 @@ msgid ""
 "Ames"
 msgstr ""
 
-#: data/Cities.dat:76 data/Cities.dat:265
-#: data/Cities.dat:386 data/Cities.dat:447
-#: data/Cities.dat:448 data/Cities.dat:527
-#: data/Cities.dat:563 data/Cities.dat:567
-#: data/Cities.dat:576 data/Cities.dat:611
-#: data/Cities.dat:618 data/Cities.dat:644
-#: data/Cities.dat:686 data/Cities.dat:692
-#: data/Cities.dat:742 data/Cities.dat:826
-#: data/Cities.dat:1142 data/Cities.dat:1560
-#: data/Cities.dat:1805 data/Cities.dat:1850
-#: data/Cities.dat:1936 data/Cities.dat:2099
-#: data/Cities.dat:2343 data/Cities.dat:2365
+#: data/Cities.dat:76 data/Cities.dat:265 data/Cities.dat:386
+#: data/Cities.dat:447 data/Cities.dat:448 data/Cities.dat:527
+#: data/Cities.dat:563 data/Cities.dat:567 data/Cities.dat:576
+#: data/Cities.dat:611 data/Cities.dat:618 data/Cities.dat:644
+#: data/Cities.dat:686 data/Cities.dat:692 data/Cities.dat:742
+#: data/Cities.dat:826 data/Cities.dat:1142 data/Cities.dat:1560
+#: data/Cities.dat:1805 data/Cities.dat:1850 data/Cities.dat:1936
+#: data/Cities.dat:2099 data/Cities.dat:2343 data/Cities.dat:2365
 #: data/Cities.dat:2410 data/Cities.dat:2711
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
@@ -7395,12 +6827,10 @@ msgid ""
 "Amsterdam"
 msgstr ""
 
-#: data/Cities.dat:82 data/Cities.dat:698
-#: data/Cities.dat:975 data/Cities.dat:998
-#: data/Cities.dat:1398 data/Cities.dat:1488
-#: data/Cities.dat:1634 data/Cities.dat:1834
-#: data/Cities.dat:2218 data/Cities.dat:2535
-#: data/Cities.dat:2621 data/Cities.dat:2736
+#: data/Cities.dat:82 data/Cities.dat:698 data/Cities.dat:975
+#: data/Cities.dat:998 data/Cities.dat:1398 data/Cities.dat:1488
+#: data/Cities.dat:1634 data/Cities.dat:1834 data/Cities.dat:2218
+#: data/Cities.dat:2535 data/Cities.dat:2621 data/Cities.dat:2736
 #: data/Cities.dat:2758 data/Cities.dat:2782
 msgid ""
 "_: Country name (optional, but should be translated)\n"
@@ -7413,18 +6843,14 @@ msgid ""
 "Anaconda"
 msgstr ""
 
-#: data/Cities.dat:83 data/Cities.dat:179
-#: data/Cities.dat:272 data/Cities.dat:331
-#: data/Cities.dat:394 data/Cities.dat:493
-#: data/Cities.dat:594 data/Cities.dat:657
-#: data/Cities.dat:824 data/Cities.dat:955
-#: data/Cities.dat:1049 data/Cities.dat:1057
-#: data/Cities.dat:1212 data/Cities.dat:1411
-#: data/Cities.dat:1435 data/Cities.dat:1447
-#: data/Cities.dat:1669 data/Cities.dat:1914
-#: data/Cities.dat:2057 data/Cities.dat:2064
-#: data/Cities.dat:2220 data/Cities.dat:2573
-#: data/Cities.dat:2772
+#: data/Cities.dat:83 data/Cities.dat:179 data/Cities.dat:272
+#: data/Cities.dat:331 data/Cities.dat:394 data/Cities.dat:493
+#: data/Cities.dat:594 data/Cities.dat:657 data/Cities.dat:824
+#: data/Cities.dat:955 data/Cities.dat:1049 data/Cities.dat:1057
+#: data/Cities.dat:1212 data/Cities.dat:1411 data/Cities.dat:1435
+#: data/Cities.dat:1447 data/Cities.dat:1669 data/Cities.dat:1914
+#: data/Cities.dat:2057 data/Cities.dat:2064 data/Cities.dat:2220
+#: data/Cities.dat:2573 data/Cities.dat:2772
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Montana"
@@ -7436,12 +6862,10 @@ msgid ""
 "Anadyr"
 msgstr ""
 
-#: data/Cities.dat:84 data/Cities.dat:278
-#: data/Cities.dat:729 data/Cities.dat:1257
-#: data/Cities.dat:1499 data/Cities.dat:1664
-#: data/Cities.dat:1948 data/Cities.dat:1960
-#: data/Cities.dat:2015 data/Cities.dat:2018
-#: data/Cities.dat:2111 data/Cities.dat:2671
+#: data/Cities.dat:84 data/Cities.dat:278 data/Cities.dat:729
+#: data/Cities.dat:1257 data/Cities.dat:1499 data/Cities.dat:1664
+#: data/Cities.dat:1948 data/Cities.dat:1960 data/Cities.dat:2015
+#: data/Cities.dat:2018 data/Cities.dat:2111 data/Cities.dat:2671
 #: data/Cities.dat:2799 data/Cities.dat:2827
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
@@ -7472,15 +6896,12 @@ msgid ""
 "Anderson"
 msgstr ""
 
-#: data/Cities.dat:88 data/Cities.dat:291
-#: data/Cities.dat:623 data/Cities.dat:749
-#: data/Cities.dat:780 data/Cities.dat:841
-#: data/Cities.dat:896 data/Cities.dat:1017
-#: data/Cities.dat:1136 data/Cities.dat:1296
-#: data/Cities.dat:1342 data/Cities.dat:1666
-#: data/Cities.dat:1696 data/Cities.dat:1700
-#: data/Cities.dat:1736 data/Cities.dat:1795
-#: data/Cities.dat:1801 data/Cities.dat:2398
+#: data/Cities.dat:88 data/Cities.dat:291 data/Cities.dat:623
+#: data/Cities.dat:749 data/Cities.dat:780 data/Cities.dat:841
+#: data/Cities.dat:896 data/Cities.dat:1017 data/Cities.dat:1136
+#: data/Cities.dat:1296 data/Cities.dat:1342 data/Cities.dat:1666
+#: data/Cities.dat:1696 data/Cities.dat:1700 data/Cities.dat:1736
+#: data/Cities.dat:1795 data/Cities.dat:1801 data/Cities.dat:2398
 #: data/Cities.dat:2518 data/Cities.dat:2678
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
@@ -7499,55 +6920,41 @@ msgid ""
 "Andong"
 msgstr ""
 
-#: data/Cities.dat:91 data/Cities.dat:987
-#: data/Cities.dat:1738 data/Cities.dat:2053
-#: data/Cities.dat:2600 data/Cities.dat:2604
-#: data/Cities.dat:2605 data/Cities.dat:2811
-#: data/Cities.dat:2812 data/Cities.dat:2813
+#: data/Cities.dat:91 data/Cities.dat:987 data/Cities.dat:1738
+#: data/Cities.dat:2053 data/Cities.dat:2600 data/Cities.dat:2604
+#: data/Cities.dat:2605 data/Cities.dat:2811 data/Cities.dat:2812
+#: data/Cities.dat:2813
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Gyeongbuk"
 msgstr ""
 
-#: data/Cities.dat:91 data/Cities.dat:300
-#: data/Cities.dat:370 data/Cities.dat:393
-#: data/Cities.dat:396 data/Cities.dat:455
-#: data/Cities.dat:471 data/Cities.dat:472
-#: data/Cities.dat:503 data/Cities.dat:504
-#: data/Cities.dat:505 data/Cities.dat:599
-#: data/Cities.dat:600 data/Cities.dat:601
-#: data/Cities.dat:666 data/Cities.dat:668
-#: data/Cities.dat:669 data/Cities.dat:886
-#: data/Cities.dat:887 data/Cities.dat:908
-#: data/Cities.dat:909 data/Cities.dat:910
-#: data/Cities.dat:933 data/Cities.dat:987
-#: data/Cities.dat:988 data/Cities.dat:992
-#: data/Cities.dat:1000 data/Cities.dat:1001
-#: data/Cities.dat:1027 data/Cities.dat:1069
-#: data/Cities.dat:1098 data/Cities.dat:1116
-#: data/Cities.dat:1129 data/Cities.dat:1131
-#: data/Cities.dat:1132 data/Cities.dat:1168
-#: data/Cities.dat:1169 data/Cities.dat:1174
-#: data/Cities.dat:1177 data/Cities.dat:1180
-#: data/Cities.dat:1181 data/Cities.dat:1186
-#: data/Cities.dat:1203 data/Cities.dat:1266
-#: data/Cities.dat:1486 data/Cities.dat:1539
-#: data/Cities.dat:1557 data/Cities.dat:1665
-#: data/Cities.dat:1680 data/Cities.dat:1734
-#: data/Cities.dat:1738 data/Cities.dat:1768
-#: data/Cities.dat:1773 data/Cities.dat:1950
-#: data/Cities.dat:2053 data/Cities.dat:2276
-#: data/Cities.dat:2327 data/Cities.dat:2328
-#: data/Cities.dat:2329 data/Cities.dat:2330
-#: data/Cities.dat:2364 data/Cities.dat:2387
-#: data/Cities.dat:2469 data/Cities.dat:2475
-#: data/Cities.dat:2486 data/Cities.dat:2552
-#: data/Cities.dat:2600 data/Cities.dat:2604
-#: data/Cities.dat:2605 data/Cities.dat:2607
-#: data/Cities.dat:2699 data/Cities.dat:2783
-#: data/Cities.dat:2784 data/Cities.dat:2803
-#: data/Cities.dat:2811 data/Cities.dat:2812
-#: data/Cities.dat:2813 data/Cities.dat:2814
+#: data/Cities.dat:91 data/Cities.dat:300 data/Cities.dat:370
+#: data/Cities.dat:393 data/Cities.dat:396 data/Cities.dat:455
+#: data/Cities.dat:471 data/Cities.dat:472 data/Cities.dat:503
+#: data/Cities.dat:504 data/Cities.dat:505 data/Cities.dat:599
+#: data/Cities.dat:600 data/Cities.dat:601 data/Cities.dat:666
+#: data/Cities.dat:668 data/Cities.dat:669 data/Cities.dat:886
+#: data/Cities.dat:887 data/Cities.dat:908 data/Cities.dat:909
+#: data/Cities.dat:910 data/Cities.dat:933 data/Cities.dat:987
+#: data/Cities.dat:988 data/Cities.dat:992 data/Cities.dat:1000
+#: data/Cities.dat:1001 data/Cities.dat:1027 data/Cities.dat:1069
+#: data/Cities.dat:1098 data/Cities.dat:1116 data/Cities.dat:1129
+#: data/Cities.dat:1131 data/Cities.dat:1132 data/Cities.dat:1168
+#: data/Cities.dat:1169 data/Cities.dat:1174 data/Cities.dat:1177
+#: data/Cities.dat:1180 data/Cities.dat:1181 data/Cities.dat:1186
+#: data/Cities.dat:1203 data/Cities.dat:1266 data/Cities.dat:1486
+#: data/Cities.dat:1539 data/Cities.dat:1557 data/Cities.dat:1665
+#: data/Cities.dat:1680 data/Cities.dat:1734 data/Cities.dat:1738
+#: data/Cities.dat:1768 data/Cities.dat:1773 data/Cities.dat:1950
+#: data/Cities.dat:2053 data/Cities.dat:2276 data/Cities.dat:2327
+#: data/Cities.dat:2328 data/Cities.dat:2329 data/Cities.dat:2330
+#: data/Cities.dat:2364 data/Cities.dat:2387 data/Cities.dat:2469
+#: data/Cities.dat:2475 data/Cities.dat:2486 data/Cities.dat:2552
+#: data/Cities.dat:2600 data/Cities.dat:2604 data/Cities.dat:2605
+#: data/Cities.dat:2607 data/Cities.dat:2699 data/Cities.dat:2783
+#: data/Cities.dat:2784 data/Cities.dat:2803 data/Cities.dat:2811
+#: data/Cities.dat:2812 data/Cities.dat:2813 data/Cities.dat:2814
 #: data/Cities.dat:2815 data/Cities.dat:2826
 msgid ""
 "_: Country name (optional, but should be translated)\n"
@@ -7578,9 +6985,8 @@ msgid ""
 "Ankara"
 msgstr ""
 
-#: data/Cities.dat:94 data/Cities.dat:190
-#: data/Cities.dat:659 data/Cities.dat:1133
-#: data/Cities.dat:1152
+#: data/Cities.dat:94 data/Cities.dat:190 data/Cities.dat:659
+#: data/Cities.dat:1133 data/Cities.dat:1152
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Turkey"
@@ -7592,24 +6998,18 @@ msgid ""
 "Ann Arbor"
 msgstr ""
 
-#: data/Cities.dat:95 data/Cities.dat:217
-#: data/Cities.dat:218 data/Cities.dat:625
-#: data/Cities.dat:626 data/Cities.dat:647
-#: data/Cities.dat:706 data/Cities.dat:811
-#: data/Cities.dat:949 data/Cities.dat:1020
-#: data/Cities.dat:1031 data/Cities.dat:1146
-#: data/Cities.dat:1159 data/Cities.dat:1208
-#: data/Cities.dat:1340 data/Cities.dat:1366
-#: data/Cities.dat:1437 data/Cities.dat:1551
-#: data/Cities.dat:1743 data/Cities.dat:1868
-#: data/Cities.dat:2063 data/Cities.dat:2072
-#: data/Cities.dat:2195 data/Cities.dat:2211
-#: data/Cities.dat:2222 data/Cities.dat:2237
-#: data/Cities.dat:2307 data/Cities.dat:2403
-#: data/Cities.dat:2423 data/Cities.dat:2451
-#: data/Cities.dat:2507 data/Cities.dat:2563
-#: data/Cities.dat:2572 data/Cities.dat:2701
-#: data/Cities.dat:2738 data/Cities.dat:2795
+#: data/Cities.dat:95 data/Cities.dat:217 data/Cities.dat:218
+#: data/Cities.dat:625 data/Cities.dat:626 data/Cities.dat:647
+#: data/Cities.dat:706 data/Cities.dat:811 data/Cities.dat:949
+#: data/Cities.dat:1020 data/Cities.dat:1031 data/Cities.dat:1146
+#: data/Cities.dat:1159 data/Cities.dat:1208 data/Cities.dat:1340
+#: data/Cities.dat:1366 data/Cities.dat:1437 data/Cities.dat:1551
+#: data/Cities.dat:1743 data/Cities.dat:1868 data/Cities.dat:2063
+#: data/Cities.dat:2072 data/Cities.dat:2195 data/Cities.dat:2211
+#: data/Cities.dat:2222 data/Cities.dat:2237 data/Cities.dat:2307
+#: data/Cities.dat:2403 data/Cities.dat:2423 data/Cities.dat:2451
+#: data/Cities.dat:2507 data/Cities.dat:2563 data/Cities.dat:2572
+#: data/Cities.dat:2701 data/Cities.dat:2738 data/Cities.dat:2795
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Michigan"
@@ -7663,9 +7063,8 @@ msgid ""
 "Antananarivo"
 msgstr ""
 
-#: data/Cities.dat:102 data/Cities.dat:105
-#: data/Cities.dat:1506 data/Cities.dat:2542
-#: data/Cities.dat:2548
+#: data/Cities.dat:102 data/Cities.dat:105 data/Cities.dat:1506
+#: data/Cities.dat:2542 data/Cities.dat:2548
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Madagascar"
@@ -7683,11 +7082,10 @@ msgid ""
 "Antofagasta"
 msgstr ""
 
-#: data/Cities.dat:104 data/Cities.dat:118
-#: data/Cities.dat:452 data/Cities.dat:453
-#: data/Cities.dat:555 data/Cities.dat:1337
-#: data/Cities.dat:1370 data/Cities.dat:2116
-#: data/Cities.dat:2295 data/Cities.dat:2634
+#: data/Cities.dat:104 data/Cities.dat:118 data/Cities.dat:452
+#: data/Cities.dat:453 data/Cities.dat:555 data/Cities.dat:1337
+#: data/Cities.dat:1370 data/Cities.dat:2116 data/Cities.dat:2295
+#: data/Cities.dat:2634
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Chile"
@@ -7705,9 +7103,8 @@ msgid ""
 "Antwerp"
 msgstr ""
 
-#: data/Cities.dat:106 data/Cities.dat:368
-#: data/Cities.dat:1114 data/Cities.dat:1911
-#: data/Cities.dat:2602
+#: data/Cities.dat:106 data/Cities.dat:368 data/Cities.dat:1114
+#: data/Cities.dat:1911 data/Cities.dat:2602
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Belgium"
@@ -7725,18 +7122,14 @@ msgid ""
 "Appleton"
 msgstr ""
 
-#: data/Cities.dat:108 data/Cities.dat:199
-#: data/Cities.dat:207 data/Cities.dat:316
-#: data/Cities.dat:634 data/Cities.dat:717
-#: data/Cities.dat:820 data/Cities.dat:959
-#: data/Cities.dat:1121 data/Cities.dat:1167
-#: data/Cities.dat:1254 data/Cities.dat:1329
-#: data/Cities.dat:1496 data/Cities.dat:1531
-#: data/Cities.dat:1657 data/Cities.dat:1930
-#: data/Cities.dat:2136 data/Cities.dat:2169
-#: data/Cities.dat:2339 data/Cities.dat:2461
-#: data/Cities.dat:2472 data/Cities.dat:2717
-#: data/Cities.dat:2718 data/Cities.dat:2719
+#: data/Cities.dat:108 data/Cities.dat:199 data/Cities.dat:207
+#: data/Cities.dat:316 data/Cities.dat:634 data/Cities.dat:717
+#: data/Cities.dat:820 data/Cities.dat:959 data/Cities.dat:1121
+#: data/Cities.dat:1167 data/Cities.dat:1254 data/Cities.dat:1329
+#: data/Cities.dat:1496 data/Cities.dat:1531 data/Cities.dat:1657
+#: data/Cities.dat:1930 data/Cities.dat:2136 data/Cities.dat:2169
+#: data/Cities.dat:2339 data/Cities.dat:2461 data/Cities.dat:2472
+#: data/Cities.dat:2717 data/Cities.dat:2718 data/Cities.dat:2719
 #: data/Cities.dat:2729 data/Cities.dat:2816
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
@@ -7779,9 +7172,8 @@ msgid ""
 "Arecibo Obs."
 msgstr ""
 
-#: data/Cities.dat:114 data/Cities.dat:314
-#: data/Cities.dat:1568 data/Cities.dat:2061
-#: data/Cities.dat:2117 data/Cities.dat:2207
+#: data/Cities.dat:114 data/Cities.dat:314 data/Cities.dat:1568
+#: data/Cities.dat:2061 data/Cities.dat:2117 data/Cities.dat:2207
 #: data/Cities.dat:2268
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
@@ -7818,18 +7210,14 @@ msgid ""
 "Arkadelphia"
 msgstr ""
 
-#: data/Cities.dat:119 data/Cities.dat:157
-#: data/Cities.dat:253 data/Cities.dat:560
-#: data/Cities.dat:733 data/Cities.dat:773
-#: data/Cities.dat:802 data/Cities.dat:823
-#: data/Cities.dat:840 data/Cities.dat:1036
-#: data/Cities.dat:1107 data/Cities.dat:1162
-#: data/Cities.dat:1193 data/Cities.dat:1353
-#: data/Cities.dat:1431 data/Cities.dat:1502
-#: data/Cities.dat:1603 data/Cities.dat:1851
-#: data/Cities.dat:1949 data/Cities.dat:2033
-#: data/Cities.dat:2205 data/Cities.dat:2412
-#: data/Cities.dat:2520 data/Cities.dat:2733
+#: data/Cities.dat:119 data/Cities.dat:157 data/Cities.dat:253
+#: data/Cities.dat:560 data/Cities.dat:733 data/Cities.dat:773
+#: data/Cities.dat:802 data/Cities.dat:823 data/Cities.dat:840
+#: data/Cities.dat:1036 data/Cities.dat:1107 data/Cities.dat:1162
+#: data/Cities.dat:1193 data/Cities.dat:1353 data/Cities.dat:1431
+#: data/Cities.dat:1502 data/Cities.dat:1603 data/Cities.dat:1851
+#: data/Cities.dat:1949 data/Cities.dat:2033 data/Cities.dat:2205
+#: data/Cities.dat:2412 data/Cities.dat:2520 data/Cities.dat:2733
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Arkansas"
@@ -7841,18 +7229,15 @@ msgid ""
 "Arkhangelsk"
 msgstr ""
 
-#: data/Cities.dat:120 data/Cities.dat:1211
-#: data/Cities.dat:1741 data/Cities.dat:1867
-#: data/Cities.dat:2016 data/Cities.dat:2114
-#: data/Cities.dat:2439 data/Cities.dat:2481
-#: data/Cities.dat:2673
+#: data/Cities.dat:120 data/Cities.dat:1211 data/Cities.dat:1741
+#: data/Cities.dat:1867 data/Cities.dat:2016 data/Cities.dat:2114
+#: data/Cities.dat:2439 data/Cities.dat:2481 data/Cities.dat:2673
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "North-West Region"
 msgstr ""
 
-#: data/Cities.dat:121 data/Cities.dat:122
-#: data/Cities.dat:123
+#: data/Cities.dat:121 data/Cities.dat:122 data/Cities.dat:123
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Arlington"
@@ -7864,26 +7249,19 @@ msgid ""
 "Arlington Heights"
 msgstr ""
 
-#: data/Cities.dat:124 data/Cities.dat:161
-#: data/Cities.dat:241 data/Cities.dat:290
-#: data/Cities.dat:424 data/Cities.dat:434
-#: data/Cities.dat:457 data/Cities.dat:483
-#: data/Cities.dat:487 data/Cities.dat:508
-#: data/Cities.dat:585 data/Cities.dat:627
-#: data/Cities.dat:630 data/Cities.dat:632
-#: data/Cities.dat:645 data/Cities.dat:712
-#: data/Cities.dat:728 data/Cities.dat:741
-#: data/Cities.dat:743 data/Cities.dat:778
-#: data/Cities.dat:1192 data/Cities.dat:1221
-#: data/Cities.dat:1352 data/Cities.dat:1601
-#: data/Cities.dat:1681 data/Cities.dat:1778
-#: data/Cities.dat:1873 data/Cities.dat:1977
-#: data/Cities.dat:2001 data/Cities.dat:2007
-#: data/Cities.dat:2189 data/Cities.dat:2198
-#: data/Cities.dat:2312 data/Cities.dat:2376
-#: data/Cities.dat:2413 data/Cities.dat:2449
-#: data/Cities.dat:2617 data/Cities.dat:2709
-#: data/Cities.dat:2716
+#: data/Cities.dat:124 data/Cities.dat:161 data/Cities.dat:241
+#: data/Cities.dat:290 data/Cities.dat:424 data/Cities.dat:434
+#: data/Cities.dat:457 data/Cities.dat:483 data/Cities.dat:487
+#: data/Cities.dat:508 data/Cities.dat:585 data/Cities.dat:627
+#: data/Cities.dat:630 data/Cities.dat:632 data/Cities.dat:645
+#: data/Cities.dat:712 data/Cities.dat:728 data/Cities.dat:741
+#: data/Cities.dat:743 data/Cities.dat:778 data/Cities.dat:1192
+#: data/Cities.dat:1221 data/Cities.dat:1352 data/Cities.dat:1601
+#: data/Cities.dat:1681 data/Cities.dat:1778 data/Cities.dat:1873
+#: data/Cities.dat:1977 data/Cities.dat:2001 data/Cities.dat:2007
+#: data/Cities.dat:2189 data/Cities.dat:2198 data/Cities.dat:2312
+#: data/Cities.dat:2376 data/Cities.dat:2413 data/Cities.dat:2449
+#: data/Cities.dat:2617 data/Cities.dat:2709 data/Cities.dat:2716
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Illinois"
@@ -7913,8 +7291,7 @@ msgid ""
 "Arrecife"
 msgstr ""
 
-#: data/Cities.dat:127 data/Cities.dat:1372
-#: data/Cities.dat:2118
+#: data/Cities.dat:127 data/Cities.dat:1372 data/Cities.dat:2118
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Gran Canaria"
@@ -7926,9 +7303,8 @@ msgid ""
 "Arua"
 msgstr ""
 
-#: data/Cities.dat:128 data/Cities.dat:760
-#: data/Cities.dat:1185 data/Cities.dat:1217
-#: data/Cities.dat:1710
+#: data/Cities.dat:128 data/Cities.dat:760 data/Cities.dat:1185
+#: data/Cities.dat:1217 data/Cities.dat:1710
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Uganda"
@@ -7940,21 +7316,16 @@ msgid ""
 "Arvada"
 msgstr ""
 
-#: data/Cities.dat:129 data/Cities.dat:138
-#: data/Cities.dat:160 data/Cities.dat:321
-#: data/Cities.dat:384 data/Cities.dat:542
-#: data/Cities.dat:569 data/Cities.dat:586
-#: data/Cities.dat:640 data/Cities.dat:694
-#: data/Cities.dat:758 data/Cities.dat:782
-#: data/Cities.dat:795 data/Cities.dat:825
-#: data/Cities.dat:930 data/Cities.dat:947
-#: data/Cities.dat:957 data/Cities.dat:1281
-#: data/Cities.dat:1356 data/Cities.dat:1359
-#: data/Cities.dat:1464 data/Cities.dat:1721
-#: data/Cities.dat:2115 data/Cities.dat:2178
-#: data/Cities.dat:2448 data/Cities.dat:2529
-#: data/Cities.dat:2568 data/Cities.dat:2740
-#: data/Cities.dat:2825
+#: data/Cities.dat:129 data/Cities.dat:138 data/Cities.dat:160
+#: data/Cities.dat:321 data/Cities.dat:384 data/Cities.dat:542
+#: data/Cities.dat:569 data/Cities.dat:586 data/Cities.dat:640
+#: data/Cities.dat:694 data/Cities.dat:758 data/Cities.dat:782
+#: data/Cities.dat:795 data/Cities.dat:825 data/Cities.dat:930
+#: data/Cities.dat:947 data/Cities.dat:957 data/Cities.dat:1281
+#: data/Cities.dat:1356 data/Cities.dat:1359 data/Cities.dat:1464
+#: data/Cities.dat:1721 data/Cities.dat:2115 data/Cities.dat:2178
+#: data/Cities.dat:2448 data/Cities.dat:2529 data/Cities.dat:2568
+#: data/Cities.dat:2740 data/Cities.dat:2825
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Colorado"
@@ -7972,58 +7343,46 @@ msgid ""
 "Asheville"
 msgstr ""
 
-#: data/Cities.dat:131 data/Cities.dat:310
-#: data/Cities.dat:387 data/Cities.dat:458
-#: data/Cities.dat:462 data/Cities.dat:696
-#: data/Cities.dat:745 data/Cities.dat:803
-#: data/Cities.dat:899 data/Cities.dat:935
-#: data/Cities.dat:963 data/Cities.dat:1071
-#: data/Cities.dat:1073 data/Cities.dat:1223
-#: data/Cities.dat:1287 data/Cities.dat:1946
-#: data/Cities.dat:2138 data/Cities.dat:2203
-#: data/Cities.dat:2445 data/Cities.dat:2477
-#: data/Cities.dat:2761 data/Cities.dat:2779
+#: data/Cities.dat:131 data/Cities.dat:310 data/Cities.dat:387
+#: data/Cities.dat:458 data/Cities.dat:462 data/Cities.dat:696
+#: data/Cities.dat:745 data/Cities.dat:803 data/Cities.dat:899
+#: data/Cities.dat:935 data/Cities.dat:963 data/Cities.dat:1071
+#: data/Cities.dat:1073 data/Cities.dat:1223 data/Cities.dat:1287
+#: data/Cities.dat:1946 data/Cities.dat:2138 data/Cities.dat:2203
+#: data/Cities.dat:2445 data/Cities.dat:2477 data/Cities.dat:2761
+#: data/Cities.dat:2779
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "North Carolina"
 msgstr ""
 
-#: data/Cities.dat:132 data/Cities.dat:133
-#: data/Cities.dat:134
+#: data/Cities.dat:132 data/Cities.dat:133 data/Cities.dat:134
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ashland"
 msgstr ""
 
-#: data/Cities.dat:133 data/Cities.dat:311
-#: data/Cities.dat:328 data/Cities.dat:564
-#: data/Cities.dat:577 data/Cities.dat:583
-#: data/Cities.dat:746 data/Cities.dat:798
-#: data/Cities.dat:848 data/Cities.dat:922
-#: data/Cities.dat:1054 data/Cities.dat:1062
-#: data/Cities.dat:1104 data/Cities.dat:1389
-#: data/Cities.dat:1412 data/Cities.dat:1462
-#: data/Cities.dat:1570 data/Cities.dat:1706
-#: data/Cities.dat:1820 data/Cities.dat:1943
-#: data/Cities.dat:1956 data/Cities.dat:2174
-#: data/Cities.dat:2389 data/Cities.dat:2763
+#: data/Cities.dat:133 data/Cities.dat:311 data/Cities.dat:328
+#: data/Cities.dat:564 data/Cities.dat:577 data/Cities.dat:583
+#: data/Cities.dat:746 data/Cities.dat:798 data/Cities.dat:848
+#: data/Cities.dat:922 data/Cities.dat:1054 data/Cities.dat:1062
+#: data/Cities.dat:1104 data/Cities.dat:1389 data/Cities.dat:1412
+#: data/Cities.dat:1462 data/Cities.dat:1570 data/Cities.dat:1706
+#: data/Cities.dat:1820 data/Cities.dat:1943 data/Cities.dat:1956
+#: data/Cities.dat:2174 data/Cities.dat:2389 data/Cities.dat:2763
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Kentucky"
 msgstr ""
 
-#: data/Cities.dat:134 data/Cities.dat:154
-#: data/Cities.dat:159 data/Cities.dat:195
-#: data/Cities.dat:198 data/Cities.dat:267
-#: data/Cities.dat:367 data/Cities.dat:939
-#: data/Cities.dat:964 data/Cities.dat:1251
-#: data/Cities.dat:1409 data/Cities.dat:1423
-#: data/Cities.dat:1654 data/Cities.dat:1697
-#: data/Cities.dat:1862 data/Cities.dat:1876
-#: data/Cities.dat:2079 data/Cities.dat:2144
-#: data/Cities.dat:2199 data/Cities.dat:2202
-#: data/Cities.dat:2235 data/Cities.dat:2281
-#: data/Cities.dat:2455 data/Cities.dat:2637
+#: data/Cities.dat:134 data/Cities.dat:154 data/Cities.dat:159
+#: data/Cities.dat:195 data/Cities.dat:198 data/Cities.dat:267
+#: data/Cities.dat:367 data/Cities.dat:939 data/Cities.dat:964
+#: data/Cities.dat:1251 data/Cities.dat:1409 data/Cities.dat:1423
+#: data/Cities.dat:1654 data/Cities.dat:1697 data/Cities.dat:1862
+#: data/Cities.dat:1876 data/Cities.dat:2079 data/Cities.dat:2144
+#: data/Cities.dat:2199 data/Cities.dat:2202 data/Cities.dat:2235
+#: data/Cities.dat:2281 data/Cities.dat:2455 data/Cities.dat:2637
 #: data/Cities.dat:2691 data/Cities.dat:2735
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
@@ -8036,18 +7395,14 @@ msgid ""
 "Ashley"
 msgstr ""
 
-#: data/Cities.dat:135 data/Cities.dat:224
-#: data/Cities.dat:280 data/Cities.dat:329
-#: data/Cities.dat:648 data/Cities.dat:652
-#: data/Cities.dat:799 data/Cities.dat:894
-#: data/Cities.dat:945 data/Cities.dat:1021
-#: data/Cities.dat:1022 data/Cities.dat:1041
-#: data/Cities.dat:1078 data/Cities.dat:1166
-#: data/Cities.dat:1358 data/Cities.dat:1429
-#: data/Cities.dat:1430 data/Cities.dat:1525
-#: data/Cities.dat:1661 data/Cities.dat:1813
-#: data/Cities.dat:1996 data/Cities.dat:2224
-#: data/Cities.dat:2759
+#: data/Cities.dat:135 data/Cities.dat:224 data/Cities.dat:280
+#: data/Cities.dat:329 data/Cities.dat:648 data/Cities.dat:652
+#: data/Cities.dat:799 data/Cities.dat:894 data/Cities.dat:945
+#: data/Cities.dat:1021 data/Cities.dat:1022 data/Cities.dat:1041
+#: data/Cities.dat:1078 data/Cities.dat:1166 data/Cities.dat:1358
+#: data/Cities.dat:1429 data/Cities.dat:1430 data/Cities.dat:1525
+#: data/Cities.dat:1661 data/Cities.dat:1813 data/Cities.dat:1996
+#: data/Cities.dat:2224 data/Cities.dat:2759
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "North Dakota"
@@ -8065,8 +7420,7 @@ msgid ""
 "Asmera"
 msgstr ""
 
-#: data/Cities.dat:137 data/Cities.dat:139
-#: data/Cities.dat:1562
+#: data/Cities.dat:137 data/Cities.dat:139 data/Cities.dat:1562
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Eritrea"
@@ -8120,15 +7474,14 @@ msgid ""
 "Atenas"
 msgstr ""
 
-#: data/Cities.dat:144 data/Cities.dat:145
-#: data/Cities.dat:1258 data/Cities.dat:2524
+#: data/Cities.dat:144 data/Cities.dat:145 data/Cities.dat:1258
+#: data/Cities.dat:2524
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Greece"
 msgstr ""
 
-#: data/Cities.dat:145 data/Cities.dat:146
-#: data/Cities.dat:147
+#: data/Cities.dat:145 data/Cities.dat:146 data/Cities.dat:147
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Athens"
@@ -8152,24 +7505,18 @@ msgid ""
 "Atlantic City"
 msgstr ""
 
-#: data/Cities.dat:150 data/Cities.dat:220
-#: data/Cities.dat:289 data/Cities.dat:313
-#: data/Cities.dat:347 data/Cities.dat:410
-#: data/Cities.dat:420 data/Cities.dat:514
-#: data/Cities.dat:526 data/Cities.dat:579
-#: data/Cities.dat:582 data/Cities.dat:705
-#: data/Cities.dat:710 data/Cities.dat:715
-#: data/Cities.dat:744 data/Cities.dat:860
-#: data/Cities.dat:1074 data/Cities.dat:1149
-#: data/Cities.dat:1183 data/Cities.dat:1550
-#: data/Cities.dat:1655 data/Cities.dat:1658
-#: data/Cities.dat:1711 data/Cities.dat:1798
-#: data/Cities.dat:1817 data/Cities.dat:1828
-#: data/Cities.dat:1846 data/Cities.dat:1887
-#: data/Cities.dat:1989 data/Cities.dat:2006
-#: data/Cities.dat:2040 data/Cities.dat:2104
-#: data/Cities.dat:2106 data/Cities.dat:2390
-#: data/Cities.dat:2392 data/Cities.dat:2565
+#: data/Cities.dat:150 data/Cities.dat:220 data/Cities.dat:289
+#: data/Cities.dat:313 data/Cities.dat:347 data/Cities.dat:410
+#: data/Cities.dat:420 data/Cities.dat:514 data/Cities.dat:526
+#: data/Cities.dat:579 data/Cities.dat:582 data/Cities.dat:705
+#: data/Cities.dat:710 data/Cities.dat:715 data/Cities.dat:744
+#: data/Cities.dat:860 data/Cities.dat:1074 data/Cities.dat:1149
+#: data/Cities.dat:1183 data/Cities.dat:1550 data/Cities.dat:1655
+#: data/Cities.dat:1658 data/Cities.dat:1711 data/Cities.dat:1798
+#: data/Cities.dat:1817 data/Cities.dat:1828 data/Cities.dat:1846
+#: data/Cities.dat:1887 data/Cities.dat:1989 data/Cities.dat:2006
+#: data/Cities.dat:2040 data/Cities.dat:2104 data/Cities.dat:2106
+#: data/Cities.dat:2390 data/Cities.dat:2392 data/Cities.dat:2565
 #: data/Cities.dat:2610 data/Cities.dat:2665
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
@@ -8200,11 +7547,9 @@ msgid ""
 "Auckland"
 msgstr ""
 
-#: data/Cities.dat:155 data/Cities.dat:284
-#: data/Cities.dat:499 data/Cities.dat:691
-#: data/Cities.dat:1141 data/Cities.dat:1723
-#: data/Cities.dat:1896 data/Cities.dat:2726
-#: data/Cities.dat:2745
+#: data/Cities.dat:155 data/Cities.dat:284 data/Cities.dat:499
+#: data/Cities.dat:691 data/Cities.dat:1141 data/Cities.dat:1723
+#: data/Cities.dat:1896 data/Cities.dat:2726 data/Cities.dat:2745
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "New Zealand"
@@ -8216,15 +7561,13 @@ msgid ""
 "Augsburg"
 msgstr ""
 
-#: data/Cities.dat:157 data/Cities.dat:158
-#: data/Cities.dat:159
+#: data/Cities.dat:157 data/Cities.dat:158 data/Cities.dat:159
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Augusta"
 msgstr ""
 
-#: data/Cities.dat:160 data/Cities.dat:161
-#: data/Cities.dat:162
+#: data/Cities.dat:160 data/Cities.dat:161 data/Cities.dat:162
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Aurora"
@@ -8242,8 +7585,8 @@ msgid ""
 "Avalon"
 msgstr ""
 
-#: data/Cities.dat:165 data/Cities.dat:1802
-#: data/Cities.dat:2175 data/Cities.dat:2479
+#: data/Cities.dat:165 data/Cities.dat:1802 data/Cities.dat:2175
+#: data/Cities.dat:2479
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "New South Wales"
@@ -8261,21 +7604,16 @@ msgid ""
 "Avon"
 msgstr ""
 
-#: data/Cities.dat:167 data/Cities.dat:346
-#: data/Cities.dat:353 data/Cities.dat:385
-#: data/Cities.dat:478 data/Cities.dat:609
-#: data/Cities.dat:610 data/Cities.dat:642
-#: data/Cities.dat:757 data/Cities.dat:792
-#: data/Cities.dat:969 data/Cities.dat:1012
-#: data/Cities.dat:1038 data/Cities.dat:1522
-#: data/Cities.dat:1608 data/Cities.dat:1646
-#: data/Cities.dat:1797 data/Cities.dat:1806
-#: data/Cities.dat:1807 data/Cities.dat:1809
-#: data/Cities.dat:1861 data/Cities.dat:1918
-#: data/Cities.dat:2121 data/Cities.dat:2404
-#: data/Cities.dat:2441 data/Cities.dat:2459
-#: data/Cities.dat:2556 data/Cities.dat:2710
-#: data/Cities.dat:2731 data/Cities.dat:2766
+#: data/Cities.dat:167 data/Cities.dat:346 data/Cities.dat:353
+#: data/Cities.dat:385 data/Cities.dat:478 data/Cities.dat:609
+#: data/Cities.dat:610 data/Cities.dat:642 data/Cities.dat:757
+#: data/Cities.dat:792 data/Cities.dat:969 data/Cities.dat:1012
+#: data/Cities.dat:1038 data/Cities.dat:1522 data/Cities.dat:1608
+#: data/Cities.dat:1646 data/Cities.dat:1797 data/Cities.dat:1806
+#: data/Cities.dat:1807 data/Cities.dat:1809 data/Cities.dat:1861
+#: data/Cities.dat:1918 data/Cities.dat:2121 data/Cities.dat:2404
+#: data/Cities.dat:2441 data/Cities.dat:2459 data/Cities.dat:2556
+#: data/Cities.dat:2710 data/Cities.dat:2731 data/Cities.dat:2766
 #: data/Cities.dat:2778 data/Cities.dat:2800
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
@@ -8306,8 +7644,8 @@ msgid ""
 "Bacolod"
 msgstr ""
 
-#: data/Cities.dat:171 data/Cities.dat:589
-#: data/Cities.dat:1530 data/Cities.dat:2129
+#: data/Cities.dat:171 data/Cities.dat:589 data/Cities.dat:1530
+#: data/Cities.dat:2129
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Philippines"
@@ -8349,8 +7687,7 @@ msgid ""
 "Baghdad"
 msgstr ""
 
-#: data/Cities.dat:176 data/Cities.dat:212
-#: data/Cities.dat:2259
+#: data/Cities.dat:176 data/Cities.dat:212 data/Cities.dat:2259
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Iraq"
@@ -8374,12 +7711,10 @@ msgid ""
 "Baie-Comeau"
 msgstr ""
 
-#: data/Cities.dat:178 data/Cities.dat:461
-#: data/Cities.dat:482 data/Cities.dat:897
-#: data/Cities.dat:1380 data/Cities.dat:1688
-#: data/Cities.dat:1703 data/Cities.dat:2128
-#: data/Cities.dat:2331 data/Cities.dat:2346
-#: data/Cities.dat:2419 data/Cities.dat:2570
+#: data/Cities.dat:178 data/Cities.dat:461 data/Cities.dat:482
+#: data/Cities.dat:897 data/Cities.dat:1380 data/Cities.dat:1688
+#: data/Cities.dat:1703 data/Cities.dat:2128 data/Cities.dat:2331
+#: data/Cities.dat:2346 data/Cities.dat:2419 data/Cities.dat:2570
 #: data/Cities.dat:2624
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
@@ -8404,8 +7739,7 @@ msgid ""
 "Balboa"
 msgstr ""
 
-#: data/Cities.dat:181 data/Cities.dat:541
-#: data/Cities.dat:1971
+#: data/Cities.dat:181 data/Cities.dat:541 data/Cities.dat:1971
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Panama"
@@ -8423,9 +7757,8 @@ msgid ""
 "Bali"
 msgstr ""
 
-#: data/Cities.dat:183 data/Cities.dat:317
-#: data/Cities.dat:660 data/Cities.dat:1164
-#: data/Cities.dat:1172 data/Cities.dat:1962
+#: data/Cities.dat:183 data/Cities.dat:317 data/Cities.dat:660
+#: data/Cities.dat:1164 data/Cities.dat:1172 data/Cities.dat:1962
 #: data/Cities.dat:2601
 msgid ""
 "_: Country name (optional, but should be translated)\n"
@@ -8444,8 +7777,8 @@ msgid ""
 "Bamako"
 msgstr ""
 
-#: data/Cities.dat:185 data/Cities.dat:888
-#: data/Cities.dat:2323 data/Cities.dat:2549
+#: data/Cities.dat:185 data/Cities.dat:888 data/Cities.dat:2323
+#: data/Cities.dat:2549
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Mali"
@@ -8463,9 +7796,8 @@ msgid ""
 "Bandar Abbass"
 msgstr ""
 
-#: data/Cities.dat:187 data/Cities.dat:188
-#: data/Cities.dat:279 data/Cities.dat:768
-#: data/Cities.dat:2348 data/Cities.dat:2484
+#: data/Cities.dat:187 data/Cities.dat:188 data/Cities.dat:279
+#: data/Cities.dat:768 data/Cities.dat:2348 data/Cities.dat:2484
 #: data/Cities.dat:2509
 msgid ""
 "_: Country name (optional, but should be translated)\n"
@@ -8502,11 +7834,9 @@ msgid ""
 "Banff"
 msgstr ""
 
-#: data/Cities.dat:191 data/Cities.dat:405
-#: data/Cities.dat:536 data/Cities.dat:723
-#: data/Cities.dat:829 data/Cities.dat:1171
-#: data/Cities.dat:1404 data/Cities.dat:1587
-#: data/Cities.dat:1992
+#: data/Cities.dat:191 data/Cities.dat:405 data/Cities.dat:536
+#: data/Cities.dat:723 data/Cities.dat:829 data/Cities.dat:1171
+#: data/Cities.dat:1404 data/Cities.dat:1587 data/Cities.dat:1992
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Alberta"
@@ -8518,12 +7848,10 @@ msgid ""
 "Bangalore"
 msgstr ""
 
-#: data/Cities.dat:192 data/Cities.dat:308
-#: data/Cities.dat:403 data/Cities.dat:875
-#: data/Cities.dat:900 data/Cities.dat:989
-#: data/Cities.dat:1126 data/Cities.dat:1290
-#: data/Cities.dat:1497 data/Cities.dat:1763
-#: data/Cities.dat:1764 data/Cities.dat:1804
+#: data/Cities.dat:192 data/Cities.dat:308 data/Cities.dat:403
+#: data/Cities.dat:875 data/Cities.dat:900 data/Cities.dat:989
+#: data/Cities.dat:1126 data/Cities.dat:1290 data/Cities.dat:1497
+#: data/Cities.dat:1763 data/Cities.dat:1764 data/Cities.dat:1804
 #: data/Cities.dat:1912 data/Cities.dat:2623
 msgid ""
 "_: Country name (optional, but should be translated)\n"
@@ -8536,8 +7864,7 @@ msgid ""
 "Bangassou"
 msgstr ""
 
-#: data/Cities.dat:193 data/Cities.dat:196
-#: data/Cities.dat:275
+#: data/Cities.dat:193 data/Cities.dat:196 data/Cities.dat:275
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Central African Republic"
@@ -8549,9 +7876,8 @@ msgid ""
 "Bangkok"
 msgstr ""
 
-#: data/Cities.dat:194 data/Cities.dat:481
-#: data/Cities.dat:1045 data/Cities.dat:1302
-#: data/Cities.dat:2024 data/Cities.dat:2595
+#: data/Cities.dat:194 data/Cities.dat:481 data/Cities.dat:1045
+#: data/Cities.dat:1302 data/Cities.dat:2024 data/Cities.dat:2595
 #: data/Cities.dat:2597
 msgid ""
 "_: Country name (optional, but should be translated)\n"
@@ -8642,15 +7968,12 @@ msgid ""
 "Barre"
 msgstr ""
 
-#: data/Cities.dat:206 data/Cities.dat:211
-#: data/Cities.dat:246 data/Cities.dat:252
-#: data/Cities.dat:334 data/Cities.dat:337
-#: data/Cities.dat:356 data/Cities.dat:388
-#: data/Cities.dat:771 data/Cities.dat:787
-#: data/Cities.dat:1636 data/Cities.dat:1701
-#: data/Cities.dat:1824 data/Cities.dat:2108
-#: data/Cities.dat:2143 data/Cities.dat:2229
-#: data/Cities.dat:2418 data/Cities.dat:2420
+#: data/Cities.dat:206 data/Cities.dat:211 data/Cities.dat:246
+#: data/Cities.dat:252 data/Cities.dat:334 data/Cities.dat:337
+#: data/Cities.dat:356 data/Cities.dat:388 data/Cities.dat:771
+#: data/Cities.dat:787 data/Cities.dat:1636 data/Cities.dat:1701
+#: data/Cities.dat:1824 data/Cities.dat:2108 data/Cities.dat:2143
+#: data/Cities.dat:2229 data/Cities.dat:2418 data/Cities.dat:2420
 #: data/Cities.dat:2777
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
@@ -8747,15 +8070,12 @@ msgid ""
 "Bay St. Louis"
 msgstr ""
 
-#: data/Cities.dat:219 data/Cities.dat:273
-#: data/Cities.dat:516 data/Cities.dat:548
-#: data/Cities.dat:566 data/Cities.dat:965
-#: data/Cities.dat:970 data/Cities.dat:985
-#: data/Cities.dat:1046 data/Cities.dat:1090
-#: data/Cities.dat:1160 data/Cities.dat:1378
-#: data/Cities.dat:1609 data/Cities.dat:1788
-#: data/Cities.dat:1945 data/Cities.dat:1988
-#: data/Cities.dat:2027 data/Cities.dat:2584
+#: data/Cities.dat:219 data/Cities.dat:273 data/Cities.dat:516
+#: data/Cities.dat:548 data/Cities.dat:566 data/Cities.dat:965
+#: data/Cities.dat:970 data/Cities.dat:985 data/Cities.dat:1046
+#: data/Cities.dat:1090 data/Cities.dat:1160 data/Cities.dat:1378
+#: data/Cities.dat:1609 data/Cities.dat:1788 data/Cities.dat:1945
+#: data/Cities.dat:1988 data/Cities.dat:2027 data/Cities.dat:2584
 #: data/Cities.dat:2657 data/Cities.dat:2776
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
@@ -8786,12 +8106,10 @@ msgid ""
 "Be'er Sheva"
 msgstr ""
 
-#: data/Cities.dat:223 data/Cities.dat:295
-#: data/Cities.dat:1004 data/Cities.dat:1093
-#: data/Cities.dat:1184 data/Cities.dat:1671
-#: data/Cities.dat:2012 data/Cities.dat:2134
-#: data/Cities.dat:2139 data/Cities.dat:2161
-#: data/Cities.dat:2511
+#: data/Cities.dat:223 data/Cities.dat:295 data/Cities.dat:1004
+#: data/Cities.dat:1093 data/Cities.dat:1184 data/Cities.dat:1671
+#: data/Cities.dat:2012 data/Cities.dat:2134 data/Cities.dat:2139
+#: data/Cities.dat:2161 data/Cities.dat:2511
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Israel"
@@ -8827,18 +8145,14 @@ msgid ""
 "Beaver"
 msgstr ""
 
-#: data/Cities.dat:228 data/Cities.dat:294
-#: data/Cities.dat:325 data/Cities.dat:446
-#: data/Cities.dat:636 data/Cities.dat:777
-#: data/Cities.dat:893 data/Cities.dat:960
-#: data/Cities.dat:1219 data/Cities.dat:1384
-#: data/Cities.dat:1443 data/Cities.dat:1649
-#: data/Cities.dat:1698 data/Cities.dat:1742
-#: data/Cities.dat:1894 data/Cities.dat:1923
-#: data/Cities.dat:2112 data/Cities.dat:2176
-#: data/Cities.dat:2249 data/Cities.dat:2254
-#: data/Cities.dat:2426 data/Cities.dat:2652
-#: data/Cities.dat:2728
+#: data/Cities.dat:228 data/Cities.dat:294 data/Cities.dat:325
+#: data/Cities.dat:446 data/Cities.dat:636 data/Cities.dat:777
+#: data/Cities.dat:893 data/Cities.dat:960 data/Cities.dat:1219
+#: data/Cities.dat:1384 data/Cities.dat:1443 data/Cities.dat:1649
+#: data/Cities.dat:1698 data/Cities.dat:1742 data/Cities.dat:1894
+#: data/Cities.dat:1923 data/Cities.dat:2112 data/Cities.dat:2176
+#: data/Cities.dat:2249 data/Cities.dat:2254 data/Cities.dat:2426
+#: data/Cities.dat:2652 data/Cities.dat:2728
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Utah"
@@ -8856,17 +8170,13 @@ msgid ""
 "Beckley"
 msgstr ""
 
-#: data/Cities.dat:230 data/Cities.dat:293
-#: data/Cities.dat:460 data/Cities.dat:515
-#: data/Cities.dat:750 data/Cities.dat:793
-#: data/Cities.dat:898 data/Cities.dat:958
-#: data/Cities.dat:1032 data/Cities.dat:1082
-#: data/Cities.dat:1117 data/Cities.dat:1407
-#: data/Cities.dat:1555 data/Cities.dat:1708
-#: data/Cities.dat:1835 data/Cities.dat:1981
-#: data/Cities.dat:1985 data/Cities.dat:2105
-#: data/Cities.dat:2246 data/Cities.dat:2725
-#: data/Cities.dat:2744
+#: data/Cities.dat:230 data/Cities.dat:293 data/Cities.dat:460
+#: data/Cities.dat:515 data/Cities.dat:750 data/Cities.dat:793
+#: data/Cities.dat:898 data/Cities.dat:958 data/Cities.dat:1032
+#: data/Cities.dat:1082 data/Cities.dat:1117 data/Cities.dat:1407
+#: data/Cities.dat:1555 data/Cities.dat:1708 data/Cities.dat:1835
+#: data/Cities.dat:1981 data/Cities.dat:1985 data/Cities.dat:2105
+#: data/Cities.dat:2246 data/Cities.dat:2725 data/Cities.dat:2744
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "West Virginia"
@@ -8878,9 +8188,8 @@ msgid ""
 "Beijing"
 msgstr ""
 
-#: data/Cities.dat:231 data/Cities.dat:415
-#: data/Cities.dat:1097 data/Cities.dat:1414
-#: data/Cities.dat:1489 data/Cities.dat:1994
+#: data/Cities.dat:231 data/Cities.dat:415 data/Cities.dat:1097
+#: data/Cities.dat:1414 data/Cities.dat:1489 data/Cities.dat:1994
 #: data/Cities.dat:2120 data/Cities.dat:2336
 msgid ""
 "_: Country name (optional, but should be translated)\n"
@@ -8893,8 +8202,8 @@ msgid ""
 "Beira"
 msgstr ""
 
-#: data/Cities.dat:232 data/Cities.dat:1538
-#: data/Cities.dat:1772 data/Cities.dat:1995
+#: data/Cities.dat:232 data/Cities.dat:1538 data/Cities.dat:1772
+#: data/Cities.dat:1995
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Mozambique"
@@ -8918,9 +8227,8 @@ msgid ""
 "Beja"
 msgstr ""
 
-#: data/Cities.dat:234 data/Cities.dat:534
-#: data/Cities.dat:872 data/Cities.dat:1348
-#: data/Cities.dat:1428 data/Cities.dat:1915
+#: data/Cities.dat:234 data/Cities.dat:534 data/Cities.dat:872
+#: data/Cities.dat:1348 data/Cities.dat:1428 data/Cities.dat:1915
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Portugal"
@@ -8932,9 +8240,8 @@ msgid ""
 "Belem"
 msgstr ""
 
-#: data/Cities.dat:235 data/Cities.dat:335
-#: data/Cities.dat:1154 data/Cities.dat:1520
-#: data/Cities.dat:1787 data/Cities.dat:2153
+#: data/Cities.dat:235 data/Cities.dat:335 data/Cities.dat:1154
+#: data/Cities.dat:1520 data/Cities.dat:1787 data/Cities.dat:2153
 #: data/Cities.dat:2183 data/Cities.dat:2483
 msgid ""
 "_: Country name (optional, but should be translated)\n"
@@ -8959,14 +8266,11 @@ msgid ""
 "Belgorod"
 msgstr ""
 
-#: data/Cities.dat:238 data/Cities.dat:369
-#: data/Cities.dat:1155 data/Cities.dat:1214
-#: data/Cities.dat:1305 data/Cities.dat:1320
-#: data/Cities.dat:1427 data/Cities.dat:1715
-#: data/Cities.dat:1922 data/Cities.dat:2231
-#: data/Cities.dat:2380 data/Cities.dat:2495
-#: data/Cities.dat:2581 data/Cities.dat:2588
-#: data/Cities.dat:2670
+#: data/Cities.dat:238 data/Cities.dat:369 data/Cities.dat:1155
+#: data/Cities.dat:1214 data/Cities.dat:1305 data/Cities.dat:1320
+#: data/Cities.dat:1427 data/Cities.dat:1715 data/Cities.dat:1922
+#: data/Cities.dat:2231 data/Cities.dat:2380 data/Cities.dat:2495
+#: data/Cities.dat:2581 data/Cities.dat:2588 data/Cities.dat:2670
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Central Region"
@@ -9044,9 +8348,8 @@ msgid ""
 "Bender Cassim"
 msgstr ""
 
-#: data/Cities.dat:249 data/Cities.dat:254
-#: data/Cities.dat:494 data/Cities.dat:1277
-#: data/Cities.dat:1679
+#: data/Cities.dat:249 data/Cities.dat:254 data/Cities.dat:494
+#: data/Cities.dat:1277 data/Cities.dat:1679
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Somalia"
@@ -9058,8 +8361,7 @@ msgid ""
 "Bendigo"
 msgstr ""
 
-#: data/Cities.dat:250 data/Cities.dat:1595
-#: data/Cities.dat:2242
+#: data/Cities.dat:250 data/Cities.dat:1595 data/Cities.dat:2242
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Victoria"
@@ -9101,9 +8403,8 @@ msgid ""
 "Bergen"
 msgstr ""
 
-#: data/Cities.dat:256 data/Cities.dat:299
-#: data/Cities.dat:680 data/Cities.dat:1311
-#: data/Cities.dat:1931 data/Cities.dat:2374
+#: data/Cities.dat:256 data/Cities.dat:299 data/Cities.dat:680
+#: data/Cities.dat:1311 data/Cities.dat:1931 data/Cities.dat:2374
 #: data/Cities.dat:2446 data/Cities.dat:2571
 msgid ""
 "_: Country name (optional, but should be translated)\n"
@@ -9128,20 +8429,15 @@ msgid ""
 "Berlin"
 msgstr ""
 
-#: data/Cities.dat:260 data/Cities.dat:513
-#: data/Cities.dat:557 data/Cities.dat:561
-#: data/Cities.dat:643 data/Cities.dat:677
-#: data/Cities.dat:784 data/Cities.dat:850
-#: data/Cities.dat:978 data/Cities.dat:1242
-#: data/Cities.dat:1341 data/Cities.dat:1363
-#: data/Cities.dat:1391 data/Cities.dat:1432
-#: data/Cities.dat:1523 data/Cities.dat:1607
-#: data/Cities.dat:1612 data/Cities.dat:1648
-#: data/Cities.dat:1783 data/Cities.dat:1821
-#: data/Cities.dat:2049 data/Cities.dat:2083
-#: data/Cities.dat:2193 data/Cities.dat:2244
-#: data/Cities.dat:2724 data/Cities.dat:2764
-#: data/Cities.dat:2786
+#: data/Cities.dat:260 data/Cities.dat:513 data/Cities.dat:557
+#: data/Cities.dat:561 data/Cities.dat:643 data/Cities.dat:677
+#: data/Cities.dat:784 data/Cities.dat:850 data/Cities.dat:978
+#: data/Cities.dat:1242 data/Cities.dat:1341 data/Cities.dat:1363
+#: data/Cities.dat:1391 data/Cities.dat:1432 data/Cities.dat:1523
+#: data/Cities.dat:1607 data/Cities.dat:1612 data/Cities.dat:1648
+#: data/Cities.dat:1783 data/Cities.dat:1821 data/Cities.dat:2049
+#: data/Cities.dat:2083 data/Cities.dat:2193 data/Cities.dat:2244
+#: data/Cities.dat:2724 data/Cities.dat:2764 data/Cities.dat:2786
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "New Hampshire"
@@ -9153,9 +8449,8 @@ msgid ""
 "Bern"
 msgstr ""
 
-#: data/Cities.dat:261 data/Cities.dat:288
-#: data/Cities.dat:906 data/Cities.dat:940
-#: data/Cities.dat:1379 data/Cities.dat:2836
+#: data/Cities.dat:261 data/Cities.dat:288 data/Cities.dat:906
+#: data/Cities.dat:940 data/Cities.dat:1379 data/Cities.dat:2836
 #: data/Cities.dat:2840
 msgid ""
 "_: Country name (optional, but should be translated)\n"
@@ -9312,9 +8607,8 @@ msgid ""
 "Blantyre"
 msgstr ""
 
-#: data/Cities.dat:287 data/Cities.dat:1234
-#: data/Cities.dat:1419 data/Cities.dat:1750
-#: data/Cities.dat:2837
+#: data/Cities.dat:287 data/Cities.dat:1234 data/Cities.dat:1419
+#: data/Cities.dat:1750 data/Cities.dat:2837
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Malawi"
@@ -9332,8 +8626,7 @@ msgid ""
 "Bloomfield"
 msgstr ""
 
-#: data/Cities.dat:290 data/Cities.dat:291
-#: data/Cities.dat:292
+#: data/Cities.dat:290 data/Cities.dat:291 data/Cities.dat:292
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bloomington"
@@ -9375,26 +8668,19 @@ msgid ""
 "Boca Raton"
 msgstr ""
 
-#: data/Cities.dat:297 data/Cities.dat:418
-#: data/Cities.dat:522 data/Cities.dat:621
-#: data/Cities.dat:676 data/Cities.dat:828
-#: data/Cities.dat:831 data/Cities.dat:868
-#: data/Cities.dat:879 data/Cities.dat:1070
-#: data/Cities.dat:1092 data/Cities.dat:1163
-#: data/Cities.dat:1179 data/Cities.dat:1279
-#: data/Cities.dat:1350 data/Cities.dat:1354
-#: data/Cities.dat:1369 data/Cities.dat:1482
-#: data/Cities.dat:1594 data/Cities.dat:1613
-#: data/Cities.dat:1630 data/Cities.dat:1631
-#: data/Cities.dat:1663 data/Cities.dat:1780
-#: data/Cities.dat:1885 data/Cities.dat:1920
-#: data/Cities.dat:1926 data/Cities.dat:1965
-#: data/Cities.dat:1972 data/Cities.dat:1999
-#: data/Cities.dat:2059 data/Cities.dat:2074
-#: data/Cities.dat:2300 data/Cities.dat:2322
-#: data/Cities.dat:2438 data/Cities.dat:2471
-#: data/Cities.dat:2492 data/Cities.dat:2496
-#: data/Cities.dat:2734
+#: data/Cities.dat:297 data/Cities.dat:418 data/Cities.dat:522
+#: data/Cities.dat:621 data/Cities.dat:676 data/Cities.dat:828
+#: data/Cities.dat:831 data/Cities.dat:868 data/Cities.dat:879
+#: data/Cities.dat:1070 data/Cities.dat:1092 data/Cities.dat:1163
+#: data/Cities.dat:1179 data/Cities.dat:1279 data/Cities.dat:1350
+#: data/Cities.dat:1354 data/Cities.dat:1369 data/Cities.dat:1482
+#: data/Cities.dat:1594 data/Cities.dat:1613 data/Cities.dat:1630
+#: data/Cities.dat:1631 data/Cities.dat:1663 data/Cities.dat:1780
+#: data/Cities.dat:1885 data/Cities.dat:1920 data/Cities.dat:1926
+#: data/Cities.dat:1965 data/Cities.dat:1972 data/Cities.dat:1999
+#: data/Cities.dat:2059 data/Cities.dat:2074 data/Cities.dat:2300
+#: data/Cities.dat:2322 data/Cities.dat:2438 data/Cities.dat:2471
+#: data/Cities.dat:2492 data/Cities.dat:2496 data/Cities.dat:2734
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Florida"
@@ -9418,8 +8704,8 @@ msgid ""
 "Boeun"
 msgstr ""
 
-#: data/Cities.dat:300 data/Cities.dat:471
-#: data/Cities.dat:504 data/Cities.dat:1174
+#: data/Cities.dat:300 data/Cities.dat:471 data/Cities.dat:504
+#: data/Cities.dat:1174
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Chungbuk"
@@ -9521,9 +8807,8 @@ msgid ""
 "Borowiec"
 msgstr ""
 
-#: data/Cities.dat:315 data/Cities.dat:839
-#: data/Cities.dat:902 data/Cities.dat:2038
-#: data/Cities.dat:2092 data/Cities.dat:2644
+#: data/Cities.dat:315 data/Cities.dat:839 data/Cities.dat:902
+#: data/Cities.dat:2038 data/Cities.dat:2092 data/Cities.dat:2644
 #: data/Cities.dat:2704 data/Cities.dat:2833
 msgid ""
 "_: Country name (optional, but should be translated)\n"
@@ -9632,12 +8917,10 @@ msgid ""
 "Boyden"
 msgstr ""
 
-#: data/Cities.dat:330 data/Cities.dat:421
-#: data/Cities.dat:622 data/Cities.dat:695
-#: data/Cities.dat:708 data/Cities.dat:1039
-#: data/Cities.dat:1188 data/Cities.dat:1399
-#: data/Cities.dat:1718 data/Cities.dat:2069
-#: data/Cities.dat:2086 data/Cities.dat:2098
+#: data/Cities.dat:330 data/Cities.dat:421 data/Cities.dat:622
+#: data/Cities.dat:695 data/Cities.dat:708 data/Cities.dat:1039
+#: data/Cities.dat:1188 data/Cities.dat:1399 data/Cities.dat:1718
+#: data/Cities.dat:2069 data/Cities.dat:2086 data/Cities.dat:2098
 #: data/Cities.dat:2405 data/Cities.dat:2473
 msgid ""
 "_: Country name (optional, but should be translated)\n"
@@ -9662,8 +8945,8 @@ msgid ""
 "Brandon"
 msgstr ""
 
-#: data/Cities.dat:333 data/Cities.dat:506
-#: data/Cities.dat:2523 data/Cities.dat:2774
+#: data/Cities.dat:333 data/Cities.dat:506 data/Cities.dat:2523
+#: data/Cities.dat:2774
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Manitoba"
@@ -9789,26 +9072,23 @@ msgid ""
 "Brisbane"
 msgstr ""
 
-#: data/Cities.dat:351 data/Cities.dat:1143
-#: data/Cities.dat:1270 data/Cities.dat:2559
+#: data/Cities.dat:351 data/Cities.dat:1143 data/Cities.dat:1270
+#: data/Cities.dat:2559
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Queensland"
 msgstr ""
 
-#: data/Cities.dat:352 data/Cities.dat:353
-#: data/Cities.dat:354 data/Cities.dat:355
-#: data/Cities.dat:356
+#: data/Cities.dat:352 data/Cities.dat:353 data/Cities.dat:354
+#: data/Cities.dat:355 data/Cities.dat:356
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bristol"
 msgstr ""
 
-#: data/Cities.dat:354 data/Cities.dat:580
-#: data/Cities.dat:1823 data/Cities.dat:1991
-#: data/Cities.dat:2110 data/Cities.dat:2225
-#: data/Cities.dat:2705 data/Cities.dat:2737
-#: data/Cities.dat:2788
+#: data/Cities.dat:354 data/Cities.dat:580 data/Cities.dat:1823
+#: data/Cities.dat:1991 data/Cities.dat:2110 data/Cities.dat:2225
+#: data/Cities.dat:2705 data/Cities.dat:2737 data/Cities.dat:2788
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Rhode Island"
@@ -9856,14 +9136,11 @@ msgid ""
 "Brookside Park"
 msgstr ""
 
-#: data/Cities.dat:364 data/Cities.dat:518
-#: data/Cities.dat:675 data/Cities.dat:753
-#: data/Cities.dat:914 data/Cities.dat:1033
-#: data/Cities.dat:1376 data/Cities.dat:1406
-#: data/Cities.dat:1637 data/Cities.dat:1647
-#: data/Cities.dat:1800 data/Cities.dat:1816
-#: data/Cities.dat:2319 data/Cities.dat:2381
-#: data/Cities.dat:2760
+#: data/Cities.dat:364 data/Cities.dat:518 data/Cities.dat:675
+#: data/Cities.dat:753 data/Cities.dat:914 data/Cities.dat:1033
+#: data/Cities.dat:1376 data/Cities.dat:1406 data/Cities.dat:1637
+#: data/Cities.dat:1647 data/Cities.dat:1800 data/Cities.dat:1816
+#: data/Cities.dat:2319 data/Cities.dat:2381 data/Cities.dat:2760
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Delaware"
@@ -9905,9 +9182,8 @@ msgid ""
 "Buan"
 msgstr ""
 
-#: data/Cities.dat:370 data/Cities.dat:988
-#: data/Cities.dat:1131 data/Cities.dat:1169
-#: data/Cities.dat:1180 data/Cities.dat:1181
+#: data/Cities.dat:370 data/Cities.dat:988 data/Cities.dat:1131
+#: data/Cities.dat:1169 data/Cities.dat:1180 data/Cities.dat:1181
 #: data/Cities.dat:1773
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
@@ -9944,8 +9220,8 @@ msgid ""
 "Budapest"
 msgstr ""
 
-#: data/Cities.dat:374 data/Cities.dat:629
-#: data/Cities.dat:874 data/Cities.dat:1301
+#: data/Cities.dat:374 data/Cities.dat:629 data/Cities.dat:874
+#: data/Cities.dat:1301
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Hungary"
@@ -9981,9 +9257,8 @@ msgid ""
 "Bujumburo"
 msgstr ""
 
-#: data/Cities.dat:379 data/Cities.dat:391
-#: data/Cities.dat:921 data/Cities.dat:1747
-#: data/Cities.dat:1829 data/Cities.dat:2230
+#: data/Cities.dat:379 data/Cities.dat:391 data/Cities.dat:921
+#: data/Cities.dat:1747 data/Cities.dat:1829 data/Cities.dat:2230
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Burundi"
@@ -10007,9 +9282,8 @@ msgid ""
 "Bulawayo"
 msgstr ""
 
-#: data/Cities.dat:381 data/Cities.dat:498
-#: data/Cities.dat:993 data/Cities.dat:1028
-#: data/Cities.dat:1746
+#: data/Cities.dat:381 data/Cities.dat:498 data/Cities.dat:993
+#: data/Cities.dat:1028 data/Cities.dat:1746
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Zimbabwe"
@@ -10027,9 +9301,8 @@ msgid ""
 "Burgos"
 msgstr ""
 
-#: data/Cities.dat:384 data/Cities.dat:385
-#: data/Cities.dat:386 data/Cities.dat:387
-#: data/Cities.dat:388 data/Cities.dat:389
+#: data/Cities.dat:384 data/Cities.dat:385 data/Cities.dat:386
+#: data/Cities.dat:387 data/Cities.dat:388 data/Cities.dat:389
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Burlington"
@@ -10053,18 +9326,14 @@ msgid ""
 "Burwash"
 msgstr ""
 
-#: data/Cities.dat:392 data/Cities.dat:465
-#: data/Cities.dat:682 data/Cities.dat:937
-#: data/Cities.dat:984 data/Cities.dat:1015
-#: data/Cities.dat:1231 data/Cities.dat:1253
-#: data/Cities.dat:1273 data/Cities.dat:1282
-#: data/Cities.dat:1452 data/Cities.dat:1668
-#: data/Cities.dat:1844 data/Cities.dat:1935
-#: data/Cities.dat:2310 data/Cities.dat:2367
-#: data/Cities.dat:2368 data/Cities.dat:2421
-#: data/Cities.dat:2463 data/Cities.dat:2532
-#: data/Cities.dat:2537 data/Cities.dat:2554
-#: data/Cities.dat:2712 data/Cities.dat:2769
+#: data/Cities.dat:392 data/Cities.dat:465 data/Cities.dat:682
+#: data/Cities.dat:937 data/Cities.dat:984 data/Cities.dat:1015
+#: data/Cities.dat:1231 data/Cities.dat:1253 data/Cities.dat:1273
+#: data/Cities.dat:1282 data/Cities.dat:1452 data/Cities.dat:1668
+#: data/Cities.dat:1844 data/Cities.dat:1935 data/Cities.dat:2310
+#: data/Cities.dat:2367 data/Cities.dat:2368 data/Cities.dat:2421
+#: data/Cities.dat:2463 data/Cities.dat:2532 data/Cities.dat:2537
+#: data/Cities.dat:2554 data/Cities.dat:2712 data/Cities.dat:2769
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Ontario"
@@ -10088,9 +9357,8 @@ msgid ""
 "Butterworth"
 msgstr ""
 
-#: data/Cities.dat:395 data/Cities.dat:1306
-#: data/Cities.dat:1312 data/Cities.dat:1313
-#: data/Cities.dat:1997 data/Cities.dat:2352
+#: data/Cities.dat:395 data/Cities.dat:1306 data/Cities.dat:1312
+#: data/Cities.dat:1313 data/Cities.dat:1997 data/Cities.dat:2352
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Malaysia"
@@ -10102,8 +9370,7 @@ msgid ""
 "Buyeo"
 msgstr ""
 
-#: data/Cities.dat:396 data/Cities.dat:910
-#: data/Cities.dat:2329
+#: data/Cities.dat:396 data/Cities.dat:910 data/Cities.dat:2329
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Chungnam"
@@ -10181,8 +9448,7 @@ msgid ""
 "Caliente"
 msgstr ""
 
-#: data/Cities.dat:407 data/Cities.dat:408
-#: data/Cities.dat:409
+#: data/Cities.dat:407 data/Cities.dat:408 data/Cities.dat:409
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cambridge"
@@ -10254,18 +9520,14 @@ msgid ""
 "Cape Girardeau"
 msgstr ""
 
-#: data/Cities.dat:419 data/Cities.dat:488
-#: data/Cities.dat:543 data/Cities.dat:584
-#: data/Cities.dat:587 data/Cities.dat:816
-#: data/Cities.dat:856 data/Cities.dat:1023
-#: data/Cities.dat:1135 data/Cities.dat:1176
-#: data/Cities.dat:1194 data/Cities.dat:1226
-#: data/Cities.dat:1390 data/Cities.dat:1626
-#: data/Cities.dat:1733 data/Cities.dat:1794
-#: data/Cities.dat:1952 data/Cities.dat:2065
-#: data/Cities.dat:2103 data/Cities.dat:2200
-#: data/Cities.dat:2415 data/Cities.dat:2422
-#: data/Cities.dat:2430 data/Cities.dat:2432
+#: data/Cities.dat:419 data/Cities.dat:488 data/Cities.dat:543
+#: data/Cities.dat:584 data/Cities.dat:587 data/Cities.dat:816
+#: data/Cities.dat:856 data/Cities.dat:1023 data/Cities.dat:1135
+#: data/Cities.dat:1176 data/Cities.dat:1194 data/Cities.dat:1226
+#: data/Cities.dat:1390 data/Cities.dat:1626 data/Cities.dat:1733
+#: data/Cities.dat:1794 data/Cities.dat:1952 data/Cities.dat:2065
+#: data/Cities.dat:2103 data/Cities.dat:2200 data/Cities.dat:2415
+#: data/Cities.dat:2422 data/Cities.dat:2430 data/Cities.dat:2432
 #: data/Cities.dat:2612
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
@@ -10290,8 +9552,7 @@ msgid ""
 "Caracas"
 msgstr ""
 
-#: data/Cities.dat:422 data/Cities.dat:1440
-#: data/Cities.dat:1505
+#: data/Cities.dat:422 data/Cities.dat:1440 data/Cities.dat:1505
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Venezuela"
@@ -10585,12 +9846,10 @@ msgid ""
 "Cheboksary"
 msgstr ""
 
-#: data/Cities.dat:467 data/Cities.dat:1157
-#: data/Cities.dat:1239 data/Cities.dat:1836
-#: data/Cities.dat:1924 data/Cities.dat:2000
-#: data/Cities.dat:2003 data/Cities.dat:2258
-#: data/Cities.dat:2299 data/Cities.dat:2301
-#: data/Cities.dat:2599 data/Cities.dat:2821
+#: data/Cities.dat:467 data/Cities.dat:1157 data/Cities.dat:1239
+#: data/Cities.dat:1836 data/Cities.dat:1924 data/Cities.dat:2000
+#: data/Cities.dat:2003 data/Cities.dat:2258 data/Cities.dat:2299
+#: data/Cities.dat:2301 data/Cities.dat:2599 data/Cities.dat:2821
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Volga Region"
@@ -10608,9 +9867,8 @@ msgid ""
 "Chelyabinsk"
 msgstr ""
 
-#: data/Cities.dat:469 data/Cities.dat:730
-#: data/Cities.dat:1259 data/Cities.dat:1319
-#: data/Cities.dat:2591
+#: data/Cities.dat:469 data/Cities.dat:730 data/Cities.dat:1259
+#: data/Cities.dat:1319 data/Cities.dat:2591
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Ural"
@@ -10634,11 +9892,9 @@ msgid ""
 "Cheorwon"
 msgstr ""
 
-#: data/Cities.dat:472 data/Cities.dat:503
-#: data/Cities.dat:669 data/Cities.dat:887
-#: data/Cities.dat:1098 data/Cities.dat:2387
-#: data/Cities.dat:2486 data/Cities.dat:2783
-#: data/Cities.dat:2814
+#: data/Cities.dat:472 data/Cities.dat:503 data/Cities.dat:669
+#: data/Cities.dat:887 data/Cities.dat:1098 data/Cities.dat:2387
+#: data/Cities.dat:2486 data/Cities.dat:2783 data/Cities.dat:2814
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Gangwon"
@@ -10668,12 +9924,10 @@ msgid ""
 "Cherkessk"
 msgstr ""
 
-#: data/Cities.dat:475 data/Cities.dat:979
-#: data/Cities.dat:1308 data/Cities.dat:1508
-#: data/Cities.dat:1569 data/Cities.dat:1767
-#: data/Cities.dat:2214 data/Cities.dat:2382
-#: data/Cities.dat:2447 data/Cities.dat:2669
-#: data/Cities.dat:2672
+#: data/Cities.dat:475 data/Cities.dat:979 data/Cities.dat:1308
+#: data/Cities.dat:1508 data/Cities.dat:1569 data/Cities.dat:1767
+#: data/Cities.dat:2214 data/Cities.dat:2382 data/Cities.dat:2447
+#: data/Cities.dat:2669 data/Cities.dat:2672
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "South Region"
@@ -10727,8 +9981,8 @@ msgid ""
 "Chiclayo"
 msgstr ""
 
-#: data/Cities.dat:484 data/Cities.dat:1111
-#: data/Cities.dat:1420 data/Cities.dat:2491
+#: data/Cities.dat:484 data/Cities.dat:1111 data/Cities.dat:1420
+#: data/Cities.dat:2491
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Peru"
@@ -10746,8 +10000,7 @@ msgid ""
 "Chignik"
 msgstr ""
 
-#: data/Cities.dat:487 data/Cities.dat:488
-#: data/Cities.dat:489
+#: data/Cities.dat:487 data/Cities.dat:488 data/Cities.dat:489
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chillicothe"
@@ -10759,9 +10012,8 @@ msgid ""
 "Chingola"
 msgstr ""
 
-#: data/Cities.dat:490 data/Cities.dat:1200
-#: data/Cities.dat:1284 data/Cities.dat:1436
-#: data/Cities.dat:1477 data/Cities.dat:1789
+#: data/Cities.dat:490 data/Cities.dat:1200 data/Cities.dat:1284
+#: data/Cities.dat:1436 data/Cities.dat:1477 data/Cities.dat:1789
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Zambie"
@@ -10881,9 +10133,8 @@ msgid ""
 "Chuuk"
 msgstr ""
 
-#: data/Cities.dat:507 data/Cities.dat:1304
-#: data/Cities.dat:2054 data/Cities.dat:2576
-#: data/Cities.dat:2806
+#: data/Cities.dat:507 data/Cities.dat:1304 data/Cities.dat:2054
+#: data/Cities.dat:2576 data/Cities.dat:2806
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Micronesia"
@@ -11111,8 +10362,7 @@ msgid ""
 "Colorado Springs"
 msgstr ""
 
-#: data/Cities.dat:543 data/Cities.dat:544
-#: data/Cities.dat:545
+#: data/Cities.dat:543 data/Cities.dat:544 data/Cities.dat:545
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Columbia"
@@ -11124,8 +10374,8 @@ msgid ""
 "Columbia Station"
 msgstr ""
 
-#: data/Cities.dat:547 data/Cities.dat:548
-#: data/Cities.dat:549 data/Cities.dat:550
+#: data/Cities.dat:547 data/Cities.dat:548 data/Cities.dat:549
+#: data/Cities.dat:550
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Columbus"
@@ -11437,9 +10687,8 @@ msgid ""
 "Dakar"
 msgstr ""
 
-#: data/Cities.dat:602 data/Cities.dat:1228
-#: data/Cities.dat:2052 data/Cities.dat:2431
-#: data/Cities.dat:2526 data/Cities.dat:2835
+#: data/Cities.dat:602 data/Cities.dat:1228 data/Cities.dat:2052
+#: data/Cities.dat:2431 data/Cities.dat:2526 data/Cities.dat:2835
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Senegal"
@@ -11469,12 +10718,10 @@ msgid ""
 "Dalsbruk"
 msgstr ""
 
-#: data/Cities.dat:605 data/Cities.dat:769
-#: data/Cities.dat:1060 data/Cities.dat:1316
-#: data/Cities.dat:1347 data/Cities.dat:1621
-#: data/Cities.dat:1939 data/Cities.dat:2066
-#: data/Cities.dat:2497 data/Cities.dat:2586
-#: data/Cities.dat:2642
+#: data/Cities.dat:605 data/Cities.dat:769 data/Cities.dat:1060
+#: data/Cities.dat:1316 data/Cities.dat:1347 data/Cities.dat:1621
+#: data/Cities.dat:1939 data/Cities.dat:2066 data/Cities.dat:2497
+#: data/Cities.dat:2586 data/Cities.dat:2642
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Finland"
@@ -11750,8 +10997,7 @@ msgid ""
 "Dhahran"
 msgstr ""
 
-#: data/Cities.dat:649 data/Cities.dat:1175
-#: data/Cities.dat:2187
+#: data/Cities.dat:649 data/Cities.dat:1175 data/Cities.dat:2187
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Saudi Arabia"
@@ -11781,9 +11027,8 @@ msgid ""
 "Diego Garcia"
 msgstr ""
 
-#: data/Cities.dat:654 data/Cities.dat:1190
-#: data/Cities.dat:1640 data/Cities.dat:1957
-#: data/Cities.dat:2217 data/Cities.dat:2240
+#: data/Cities.dat:654 data/Cities.dat:1190 data/Cities.dat:1640
+#: data/Cities.dat:1957 data/Cities.dat:2217 data/Cities.dat:2240
 #: data/Cities.dat:2540 data/Cities.dat:2689
 msgid ""
 "_: Country name (optional, but should be translated)\n"
@@ -11808,27 +11053,20 @@ msgid ""
 "Dillingham"
 msgstr ""
 
-#: data/Cities.dat:656 data/Cities.dat:783
-#: data/Cities.dat:821 data/Cities.dat:1005
-#: data/Cities.dat:1008 data/Cities.dat:1019
-#: data/Cities.dat:1047 data/Cities.dat:1080
-#: data/Cities.dat:1101 data/Cities.dat:1202
-#: data/Cities.dat:1204 data/Cities.dat:1205
-#: data/Cities.dat:1209 data/Cities.dat:1210
-#: data/Cities.dat:1218 data/Cities.dat:1220
-#: data/Cities.dat:1229 data/Cities.dat:1230
-#: data/Cities.dat:1238 data/Cities.dat:1240
-#: data/Cities.dat:1246 data/Cities.dat:1293
-#: data/Cities.dat:1295 data/Cities.dat:1299
-#: data/Cities.dat:1300 data/Cities.dat:1317
-#: data/Cities.dat:1362 data/Cities.dat:1417
-#: data/Cities.dat:1567 data/Cities.dat:1682
-#: data/Cities.dat:1759 data/Cities.dat:1951
-#: data/Cities.dat:2067 data/Cities.dat:2400
-#: data/Cities.dat:2515 data/Cities.dat:2613
-#: data/Cities.dat:2614 data/Cities.dat:2683
-#: data/Cities.dat:2684 data/Cities.dat:2685
-#: data/Cities.dat:2686 data/Cities.dat:2687
+#: data/Cities.dat:656 data/Cities.dat:783 data/Cities.dat:821
+#: data/Cities.dat:1005 data/Cities.dat:1008 data/Cities.dat:1019
+#: data/Cities.dat:1047 data/Cities.dat:1080 data/Cities.dat:1101
+#: data/Cities.dat:1202 data/Cities.dat:1204 data/Cities.dat:1205
+#: data/Cities.dat:1209 data/Cities.dat:1210 data/Cities.dat:1218
+#: data/Cities.dat:1220 data/Cities.dat:1229 data/Cities.dat:1230
+#: data/Cities.dat:1238 data/Cities.dat:1240 data/Cities.dat:1246
+#: data/Cities.dat:1293 data/Cities.dat:1295 data/Cities.dat:1299
+#: data/Cities.dat:1300 data/Cities.dat:1317 data/Cities.dat:1362
+#: data/Cities.dat:1417 data/Cities.dat:1567 data/Cities.dat:1682
+#: data/Cities.dat:1759 data/Cities.dat:1951 data/Cities.dat:2067
+#: data/Cities.dat:2400 data/Cities.dat:2515 data/Cities.dat:2613
+#: data/Cities.dat:2614 data/Cities.dat:2683 data/Cities.dat:2684
+#: data/Cities.dat:2685 data/Cities.dat:2686 data/Cities.dat:2687
 #: data/Cities.dat:2688
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
@@ -11859,11 +11097,10 @@ msgid ""
 "Djerba"
 msgstr ""
 
-#: data/Cities.dat:661 data/Cities.dat:876
-#: data/Cities.dat:1206 data/Cities.dat:1584
-#: data/Cities.dat:2335 data/Cities.dat:2397
-#: data/Cities.dat:2506 data/Cities.dat:2561
-#: data/Cities.dat:2583 data/Cities.dat:2832
+#: data/Cities.dat:661 data/Cities.dat:876 data/Cities.dat:1206
+#: data/Cities.dat:1584 data/Cities.dat:2335 data/Cities.dat:2397
+#: data/Cities.dat:2506 data/Cities.dat:2561 data/Cities.dat:2583
+#: data/Cities.dat:2832
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Tunisia"
@@ -11893,9 +11130,8 @@ msgid ""
 "Dodoma"
 msgstr ""
 
-#: data/Cities.dat:664 data/Cities.dat:1573
-#: data/Cities.dat:1709 data/Cities.dat:1748
-#: data/Cities.dat:2830
+#: data/Cities.dat:664 data/Cities.dat:1573 data/Cities.dat:1709
+#: data/Cities.dat:1748 data/Cities.dat:2830
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Tanzanie"
@@ -11937,8 +11173,8 @@ msgid ""
 "Dongducheon"
 msgstr ""
 
-#: data/Cities.dat:668 data/Cities.dat:1129
-#: data/Cities.dat:2475 data/Cities.dat:2803
+#: data/Cities.dat:668 data/Cities.dat:1129 data/Cities.dat:2475
+#: data/Cities.dat:2803
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Gyeonggi"
@@ -11968,8 +11204,7 @@ msgid ""
 "Douala"
 msgstr ""
 
-#: data/Cities.dat:672 data/Cities.dat:2534
-#: data/Cities.dat:2805
+#: data/Cities.dat:672 data/Cities.dat:2534 data/Cities.dat:2805
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Cameroon"
@@ -11987,8 +11222,8 @@ msgid ""
 "Isle of Man"
 msgstr ""
 
-#: data/Cities.dat:674 data/Cities.dat:675
-#: data/Cities.dat:676 data/Cities.dat:677
+#: data/Cities.dat:674 data/Cities.dat:675 data/Cities.dat:676
+#: data/Cities.dat:677
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dover"
@@ -12036,8 +11271,7 @@ msgid ""
 "Dublin"
 msgstr ""
 
-#: data/Cities.dat:684 data/Cities.dat:693
-#: data/Cities.dat:2337
+#: data/Cities.dat:684 data/Cities.dat:693 data/Cities.dat:2337
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Ireland"
@@ -12289,8 +11523,8 @@ msgid ""
 "Edmundston"
 msgstr ""
 
-#: data/Cities.dat:724 data/Cities.dat:857
-#: data/Cities.dat:1685 data/Cities.dat:2427
+#: data/Cities.dat:724 data/Cities.dat:857 data/Cities.dat:1685
+#: data/Cities.dat:2427
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "New Brunswick"
@@ -12362,9 +11596,8 @@ msgid ""
 "El Fasher"
 msgstr ""
 
-#: data/Cities.dat:734 data/Cities.dat:737
-#: data/Cities.dat:1260 data/Cities.dat:2075
-#: data/Cities.dat:2680 data/Cities.dat:2681
+#: data/Cities.dat:734 data/Cities.dat:737 data/Cities.dat:1260
+#: data/Cities.dat:2075 data/Cities.dat:2680 data/Cities.dat:2681
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Sudan"
@@ -12490,27 +11723,20 @@ msgid ""
 "Elva"
 msgstr ""
 
-#: data/Cities.dat:754 data/Cities.dat:997
-#: data/Cities.dat:1197 data/Cities.dat:1198
-#: data/Cities.dat:1213 data/Cities.dat:1244
-#: data/Cities.dat:1245 data/Cities.dat:1264
-#: data/Cities.dat:1285 data/Cities.dat:1294
-#: data/Cities.dat:1315 data/Cities.dat:1318
-#: data/Cities.dat:1326 data/Cities.dat:1446
-#: data/Cities.dat:1487 data/Cities.dat:1745
-#: data/Cities.dat:1753 data/Cities.dat:1781
-#: data/Cities.dat:1782 data/Cities.dat:1959
-#: data/Cities.dat:1961 data/Cities.dat:2017
-#: data/Cities.dat:2123 data/Cities.dat:2124
-#: data/Cities.dat:2125 data/Cities.dat:2126
-#: data/Cities.dat:2137 data/Cities.dat:2147
-#: data/Cities.dat:2232 data/Cities.dat:2306
-#: data/Cities.dat:2358 data/Cities.dat:2362
-#: data/Cities.dat:2474 data/Cities.dat:2493
-#: data/Cities.dat:2498 data/Cities.dat:2501
-#: data/Cities.dat:2504 data/Cities.dat:2592
-#: data/Cities.dat:2593 data/Cities.dat:2629
-#: data/Cities.dat:2663 data/Cities.dat:2676
+#: data/Cities.dat:754 data/Cities.dat:997 data/Cities.dat:1197
+#: data/Cities.dat:1198 data/Cities.dat:1213 data/Cities.dat:1244
+#: data/Cities.dat:1245 data/Cities.dat:1264 data/Cities.dat:1285
+#: data/Cities.dat:1294 data/Cities.dat:1315 data/Cities.dat:1318
+#: data/Cities.dat:1326 data/Cities.dat:1446 data/Cities.dat:1487
+#: data/Cities.dat:1745 data/Cities.dat:1753 data/Cities.dat:1781
+#: data/Cities.dat:1782 data/Cities.dat:1959 data/Cities.dat:1961
+#: data/Cities.dat:2017 data/Cities.dat:2123 data/Cities.dat:2124
+#: data/Cities.dat:2125 data/Cities.dat:2126 data/Cities.dat:2137
+#: data/Cities.dat:2147 data/Cities.dat:2232 data/Cities.dat:2306
+#: data/Cities.dat:2358 data/Cities.dat:2362 data/Cities.dat:2474
+#: data/Cities.dat:2493 data/Cities.dat:2498 data/Cities.dat:2501
+#: data/Cities.dat:2504 data/Cities.dat:2592 data/Cities.dat:2593
+#: data/Cities.dat:2629 data/Cities.dat:2663 data/Cities.dat:2676
 #: data/Cities.dat:2677
 msgid ""
 "_: Country name (optional, but should be translated)\n"
@@ -12637,8 +11863,7 @@ msgid ""
 "Eugene"
 msgstr ""
 
-#: data/Cities.dat:775 data/Cities.dat:776
-#: data/Cities.dat:777
+#: data/Cities.dat:775 data/Cities.dat:776 data/Cities.dat:777
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Eureka"
@@ -12836,8 +12061,7 @@ msgid ""
 "Florala"
 msgstr ""
 
-#: data/Cities.dat:813 data/Cities.dat:814
-#: data/Cities.dat:815
+#: data/Cities.dat:813 data/Cities.dat:814 data/Cities.dat:815
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Florence"
@@ -12933,8 +12157,8 @@ msgid ""
 "Fort McPherson"
 msgstr ""
 
-#: data/Cities.dat:830 data/Cities.dat:838
-#: data/Cities.dat:1140 data/Cities.dat:2810
+#: data/Cities.dat:830 data/Cities.dat:838 data/Cities.dat:1140
+#: data/Cities.dat:2810
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Northwest Territories"
@@ -13036,9 +12260,8 @@ msgid ""
 "Franceville"
 msgstr ""
 
-#: data/Cities.dat:846 data/Cities.dat:1360
-#: data/Cities.dat:1415 data/Cities.dat:1509
-#: data/Cities.dat:2070
+#: data/Cities.dat:846 data/Cities.dat:1360 data/Cities.dat:1415
+#: data/Cities.dat:1509 data/Cities.dat:2070
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Gabon"
@@ -13050,8 +12273,7 @@ msgid ""
 "Francistown"
 msgstr ""
 
-#: data/Cities.dat:847 data/Cities.dat:877
-#: data/Cities.dat:1441
+#: data/Cities.dat:847 data/Cities.dat:877 data/Cities.dat:1441
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Botswana"
@@ -13123,12 +12345,10 @@ msgid ""
 "Frederiksvaerk"
 msgstr ""
 
-#: data/Cities.dat:859 data/Cities.dat:1059
-#: data/Cities.dat:1077 data/Cities.dat:1086
-#: data/Cities.dat:1215 data/Cities.dat:1292
-#: data/Cities.dat:1303 data/Cities.dat:1760
-#: data/Cities.dat:2182 data/Cities.dat:2212
-#: data/Cities.dat:2378 data/Cities.dat:2675
+#: data/Cities.dat:859 data/Cities.dat:1059 data/Cities.dat:1077
+#: data/Cities.dat:1086 data/Cities.dat:1215 data/Cities.dat:1292
+#: data/Cities.dat:1303 data/Cities.dat:1760 data/Cities.dat:2182
+#: data/Cities.dat:2212 data/Cities.dat:2378 data/Cities.dat:2675
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Zealand"
@@ -13446,11 +12666,10 @@ msgid ""
 "Geochang"
 msgstr ""
 
-#: data/Cities.dat:908 data/Cities.dat:909
-#: data/Cities.dat:1000 data/Cities.dat:1027
-#: data/Cities.dat:1186 data/Cities.dat:1557
-#: data/Cities.dat:1665 data/Cities.dat:1768
-#: data/Cities.dat:2276 data/Cities.dat:2552
+#: data/Cities.dat:908 data/Cities.dat:909 data/Cities.dat:1000
+#: data/Cities.dat:1027 data/Cities.dat:1186 data/Cities.dat:1557
+#: data/Cities.dat:1665 data/Cities.dat:1768 data/Cities.dat:2276
+#: data/Cities.dat:2552
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Gyeongnam"
@@ -13468,8 +12687,8 @@ msgid ""
 "Geomsan"
 msgstr ""
 
-#: data/Cities.dat:911 data/Cities.dat:912
-#: data/Cities.dat:913 data/Cities.dat:914
+#: data/Cities.dat:911 data/Cities.dat:912 data/Cities.dat:913
+#: data/Cities.dat:914
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Georgetown"
@@ -13589,8 +12808,7 @@ msgid ""
 "Godthåb"
 msgstr ""
 
-#: data/Cities.dat:932 data/Cities.dat:2393
-#: data/Cities.dat:2531
+#: data/Cities.dat:932 data/Cities.dat:2393 data/Cities.dat:2531
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Greenland"
@@ -13602,11 +12820,9 @@ msgid ""
 "Goheung"
 msgstr ""
 
-#: data/Cities.dat:933 data/Cities.dat:1001
-#: data/Cities.dat:1069 data/Cities.dat:1168
-#: data/Cities.dat:1680 data/Cities.dat:1734
-#: data/Cities.dat:2469 data/Cities.dat:2699
-#: data/Cities.dat:2815
+#: data/Cities.dat:933 data/Cities.dat:1001 data/Cities.dat:1069
+#: data/Cities.dat:1168 data/Cities.dat:1680 data/Cities.dat:1734
+#: data/Cities.dat:2469 data/Cities.dat:2699 data/Cities.dat:2815
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Jeonnam"
@@ -13666,11 +12882,9 @@ msgid ""
 "Gothenburg"
 msgstr ""
 
-#: data/Cities.dat:942 data/Cities.dat:1127
-#: data/Cities.dat:1275 data/Cities.dat:1474
-#: data/Cities.dat:1475 data/Cities.dat:1515
-#: data/Cities.dat:1909 data/Cities.dat:2454
-#: data/Cities.dat:2615
+#: data/Cities.dat:942 data/Cities.dat:1127 data/Cities.dat:1275
+#: data/Cities.dat:1474 data/Cities.dat:1475 data/Cities.dat:1515
+#: data/Cities.dat:1909 data/Cities.dat:2454 data/Cities.dat:2615
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Sweden"
@@ -13790,8 +13004,8 @@ msgid ""
 "Greensboro"
 msgstr ""
 
-#: data/Cities.dat:964 data/Cities.dat:965
-#: data/Cities.dat:966 data/Cities.dat:967
+#: data/Cities.dat:964 data/Cities.dat:965 data/Cities.dat:966
+#: data/Cities.dat:967
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Greenville"
@@ -13875,8 +13089,7 @@ msgid ""
 "Guantanamo Bay"
 msgstr ""
 
-#: data/Cities.dat:981 data/Cities.dat:1048
-#: data/Cities.dat:1332
+#: data/Cities.dat:981 data/Cities.dat:1048 data/Cities.dat:1332
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Cuba"
@@ -14086,8 +13299,7 @@ msgid ""
 "Hamden"
 msgstr ""
 
-#: data/Cities.dat:1013 data/Cities.dat:1014
-#: data/Cities.dat:1015
+#: data/Cities.dat:1013 data/Cities.dat:1014 data/Cities.dat:1015
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hamilton"
@@ -14165,8 +13377,7 @@ msgid ""
 "Hao"
 msgstr ""
 
-#: data/Cities.dat:1026 data/Cities.dat:1974
-#: data/Cities.dat:2487
+#: data/Cities.dat:1026 data/Cities.dat:1974 data/Cities.dat:2487
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "French Polynesia"
@@ -14190,8 +13401,8 @@ msgid ""
 "Harbel"
 msgstr ""
 
-#: data/Cities.dat:1029 data/Cities.dat:1030
-#: data/Cities.dat:1687 data/Cities.dat:2809
+#: data/Cities.dat:1029 data/Cities.dat:1030 data/Cities.dat:1687
+#: data/Cities.dat:2809
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Liberia"
@@ -14665,9 +13876,8 @@ msgid ""
 "Huambo"
 msgstr ""
 
-#: data/Cities.dat:1110 data/Cities.dat:1468
-#: data/Cities.dat:1472 data/Cities.dat:1605
-#: data/Cities.dat:1769 data/Cities.dat:2406
+#: data/Cities.dat:1110 data/Cities.dat:1468 data/Cities.dat:1472
+#: data/Cities.dat:1605 data/Cities.dat:1769 data/Cities.dat:2406
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Angola"
@@ -14829,12 +14039,10 @@ msgid ""
 "Ine"
 msgstr ""
 
-#: data/Cities.dat:1137 data/Cities.dat:1165
-#: data/Cities.dat:1263 data/Cities.dat:1322
-#: data/Cities.dat:1507 data/Cities.dat:1516
-#: data/Cities.dat:1650 data/Cities.dat:1770
-#: data/Cities.dat:2500 data/Cities.dat:2538
-#: data/Cities.dat:2620 data/Cities.dat:2791
+#: data/Cities.dat:1137 data/Cities.dat:1165 data/Cities.dat:1263
+#: data/Cities.dat:1322 data/Cities.dat:1507 data/Cities.dat:1516
+#: data/Cities.dat:1650 data/Cities.dat:1770 data/Cities.dat:2500
+#: data/Cities.dat:2538 data/Cities.dat:2620 data/Cities.dat:2791
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Marshall Islands"
@@ -14852,11 +14060,9 @@ msgid ""
 "Innsbruck"
 msgstr ""
 
-#: data/Cities.dat:1139 data/Cities.dat:1227
-#: data/Cities.dat:1314 data/Cities.dat:1403
-#: data/Cities.dat:1426 data/Cities.dat:2256
-#: data/Cities.dat:2641 data/Cities.dat:2661
-#: data/Cities.dat:2674
+#: data/Cities.dat:1139 data/Cities.dat:1227 data/Cities.dat:1314
+#: data/Cities.dat:1403 data/Cities.dat:1426 data/Cities.dat:2256
+#: data/Cities.dat:2641 data/Cities.dat:2661 data/Cities.dat:2674
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Austria"
@@ -14934,9 +14140,8 @@ msgid ""
 "Islamabad"
 msgstr ""
 
-#: data/Cities.dat:1151 data/Cities.dat:1232
-#: data/Cities.dat:1345 data/Cities.dat:2011
-#: data/Cities.dat:2150
+#: data/Cities.dat:1151 data/Cities.dat:1232 data/Cities.dat:1345
+#: data/Cities.dat:2011 data/Cities.dat:2150
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Pakistan"
@@ -14972,9 +14177,8 @@ msgid ""
 "Izaña"
 msgstr ""
 
-#: data/Cities.dat:1156 data/Cities.dat:2208
-#: data/Cities.dat:2275 data/Cities.dat:2286
-#: data/Cities.dat:2287 data/Cities.dat:2635
+#: data/Cities.dat:1156 data/Cities.dat:2208 data/Cities.dat:2275
+#: data/Cities.dat:2286 data/Cities.dat:2287 data/Cities.dat:2635
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Tenerife"
@@ -14992,8 +14196,7 @@ msgid ""
 "J. Horrocks"
 msgstr ""
 
-#: data/Cities.dat:1159 data/Cities.dat:1160
-#: data/Cities.dat:1161
+#: data/Cities.dat:1159 data/Cities.dat:1160 data/Cities.dat:1161
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jackson"
@@ -15047,8 +14250,7 @@ msgid ""
 "Jarkov"
 msgstr ""
 
-#: data/Cities.dat:1170 data/Cities.dat:1890
-#: data/Cities.dat:2801
+#: data/Cities.dat:1170 data/Cities.dat:1890 data/Cities.dat:2801
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Ukraine"
@@ -15462,9 +14664,8 @@ msgid ""
 "Katima Mulilo"
 msgstr ""
 
-#: data/Cities.dat:1237 data/Cities.dat:1908
-#: data/Cities.dat:2698 data/Cities.dat:2767
-#: data/Cities.dat:2768
+#: data/Cities.dat:1237 data/Cities.dat:1908 data/Cities.dat:2698
+#: data/Cities.dat:2767 data/Cities.dat:2768
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Namibia"
@@ -15716,8 +14917,7 @@ msgid ""
 "Kisangani"
 msgstr ""
 
-#: data/Cities.dat:1276 data/Cities.dat:1564
-#: data/Cities.dat:1572
+#: data/Cities.dat:1276 data/Cities.dat:1564 data/Cities.dat:1572
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Dem rep of Congo"
@@ -15747,8 +14947,7 @@ msgid ""
 "Kisumu"
 msgstr ""
 
-#: data/Cities.dat:1280 data/Cities.dat:1684
-#: data/Cities.dat:1765
+#: data/Cities.dat:1280 data/Cities.dat:1684 data/Cities.dat:1765
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Kenya"
@@ -16222,8 +15421,7 @@ msgid ""
 "Lakeland"
 msgstr ""
 
-#: data/Cities.dat:1355 data/Cities.dat:1356
-#: data/Cities.dat:1357
+#: data/Cities.dat:1355 data/Cities.dat:1356 data/Cities.dat:1357
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lakewood"
@@ -16331,8 +15529,7 @@ msgid ""
 "Latina"
 msgstr ""
 
-#: data/Cities.dat:1376 data/Cities.dat:1377
-#: data/Cities.dat:1378
+#: data/Cities.dat:1376 data/Cities.dat:1377 data/Cities.dat:1378
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Laurel"
@@ -16386,8 +15583,7 @@ msgid ""
 "Learmonth"
 msgstr ""
 
-#: data/Cities.dat:1386 data/Cities.dat:1993
-#: data/Cities.dat:2005
+#: data/Cities.dat:1386 data/Cities.dat:1993 data/Cities.dat:2005
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Western Australia"
@@ -16399,8 +15595,7 @@ msgid ""
 "Leavenworth"
 msgstr ""
 
-#: data/Cities.dat:1389 data/Cities.dat:1390
-#: data/Cities.dat:1391
+#: data/Cities.dat:1389 data/Cities.dat:1390 data/Cities.dat:1391
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lebanon"
@@ -16508,8 +15703,7 @@ msgid ""
 "Lewisburg"
 msgstr ""
 
-#: data/Cities.dat:1408 data/Cities.dat:1409
-#: data/Cities.dat:1410
+#: data/Cities.dat:1408 data/Cities.dat:1409 data/Cities.dat:1410
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lewiston"
@@ -16587,8 +15781,7 @@ msgid ""
 "Lima"
 msgstr ""
 
-#: data/Cities.dat:1422 data/Cities.dat:1423
-#: data/Cities.dat:1424
+#: data/Cities.dat:1422 data/Cities.dat:1423 data/Cities.dat:1424
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lincoln"
@@ -16732,8 +15925,7 @@ msgid ""
 "Lomnicky stit"
 msgstr ""
 
-#: data/Cities.dat:1448 data/Cities.dat:2373
-#: data/Cities.dat:2443
+#: data/Cities.dat:1448 data/Cities.dat:2373 data/Cities.dat:2443
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Slovakia"
@@ -17009,8 +16201,7 @@ msgid ""
 "Madelia"
 msgstr ""
 
-#: data/Cities.dat:1494 data/Cities.dat:1495
-#: data/Cities.dat:1496
+#: data/Cities.dat:1494 data/Cities.dat:1495 data/Cities.dat:1496
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Madison"
@@ -17178,8 +16369,7 @@ msgid ""
 "Manaus"
 msgstr ""
 
-#: data/Cities.dat:1521 data/Cities.dat:1522
-#: data/Cities.dat:1523
+#: data/Cities.dat:1521 data/Cities.dat:1522 data/Cities.dat:1523
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Manchester"
@@ -17191,8 +16381,7 @@ msgid ""
 "Mandalay"
 msgstr ""
 
-#: data/Cities.dat:1524 data/Cities.dat:2145
-#: data/Cities.dat:2371
+#: data/Cities.dat:1524 data/Cities.dat:2145 data/Cities.dat:2371
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Myanmar"
@@ -17276,9 +16465,8 @@ msgid ""
 "Manzini"
 msgstr ""
 
-#: data/Cities.dat:1537 data/Cities.dat:1565
-#: data/Cities.dat:1571 data/Cities.dat:1629
-#: data/Cities.dat:2361
+#: data/Cities.dat:1537 data/Cities.dat:1565 data/Cities.dat:1571
+#: data/Cities.dat:1629 data/Cities.dat:2361
 msgid ""
 "_: Country name (optional, but should be translated)\n"
 "Swaziland"
@@ -17296,8 +16484,7 @@ msgid ""
 "Marado"
 msgstr ""
 
-#: data/Cities.dat:1539 data/Cities.dat:2327
-#: data/Cities.dat:2328
+#: data/Cities.dat:1539 data/Cities.dat:2327 data/Cities.dat:2328
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Jeju"
@@ -17885,8 +17072,8 @@ msgid ""
 "Middelfart"
 msgstr ""
 
-#: data/Cities.dat:1635 data/Cities.dat:1870
-#: data/Cities.dat:1889 data/Cities.dat:2476
+#: data/Cities.dat:1635 data/Cities.dat:1870 data/Cities.dat:1889
+#: data/Cities.dat:2476
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Fyn"
@@ -17952,8 +17139,8 @@ msgid ""
 "Mildenau"
 msgstr ""
 
-#: data/Cities.dat:1646 data/Cities.dat:1647
-#: data/Cities.dat:1648 data/Cities.dat:1649
+#: data/Cities.dat:1646 data/Cities.dat:1647 data/Cities.dat:1648
+#: data/Cities.dat:1649
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Milford"
@@ -18253,8 +17440,7 @@ msgid ""
 "Montgomery"
 msgstr ""
 
-#: data/Cities.dat:1696 data/Cities.dat:1697
-#: data/Cities.dat:1698
+#: data/Cities.dat:1696 data/Cities.dat:1697 data/Cities.dat:1698
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Monticello"
@@ -18302,9 +17488,8 @@ msgid ""
 "Moose Jaw"
 msgstr ""
 
-#: data/Cities.dat:1705 data/Cities.dat:2100
-#: data/Cities.dat:2160 data/Cities.dat:2303
-#: data/Cities.dat:2478
+#: data/Cities.dat:1705 data/Cities.dat:2100 data/Cities.dat:2160
+#: data/Cities.dat:2303 data/Cities.dat:2478
 msgid ""
 "_: Region/state name (optional, rarely needs a translation)\n"
 "Saskatchewan"
@@ -18880,8 +18065,8 @@ msgid ""
 "New Carrollton"
 msgstr ""
 
-#: data/Cities.dat:1800 data/Cities.dat:1801
-#: data/Cities.dat:1802 data/Cities.dat:1803
+#: data/Cities.dat:1800 data/Cities.dat:1801 data/Cities.dat:1802
+#: data/Cities.dat:1803
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "New Castle"
@@ -18977,9 +18162,8 @@ msgid ""
 "Newell"
 msgstr ""
 
-#: data/Cities.dat:1820 data/Cities.dat:1821
-#: data/Cities.dat:1822 data/Cities.dat:1823
-#: data/Cities.dat:1824
+#: data/Cities.dat:1820 data/Cities.dat:1821 data/Cities.dat:1822
+#: data/Cities.dat:1823 data/Cities.dat:1824
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Newport"
@@ -19537,8 +18721,7 @@ msgid ""
 "Oran"
 msgstr ""
 
-#: data/Cities.dat:1917 data/Cities.dat:1918
-#: data/Cities.dat:1919
+#: data/Cities.dat:1917 data/Cities.dat:1918 data/Cities.dat:1919
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Orange"
@@ -19694,8 +18877,7 @@ msgid ""
 "Owensboro"
 msgstr ""
 
-#: data/Cities.dat:1944 data/Cities.dat:1945
-#: data/Cities.dat:1946
+#: data/Cities.dat:1944 data/Cities.dat:1945 data/Cities.dat:1946
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oxford"
@@ -19875,8 +19057,7 @@ msgid ""
 "Paradise"
 msgstr ""
 
-#: data/Cities.dat:1976 data/Cities.dat:1977
-#: data/Cities.dat:1978
+#: data/Cities.dat:1976 data/Cities.dat:1977 data/Cities.dat:1978
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Paris"
@@ -20314,8 +19495,8 @@ msgid ""
 "Plattsburgh"
 msgstr ""
 
-#: data/Cities.dat:2046 data/Cities.dat:2047
-#: data/Cities.dat:2048 data/Cities.dat:2049
+#: data/Cities.dat:2046 data/Cities.dat:2047 data/Cities.dat:2048
+#: data/Cities.dat:2049
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Plymouth"
@@ -20525,8 +19706,8 @@ msgid ""
 "Porto Novo"
 msgstr ""
 
-#: data/Cities.dat:2082 data/Cities.dat:2083
-#: data/Cities.dat:2084 data/Cities.dat:2085
+#: data/Cities.dat:2082 data/Cities.dat:2083 data/Cities.dat:2084
+#: data/Cities.dat:2085
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Portsmouth"
@@ -20640,8 +19821,7 @@ msgid ""
 "Prince Rupert"
 msgstr ""
 
-#: data/Cities.dat:2103 data/Cities.dat:2104
-#: data/Cities.dat:2105
+#: data/Cities.dat:2103 data/Cities.dat:2104 data/Cities.dat:2105
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Princeton"
@@ -21061,9 +20241,8 @@ msgid ""
 "Richland"
 msgstr ""
 
-#: data/Cities.dat:2173 data/Cities.dat:2174
-#: data/Cities.dat:2175 data/Cities.dat:2176
-#: data/Cities.dat:2177
+#: data/Cities.dat:2173 data/Cities.dat:2174 data/Cities.dat:2175
+#: data/Cities.dat:2176 data/Cities.dat:2177
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Richmond"
@@ -21159,8 +20338,7 @@ msgid ""
 "Rochdale Lanc"
 msgstr ""
 
-#: data/Cities.dat:2192 data/Cities.dat:2193
-#: data/Cities.dat:2194
+#: data/Cities.dat:2192 data/Cities.dat:2193 data/Cities.dat:2194
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rochester"
@@ -21448,8 +20626,8 @@ msgid ""
 "Sale"
 msgstr ""
 
-#: data/Cities.dat:2243 data/Cities.dat:2244
-#: data/Cities.dat:2245 data/Cities.dat:2246
+#: data/Cities.dat:2243 data/Cities.dat:2244 data/Cities.dat:2245
+#: data/Cities.dat:2246
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Salem"
@@ -22457,9 +21635,8 @@ msgid ""
 "Springdale"
 msgstr ""
 
-#: data/Cities.dat:2413 data/Cities.dat:2414
-#: data/Cities.dat:2415 data/Cities.dat:2416
-#: data/Cities.dat:2417 data/Cities.dat:2418
+#: data/Cities.dat:2413 data/Cities.dat:2414 data/Cities.dat:2415
+#: data/Cities.dat:2416 data/Cities.dat:2417 data/Cities.dat:2418
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Springfield"
@@ -23419,8 +22596,7 @@ msgid ""
 "Trondheim"
 msgstr ""
 
-#: data/Cities.dat:2572 data/Cities.dat:2573
-#: data/Cities.dat:2574
+#: data/Cities.dat:2572 data/Cities.dat:2573 data/Cities.dat:2574
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Troy"
@@ -23930,8 +23106,7 @@ msgid ""
 "Vicksburg"
 msgstr ""
 
-#: data/Cities.dat:2658 data/Cities.dat:2659
-#: data/Cities.dat:2660
+#: data/Cities.dat:2658 data/Cities.dat:2659 data/Cities.dat:2660
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Victoria"
@@ -24189,8 +23364,7 @@ msgid ""
 "Warner Robins"
 msgstr ""
 
-#: data/Cities.dat:2701 data/Cities.dat:2702
-#: data/Cities.dat:2703
+#: data/Cities.dat:2701 data/Cities.dat:2702 data/Cities.dat:2703
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Warren"
@@ -24394,8 +23568,7 @@ msgid ""
 "Westland"
 msgstr ""
 
-#: data/Cities.dat:2739 data/Cities.dat:2740
-#: data/Cities.dat:2741
+#: data/Cities.dat:2739 data/Cities.dat:2740 data/Cities.dat:2741
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Westminster"
@@ -24521,8 +23694,8 @@ msgid ""
 "Wilmington"
 msgstr ""
 
-#: data/Cities.dat:2762 data/Cities.dat:2763
-#: data/Cities.dat:2764 data/Cities.dat:2765
+#: data/Cities.dat:2762 data/Cities.dat:2763 data/Cities.dat:2764
+#: data/Cities.dat:2765
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Winchester"
@@ -24972,60 +24145,42 @@ msgid ""
 "Ávila"
 msgstr ""
 
-#: data/image_url.dat:17 data/image_url.dat:18
-#: data/image_url.dat:19 data/image_url.dat:20
-#: data/image_url.dat:21 data/image_url.dat:22
-#: data/image_url.dat:23 data/image_url.dat:24
-#: data/image_url.dat:25 data/image_url.dat:26
-#: data/image_url.dat:27 data/image_url.dat:28
-#: data/image_url.dat:31 data/image_url.dat:33
-#: data/image_url.dat:34 data/image_url.dat:36
-#: data/image_url.dat:37 data/image_url.dat:38
-#: data/image_url.dat:39 data/image_url.dat:42
-#: data/image_url.dat:43 data/image_url.dat:44
-#: data/image_url.dat:45 data/image_url.dat:46
-#: data/image_url.dat:49 data/image_url.dat:50
-#: data/image_url.dat:51 data/image_url.dat:52
-#: data/image_url.dat:53 data/image_url.dat:54
-#: data/image_url.dat:55 data/image_url.dat:56
-#: data/image_url.dat:57 data/image_url.dat:58
-#: data/image_url.dat:59 data/image_url.dat:60
-#: data/image_url.dat:61 data/image_url.dat:62
-#: data/image_url.dat:63 data/image_url.dat:64
-#: data/image_url.dat:65 data/image_url.dat:66
-#: data/image_url.dat:67 data/image_url.dat:68
-#: data/image_url.dat:69 data/image_url.dat:70
-#: data/image_url.dat:71 data/image_url.dat:72
-#: data/image_url.dat:73 data/image_url.dat:74
-#: data/image_url.dat:75 data/image_url.dat:77
-#: data/image_url.dat:78 data/image_url.dat:79
-#: data/image_url.dat:80 data/image_url.dat:81
-#: data/image_url.dat:82 data/image_url.dat:83
-#: data/image_url.dat:84 data/image_url.dat:85
-#: data/image_url.dat:86 data/image_url.dat:87
-#: data/image_url.dat:88 data/image_url.dat:89
-#: data/image_url.dat:90 data/image_url.dat:91
-#: data/image_url.dat:92 data/image_url.dat:93
-#: data/image_url.dat:94 data/image_url.dat:95
-#: data/image_url.dat:96 data/image_url.dat:97
-#: data/image_url.dat:98 data/image_url.dat:99
-#: data/image_url.dat:100 data/image_url.dat:101
-#: data/image_url.dat:102 data/image_url.dat:103
-#: data/image_url.dat:104 data/image_url.dat:105
-#: data/image_url.dat:106 data/image_url.dat:107
-#: data/image_url.dat:108 data/image_url.dat:109
-#: data/image_url.dat:110 data/image_url.dat:111
-#: data/image_url.dat:112 data/image_url.dat:113
-#: data/image_url.dat:116 data/image_url.dat:117
-#: data/image_url.dat:118 data/image_url.dat:119
-#: data/image_url.dat:122 data/image_url.dat:123
-#: data/image_url.dat:124 data/image_url.dat:125
-#: data/image_url.dat:126 data/image_url.dat:127
-#: data/image_url.dat:128 data/image_url.dat:131
-#: data/image_url.dat:132 data/image_url.dat:133
-#: data/image_url.dat:134 data/image_url.dat:135
-#: data/image_url.dat:136 data/image_url.dat:149
-#: data/image_url.dat:151 data/image_url.dat:152
+#: data/image_url.dat:17 data/image_url.dat:18 data/image_url.dat:19
+#: data/image_url.dat:20 data/image_url.dat:21 data/image_url.dat:22
+#: data/image_url.dat:23 data/image_url.dat:24 data/image_url.dat:25
+#: data/image_url.dat:26 data/image_url.dat:27 data/image_url.dat:28
+#: data/image_url.dat:31 data/image_url.dat:33 data/image_url.dat:34
+#: data/image_url.dat:36 data/image_url.dat:37 data/image_url.dat:38
+#: data/image_url.dat:39 data/image_url.dat:42 data/image_url.dat:43
+#: data/image_url.dat:44 data/image_url.dat:45 data/image_url.dat:46
+#: data/image_url.dat:49 data/image_url.dat:50 data/image_url.dat:51
+#: data/image_url.dat:52 data/image_url.dat:53 data/image_url.dat:54
+#: data/image_url.dat:55 data/image_url.dat:56 data/image_url.dat:57
+#: data/image_url.dat:58 data/image_url.dat:59 data/image_url.dat:60
+#: data/image_url.dat:61 data/image_url.dat:62 data/image_url.dat:63
+#: data/image_url.dat:64 data/image_url.dat:65 data/image_url.dat:66
+#: data/image_url.dat:67 data/image_url.dat:68 data/image_url.dat:69
+#: data/image_url.dat:70 data/image_url.dat:71 data/image_url.dat:72
+#: data/image_url.dat:73 data/image_url.dat:74 data/image_url.dat:75
+#: data/image_url.dat:77 data/image_url.dat:78 data/image_url.dat:79
+#: data/image_url.dat:80 data/image_url.dat:81 data/image_url.dat:82
+#: data/image_url.dat:83 data/image_url.dat:84 data/image_url.dat:85
+#: data/image_url.dat:86 data/image_url.dat:87 data/image_url.dat:88
+#: data/image_url.dat:89 data/image_url.dat:90 data/image_url.dat:91
+#: data/image_url.dat:92 data/image_url.dat:93 data/image_url.dat:94
+#: data/image_url.dat:95 data/image_url.dat:96 data/image_url.dat:97
+#: data/image_url.dat:98 data/image_url.dat:99 data/image_url.dat:100
+#: data/image_url.dat:101 data/image_url.dat:102 data/image_url.dat:103
+#: data/image_url.dat:104 data/image_url.dat:105 data/image_url.dat:106
+#: data/image_url.dat:107 data/image_url.dat:108 data/image_url.dat:109
+#: data/image_url.dat:110 data/image_url.dat:111 data/image_url.dat:112
+#: data/image_url.dat:113 data/image_url.dat:116 data/image_url.dat:117
+#: data/image_url.dat:118 data/image_url.dat:119 data/image_url.dat:122
+#: data/image_url.dat:123 data/image_url.dat:124 data/image_url.dat:125
+#: data/image_url.dat:126 data/image_url.dat:127 data/image_url.dat:128
+#: data/image_url.dat:131 data/image_url.dat:132 data/image_url.dat:133
+#: data/image_url.dat:134 data/image_url.dat:135 data/image_url.dat:136
+#: data/image_url.dat:149 data/image_url.dat:151 data/image_url.dat:152
 msgid ""
 "_: Image/info menu item (should be translated)\n"
 "Show HST Image"
@@ -25037,8 +24192,7 @@ msgid ""
 "Show HST Image (2002)"
 msgstr ""
 
-#: data/image_url.dat:30 data/image_url.dat:139
-#: data/image_url.dat:147
+#: data/image_url.dat:30 data/image_url.dat:139 data/image_url.dat:147
 msgid ""
 "_: Image/info menu item (should be translated)\n"
 "Show HST Image (2003)"
@@ -25062,15 +24216,13 @@ msgid ""
 "Show HST Image (1999)"
 msgstr ""
 
-#: data/image_url.dat:41 data/image_url.dat:115
-#: data/image_url.dat:130
+#: data/image_url.dat:41 data/image_url.dat:115 data/image_url.dat:130
 msgid ""
 "_: Image/info menu item (should be translated)\n"
 "Show HST Image (2004)"
 msgstr ""
 
-#: data/image_url.dat:47 data/image_url.dat:114
-#: data/image_url.dat:137
+#: data/image_url.dat:47 data/image_url.dat:114 data/image_url.dat:137
 msgid ""
 "_: Image/info menu item (should be translated)\n"
 "Show HST Image (1995)"
@@ -25160,281 +24312,193 @@ msgid ""
 "Show HST (Rings and Moons)"
 msgstr ""
 
-#: data/image_url.dat:155 data/image_url.dat:156
-#: data/image_url.dat:157 data/image_url.dat:158
-#: data/image_url.dat:159 data/image_url.dat:160
-#: data/image_url.dat:161 data/image_url.dat:162
-#: data/image_url.dat:163 data/image_url.dat:164
-#: data/image_url.dat:165 data/image_url.dat:166
-#: data/image_url.dat:167 data/image_url.dat:168
-#: data/image_url.dat:169 data/image_url.dat:170
-#: data/image_url.dat:171 data/image_url.dat:172
-#: data/image_url.dat:173 data/image_url.dat:174
-#: data/image_url.dat:175 data/image_url.dat:176
-#: data/image_url.dat:177 data/image_url.dat:178
-#: data/image_url.dat:179 data/image_url.dat:180
-#: data/image_url.dat:181 data/image_url.dat:182
-#: data/image_url.dat:183 data/image_url.dat:184
-#: data/image_url.dat:185 data/image_url.dat:186
-#: data/image_url.dat:187 data/image_url.dat:188
-#: data/image_url.dat:189 data/image_url.dat:190
-#: data/image_url.dat:191 data/image_url.dat:192
-#: data/image_url.dat:193 data/image_url.dat:194
-#: data/image_url.dat:195 data/image_url.dat:196
-#: data/image_url.dat:197 data/image_url.dat:198
-#: data/image_url.dat:199 data/image_url.dat:200
-#: data/image_url.dat:201 data/image_url.dat:202
-#: data/image_url.dat:203 data/image_url.dat:204
-#: data/image_url.dat:205 data/image_url.dat:206
-#: data/image_url.dat:207 data/image_url.dat:208
-#: data/image_url.dat:209 data/image_url.dat:210
-#: data/image_url.dat:211 data/image_url.dat:212
-#: data/image_url.dat:213 data/image_url.dat:214
-#: data/image_url.dat:215 data/image_url.dat:216
-#: data/image_url.dat:217 data/image_url.dat:218
-#: data/image_url.dat:219 data/image_url.dat:220
-#: data/image_url.dat:221 data/image_url.dat:222
-#: data/image_url.dat:223 data/image_url.dat:224
-#: data/image_url.dat:225 data/image_url.dat:226
-#: data/image_url.dat:227 data/image_url.dat:228
-#: data/image_url.dat:229 data/image_url.dat:230
-#: data/image_url.dat:231 data/image_url.dat:232
-#: data/image_url.dat:233 data/image_url.dat:234
-#: data/image_url.dat:235 data/image_url.dat:236
-#: data/image_url.dat:237 data/image_url.dat:238
-#: data/image_url.dat:239 data/image_url.dat:240
-#: data/image_url.dat:241 data/image_url.dat:242
-#: data/image_url.dat:243 data/image_url.dat:244
-#: data/image_url.dat:245 data/image_url.dat:246
-#: data/image_url.dat:247 data/image_url.dat:248
-#: data/image_url.dat:249 data/image_url.dat:250
-#: data/image_url.dat:251 data/image_url.dat:252
-#: data/image_url.dat:253 data/image_url.dat:254
-#: data/image_url.dat:255 data/image_url.dat:256
-#: data/image_url.dat:257 data/image_url.dat:258
-#: data/image_url.dat:259 data/image_url.dat:260
-#: data/image_url.dat:261 data/image_url.dat:262
+#: data/image_url.dat:155 data/image_url.dat:156 data/image_url.dat:157
+#: data/image_url.dat:158 data/image_url.dat:159 data/image_url.dat:160
+#: data/image_url.dat:161 data/image_url.dat:162 data/image_url.dat:163
+#: data/image_url.dat:164 data/image_url.dat:165 data/image_url.dat:166
+#: data/image_url.dat:167 data/image_url.dat:168 data/image_url.dat:169
+#: data/image_url.dat:170 data/image_url.dat:171 data/image_url.dat:172
+#: data/image_url.dat:173 data/image_url.dat:174 data/image_url.dat:175
+#: data/image_url.dat:176 data/image_url.dat:177 data/image_url.dat:178
+#: data/image_url.dat:179 data/image_url.dat:180 data/image_url.dat:181
+#: data/image_url.dat:182 data/image_url.dat:183 data/image_url.dat:184
+#: data/image_url.dat:185 data/image_url.dat:186 data/image_url.dat:187
+#: data/image_url.dat:188 data/image_url.dat:189 data/image_url.dat:190
+#: data/image_url.dat:191 data/image_url.dat:192 data/image_url.dat:193
+#: data/image_url.dat:194 data/image_url.dat:195 data/image_url.dat:196
+#: data/image_url.dat:197 data/image_url.dat:198 data/image_url.dat:199
+#: data/image_url.dat:200 data/image_url.dat:201 data/image_url.dat:202
+#: data/image_url.dat:203 data/image_url.dat:204 data/image_url.dat:205
+#: data/image_url.dat:206 data/image_url.dat:207 data/image_url.dat:208
+#: data/image_url.dat:209 data/image_url.dat:210 data/image_url.dat:211
+#: data/image_url.dat:212 data/image_url.dat:213 data/image_url.dat:214
+#: data/image_url.dat:215 data/image_url.dat:216 data/image_url.dat:217
+#: data/image_url.dat:218 data/image_url.dat:219 data/image_url.dat:220
+#: data/image_url.dat:221 data/image_url.dat:222 data/image_url.dat:223
+#: data/image_url.dat:224 data/image_url.dat:225 data/image_url.dat:226
+#: data/image_url.dat:227 data/image_url.dat:228 data/image_url.dat:229
+#: data/image_url.dat:230 data/image_url.dat:231 data/image_url.dat:232
+#: data/image_url.dat:233 data/image_url.dat:234 data/image_url.dat:235
+#: data/image_url.dat:236 data/image_url.dat:237 data/image_url.dat:238
+#: data/image_url.dat:239 data/image_url.dat:240 data/image_url.dat:241
+#: data/image_url.dat:242 data/image_url.dat:243 data/image_url.dat:244
+#: data/image_url.dat:245 data/image_url.dat:246 data/image_url.dat:247
+#: data/image_url.dat:248 data/image_url.dat:249 data/image_url.dat:250
+#: data/image_url.dat:251 data/image_url.dat:252 data/image_url.dat:253
+#: data/image_url.dat:254 data/image_url.dat:255 data/image_url.dat:256
+#: data/image_url.dat:257 data/image_url.dat:258 data/image_url.dat:259
+#: data/image_url.dat:260 data/image_url.dat:261 data/image_url.dat:262
 #: data/image_url.dat:263 data/image_url.dat:264
 msgid ""
 "_: Image/info menu item (should be translated)\n"
 "Show SEDS Image"
 msgstr ""
 
-#: data/image_url.dat:267 data/image_url.dat:268
-#: data/image_url.dat:269 data/image_url.dat:270
-#: data/image_url.dat:271 data/image_url.dat:272
-#: data/image_url.dat:273 data/image_url.dat:274
-#: data/image_url.dat:275 data/image_url.dat:276
-#: data/image_url.dat:277 data/image_url.dat:278
-#: data/image_url.dat:279 data/image_url.dat:280
-#: data/image_url.dat:281 data/image_url.dat:282
-#: data/image_url.dat:283 data/image_url.dat:284
-#: data/image_url.dat:285 data/image_url.dat:286
-#: data/image_url.dat:287 data/image_url.dat:288
-#: data/image_url.dat:289 data/image_url.dat:290
-#: data/image_url.dat:291 data/image_url.dat:292
-#: data/image_url.dat:293 data/image_url.dat:294
-#: data/image_url.dat:295 data/image_url.dat:296
-#: data/image_url.dat:297 data/image_url.dat:298
-#: data/image_url.dat:299 data/image_url.dat:300
-#: data/image_url.dat:301 data/image_url.dat:302
-#: data/image_url.dat:303 data/image_url.dat:304
-#: data/image_url.dat:305 data/image_url.dat:306
-#: data/image_url.dat:307 data/image_url.dat:308
-#: data/image_url.dat:309 data/image_url.dat:310
-#: data/image_url.dat:311 data/image_url.dat:312
-#: data/image_url.dat:313 data/image_url.dat:314
-#: data/image_url.dat:315 data/image_url.dat:316
-#: data/image_url.dat:317 data/image_url.dat:318
-#: data/image_url.dat:319 data/image_url.dat:320
-#: data/image_url.dat:321 data/image_url.dat:322
-#: data/image_url.dat:323 data/image_url.dat:324
-#: data/image_url.dat:325 data/image_url.dat:326
-#: data/image_url.dat:327 data/image_url.dat:328
-#: data/image_url.dat:329 data/image_url.dat:330
-#: data/image_url.dat:331 data/image_url.dat:332
-#: data/image_url.dat:333 data/image_url.dat:334
-#: data/image_url.dat:335 data/image_url.dat:336
-#: data/image_url.dat:337 data/image_url.dat:338
-#: data/image_url.dat:339 data/image_url.dat:340
-#: data/image_url.dat:341 data/image_url.dat:342
-#: data/image_url.dat:343 data/image_url.dat:344
-#: data/image_url.dat:345 data/image_url.dat:346
-#: data/image_url.dat:347 data/image_url.dat:348
-#: data/image_url.dat:349 data/image_url.dat:350
-#: data/image_url.dat:351 data/image_url.dat:352
-#: data/image_url.dat:353 data/image_url.dat:354
-#: data/image_url.dat:355 data/image_url.dat:356
-#: data/image_url.dat:357 data/image_url.dat:358
-#: data/image_url.dat:359 data/image_url.dat:360
-#: data/image_url.dat:361 data/image_url.dat:362
-#: data/image_url.dat:363 data/image_url.dat:364
-#: data/image_url.dat:365 data/image_url.dat:366
-#: data/image_url.dat:367 data/image_url.dat:368
-#: data/image_url.dat:369 data/image_url.dat:370
-#: data/image_url.dat:371 data/image_url.dat:372
-#: data/image_url.dat:373 data/image_url.dat:374
-#: data/image_url.dat:375 data/image_url.dat:376
-#: data/image_url.dat:377 data/image_url.dat:378
-#: data/image_url.dat:379 data/image_url.dat:380
-#: data/image_url.dat:381 data/image_url.dat:382
-#: data/image_url.dat:383 data/image_url.dat:384
-#: data/image_url.dat:385 data/image_url.dat:386
-#: data/image_url.dat:387 data/image_url.dat:388
-#: data/image_url.dat:389 data/image_url.dat:390
-#: data/image_url.dat:391 data/image_url.dat:392
-#: data/image_url.dat:393 data/image_url.dat:394
-#: data/image_url.dat:395 data/image_url.dat:396
-#: data/image_url.dat:397 data/image_url.dat:398
-#: data/image_url.dat:399 data/image_url.dat:400
-#: data/image_url.dat:401 data/image_url.dat:402
-#: data/image_url.dat:403 data/image_url.dat:404
-#: data/image_url.dat:405 data/image_url.dat:406
-#: data/image_url.dat:407 data/image_url.dat:408
-#: data/image_url.dat:409 data/image_url.dat:410
-#: data/image_url.dat:411 data/image_url.dat:412
-#: data/image_url.dat:413 data/image_url.dat:414
-#: data/image_url.dat:415 data/image_url.dat:416
-#: data/image_url.dat:417 data/image_url.dat:418
-#: data/image_url.dat:419 data/image_url.dat:420
-#: data/image_url.dat:421 data/image_url.dat:422
-#: data/image_url.dat:423 data/image_url.dat:424
-#: data/image_url.dat:425 data/image_url.dat:426
-#: data/image_url.dat:427 data/image_url.dat:428
-#: data/image_url.dat:429 data/image_url.dat:430
-#: data/image_url.dat:431 data/image_url.dat:432
-#: data/image_url.dat:433 data/image_url.dat:434
-#: data/image_url.dat:435 data/image_url.dat:436
-#: data/image_url.dat:437 data/image_url.dat:438
-#: data/image_url.dat:439 data/image_url.dat:440
-#: data/image_url.dat:441 data/image_url.dat:442
-#: data/image_url.dat:443 data/image_url.dat:444
-#: data/image_url.dat:445 data/image_url.dat:446
-#: data/image_url.dat:447 data/image_url.dat:448
-#: data/image_url.dat:449 data/image_url.dat:450
-#: data/image_url.dat:451 data/image_url.dat:452
-#: data/image_url.dat:453 data/image_url.dat:454
-#: data/image_url.dat:455 data/image_url.dat:456
-#: data/image_url.dat:457 data/image_url.dat:458
-#: data/image_url.dat:459 data/image_url.dat:460
-#: data/image_url.dat:461 data/image_url.dat:462
-#: data/image_url.dat:463 data/image_url.dat:464
-#: data/image_url.dat:465 data/image_url.dat:466
-#: data/image_url.dat:467 data/image_url.dat:468
-#: data/image_url.dat:469 data/image_url.dat:470
-#: data/image_url.dat:471 data/image_url.dat:472
-#: data/image_url.dat:473 data/image_url.dat:474
-#: data/image_url.dat:475 data/image_url.dat:476
-#: data/image_url.dat:477 data/image_url.dat:478
-#: data/image_url.dat:479 data/image_url.dat:480
-#: data/image_url.dat:481 data/image_url.dat:482
-#: data/image_url.dat:483 data/image_url.dat:484
-#: data/image_url.dat:485 data/image_url.dat:486
-#: data/image_url.dat:487 data/image_url.dat:488
-#: data/image_url.dat:489 data/image_url.dat:490
-#: data/image_url.dat:491 data/image_url.dat:492
-#: data/image_url.dat:493 data/image_url.dat:494
-#: data/image_url.dat:495 data/image_url.dat:496
-#: data/image_url.dat:497 data/image_url.dat:498
-#: data/image_url.dat:499 data/image_url.dat:500
-#: data/image_url.dat:501 data/image_url.dat:502
-#: data/image_url.dat:503 data/image_url.dat:504
-#: data/image_url.dat:505 data/image_url.dat:506
-#: data/image_url.dat:507 data/image_url.dat:508
-#: data/image_url.dat:509 data/image_url.dat:510
-#: data/image_url.dat:511 data/image_url.dat:512
-#: data/image_url.dat:513 data/image_url.dat:514
-#: data/image_url.dat:515 data/image_url.dat:516
-#: data/image_url.dat:517 data/image_url.dat:518
-#: data/image_url.dat:519 data/image_url.dat:520
-#: data/image_url.dat:521 data/image_url.dat:522
-#: data/image_url.dat:523 data/image_url.dat:524
-#: data/image_url.dat:525 data/image_url.dat:526
-#: data/image_url.dat:527 data/image_url.dat:528
-#: data/image_url.dat:529 data/image_url.dat:530
-#: data/image_url.dat:531 data/image_url.dat:532
-#: data/image_url.dat:533 data/image_url.dat:534
-#: data/image_url.dat:535 data/image_url.dat:536
-#: data/image_url.dat:537 data/image_url.dat:538
-#: data/image_url.dat:539 data/image_url.dat:540
-#: data/image_url.dat:541 data/image_url.dat:542
-#: data/image_url.dat:543 data/image_url.dat:544
-#: data/image_url.dat:545 data/image_url.dat:546
-#: data/image_url.dat:547 data/image_url.dat:548
-#: data/image_url.dat:549 data/image_url.dat:550
-#: data/image_url.dat:551 data/image_url.dat:552
-#: data/image_url.dat:553
+#: data/image_url.dat:267 data/image_url.dat:268 data/image_url.dat:269
+#: data/image_url.dat:270 data/image_url.dat:271 data/image_url.dat:272
+#: data/image_url.dat:273 data/image_url.dat:274 data/image_url.dat:275
+#: data/image_url.dat:276 data/image_url.dat:277 data/image_url.dat:278
+#: data/image_url.dat:279 data/image_url.dat:280 data/image_url.dat:281
+#: data/image_url.dat:282 data/image_url.dat:283 data/image_url.dat:284
+#: data/image_url.dat:285 data/image_url.dat:286 data/image_url.dat:287
+#: data/image_url.dat:288 data/image_url.dat:289 data/image_url.dat:290
+#: data/image_url.dat:291 data/image_url.dat:292 data/image_url.dat:293
+#: data/image_url.dat:294 data/image_url.dat:295 data/image_url.dat:296
+#: data/image_url.dat:297 data/image_url.dat:298 data/image_url.dat:299
+#: data/image_url.dat:300 data/image_url.dat:301 data/image_url.dat:302
+#: data/image_url.dat:303 data/image_url.dat:304 data/image_url.dat:305
+#: data/image_url.dat:306 data/image_url.dat:307 data/image_url.dat:308
+#: data/image_url.dat:309 data/image_url.dat:310 data/image_url.dat:311
+#: data/image_url.dat:312 data/image_url.dat:313 data/image_url.dat:314
+#: data/image_url.dat:315 data/image_url.dat:316 data/image_url.dat:317
+#: data/image_url.dat:318 data/image_url.dat:319 data/image_url.dat:320
+#: data/image_url.dat:321 data/image_url.dat:322 data/image_url.dat:323
+#: data/image_url.dat:324 data/image_url.dat:325 data/image_url.dat:326
+#: data/image_url.dat:327 data/image_url.dat:328 data/image_url.dat:329
+#: data/image_url.dat:330 data/image_url.dat:331 data/image_url.dat:332
+#: data/image_url.dat:333 data/image_url.dat:334 data/image_url.dat:335
+#: data/image_url.dat:336 data/image_url.dat:337 data/image_url.dat:338
+#: data/image_url.dat:339 data/image_url.dat:340 data/image_url.dat:341
+#: data/image_url.dat:342 data/image_url.dat:343 data/image_url.dat:344
+#: data/image_url.dat:345 data/image_url.dat:346 data/image_url.dat:347
+#: data/image_url.dat:348 data/image_url.dat:349 data/image_url.dat:350
+#: data/image_url.dat:351 data/image_url.dat:352 data/image_url.dat:353
+#: data/image_url.dat:354 data/image_url.dat:355 data/image_url.dat:356
+#: data/image_url.dat:357 data/image_url.dat:358 data/image_url.dat:359
+#: data/image_url.dat:360 data/image_url.dat:361 data/image_url.dat:362
+#: data/image_url.dat:363 data/image_url.dat:364 data/image_url.dat:365
+#: data/image_url.dat:366 data/image_url.dat:367 data/image_url.dat:368
+#: data/image_url.dat:369 data/image_url.dat:370 data/image_url.dat:371
+#: data/image_url.dat:372 data/image_url.dat:373 data/image_url.dat:374
+#: data/image_url.dat:375 data/image_url.dat:376 data/image_url.dat:377
+#: data/image_url.dat:378 data/image_url.dat:379 data/image_url.dat:380
+#: data/image_url.dat:381 data/image_url.dat:382 data/image_url.dat:383
+#: data/image_url.dat:384 data/image_url.dat:385 data/image_url.dat:386
+#: data/image_url.dat:387 data/image_url.dat:388 data/image_url.dat:389
+#: data/image_url.dat:390 data/image_url.dat:391 data/image_url.dat:392
+#: data/image_url.dat:393 data/image_url.dat:394 data/image_url.dat:395
+#: data/image_url.dat:396 data/image_url.dat:397 data/image_url.dat:398
+#: data/image_url.dat:399 data/image_url.dat:400 data/image_url.dat:401
+#: data/image_url.dat:402 data/image_url.dat:403 data/image_url.dat:404
+#: data/image_url.dat:405 data/image_url.dat:406 data/image_url.dat:407
+#: data/image_url.dat:408 data/image_url.dat:409 data/image_url.dat:410
+#: data/image_url.dat:411 data/image_url.dat:412 data/image_url.dat:413
+#: data/image_url.dat:414 data/image_url.dat:415 data/image_url.dat:416
+#: data/image_url.dat:417 data/image_url.dat:418 data/image_url.dat:419
+#: data/image_url.dat:420 data/image_url.dat:421 data/image_url.dat:422
+#: data/image_url.dat:423 data/image_url.dat:424 data/image_url.dat:425
+#: data/image_url.dat:426 data/image_url.dat:427 data/image_url.dat:428
+#: data/image_url.dat:429 data/image_url.dat:430 data/image_url.dat:431
+#: data/image_url.dat:432 data/image_url.dat:433 data/image_url.dat:434
+#: data/image_url.dat:435 data/image_url.dat:436 data/image_url.dat:437
+#: data/image_url.dat:438 data/image_url.dat:439 data/image_url.dat:440
+#: data/image_url.dat:441 data/image_url.dat:442 data/image_url.dat:443
+#: data/image_url.dat:444 data/image_url.dat:445 data/image_url.dat:446
+#: data/image_url.dat:447 data/image_url.dat:448 data/image_url.dat:449
+#: data/image_url.dat:450 data/image_url.dat:451 data/image_url.dat:452
+#: data/image_url.dat:453 data/image_url.dat:454 data/image_url.dat:455
+#: data/image_url.dat:456 data/image_url.dat:457 data/image_url.dat:458
+#: data/image_url.dat:459 data/image_url.dat:460 data/image_url.dat:461
+#: data/image_url.dat:462 data/image_url.dat:463 data/image_url.dat:464
+#: data/image_url.dat:465 data/image_url.dat:466 data/image_url.dat:467
+#: data/image_url.dat:468 data/image_url.dat:469 data/image_url.dat:470
+#: data/image_url.dat:471 data/image_url.dat:472 data/image_url.dat:473
+#: data/image_url.dat:474 data/image_url.dat:475 data/image_url.dat:476
+#: data/image_url.dat:477 data/image_url.dat:478 data/image_url.dat:479
+#: data/image_url.dat:480 data/image_url.dat:481 data/image_url.dat:482
+#: data/image_url.dat:483 data/image_url.dat:484 data/image_url.dat:485
+#: data/image_url.dat:486 data/image_url.dat:487 data/image_url.dat:488
+#: data/image_url.dat:489 data/image_url.dat:490 data/image_url.dat:491
+#: data/image_url.dat:492 data/image_url.dat:493 data/image_url.dat:494
+#: data/image_url.dat:495 data/image_url.dat:496 data/image_url.dat:497
+#: data/image_url.dat:498 data/image_url.dat:499 data/image_url.dat:500
+#: data/image_url.dat:501 data/image_url.dat:502 data/image_url.dat:503
+#: data/image_url.dat:504 data/image_url.dat:505 data/image_url.dat:506
+#: data/image_url.dat:507 data/image_url.dat:508 data/image_url.dat:509
+#: data/image_url.dat:510 data/image_url.dat:511 data/image_url.dat:512
+#: data/image_url.dat:513 data/image_url.dat:514 data/image_url.dat:515
+#: data/image_url.dat:516 data/image_url.dat:517 data/image_url.dat:518
+#: data/image_url.dat:519 data/image_url.dat:520 data/image_url.dat:521
+#: data/image_url.dat:522 data/image_url.dat:523 data/image_url.dat:524
+#: data/image_url.dat:525 data/image_url.dat:526 data/image_url.dat:527
+#: data/image_url.dat:528 data/image_url.dat:529 data/image_url.dat:530
+#: data/image_url.dat:531 data/image_url.dat:532 data/image_url.dat:533
+#: data/image_url.dat:534 data/image_url.dat:535 data/image_url.dat:536
+#: data/image_url.dat:537 data/image_url.dat:538 data/image_url.dat:539
+#: data/image_url.dat:540 data/image_url.dat:541 data/image_url.dat:542
+#: data/image_url.dat:543 data/image_url.dat:544 data/image_url.dat:545
+#: data/image_url.dat:546 data/image_url.dat:547 data/image_url.dat:548
+#: data/image_url.dat:549 data/image_url.dat:550 data/image_url.dat:551
+#: data/image_url.dat:552 data/image_url.dat:553
 msgid ""
 "_: Image/info menu item (should be translated)\n"
 "Show KPNO AOP Image"
 msgstr ""
 
-#: data/image_url.dat:556 data/image_url.dat:557
-#: data/image_url.dat:558 data/image_url.dat:559
-#: data/image_url.dat:560 data/image_url.dat:561
-#: data/image_url.dat:562 data/image_url.dat:563
-#: data/image_url.dat:564 data/image_url.dat:567
-#: data/image_url.dat:568 data/image_url.dat:569
-#: data/image_url.dat:570 data/image_url.dat:571
-#: data/image_url.dat:572 data/image_url.dat:573
-#: data/image_url.dat:574 data/image_url.dat:575
-#: data/image_url.dat:576 data/image_url.dat:577
-#: data/image_url.dat:578 data/image_url.dat:579
-#: data/image_url.dat:580 data/image_url.dat:581
-#: data/image_url.dat:582 data/image_url.dat:583
-#: data/image_url.dat:584 data/image_url.dat:585
-#: data/image_url.dat:586 data/image_url.dat:587
-#: data/image_url.dat:588 data/image_url.dat:589
-#: data/image_url.dat:590 data/image_url.dat:591
-#: data/image_url.dat:592 data/image_url.dat:593
-#: data/image_url.dat:594 data/image_url.dat:595
-#: data/image_url.dat:596 data/image_url.dat:597
-#: data/image_url.dat:598 data/image_url.dat:599
-#: data/image_url.dat:600 data/image_url.dat:601
-#: data/image_url.dat:602 data/image_url.dat:603
-#: data/image_url.dat:604 data/image_url.dat:605
-#: data/image_url.dat:606 data/image_url.dat:607
-#: data/image_url.dat:608 data/image_url.dat:609
-#: data/image_url.dat:610 data/image_url.dat:611
-#: data/image_url.dat:612 data/image_url.dat:613
-#: data/image_url.dat:614 data/image_url.dat:615
-#: data/image_url.dat:616 data/image_url.dat:617
-#: data/image_url.dat:618 data/image_url.dat:619
-#: data/image_url.dat:620 data/image_url.dat:621
-#: data/image_url.dat:622 data/image_url.dat:623
-#: data/image_url.dat:624 data/image_url.dat:625
-#: data/image_url.dat:626 data/image_url.dat:627
-#: data/image_url.dat:628 data/image_url.dat:629
-#: data/image_url.dat:630 data/image_url.dat:631
-#: data/image_url.dat:632 data/image_url.dat:633
-#: data/image_url.dat:634 data/image_url.dat:635
-#: data/image_url.dat:636 data/image_url.dat:637
-#: data/image_url.dat:638 data/image_url.dat:639
-#: data/image_url.dat:640 data/image_url.dat:641
-#: data/image_url.dat:642 data/image_url.dat:643
-#: data/image_url.dat:644 data/image_url.dat:645
-#: data/image_url.dat:646 data/image_url.dat:647
-#: data/image_url.dat:648 data/image_url.dat:649
-#: data/image_url.dat:650 data/image_url.dat:651
-#: data/image_url.dat:652 data/image_url.dat:653
-#: data/image_url.dat:654 data/image_url.dat:655
-#: data/image_url.dat:656 data/image_url.dat:657
-#: data/image_url.dat:658 data/image_url.dat:659
-#: data/image_url.dat:660 data/image_url.dat:661
-#: data/image_url.dat:662 data/image_url.dat:663
-#: data/image_url.dat:664 data/image_url.dat:665
-#: data/image_url.dat:666 data/image_url.dat:667
-#: data/image_url.dat:668 data/image_url.dat:669
-#: data/image_url.dat:670 data/image_url.dat:671
-#: data/image_url.dat:672 data/image_url.dat:673
-#: data/image_url.dat:674 data/image_url.dat:675
-#: data/image_url.dat:676 data/image_url.dat:677
-#: data/image_url.dat:678 data/image_url.dat:679
-#: data/image_url.dat:680 data/image_url.dat:681
-#: data/image_url.dat:682 data/image_url.dat:683
-#: data/image_url.dat:684 data/image_url.dat:685
-#: data/image_url.dat:686 data/image_url.dat:687
-#: data/image_url.dat:688 data/image_url.dat:689
+#: data/image_url.dat:556 data/image_url.dat:557 data/image_url.dat:558
+#: data/image_url.dat:559 data/image_url.dat:560 data/image_url.dat:561
+#: data/image_url.dat:562 data/image_url.dat:563 data/image_url.dat:564
+#: data/image_url.dat:567 data/image_url.dat:568 data/image_url.dat:569
+#: data/image_url.dat:570 data/image_url.dat:571 data/image_url.dat:572
+#: data/image_url.dat:573 data/image_url.dat:574 data/image_url.dat:575
+#: data/image_url.dat:576 data/image_url.dat:577 data/image_url.dat:578
+#: data/image_url.dat:579 data/image_url.dat:580 data/image_url.dat:581
+#: data/image_url.dat:582 data/image_url.dat:583 data/image_url.dat:584
+#: data/image_url.dat:585 data/image_url.dat:586 data/image_url.dat:587
+#: data/image_url.dat:588 data/image_url.dat:589 data/image_url.dat:590
+#: data/image_url.dat:591 data/image_url.dat:592 data/image_url.dat:593
+#: data/image_url.dat:594 data/image_url.dat:595 data/image_url.dat:596
+#: data/image_url.dat:597 data/image_url.dat:598 data/image_url.dat:599
+#: data/image_url.dat:600 data/image_url.dat:601 data/image_url.dat:602
+#: data/image_url.dat:603 data/image_url.dat:604 data/image_url.dat:605
+#: data/image_url.dat:606 data/image_url.dat:607 data/image_url.dat:608
+#: data/image_url.dat:609 data/image_url.dat:610 data/image_url.dat:611
+#: data/image_url.dat:612 data/image_url.dat:613 data/image_url.dat:614
+#: data/image_url.dat:615 data/image_url.dat:616 data/image_url.dat:617
+#: data/image_url.dat:618 data/image_url.dat:619 data/image_url.dat:620
+#: data/image_url.dat:621 data/image_url.dat:622 data/image_url.dat:623
+#: data/image_url.dat:624 data/image_url.dat:625 data/image_url.dat:626
+#: data/image_url.dat:627 data/image_url.dat:628 data/image_url.dat:629
+#: data/image_url.dat:630 data/image_url.dat:631 data/image_url.dat:632
+#: data/image_url.dat:633 data/image_url.dat:634 data/image_url.dat:635
+#: data/image_url.dat:636 data/image_url.dat:637 data/image_url.dat:638
+#: data/image_url.dat:639 data/image_url.dat:640 data/image_url.dat:641
+#: data/image_url.dat:642 data/image_url.dat:643 data/image_url.dat:644
+#: data/image_url.dat:645 data/image_url.dat:646 data/image_url.dat:647
+#: data/image_url.dat:648 data/image_url.dat:649 data/image_url.dat:650
+#: data/image_url.dat:651 data/image_url.dat:652 data/image_url.dat:653
+#: data/image_url.dat:654 data/image_url.dat:655 data/image_url.dat:656
+#: data/image_url.dat:657 data/image_url.dat:658 data/image_url.dat:659
+#: data/image_url.dat:660 data/image_url.dat:661 data/image_url.dat:662
+#: data/image_url.dat:663 data/image_url.dat:664 data/image_url.dat:665
+#: data/image_url.dat:666 data/image_url.dat:667 data/image_url.dat:668
+#: data/image_url.dat:669 data/image_url.dat:670 data/image_url.dat:671
+#: data/image_url.dat:672 data/image_url.dat:673 data/image_url.dat:674
+#: data/image_url.dat:675 data/image_url.dat:676 data/image_url.dat:677
+#: data/image_url.dat:678 data/image_url.dat:679 data/image_url.dat:680
+#: data/image_url.dat:681 data/image_url.dat:682 data/image_url.dat:683
+#: data/image_url.dat:684 data/image_url.dat:685 data/image_url.dat:686
+#: data/image_url.dat:687 data/image_url.dat:688 data/image_url.dat:689
 msgid ""
 "_: Image/info menu item (should be translated)\n"
 "Show NOAO Image"
@@ -25476,18 +24540,14 @@ msgid ""
 "Show Magellan Surface Image"
 msgstr ""
 
-#: data/image_url.dat:696 data/image_url.dat:702
-#: data/image_url.dat:705 data/image_url.dat:706
-#: data/image_url.dat:707 data/image_url.dat:708
-#: data/image_url.dat:709 data/image_url.dat:710
-#: data/image_url.dat:711 data/image_url.dat:712
-#: data/image_url.dat:713 data/image_url.dat:714
-#: data/image_url.dat:715 data/image_url.dat:716
-#: data/image_url.dat:717 data/image_url.dat:718
-#: data/image_url.dat:719 data/image_url.dat:720
-#: data/image_url.dat:721 data/image_url.dat:722
-#: data/image_url.dat:724 data/image_url.dat:725
-#: data/image_url.dat:726 data/image_url.dat:727
+#: data/image_url.dat:696 data/image_url.dat:702 data/image_url.dat:705
+#: data/image_url.dat:706 data/image_url.dat:707 data/image_url.dat:708
+#: data/image_url.dat:709 data/image_url.dat:710 data/image_url.dat:711
+#: data/image_url.dat:712 data/image_url.dat:713 data/image_url.dat:714
+#: data/image_url.dat:715 data/image_url.dat:716 data/image_url.dat:717
+#: data/image_url.dat:718 data/image_url.dat:719 data/image_url.dat:720
+#: data/image_url.dat:721 data/image_url.dat:722 data/image_url.dat:724
+#: data/image_url.dat:725 data/image_url.dat:726 data/image_url.dat:727
 #: data/image_url.dat:728
 msgid ""
 "_: Image/info menu item (should be translated)\n"
@@ -25548,113 +24608,81 @@ msgid ""
 "Show APOD Image (Venera lander)"
 msgstr ""
 
-#: data/image_url.dat:737 data/image_url.dat:738
-#: data/image_url.dat:739 data/image_url.dat:740
-#: data/image_url.dat:741 data/image_url.dat:742
-#: data/image_url.dat:743 data/image_url.dat:744
-#: data/image_url.dat:745 data/image_url.dat:746
+#: data/image_url.dat:737 data/image_url.dat:738 data/image_url.dat:739
+#: data/image_url.dat:740 data/image_url.dat:741 data/image_url.dat:742
+#: data/image_url.dat:743 data/image_url.dat:744 data/image_url.dat:745
+#: data/image_url.dat:746
 msgid ""
 "_: Image/info menu item (should be translated)\n"
 "Show Spitzer Image"
 msgstr ""
 
-#: data/info_url.dat:17 data/info_url.dat:18
-#: data/info_url.dat:19 data/info_url.dat:20
-#: data/info_url.dat:21 data/info_url.dat:22
-#: data/info_url.dat:23 data/info_url.dat:24
-#: data/info_url.dat:25 data/info_url.dat:26
-#: data/info_url.dat:27 data/info_url.dat:28
-#: data/info_url.dat:29 data/info_url.dat:30
-#: data/info_url.dat:31 data/info_url.dat:32
-#: data/info_url.dat:33 data/info_url.dat:34
-#: data/info_url.dat:35 data/info_url.dat:149
-#: data/info_url.dat:150 data/info_url.dat:151
-#: data/info_url.dat:152 data/info_url.dat:153
-#: data/info_url.dat:154 data/info_url.dat:155
-#: data/info_url.dat:156 data/info_url.dat:157
-#: data/info_url.dat:158 data/info_url.dat:161
-#: data/info_url.dat:164 data/info_url.dat:169
-#: data/info_url.dat:173 data/info_url.dat:177
-#: data/info_url.dat:181 data/info_url.dat:189
-#: data/info_url.dat:195 data/info_url.dat:200
-#: data/info_url.dat:204 data/info_url.dat:208
-#: data/info_url.dat:211 data/info_url.dat:214
-#: data/info_url.dat:215 data/info_url.dat:216
-#: data/info_url.dat:217 data/info_url.dat:219
-#: data/info_url.dat:220 data/info_url.dat:221
-#: data/info_url.dat:222 data/info_url.dat:223
-#: data/info_url.dat:224 data/info_url.dat:225
-#: data/info_url.dat:226 data/info_url.dat:227
-#: data/info_url.dat:228 data/info_url.dat:230
-#: data/info_url.dat:232 data/info_url.dat:235
-#: data/info_url.dat:236 data/info_url.dat:237
-#: data/info_url.dat:238 data/info_url.dat:239
-#: data/info_url.dat:240
+#: data/info_url.dat:17 data/info_url.dat:18 data/info_url.dat:19
+#: data/info_url.dat:20 data/info_url.dat:21 data/info_url.dat:22
+#: data/info_url.dat:23 data/info_url.dat:24 data/info_url.dat:25
+#: data/info_url.dat:26 data/info_url.dat:27 data/info_url.dat:28
+#: data/info_url.dat:29 data/info_url.dat:30 data/info_url.dat:31
+#: data/info_url.dat:32 data/info_url.dat:33 data/info_url.dat:34
+#: data/info_url.dat:35 data/info_url.dat:149 data/info_url.dat:150
+#: data/info_url.dat:151 data/info_url.dat:152 data/info_url.dat:153
+#: data/info_url.dat:154 data/info_url.dat:155 data/info_url.dat:156
+#: data/info_url.dat:157 data/info_url.dat:158 data/info_url.dat:161
+#: data/info_url.dat:164 data/info_url.dat:169 data/info_url.dat:173
+#: data/info_url.dat:177 data/info_url.dat:181 data/info_url.dat:189
+#: data/info_url.dat:195 data/info_url.dat:200 data/info_url.dat:204
+#: data/info_url.dat:208 data/info_url.dat:211 data/info_url.dat:214
+#: data/info_url.dat:215 data/info_url.dat:216 data/info_url.dat:217
+#: data/info_url.dat:219 data/info_url.dat:220 data/info_url.dat:221
+#: data/info_url.dat:222 data/info_url.dat:223 data/info_url.dat:224
+#: data/info_url.dat:225 data/info_url.dat:226 data/info_url.dat:227
+#: data/info_url.dat:228 data/info_url.dat:230 data/info_url.dat:232
+#: data/info_url.dat:235 data/info_url.dat:236 data/info_url.dat:237
+#: data/info_url.dat:238 data/info_url.dat:239 data/info_url.dat:240
 msgid ""
 "_: Image/info menu item (should be translated)\n"
 "Wikipedia Page"
 msgstr ""
 
-#: data/info_url.dat:36 data/info_url.dat:37
-#: data/info_url.dat:38 data/info_url.dat:39
-#: data/info_url.dat:40 data/info_url.dat:41
-#: data/info_url.dat:42 data/info_url.dat:43
-#: data/info_url.dat:44 data/info_url.dat:45
-#: data/info_url.dat:46 data/info_url.dat:47
-#: data/info_url.dat:48 data/info_url.dat:49
-#: data/info_url.dat:50 data/info_url.dat:51
-#: data/info_url.dat:52 data/info_url.dat:53
-#: data/info_url.dat:54 data/info_url.dat:55
-#: data/info_url.dat:56 data/info_url.dat:57
-#: data/info_url.dat:58 data/info_url.dat:59
-#: data/info_url.dat:60 data/info_url.dat:61
-#: data/info_url.dat:62 data/info_url.dat:63
-#: data/info_url.dat:64 data/info_url.dat:65
-#: data/info_url.dat:66 data/info_url.dat:67
-#: data/info_url.dat:68 data/info_url.dat:69
-#: data/info_url.dat:70 data/info_url.dat:71
-#: data/info_url.dat:72 data/info_url.dat:73
-#: data/info_url.dat:74 data/info_url.dat:75
-#: data/info_url.dat:76 data/info_url.dat:77
-#: data/info_url.dat:78 data/info_url.dat:79
-#: data/info_url.dat:80 data/info_url.dat:81
-#: data/info_url.dat:82 data/info_url.dat:83
-#: data/info_url.dat:84 data/info_url.dat:85
-#: data/info_url.dat:86 data/info_url.dat:87
-#: data/info_url.dat:88 data/info_url.dat:89
-#: data/info_url.dat:90 data/info_url.dat:91
-#: data/info_url.dat:92 data/info_url.dat:93
-#: data/info_url.dat:94 data/info_url.dat:95
-#: data/info_url.dat:96 data/info_url.dat:97
-#: data/info_url.dat:98 data/info_url.dat:99
-#: data/info_url.dat:100 data/info_url.dat:101
-#: data/info_url.dat:102 data/info_url.dat:103
-#: data/info_url.dat:104 data/info_url.dat:105
-#: data/info_url.dat:106 data/info_url.dat:107
-#: data/info_url.dat:108 data/info_url.dat:109
-#: data/info_url.dat:110 data/info_url.dat:111
-#: data/info_url.dat:112 data/info_url.dat:113
-#: data/info_url.dat:114 data/info_url.dat:115
-#: data/info_url.dat:116 data/info_url.dat:117
-#: data/info_url.dat:118 data/info_url.dat:119
-#: data/info_url.dat:120 data/info_url.dat:121
-#: data/info_url.dat:122 data/info_url.dat:123
-#: data/info_url.dat:124 data/info_url.dat:125
-#: data/info_url.dat:126 data/info_url.dat:127
-#: data/info_url.dat:128 data/info_url.dat:129
-#: data/info_url.dat:130 data/info_url.dat:131
-#: data/info_url.dat:132 data/info_url.dat:133
-#: data/info_url.dat:134 data/info_url.dat:135
-#: data/info_url.dat:136 data/info_url.dat:137
-#: data/info_url.dat:138 data/info_url.dat:139
-#: data/info_url.dat:140 data/info_url.dat:141
-#: data/info_url.dat:142 data/info_url.dat:143
-#: data/info_url.dat:144 data/info_url.dat:145
-#: data/info_url.dat:165 data/info_url.dat:170
-#: data/info_url.dat:174 data/info_url.dat:178
-#: data/info_url.dat:182 data/info_url.dat:190
-#: data/info_url.dat:196 data/info_url.dat:201
-#: data/info_url.dat:205 data/info_url.dat:209
+#: data/info_url.dat:36 data/info_url.dat:37 data/info_url.dat:38
+#: data/info_url.dat:39 data/info_url.dat:40 data/info_url.dat:41
+#: data/info_url.dat:42 data/info_url.dat:43 data/info_url.dat:44
+#: data/info_url.dat:45 data/info_url.dat:46 data/info_url.dat:47
+#: data/info_url.dat:48 data/info_url.dat:49 data/info_url.dat:50
+#: data/info_url.dat:51 data/info_url.dat:52 data/info_url.dat:53
+#: data/info_url.dat:54 data/info_url.dat:55 data/info_url.dat:56
+#: data/info_url.dat:57 data/info_url.dat:58 data/info_url.dat:59
+#: data/info_url.dat:60 data/info_url.dat:61 data/info_url.dat:62
+#: data/info_url.dat:63 data/info_url.dat:64 data/info_url.dat:65
+#: data/info_url.dat:66 data/info_url.dat:67 data/info_url.dat:68
+#: data/info_url.dat:69 data/info_url.dat:70 data/info_url.dat:71
+#: data/info_url.dat:72 data/info_url.dat:73 data/info_url.dat:74
+#: data/info_url.dat:75 data/info_url.dat:76 data/info_url.dat:77
+#: data/info_url.dat:78 data/info_url.dat:79 data/info_url.dat:80
+#: data/info_url.dat:81 data/info_url.dat:82 data/info_url.dat:83
+#: data/info_url.dat:84 data/info_url.dat:85 data/info_url.dat:86
+#: data/info_url.dat:87 data/info_url.dat:88 data/info_url.dat:89
+#: data/info_url.dat:90 data/info_url.dat:91 data/info_url.dat:92
+#: data/info_url.dat:93 data/info_url.dat:94 data/info_url.dat:95
+#: data/info_url.dat:96 data/info_url.dat:97 data/info_url.dat:98
+#: data/info_url.dat:99 data/info_url.dat:100 data/info_url.dat:101
+#: data/info_url.dat:102 data/info_url.dat:103 data/info_url.dat:104
+#: data/info_url.dat:105 data/info_url.dat:106 data/info_url.dat:107
+#: data/info_url.dat:108 data/info_url.dat:109 data/info_url.dat:110
+#: data/info_url.dat:111 data/info_url.dat:112 data/info_url.dat:113
+#: data/info_url.dat:114 data/info_url.dat:115 data/info_url.dat:116
+#: data/info_url.dat:117 data/info_url.dat:118 data/info_url.dat:119
+#: data/info_url.dat:120 data/info_url.dat:121 data/info_url.dat:122
+#: data/info_url.dat:123 data/info_url.dat:124 data/info_url.dat:125
+#: data/info_url.dat:126 data/info_url.dat:127 data/info_url.dat:128
+#: data/info_url.dat:129 data/info_url.dat:130 data/info_url.dat:131
+#: data/info_url.dat:132 data/info_url.dat:133 data/info_url.dat:134
+#: data/info_url.dat:135 data/info_url.dat:136 data/info_url.dat:137
+#: data/info_url.dat:138 data/info_url.dat:139 data/info_url.dat:140
+#: data/info_url.dat:141 data/info_url.dat:142 data/info_url.dat:143
+#: data/info_url.dat:144 data/info_url.dat:145 data/info_url.dat:165
+#: data/info_url.dat:170 data/info_url.dat:174 data/info_url.dat:178
+#: data/info_url.dat:182 data/info_url.dat:190 data/info_url.dat:196
+#: data/info_url.dat:201 data/info_url.dat:205 data/info_url.dat:209
 msgid ""
 "_: Image/info menu item (should be translated)\n"
 "SEDS Information Page"
@@ -25666,11 +24694,10 @@ msgid ""
 "HST Press Release (2002)"
 msgstr ""
 
-#: data/info_url.dat:166 data/info_url.dat:171
-#: data/info_url.dat:175 data/info_url.dat:179
-#: data/info_url.dat:184 data/info_url.dat:191
-#: data/info_url.dat:197 data/info_url.dat:202
-#: data/info_url.dat:206 data/info_url.dat:210
+#: data/info_url.dat:166 data/info_url.dat:171 data/info_url.dat:175
+#: data/info_url.dat:179 data/info_url.dat:184 data/info_url.dat:191
+#: data/info_url.dat:197 data/info_url.dat:202 data/info_url.dat:206
+#: data/info_url.dat:210
 msgid ""
 "_: Image/info menu item (should be translated)\n"
 "NASA JPL Page"
@@ -25736,8 +24763,8 @@ msgid ""
 "The Galileo Mission"
 msgstr ""
 
-#: data/info_url.dat:193 data/info_url.dat:199
-#: data/info_url.dat:203 data/info_url.dat:207
+#: data/info_url.dat:193 data/info_url.dat:199 data/info_url.dat:203
+#: data/info_url.dat:207
 msgid ""
 "_: Image/info menu item (should be translated)\n"
 "The Voyager Missions"
@@ -27351,9 +26378,8 @@ msgid ""
 "Owl Nebula"
 msgstr ""
 
-#: data/ngcic04.dat:829 data/ngcic04.dat:830
-#: data/ngcic04.dat:832 data/ngcic04.dat:834
-#: data/ngcic04.dat:835 data/ngcic04.dat:837
+#: data/ngcic04.dat:829 data/ngcic04.dat:830 data/ngcic04.dat:832
+#: data/ngcic04.dat:834 data/ngcic04.dat:835 data/ngcic04.dat:837
 #: data/ngcic04.dat:838
 msgid ""
 "_: object name (optional)\n"
@@ -27378,16 +26404,15 @@ msgid ""
 "Antennae Galaxies"
 msgstr ""
 
-#: data/ngcic05.dat:261 data/ngcic05.dat:265
-#: data/ngcic05.dat:266 data/ngcic05.dat:267
+#: data/ngcic05.dat:261 data/ngcic05.dat:265 data/ngcic05.dat:266
+#: data/ngcic05.dat:267
 msgid ""
 "_: object name (optional)\n"
 "Box Galaxies"
 msgstr ""
 
-#: data/ngcic05.dat:471 data/ngcic05.dat:503
-#: data/ngcic05.dat:534 data/ngcic05.dat:537
-#: data/ngcic05.dat:557 data/ngcic05.dat:560
+#: data/ngcic05.dat:471 data/ngcic05.dat:503 data/ngcic05.dat:534
+#: data/ngcic05.dat:537 data/ngcic05.dat:557 data/ngcic05.dat:560
 #: data/ngcic05.dat:572 data/ngcic05.dat:576
 msgid ""
 "_: object name (optional)\n"
@@ -27592,8 +26617,7 @@ msgid ""
 "Blue Flash Nebula"
 msgstr ""
 
-#: data/ngcic08.dat:136 data/ngcic08.dat:168
-#: data/ngcic08.dat:171
+#: data/ngcic08.dat:136 data/ngcic08.dat:168 data/ngcic08.dat:171
 msgid ""
 "_: object name (optional)\n"
 "Veil Nebula"
@@ -27623,15 +26647,15 @@ msgid ""
 "Helix Nebula"
 msgstr ""
 
-#: data/ngcic08.dat:503 data/ngcic08.dat:504
-#: data/ngcic08.dat:506 data/ngcic08.dat:507
+#: data/ngcic08.dat:503 data/ngcic08.dat:504 data/ngcic08.dat:506
+#: data/ngcic08.dat:507
 msgid ""
 "_: object name (optional)\n"
 "Stephan's Quintet"
 msgstr ""
 
-#: data/ngcic08.dat:743 data/ngcic08.dat:775
-#: data/ngcic08.dat:783 data/ngcic08.dat:792
+#: data/ngcic08.dat:743 data/ngcic08.dat:775 data/ngcic08.dat:783
+#: data/ngcic08.dat:792
 msgid ""
 "_: object name (optional)\n"
 "Grus Quartet"
@@ -28133,8 +27157,7 @@ msgstr ""
 msgid "FWHM:"
 msgstr ""
 
-#: ccdpreviewui.ui:233 ccdpreviewui.ui:370
-#: ccdpreviewui.ui:399
+#: ccdpreviewui.ui:233 ccdpreviewui.ui:370 ccdpreviewui.ui:399
 #, no-c-format
 msgid "Full Width at Half Maximum"
 msgstr ""
@@ -28149,9 +27172,8 @@ msgstr ""
 msgid "--"
 msgstr ""
 
-#: ccdpreviewui.ui:396 newfovui.ui:156
-#: newfovui.ui:192 newfovui.ui:456 newfovui.ui:492
-#: telescopepropui.ui:205 telescopepropui.ui:228
+#: ccdpreviewui.ui:396 newfovui.ui:156 newfovui.ui:192 newfovui.ui:456
+#: newfovui.ui:492 telescopepropui.ui:205 telescopepropui.ui:228
 #, no-c-format
 msgid "mm"
 msgstr ""
@@ -28303,9 +27325,8 @@ msgstr ""
 msgid "<p align=\"center\">Coordinates</p>"
 msgstr ""
 
-#: details_position.ui:109 details_position.ui:134
-#: details_position.ui:234 details_position.ui:259
-#: details_position.ui:393 details_position.ui:758
+#: details_position.ui:109 details_position.ui:134 details_position.ui:234
+#: details_position.ui:259 details_position.ui:393 details_position.ui:758
 #: details_position.ui:831 details_position.ui:856
 #, no-c-format
 msgid "00:00:00"
@@ -28322,15 +27343,13 @@ msgid "RA (2000.0):"
 msgstr ""
 
 #: details_position.ui:280 tools/modcalcazeldlg.ui:409
-#: tools/modcalcazeldlg.ui:706
-#: tools/modcalcplanetsdlg.ui:448
+#: tools/modcalcazeldlg.ui:706 tools/modcalcplanetsdlg.ui:448
 #, no-c-format
 msgid "Altitude:"
 msgstr ""
 
 #: details_position.ui:304 tools/modcalcazeldlg.ui:401
-#: tools/modcalcazeldlg.ui:605
-#: tools/modcalcplanetsdlg.ui:429
+#: tools/modcalcazeldlg.ui:605 tools/modcalcplanetsdlg.ui:429
 #, no-c-format
 msgid "Azimuth:"
 msgstr ""
@@ -28355,8 +27374,7 @@ msgstr ""
 msgid "<p align=\"center\">Rise/Set/Transit</p>"
 msgstr ""
 
-#: details_position.ui:584 details_position.ui:609
-#: details_position.ui:706
+#: details_position.ui:584 details_position.ui:609 details_position.ui:706
 #, no-c-format
 msgid "00:00"
 msgstr ""
@@ -28411,8 +27429,7 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: devmanager.ui:65 devmanager.ui:152
-#: tools/argstartindi.ui:72
+#: devmanager.ui:65 devmanager.ui:152 tools/argstartindi.ui:72
 #, no-c-format
 msgid "Mode"
 msgstr ""
@@ -28462,8 +27479,8 @@ msgstr ""
 msgid "Hosts"
 msgstr ""
 
-#: devmanager.ui:303 imagereductionui.ui:110
-#: imagereductionui.ui:288 imagereductionui.ui:456
+#: devmanager.ui:303 imagereductionui.ui:110 imagereductionui.ui:288
+#: imagereductionui.ui:456
 #, no-c-format
 msgid "Add..."
 msgstr ""
@@ -28518,15 +27535,12 @@ msgstr ""
 msgid "New dec:"
 msgstr ""
 
-#: focusdialogdlg.ui:77 tools/altvstimeui.ui:61
-#: tools/modcalcapcoorddlg.ui:186
-#: tools/modcalcapcoorddlg.ui:519
-#: tools/modcalcazeldlg.ui:349 tools/modcalcazeldlg.ui:534
-#: tools/modcalceclipticcoordsdlg.ui:287
-#: tools/modcalceclipticcoordsdlg.ui:605
-#: tools/modcalcgalcoorddlg.ui:279
-#: tools/modcalcgalcoorddlg.ui:554
-#: tools/modcalcvlsrdlg.ui:331 tools/modcalcvlsrdlg.ui:619
+#: focusdialogdlg.ui:77 tools/altvstimeui.ui:61 tools/modcalcapcoorddlg.ui:186
+#: tools/modcalcapcoorddlg.ui:519 tools/modcalcazeldlg.ui:349
+#: tools/modcalcazeldlg.ui:534 tools/modcalceclipticcoordsdlg.ui:287
+#: tools/modcalceclipticcoordsdlg.ui:605 tools/modcalcgalcoorddlg.ui:279
+#: tools/modcalcgalcoorddlg.ui:554 tools/modcalcvlsrdlg.ui:331
+#: tools/modcalcvlsrdlg.ui:619
 #, no-c-format
 msgid "Epoch:"
 msgstr ""
@@ -28669,26 +27683,22 @@ msgstr ""
 msgid "Square root"
 msgstr ""
 
-#: imagereductionui.ui:52 imagereductionui.ui:230
-#: imagereductionui.ui:398
+#: imagereductionui.ui:52 imagereductionui.ui:230 imagereductionui.ui:398
 #, no-c-format
 msgid "File Name"
 msgstr ""
 
-#: imagereductionui.ui:144 imagereductionui.ui:322
-#: imagereductionui.ui:490
+#: imagereductionui.ui:144 imagereductionui.ui:322 imagereductionui.ui:490
 #, no-c-format
 msgid "Combination"
 msgstr ""
 
-#: imagereductionui.ui:155 imagereductionui.ui:333
-#: imagereductionui.ui:501
+#: imagereductionui.ui:155 imagereductionui.ui:333 imagereductionui.ui:501
 #, no-c-format
 msgid "Average"
 msgstr ""
 
-#: imagereductionui.ui:166 imagereductionui.ui:344
-#: imagereductionui.ui:512
+#: imagereductionui.ui:166 imagereductionui.ui:344 imagereductionui.ui:512
 #, no-c-format
 msgid "Median"
 msgstr ""
@@ -28738,22 +27748,15 @@ msgstr ""
 msgid "Camera/CCD"
 msgstr ""
 
-#: imgsequencedlgui.ui:262 imgsequencedlgui.ui:418
-#: tools/argsetactionindi.ui:43
-#: tools/argsetccdtempindi.ui:40
-#: tools/argsetfilternumindi.ui:43
-#: tools/argsetfocusspeedindi.ui:63
-#: tools/argsetfocustimeoutindi.ui:40
-#: tools/argsetframetypeindi.ui:40
-#: tools/argsetgeolocationindi.ui:40
-#: tools/argsetportindi.ui:32
-#: tools/argsetscopeactionindi.ui:40
-#: tools/argsettargetcoordindi.ui:40
-#: tools/argsettargetnameindi.ui:40
+#: imgsequencedlgui.ui:262 imgsequencedlgui.ui:418 tools/argsetactionindi.ui:43
+#: tools/argsetccdtempindi.ui:40 tools/argsetfilternumindi.ui:43
+#: tools/argsetfocusspeedindi.ui:63 tools/argsetfocustimeoutindi.ui:40
+#: tools/argsetframetypeindi.ui:40 tools/argsetgeolocationindi.ui:40
+#: tools/argsetportindi.ui:32 tools/argsetscopeactionindi.ui:40
+#: tools/argsettargetcoordindi.ui:40 tools/argsettargetnameindi.ui:40
 #: tools/argsetutcindi.ui:40 tools/argshutdownindi.ui:40
-#: tools/argstartexposureindi.ui:40
-#: tools/argstartfocusindi.ui:40 tools/argstartindi.ui:40
-#: tools/argswitchindi.ui:40
+#: tools/argstartexposureindi.ui:40 tools/argstartfocusindi.ui:40
+#: tools/argstartindi.ui:40 tools/argswitchindi.ui:40
 #, no-c-format
 msgid "Device:"
 msgstr ""
@@ -29337,8 +28340,8 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Two-letter code that determines the dates on which daylight savings time "
-"begins and ends (you can view the rules by pressing the \"Explain DST "
-"Rules\" button in the Geographic Location window)."
+"begins and ends (you can view the rules by pressing the \"Explain DST Rules"
+"\" button in the Geographic Location window)."
 msgstr ""
 
 #: kstars.kcfg:217
@@ -29969,8 +28972,8 @@ msgstr ""
 #: kstars.kcfg:509
 #, no-c-format
 msgid ""
-"The background fill mode for the on-screen information boxes: 0=\"no BG\"; "
-"1=\"semi-transparent BG\"; 2=\"opaque BG\""
+"The background fill mode for the on-screen information boxes: 0=\"no BG\"; 1="
+"\"semi-transparent BG\"; 2=\"opaque BG\""
 msgstr ""
 
 #: kstars.kcfg:513
@@ -29981,8 +28984,8 @@ msgstr ""
 #: kstars.kcfg:514
 #, no-c-format
 msgid ""
-"The method for rendering stars: 0=\"realistic colors\"; 1=\"solid red\"; "
-"2=\"solid black\"; 3=\"solid white\""
+"The method for rendering stars: 0=\"realistic colors\"; 1=\"solid red\"; 2="
+"\"solid black\"; 3=\"solid white\""
 msgstr ""
 
 #: kstars.kcfg:519
@@ -30761,9 +29764,9 @@ msgstr ""
 #: newfovui.ui:321
 #, no-c-format
 msgid ""
-"This button will compute the field-of-view (FOV) angle for a specific "
-"camera/telescope combination.  You must first specify the focal length of "
-"the telescope and the size of the CCD chip or film negative.\n"
+"This button will compute the field-of-view (FOV) angle for a specific camera/"
+"telescope combination.  You must first specify the focal length of the "
+"telescope and the size of the CCD chip or film negative.\n"
 "\n"
 "The computed FOV angle (in arcminutes) will be displayed in the \"Field of "
 "view\" edit box."
@@ -31051,11 +30054,9 @@ msgstr ""
 msgid "Stars fainter than this will not be drawn while the map is moving."
 msgstr ""
 
-#: opsadvancedui.ui:248 opscatalogui.ui:82
-#: opscatalogui.ui:98 opscatalogui.ui:213
-#: opscatalogui.ui:469 opscatalogui.ui:485
-#: opssolarsystemui.ui:330 opssolarsystemui.ui:346
-#: tools/obslistwizardui.ui:851
+#: opsadvancedui.ui:248 opscatalogui.ui:82 opscatalogui.ui:98
+#: opscatalogui.ui:213 opscatalogui.ui:469 opscatalogui.ui:485
+#: opssolarsystemui.ui:330 opssolarsystemui.ui:346 tools/obslistwizardui.ui:851
 #, no-c-format
 msgid "mag"
 msgstr ""
@@ -32061,8 +31062,7 @@ msgstr ""
 msgid "Bitpix:"
 msgstr ""
 
-#: statform.ui:83 tools/modcalcvlsrdlg.ui:203
-#: tools/modcalcvlsrdlg.ui:793
+#: statform.ui:83 tools/modcalcvlsrdlg.ui:203 tools/modcalcvlsrdlg.ui:793
 #, no-c-format
 msgid "Height:"
 msgstr ""
@@ -32294,15 +31294,13 @@ msgid "Sources"
 msgstr ""
 
 #: tools/altvstimeui.ui:93 tools/argsetradec.ui:88
-#: tools/argsettargetcoordindi.ui:56
-#: tools/obslistwizardui.ui:432
+#: tools/argsettargetcoordindi.ui:56 tools/obslistwizardui.ui:432
 #, no-c-format
 msgid "Dec:"
 msgstr ""
 
 #: tools/altvstimeui.ui:109 tools/argsetradec.ui:56
-#: tools/argsettargetcoordindi.ui:48
-#: tools/obslistwizardui.ui:416
+#: tools/argsettargetcoordindi.ui:48 tools/obslistwizardui.ui:416
 #, no-c-format
 msgid "RA:"
 msgstr ""
@@ -32348,13 +31346,11 @@ msgstr ""
 
 #: tools/altvstimeui.ui:299 tools/modcalcapcoorddlg.ui:64
 #: tools/modcalcapcoorddlg.ui:497 tools/modcalcazeldlg.ui:93
-#: tools/modcalcazeldlg.ui:501
-#: tools/modcalcdaylengthdlg.ui:115
+#: tools/modcalcazeldlg.ui:501 tools/modcalcdaylengthdlg.ui:115
 #: tools/modcalcjddlg.ui:244 tools/modcalcplanetsdlg.ui:222
-#: tools/modcalcplanetsdlg.ui:847
-#: tools/modcalcsidtimedlg.ui:99
-#: tools/modcalcsidtimedlg.ui:541
-#: tools/modcalcvlsrdlg.ui:116 tools/modcalcvlsrdlg.ui:627
+#: tools/modcalcplanetsdlg.ui:847 tools/modcalcsidtimedlg.ui:99
+#: tools/modcalcsidtimedlg.ui:541 tools/modcalcvlsrdlg.ui:116
+#: tools/modcalcvlsrdlg.ui:627
 #, no-c-format
 msgid "Date:"
 msgstr ""
@@ -32364,14 +31360,12 @@ msgstr ""
 msgid "Choose City..."
 msgstr ""
 
-#: tools/altvstimeui.ui:361
-#: tools/modcalceclipticcoordsdlg.ui:622
+#: tools/altvstimeui.ui:361 tools/modcalceclipticcoordsdlg.ui:622
 #, no-c-format
 msgid "Long.:"
 msgstr ""
 
-#: tools/altvstimeui.ui:393
-#: tools/modcalceclipticcoordsdlg.ui:639
+#: tools/altvstimeui.ui:393 tools/modcalceclipticcoordsdlg.ui:639
 #, no-c-format
 msgid "Lat.:"
 msgstr ""
@@ -32516,20 +31510,17 @@ msgid ""
 "button."
 msgstr ""
 
-#: tools/arglooktoward.ui:109
-#: tools/argsettargetnameindi.ui:108
+#: tools/arglooktoward.ui:109 tools/argsettargetnameindi.ui:108
 #, no-c-format
 msgid "Object"
 msgstr ""
 
-#: tools/arglooktoward.ui:112
-#: tools/argsettargetnameindi.ui:111
+#: tools/arglooktoward.ui:112 tools/argsettargetnameindi.ui:111
 #, no-c-format
 msgid "Select object from a list"
 msgstr ""
 
-#: tools/arglooktoward.ui:115
-#: tools/argsettargetnameindi.ui:114
+#: tools/arglooktoward.ui:115 tools/argsettargetnameindi.ui:114
 #, no-c-format
 msgid ""
 "Opens the Find Object dialog, which allows you to select an object from the "
@@ -32552,8 +31543,7 @@ msgstr ""
 msgid "argSetActionINDI"
 msgstr ""
 
-#: tools/argsetactionindi.ui:51
-#: tools/argsetscopeactionindi.ui:48
+#: tools/argsetactionindi.ui:51 tools/argsetscopeactionindi.ui:48
 #, no-c-format
 msgid "Action:"
 msgstr ""
@@ -32719,9 +31709,9 @@ msgstr ""
 #: tools/argsetradec.ui:46
 #, no-c-format
 msgid ""
-"Enter the Declination coordinate to be focused on in the skymap, in degrees. "
-" You can express the angle as a simple integer (\"45\") or floating-point "
-"(\"45.333\") value, or as space- or colon-delimited values specifying "
+"Enter the Declination coordinate to be focused on in the skymap, in "
+"degrees.  You can express the angle as a simple integer (\"45\") or floating-"
+"point (\"45.333\") value, or as space- or colon-delimited values specifying "
 "degrees, arcminutes and arcseconds (\"45:20\", \"45:20:00\", \"45:20\", \"45 "
 "20.0\", etc.).\n"
 "\n"
@@ -32735,10 +31725,10 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Enter the Right Ascension coordinate to be focused on in the skymap, in "
-"hours.  You can express the angle as a simple integer (\"12\") or "
-"floating-point (\"12.333\") value, or as space- or colon-delimited values "
-"specifying hours, minutes and seconds (\"12:20\", \"12:20:00\", \"12:20\", "
-"\"12 20.0\", etc.).\n"
+"hours.  You can express the angle as a simple integer (\"12\") or floating-"
+"point (\"12.333\") value, or as space- or colon-delimited values specifying "
+"hours, minutes and seconds (\"12:20\", \"12:20:00\", \"12:20\", \"12 20.0\", "
+"etc.).\n"
 "\n"
 "Right Ascension is one of the coordinates in the Equatorial coordinate "
 "system.  It measures the angle around the celestial equator from the Vernal "
@@ -32845,13 +31835,12 @@ msgid ""
 "Reasonable values should be between 300 and 10,000,000.\n"
 msgstr ""
 
-#: tools/modcalcangdistdlg.ui:31
-#: tools/modcalcapcoorddlg.ui:34 tools/modcalcazeldlg.ui:34
-#: tools/modcalceclipticcoordsdlg.ui:34
-#: tools/modcalcequinoxdlg.ui:31
-#: tools/modcalcgalcoorddlg.ui:34 tools/modcalcgeoddlg.ui:34
-#: tools/modcalcplanetsdlg.ui:31 tools/modcalcprecdlg.ui:31
-#: tools/modcalcsidtimedlg.ui:34 tools/modcalcvlsrdlg.ui:31
+#: tools/modcalcangdistdlg.ui:31 tools/modcalcapcoorddlg.ui:34
+#: tools/modcalcazeldlg.ui:34 tools/modcalceclipticcoordsdlg.ui:34
+#: tools/modcalcequinoxdlg.ui:31 tools/modcalcgalcoorddlg.ui:34
+#: tools/modcalcgeoddlg.ui:34 tools/modcalcplanetsdlg.ui:31
+#: tools/modcalcprecdlg.ui:31 tools/modcalcsidtimedlg.ui:34
+#: tools/modcalcvlsrdlg.ui:31
 #, no-c-format
 msgid "Interactive Mode"
 msgstr ""
@@ -32861,17 +31850,12 @@ msgstr ""
 msgid "Initial Coordinates"
 msgstr ""
 
-#: tools/modcalcangdistdlg.ui:89
-#: tools/modcalcangdistdlg.ui:146
-#: tools/modcalcapcoorddlg.ui:157
-#: tools/modcalcapcoorddlg.ui:319
-#: tools/modcalcapcoorddlg.ui:508
-#: tools/modcalcazeldlg.ui:308 tools/modcalcazeldlg.ui:523
-#: tools/modcalceclipticcoordsdlg.ui:279
-#: tools/modcalceclipticcoordsdlg.ui:535
-#: tools/modcalcgalcoorddlg.ui:287
-#: tools/modcalcgalcoorddlg.ui:537
-#: tools/modcalcplanetsdlg.ui:370
+#: tools/modcalcangdistdlg.ui:89 tools/modcalcangdistdlg.ui:146
+#: tools/modcalcapcoorddlg.ui:157 tools/modcalcapcoorddlg.ui:319
+#: tools/modcalcapcoorddlg.ui:508 tools/modcalcazeldlg.ui:308
+#: tools/modcalcazeldlg.ui:523 tools/modcalceclipticcoordsdlg.ui:279
+#: tools/modcalceclipticcoordsdlg.ui:535 tools/modcalcgalcoorddlg.ui:287
+#: tools/modcalcgalcoorddlg.ui:537 tools/modcalcplanetsdlg.ui:370
 #: tools/modcalcprecdlg.ui:120 tools/modcalcprecdlg.ui:295
 #: tools/modcalcprecdlg.ui:414 tools/modcalcvlsrdlg.ui:290
 #: tools/modcalcvlsrdlg.ui:608
@@ -32879,17 +31863,12 @@ msgstr ""
 msgid "Declination:"
 msgstr ""
 
-#: tools/modcalcangdistdlg.ui:97
-#: tools/modcalcangdistdlg.ui:154
-#: tools/modcalcapcoorddlg.ui:165
-#: tools/modcalcapcoorddlg.ui:311
-#: tools/modcalcapcoorddlg.ui:541
-#: tools/modcalcazeldlg.ui:283 tools/modcalcazeldlg.ui:512
-#: tools/modcalceclipticcoordsdlg.ui:249
-#: tools/modcalceclipticcoordsdlg.ui:521
-#: tools/modcalcgalcoorddlg.ui:249
-#: tools/modcalcgalcoorddlg.ui:523
-#: tools/modcalcplanetsdlg.ui:362
+#: tools/modcalcangdistdlg.ui:97 tools/modcalcangdistdlg.ui:154
+#: tools/modcalcapcoorddlg.ui:165 tools/modcalcapcoorddlg.ui:311
+#: tools/modcalcapcoorddlg.ui:541 tools/modcalcazeldlg.ui:283
+#: tools/modcalcazeldlg.ui:512 tools/modcalceclipticcoordsdlg.ui:249
+#: tools/modcalceclipticcoordsdlg.ui:521 tools/modcalcgalcoorddlg.ui:249
+#: tools/modcalcgalcoorddlg.ui:523 tools/modcalcplanetsdlg.ui:362
 #: tools/modcalcprecdlg.ui:102 tools/modcalcprecdlg.ui:287
 #: tools/modcalcprecdlg.ui:467 tools/modcalcvlsrdlg.ui:265
 #: tools/modcalcvlsrdlg.ui:652
@@ -32902,41 +31881,28 @@ msgstr ""
 msgid "Final Coordinates"
 msgstr ""
 
-#: tools/modcalcangdistdlg.ui:191
-#: tools/modcalcapcoorddlg.ui:223
-#: tools/modcalcdaylengthdlg.ui:189
-#: tools/modcalcequinoxdlg.ui:175
-#: tools/modcalcplanetsdlg.ui:718
-#: tools/modcalcprecdlg.ui:182
+#: tools/modcalcangdistdlg.ui:191 tools/modcalcapcoorddlg.ui:223
+#: tools/modcalcdaylengthdlg.ui:189 tools/modcalcequinoxdlg.ui:175
+#: tools/modcalcplanetsdlg.ui:718 tools/modcalcprecdlg.ui:182
 #, no-c-format
 msgid "Compute"
 msgstr ""
 
-#: tools/modcalcangdistdlg.ui:331
-#: tools/modcalcapcoorddlg.ui:395
-#: tools/modcalcazeldlg.ui:454
-#: tools/modcalceclipticcoordsdlg.ui:454
-#: tools/modcalcequinoxdlg.ui:288
-#: tools/modcalcgalcoorddlg.ui:437
-#: tools/modcalcgeoddlg.ui:349
-#: tools/modcalcplanetsdlg.ui:789
-#: tools/modcalcprecdlg.ui:359
-#: tools/modcalcsidtimedlg.ui:373
+#: tools/modcalcangdistdlg.ui:331 tools/modcalcapcoorddlg.ui:395
+#: tools/modcalcazeldlg.ui:454 tools/modcalceclipticcoordsdlg.ui:454
+#: tools/modcalcequinoxdlg.ui:288 tools/modcalcgalcoorddlg.ui:437
+#: tools/modcalcgeoddlg.ui:349 tools/modcalcplanetsdlg.ui:789
+#: tools/modcalcprecdlg.ui:359 tools/modcalcsidtimedlg.ui:373
 #: tools/modcalcvlsrdlg.ui:575
 #, no-c-format
 msgid "Batch Mode"
 msgstr ""
 
-#: tools/modcalcangdistdlg.ui:353
-#: tools/modcalcapcoorddlg.ui:417
-#: tools/modcalcazeldlg.ui:476
-#: tools/modcalceclipticcoordsdlg.ui:476
-#: tools/modcalcequinoxdlg.ui:310
-#: tools/modcalcgalcoorddlg.ui:459
-#: tools/modcalcgeoddlg.ui:371
-#: tools/modcalcplanetsdlg.ui:811
-#: tools/modcalcprecdlg.ui:381
-#: tools/modcalcsidtimedlg.ui:401
+#: tools/modcalcangdistdlg.ui:353 tools/modcalcapcoorddlg.ui:417
+#: tools/modcalcazeldlg.ui:476 tools/modcalceclipticcoordsdlg.ui:476
+#: tools/modcalcequinoxdlg.ui:310 tools/modcalcgalcoorddlg.ui:459
+#: tools/modcalcgeoddlg.ui:371 tools/modcalcplanetsdlg.ui:811
+#: tools/modcalcprecdlg.ui:381 tools/modcalcsidtimedlg.ui:401
 #: tools/modcalcvlsrdlg.ui:597
 #, no-c-format
 msgid "Select Fields in Input File"
@@ -32962,121 +31928,81 @@ msgstr ""
 msgid "Initial right ascension:"
 msgstr ""
 
-#: tools/modcalcangdistdlg.ui:454
-#: tools/modcalcapcoorddlg.ui:554
-#: tools/modcalcazeldlg.ui:730
-#: tools/modcalceclipticcoordsdlg.ui:655
-#: tools/modcalcequinoxdlg.ui:359
-#: tools/modcalcgalcoorddlg.ui:638
-#: tools/modcalcgeoddlg.ui:513
-#: tools/modcalcplanetsdlg.ui:1072
-#: tools/modcalcprecdlg.ui:480
-#: tools/modcalcsidtimedlg.ui:576
+#: tools/modcalcangdistdlg.ui:454 tools/modcalcapcoorddlg.ui:554
+#: tools/modcalcazeldlg.ui:730 tools/modcalceclipticcoordsdlg.ui:655
+#: tools/modcalcequinoxdlg.ui:359 tools/modcalcgalcoorddlg.ui:638
+#: tools/modcalcgeoddlg.ui:513 tools/modcalcplanetsdlg.ui:1072
+#: tools/modcalcprecdlg.ui:480 tools/modcalcsidtimedlg.ui:576
 #: tools/modcalcvlsrdlg.ui:866
 #, no-c-format
 msgid "Fields in Output File Plus Result"
 msgstr ""
 
-#: tools/modcalcangdistdlg.ui:465
-#: tools/modcalcapcoorddlg.ui:565
-#: tools/modcalcazeldlg.ui:741
-#: tools/modcalceclipticcoordsdlg.ui:666
-#: tools/modcalcequinoxdlg.ui:370
-#: tools/modcalcgalcoorddlg.ui:649
-#: tools/modcalcgeoddlg.ui:524
-#: tools/modcalcplanetsdlg.ui:1083
-#: tools/modcalcprecdlg.ui:491
-#: tools/modcalcsidtimedlg.ui:587
+#: tools/modcalcangdistdlg.ui:465 tools/modcalcapcoorddlg.ui:565
+#: tools/modcalcazeldlg.ui:741 tools/modcalceclipticcoordsdlg.ui:666
+#: tools/modcalcequinoxdlg.ui:370 tools/modcalcgalcoorddlg.ui:649
+#: tools/modcalcgeoddlg.ui:524 tools/modcalcplanetsdlg.ui:1083
+#: tools/modcalcprecdlg.ui:491 tools/modcalcsidtimedlg.ui:587
 #: tools/modcalcvlsrdlg.ui:877
 #, no-c-format
 msgid "All parameters"
 msgstr ""
 
-#: tools/modcalcangdistdlg.ui:473
-#: tools/modcalcapcoorddlg.ui:573
-#: tools/modcalcazeldlg.ui:749
-#: tools/modcalceclipticcoordsdlg.ui:674
-#: tools/modcalcequinoxdlg.ui:378
-#: tools/modcalcgalcoorddlg.ui:657
-#: tools/modcalcgeoddlg.ui:532
-#: tools/modcalcplanetsdlg.ui:1091
-#: tools/modcalcprecdlg.ui:499
-#: tools/modcalcsidtimedlg.ui:595
+#: tools/modcalcangdistdlg.ui:473 tools/modcalcapcoorddlg.ui:573
+#: tools/modcalcazeldlg.ui:749 tools/modcalceclipticcoordsdlg.ui:674
+#: tools/modcalcequinoxdlg.ui:378 tools/modcalcgalcoorddlg.ui:657
+#: tools/modcalcgeoddlg.ui:532 tools/modcalcplanetsdlg.ui:1091
+#: tools/modcalcprecdlg.ui:499 tools/modcalcsidtimedlg.ui:595
 #: tools/modcalcvlsrdlg.ui:885
 #, no-c-format
 msgid "Only parameters in input file"
 msgstr ""
 
-#: tools/modcalcangdistdlg.ui:497
-#: tools/modcalcapcoorddlg.ui:597
-#: tools/modcalcazeldlg.ui:773
-#: tools/modcalceclipticcoordsdlg.ui:698
-#: tools/modcalcequinoxdlg.ui:402
-#: tools/modcalcgalcoorddlg.ui:681
-#: tools/modcalcgeoddlg.ui:556
-#: tools/modcalcplanetsdlg.ui:1115
-#: tools/modcalcprecdlg.ui:523
-#: tools/modcalcsidtimedlg.ui:619
+#: tools/modcalcangdistdlg.ui:497 tools/modcalcapcoorddlg.ui:597
+#: tools/modcalcazeldlg.ui:773 tools/modcalceclipticcoordsdlg.ui:698
+#: tools/modcalcequinoxdlg.ui:402 tools/modcalcgalcoorddlg.ui:681
+#: tools/modcalcgeoddlg.ui:556 tools/modcalcplanetsdlg.ui:1115
+#: tools/modcalcprecdlg.ui:523 tools/modcalcsidtimedlg.ui:619
 #: tools/modcalcvlsrdlg.ui:909
 #, no-c-format
 msgid "Input File..."
 msgstr ""
 
-#: tools/modcalcangdistdlg.ui:500
-#: tools/modcalcapcoorddlg.ui:600
-#: tools/modcalcazeldlg.ui:776
-#: tools/modcalceclipticcoordsdlg.ui:701
-#: tools/modcalcequinoxdlg.ui:405
-#: tools/modcalcgalcoorddlg.ui:684
-#: tools/modcalcgeoddlg.ui:559
-#: tools/modcalcplanetsdlg.ui:1118
-#: tools/modcalcprecdlg.ui:526
-#: tools/modcalcsidtimedlg.ui:622
+#: tools/modcalcangdistdlg.ui:500 tools/modcalcapcoorddlg.ui:600
+#: tools/modcalcazeldlg.ui:776 tools/modcalceclipticcoordsdlg.ui:701
+#: tools/modcalcequinoxdlg.ui:405 tools/modcalcgalcoorddlg.ui:684
+#: tools/modcalcgeoddlg.ui:559 tools/modcalcplanetsdlg.ui:1118
+#: tools/modcalcprecdlg.ui:526 tools/modcalcsidtimedlg.ui:622
 #: tools/modcalcvlsrdlg.ui:912
 #, no-c-format
 msgid "File with the input data"
 msgstr ""
 
-#: tools/modcalcangdistdlg.ui:518
-#: tools/modcalcapcoorddlg.ui:618
-#: tools/modcalcazeldlg.ui:794
-#: tools/modcalceclipticcoordsdlg.ui:719
-#: tools/modcalcequinoxdlg.ui:423
-#: tools/modcalcgalcoorddlg.ui:702
-#: tools/modcalcgeoddlg.ui:577
-#: tools/modcalcplanetsdlg.ui:1136
-#: tools/modcalcprecdlg.ui:544
-#: tools/modcalcsidtimedlg.ui:640
+#: tools/modcalcangdistdlg.ui:518 tools/modcalcapcoorddlg.ui:618
+#: tools/modcalcazeldlg.ui:794 tools/modcalceclipticcoordsdlg.ui:719
+#: tools/modcalcequinoxdlg.ui:423 tools/modcalcgalcoorddlg.ui:702
+#: tools/modcalcgeoddlg.ui:577 tools/modcalcplanetsdlg.ui:1136
+#: tools/modcalcprecdlg.ui:544 tools/modcalcsidtimedlg.ui:640
 #: tools/modcalcvlsrdlg.ui:930
 #, no-c-format
 msgid "Output File..."
 msgstr ""
 
-#: tools/modcalcangdistdlg.ui:521
-#: tools/modcalcapcoorddlg.ui:621
-#: tools/modcalcazeldlg.ui:797
-#: tools/modcalceclipticcoordsdlg.ui:722
-#: tools/modcalcequinoxdlg.ui:426
-#: tools/modcalcgalcoorddlg.ui:705
-#: tools/modcalcgeoddlg.ui:580
-#: tools/modcalcplanetsdlg.ui:1139
-#: tools/modcalcprecdlg.ui:547
-#: tools/modcalcsidtimedlg.ui:643
+#: tools/modcalcangdistdlg.ui:521 tools/modcalcapcoorddlg.ui:621
+#: tools/modcalcazeldlg.ui:797 tools/modcalceclipticcoordsdlg.ui:722
+#: tools/modcalcequinoxdlg.ui:426 tools/modcalcgalcoorddlg.ui:705
+#: tools/modcalcgeoddlg.ui:580 tools/modcalcplanetsdlg.ui:1139
+#: tools/modcalcprecdlg.ui:547 tools/modcalcsidtimedlg.ui:643
 #: tools/modcalcvlsrdlg.ui:933
 #, no-c-format
 msgid "File for the output data"
 msgstr ""
 
-#: tools/modcalcangdistdlg.ui:564
-#: tools/modcalcapcoorddlg.ui:664
-#: tools/modcalcazeldlg.ui:840
-#: tools/modcalceclipticcoordsdlg.ui:765
-#: tools/modcalcequinoxdlg.ui:469
-#: tools/modcalcgalcoorddlg.ui:748
-#: tools/modcalcgeoddlg.ui:623
-#: tools/modcalcplanetsdlg.ui:1182
-#: tools/modcalcprecdlg.ui:590
-#: tools/modcalcsidtimedlg.ui:686
+#: tools/modcalcangdistdlg.ui:564 tools/modcalcapcoorddlg.ui:664
+#: tools/modcalcazeldlg.ui:840 tools/modcalceclipticcoordsdlg.ui:765
+#: tools/modcalcequinoxdlg.ui:469 tools/modcalcgalcoorddlg.ui:748
+#: tools/modcalcgeoddlg.ui:623 tools/modcalcplanetsdlg.ui:1182
+#: tools/modcalcprecdlg.ui:590 tools/modcalcsidtimedlg.ui:686
 #: tools/modcalcvlsrdlg.ui:976
 #, no-c-format
 msgid "Run"
@@ -33087,11 +32013,9 @@ msgstr ""
 msgid "Target Time && Date"
 msgstr ""
 
-#: tools/modcalcapcoorddlg.ui:72
-#: tools/modcalcapcoorddlg.ui:478
+#: tools/modcalcapcoorddlg.ui:72 tools/modcalcapcoorddlg.ui:478
 #: tools/modcalcazeldlg.ui:490 tools/modcalcjddlg.ui:208
-#: tools/modcalcplanetsdlg.ui:914
-#: tools/modcalcsidtimedlg.ui:260
+#: tools/modcalcplanetsdlg.ui:914 tools/modcalcsidtimedlg.ui:260
 #: tools/modcalcvlsrdlg.ui:641
 #, no-c-format
 msgid "UT:"
@@ -33128,20 +32052,16 @@ msgstr ""
 msgid "Horizontal coordinates"
 msgstr ""
 
-#: tools/modcalcazeldlg.ui:234
-#: tools/modcalceclipticcoordsdlg.ui:156
-#: tools/modcalcgalcoorddlg.ui:156
-#: tools/modcalcgeoddlg.ui:143 tools/modcalcjddlg.ui:413
-#: tools/modcalcsidtimedlg.ui:172
+#: tools/modcalcazeldlg.ui:234 tools/modcalceclipticcoordsdlg.ui:156
+#: tools/modcalcgalcoorddlg.ui:156 tools/modcalcgeoddlg.ui:143
+#: tools/modcalcjddlg.ui:413 tools/modcalcsidtimedlg.ui:172
 #: tools/modcalcvlsrdlg.ui:526
 #, no-c-format
 msgid "Convert"
 msgstr ""
 
-#: tools/modcalcazeldlg.ui:272
-#: tools/modcalceclipticcoordsdlg.ui:216
-#: tools/modcalcgalcoorddlg.ui:216
-#: tools/modcalcplanetsdlg.ui:332
+#: tools/modcalcazeldlg.ui:272 tools/modcalceclipticcoordsdlg.ui:216
+#: tools/modcalcgalcoorddlg.ui:216 tools/modcalcplanetsdlg.ui:332
 #: tools/modcalcvlsrdlg.ui:254
 #, no-c-format
 msgid "Equatorial Coordinates"
@@ -33202,8 +32122,8 @@ msgstr ""
 msgid "Geocentric Ecliptic Coordinates"
 msgstr ""
 
-#: tools/modcalceclipticcoordsdlg.ui:45
-#: tools/modcalcgalcoorddlg.ui:45 tools/modcalcgeoddlg.ui:53
+#: tools/modcalceclipticcoordsdlg.ui:45 tools/modcalcgalcoorddlg.ui:45
+#: tools/modcalcgeoddlg.ui:53
 #, no-c-format
 msgid "Choose Input Coordinates"
 msgstr ""
@@ -33218,28 +32138,20 @@ msgstr ""
 msgid "Geocentric ecliptic"
 msgstr ""
 
-#: tools/modcalceclipticcoordsdlg.ui:527
-#: tools/modcalceclipticcoordsdlg.ui:541
-#: tools/modcalceclipticcoordsdlg.ui:611
-#: tools/modcalceclipticcoordsdlg.ui:628
-#: tools/modcalceclipticcoordsdlg.ui:645
-#: tools/modcalcgalcoorddlg.ui:529
-#: tools/modcalcgalcoorddlg.ui:543
-#: tools/modcalcgalcoorddlg.ui:560
-#: tools/modcalcgalcoorddlg.ui:577
-#: tools/modcalcgalcoorddlg.ui:594
-#: tools/modcalcsidtimedlg.ui:426
-#: tools/modcalcsidtimedlg.ui:440
-#: tools/modcalcsidtimedlg.ui:530
-#: tools/modcalcsidtimedlg.ui:547
+#: tools/modcalceclipticcoordsdlg.ui:527 tools/modcalceclipticcoordsdlg.ui:541
+#: tools/modcalceclipticcoordsdlg.ui:611 tools/modcalceclipticcoordsdlg.ui:628
+#: tools/modcalceclipticcoordsdlg.ui:645 tools/modcalcgalcoorddlg.ui:529
+#: tools/modcalcgalcoorddlg.ui:543 tools/modcalcgalcoorddlg.ui:560
+#: tools/modcalcgalcoorddlg.ui:577 tools/modcalcgalcoorddlg.ui:594
+#: tools/modcalcsidtimedlg.ui:426 tools/modcalcsidtimedlg.ui:440
+#: tools/modcalcsidtimedlg.ui:530 tools/modcalcsidtimedlg.ui:547
 #, no-c-format
 msgid ""
 "If checked, value will be read from input file. If not, value will be read "
 "from adjacent box"
 msgstr ""
 
-#: tools/modcalceclipticcoordsdlg.ui:594
-#: tools/modcalcgalcoorddlg.ui:515
+#: tools/modcalceclipticcoordsdlg.ui:594 tools/modcalcgalcoorddlg.ui:515
 #, no-c-format
 msgid "1950.0"
 msgstr ""
@@ -33269,8 +32181,7 @@ msgstr ""
 msgid "Winter Solstice"
 msgstr ""
 
-#: tools/modcalcequinoxdlg.ui:118
-#: tools/modcalcequinoxdlg.ui:321
+#: tools/modcalcequinoxdlg.ui:118 tools/modcalcequinoxdlg.ui:321
 #, no-c-format
 msgid "Year:"
 msgstr ""
@@ -33410,14 +32321,12 @@ msgstr ""
 msgid "Solar System Bodies Coordinates"
 msgstr ""
 
-#: tools/modcalcplanetsdlg.ui:42
-#: tools/modcalcsidtimedlg.ui:53
+#: tools/modcalcplanetsdlg.ui:42 tools/modcalcsidtimedlg.ui:53
 #, no-c-format
 msgid "Input Selection"
 msgstr ""
 
-#: tools/modcalcplanetsdlg.ui:78
-#: tools/modcalcplanetsdlg.ui:928
+#: tools/modcalcplanetsdlg.ui:78 tools/modcalcplanetsdlg.ui:928
 #, no-c-format
 msgid "Solar system body:"
 msgstr ""
@@ -34498,8 +33407,8 @@ msgid ""
 "the\n"
 "\t\t\ttime/date, your geographic location, and the current central position "
 "on the\n"
-"\t\t\tsky (the focus).  You can drag these boxes with the mouse, and "
-"\"shade\" them\n"
+"\t\t\tsky (the focus).  You can drag these boxes with the mouse, and \"shade"
+"\" them\n"
 "\t\t\tby double-clicking them to show more (or less) information.  You can "
 "hide\n"
 "\t\t\tthem altogether in the Settings->Info Boxes menu.\n"
diff --git a/template/messages/tdeedu/ktouch.pot b/template/messages/tdeedu/ktouch.pot
index ceee3cbb3e1..928c29fc3bb 100644
--- a/template/messages/tdeedu/ktouch.pot
+++ b/template/messages/tdeedu/ktouch.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-11 13:09+0200\n"
+"POT-Creation-Date: 2021-07-07 22:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -706,8 +706,7 @@ msgstr ""
 msgid "Keyboard Layout Editor"
 msgstr ""
 
-#: ktouchkeyboardeditor_dlg.ui:35
-#: ktouchlectureeditor_dlg.ui:500
+#: ktouchkeyboardeditor_dlg.ui:35 ktouchlectureeditor_dlg.ui:500
 #, no-c-format
 msgid "Change Font..."
 msgstr ""
@@ -934,15 +933,13 @@ msgstr ""
 msgid "Here you can change the color of the text you type in the student line."
 msgstr ""
 
-#: ktouchprefcolorslayout.ui:241
-#: ktouchprefcolorslayout.ui:321
+#: ktouchprefcolorslayout.ui:241 ktouchprefcolorslayout.ui:321
 #: ktouchprefcolorslayout.ui:439
 #, no-c-format
 msgid "Background:"
 msgstr ""
 
-#: ktouchprefcolorslayout.ui:263
-#: ktouchprefcolorslayout.ui:288
+#: ktouchprefcolorslayout.ui:263 ktouchprefcolorslayout.ui:288
 #: ktouchprefcolorslayout.ui:384
 #, no-c-format
 msgid "Text:"
@@ -1153,20 +1150,17 @@ msgstr ""
 msgid "A&utomatic level adjustment"
 msgstr ""
 
-#: ktouchpreftraininglayout.ui:74
-#: ktouchpreftraininglayout.ui:267
+#: ktouchpreftraininglayout.ui:74 ktouchpreftraininglayout.ui:267
 #, no-c-format
 msgid "Correctness:"
 msgstr ""
 
-#: ktouchpreftraininglayout.ui:90
-#: ktouchpreftraininglayout.ui:217
+#: ktouchpreftraininglayout.ui:90 ktouchpreftraininglayout.ui:217
 #, no-c-format
 msgid "Typing speed:"
 msgstr ""
 
-#: ktouchpreftraininglayout.ui:98
-#: ktouchpreftraininglayout.ui:196
+#: ktouchpreftraininglayout.ui:98 ktouchpreftraininglayout.ui:196
 #, no-c-format
 msgid "%"
 msgstr ""
@@ -1176,8 +1170,7 @@ msgstr ""
 msgid "Limits to increase a level"
 msgstr ""
 
-#: ktouchpreftraininglayout.ui:136
-#: ktouchpreftraininglayout.ui:225
+#: ktouchpreftraininglayout.ui:136 ktouchpreftraininglayout.ui:225
 #, no-c-format
 msgid "chars/minute"
 msgstr ""
diff --git a/template/messages/tdeedu/kverbos.pot b/template/messages/tdeedu/kverbos.pot
index 08808c31cb0..29380692e05 100644
--- a/template/messages/tdeedu/kverbos.pot
+++ b/template/messages/tdeedu/kverbos.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-11 13:09+0200\n"
+"POT-Creation-Date: 2021-07-07 22:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -402,69 +402,54 @@ msgstr ""
 msgid "participio:"
 msgstr ""
 
-#: qerfassen.ui:286 qlernen.ui:156
-#: qverbosoptions.ui:117
+#: qerfassen.ui:286 qlernen.ui:156 qverbosoptions.ui:117
 #, no-c-format
 msgid "presente"
 msgstr ""
 
-#: qerfassen.ui:351 qerfassen.ui:619
-#: qerfassen.ui:887 qerfassen.ui:1155
-#: qerfassen.ui:1423 qerfassen.ui:1691
-#: qerfassen.ui:1959 qerfassen.ui:2241
+#: qerfassen.ui:351 qerfassen.ui:619 qerfassen.ui:887 qerfassen.ui:1155
+#: qerfassen.ui:1423 qerfassen.ui:1691 qerfassen.ui:1959 qerfassen.ui:2241
 #: qlernen.ui:200
 #, no-c-format
 msgid "yo:"
 msgstr ""
 
-#: qerfassen.ui:365 qerfassen.ui:633
-#: qerfassen.ui:901 qerfassen.ui:1169
-#: qerfassen.ui:1437 qerfassen.ui:1705
-#: qerfassen.ui:1973 qerfassen.ui:2255
+#: qerfassen.ui:365 qerfassen.ui:633 qerfassen.ui:901 qerfassen.ui:1169
+#: qerfassen.ui:1437 qerfassen.ui:1705 qerfassen.ui:1973 qerfassen.ui:2255
 #: qlernen.ui:214
 #, no-c-format
 msgid "tu:"
 msgstr ""
 
-#: qerfassen.ui:379 qerfassen.ui:647
-#: qerfassen.ui:915 qerfassen.ui:1183
-#: qerfassen.ui:1451 qerfassen.ui:1719
-#: qerfassen.ui:1987 qerfassen.ui:2269
+#: qerfassen.ui:379 qerfassen.ui:647 qerfassen.ui:915 qerfassen.ui:1183
+#: qerfassen.ui:1451 qerfassen.ui:1719 qerfassen.ui:1987 qerfassen.ui:2269
 #: qlernen.ui:228
 #, no-c-format
 msgid "el/ella/usted:"
 msgstr ""
 
-#: qerfassen.ui:393 qerfassen.ui:661
-#: qerfassen.ui:929 qerfassen.ui:1197
-#: qerfassen.ui:1465 qerfassen.ui:1733
-#: qerfassen.ui:2001 qerfassen.ui:2283
+#: qerfassen.ui:393 qerfassen.ui:661 qerfassen.ui:929 qerfassen.ui:1197
+#: qerfassen.ui:1465 qerfassen.ui:1733 qerfassen.ui:2001 qerfassen.ui:2283
 #: qlernen.ui:242
 #, no-c-format
 msgid "nosotros:"
 msgstr ""
 
-#: qerfassen.ui:407 qerfassen.ui:675
-#: qerfassen.ui:943 qerfassen.ui:1211
-#: qerfassen.ui:1479 qerfassen.ui:1747
-#: qerfassen.ui:2015 qerfassen.ui:2297
+#: qerfassen.ui:407 qerfassen.ui:675 qerfassen.ui:943 qerfassen.ui:1211
+#: qerfassen.ui:1479 qerfassen.ui:1747 qerfassen.ui:2015 qerfassen.ui:2297
 #: qlernen.ui:256
 #, no-c-format
 msgid "vosotros:"
 msgstr ""
 
-#: qerfassen.ui:421 qerfassen.ui:689
-#: qerfassen.ui:957 qerfassen.ui:1225
-#: qerfassen.ui:1493 qerfassen.ui:1761
-#: qerfassen.ui:2029 qlernen.ui:270
+#: qerfassen.ui:421 qerfassen.ui:689 qerfassen.ui:957 qerfassen.ui:1225
+#: qerfassen.ui:1493 qerfassen.ui:1761 qerfassen.ui:2029 qlernen.ui:270
 #, no-c-format
 msgid "ellos/ellas/ustedes:"
 msgstr ""
 
-#: qerfassen.ui:529 qerfassen.ui:797
-#: qerfassen.ui:1065 qerfassen.ui:1333
-#: qerfassen.ui:1601 qerfassen.ui:1869
-#: qerfassen.ui:2137 qerfassen.ui:2415
+#: qerfassen.ui:529 qerfassen.ui:797 qerfassen.ui:1065 qerfassen.ui:1333
+#: qerfassen.ui:1601 qerfassen.ui:1869 qerfassen.ui:2137 qerfassen.ui:2415
 #, no-c-format
 msgid "Clear Page"
 msgstr ""
diff --git a/template/messages/tdeedu/kvoctrain.pot b/template/messages/tdeedu/kvoctrain.pot
index 0d2ab39d7d4..4c88b3621b3 100644
--- a/template/messages/tdeedu/kvoctrain.pot
+++ b/template/messages/tdeedu/kvoctrain.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-11 13:09+0200\n"
+"POT-Creation-Date: 2021-07-07 22:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -1703,8 +1703,8 @@ msgstr ""
 
 #: kva_io.cpp:600 kva_io.cpp:653
 msgid ""
-"<qt>The file<br><b>%1</b><br>already exists. Do you want to overwrite "
-"it?</qt>"
+"<qt>The file<br><b>%1</b><br>already exists. Do you want to overwrite it?</"
+"qt>"
 msgstr ""
 
 #: kva_io.cpp:601 kva_io.cpp:654 kvtnewstuff.cpp:79
@@ -2964,12 +2964,9 @@ msgstr ""
 #: common-dialogs/ProgressDlgForm.ui:22
 #: common-dialogs/thresholdoptionsbase.ui:249
 #: docprop-dialogs/DocOptionsPageForm.ui:16
-#: docprop-dialogs/LangPropPageForm.ui:16
-#: docprop-dialogs/LessOptPageForm.ui:16
-#: docprop-dialogs/TenseOptPageForm.ui:16
-#: docprop-dialogs/TitlePageForm.ui:16
-#: docprop-dialogs/TypeOptPageForm.ui:16
-#: docprop-dialogs/UsageOptPageForm.ui:16
+#: docprop-dialogs/LangPropPageForm.ui:16 docprop-dialogs/LessOptPageForm.ui:16
+#: docprop-dialogs/TenseOptPageForm.ui:16 docprop-dialogs/TitlePageForm.ui:16
+#: docprop-dialogs/TypeOptPageForm.ui:16 docprop-dialogs/UsageOptPageForm.ui:16
 #: entry-dialogs/AdjEntryPageForm.ui:16
 #: entry-dialogs/AuxInfoEntryPageForm.ui:24
 #: entry-dialogs/CommonEntryPageForm.ui:24
@@ -2978,44 +2975,32 @@ msgstr ""
 #: entry-dialogs/CommonEntryPageForm.ui:316
 #: entry-dialogs/CommonEntryPageForm.ui:337
 #: entry-dialogs/CommonEntryPageForm.ui:374
-#: entry-dialogs/FromToEntryPageForm.ui:16
-#: entry-dialogs/MCEntryPageForm.ui:16
-#: entry-dialogs/TenseEntryPageForm.ui:16
-#: query-dialogs/MCQueryDlgForm.ui:138
-#: query-dialogs/MCQueryDlgForm.ui:157
-#: query-dialogs/MCQueryDlgForm.ui:176
-#: query-dialogs/MCQueryDlgForm.ui:195
-#: query-dialogs/MCQueryDlgForm.ui:214
+#: entry-dialogs/FromToEntryPageForm.ui:16 entry-dialogs/MCEntryPageForm.ui:16
+#: entry-dialogs/TenseEntryPageForm.ui:16 query-dialogs/MCQueryDlgForm.ui:138
+#: query-dialogs/MCQueryDlgForm.ui:157 query-dialogs/MCQueryDlgForm.ui:176
+#: query-dialogs/MCQueryDlgForm.ui:195 query-dialogs/MCQueryDlgForm.ui:214
 #: query-dialogs/RandomQueryDlgForm.ui:81
 #: query-dialogs/RandomQueryDlgForm.ui:97
 #: query-dialogs/RandomQueryDlgForm.ui:113
 #: query-dialogs/SimpleQueryDlgForm.ui:43
-#: query-dialogs/SimpleQueryDlgForm.ui:81
-#: query-dialogs/VerbQueryDlgForm.ui:87
-#: query-dialogs/VerbQueryDlgForm.ui:108
-#: query-dialogs/VerbQueryDlgForm.ui:119
-#: query-dialogs/VerbQueryDlgForm.ui:130
-#: query-dialogs/VerbQueryDlgForm.ui:151
-#: query-dialogs/VerbQueryDlgForm.ui:187
-#: query-dialogs/VerbQueryDlgForm.ui:212
-#: query-dialogs/VerbQueryDlgForm.ui:228
-#: query-dialogs/VerbQueryDlgForm.ui:244
-#: query-dialogs/VerbQueryDlgForm.ui:260
-#: query-dialogs/VerbQueryDlgForm.ui:305
+#: query-dialogs/SimpleQueryDlgForm.ui:81 query-dialogs/VerbQueryDlgForm.ui:87
+#: query-dialogs/VerbQueryDlgForm.ui:108 query-dialogs/VerbQueryDlgForm.ui:119
+#: query-dialogs/VerbQueryDlgForm.ui:130 query-dialogs/VerbQueryDlgForm.ui:151
+#: query-dialogs/VerbQueryDlgForm.ui:187 query-dialogs/VerbQueryDlgForm.ui:212
+#: query-dialogs/VerbQueryDlgForm.ui:228 query-dialogs/VerbQueryDlgForm.ui:244
+#: query-dialogs/VerbQueryDlgForm.ui:260 query-dialogs/VerbQueryDlgForm.ui:305
 #: statistik-dialogs/GenStatPageForm.ui:16
 #: statistik-dialogs/StatistikPageForm.ui:16
 #, no-c-format
 msgid "-"
 msgstr ""
 
-#: common-dialogs/ProgressDlgForm.ui:54
-#: statistik-dialogs/GenStatPageForm.ui:37
+#: common-dialogs/ProgressDlgForm.ui:54 statistik-dialogs/GenStatPageForm.ui:37
 #, no-c-format
 msgid "Filename:"
 msgstr ""
 
-#: common-dialogs/ProgressDlgForm.ui:66
-#: statistik-dialogs/GenStatPageForm.ui:49
+#: common-dialogs/ProgressDlgForm.ui:66 statistik-dialogs/GenStatPageForm.ui:49
 #, no-c-format
 msgid "Title:"
 msgstr ""
@@ -3030,22 +3015,18 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#: common-dialogs/blockoptionsbase.ui:37
-#: common-dialogs/viewoptionsbase.ui:250
-#: entry-dialogs/AdjEntryPageForm.ui:77
-#: query-dialogs/AdjQueryDlgForm.ui:70
+#: common-dialogs/blockoptionsbase.ui:37 common-dialogs/viewoptionsbase.ui:250
+#: entry-dialogs/AdjEntryPageForm.ui:77 query-dialogs/AdjQueryDlgForm.ui:70
 #, no-c-format
 msgid "Level &2:"
 msgstr ""
 
-#: common-dialogs/blockoptionsbase.ui:53
-#: common-dialogs/viewoptionsbase.ui:114
+#: common-dialogs/blockoptionsbase.ui:53 common-dialogs/viewoptionsbase.ui:114
 #, no-c-format
 msgid "Level &5:"
 msgstr ""
 
-#: common-dialogs/blockoptionsbase.ui:64
-#: common-dialogs/viewoptionsbase.ui:152
+#: common-dialogs/blockoptionsbase.ui:64 common-dialogs/viewoptionsbase.ui:152
 #, no-c-format
 msgid "Level &6:"
 msgstr ""
@@ -3060,30 +3041,24 @@ msgstr ""
 msgid "Bl&ocking"
 msgstr ""
 
-#: common-dialogs/blockoptionsbase.ui:135
-#: common-dialogs/viewoptionsbase.ui:95
+#: common-dialogs/blockoptionsbase.ui:135 common-dialogs/viewoptionsbase.ui:95
 #, no-c-format
 msgid "Level &4:"
 msgstr ""
 
-#: common-dialogs/blockoptionsbase.ui:146
-#: common-dialogs/viewoptionsbase.ui:133
+#: common-dialogs/blockoptionsbase.ui:146 common-dialogs/viewoptionsbase.ui:133
 #, no-c-format
 msgid "Level &7:"
 msgstr ""
 
-#: common-dialogs/blockoptionsbase.ui:177
-#: common-dialogs/viewoptionsbase.ui:231
-#: entry-dialogs/AdjEntryPageForm.ui:58
-#: query-dialogs/AdjQueryDlgForm.ui:48
+#: common-dialogs/blockoptionsbase.ui:177 common-dialogs/viewoptionsbase.ui:231
+#: entry-dialogs/AdjEntryPageForm.ui:58 query-dialogs/AdjQueryDlgForm.ui:48
 #, no-c-format
 msgid "Level &1:"
 msgstr ""
 
-#: common-dialogs/blockoptionsbase.ui:228
-#: common-dialogs/viewoptionsbase.ui:294
-#: entry-dialogs/AdjEntryPageForm.ui:96
-#: query-dialogs/AdjQueryDlgForm.ui:59
+#: common-dialogs/blockoptionsbase.ui:228 common-dialogs/viewoptionsbase.ui:294
+#: entry-dialogs/AdjEntryPageForm.ui:96 query-dialogs/AdjQueryDlgForm.ui:59
 #, no-c-format
 msgid "Level &3:"
 msgstr ""
@@ -3289,8 +3264,7 @@ msgid ""
 "time"
 msgstr ""
 
-#: common-dialogs/kvoctrain.kcfg:72
-#: common-dialogs/queryoptionsbase.ui:33
+#: common-dialogs/kvoctrain.kcfg:72 common-dialogs/queryoptionsbase.ui:33
 #, no-c-format
 msgid "Use the Leitner learning method"
 msgstr ""
@@ -4159,8 +4133,7 @@ msgstr ""
 msgid "&Use colors"
 msgstr ""
 
-#: common-dialogs/viewoptionsbase.ui:433
-#: common-dialogs/viewoptionsbase.ui:436
+#: common-dialogs/viewoptionsbase.ui:433 common-dialogs/viewoptionsbase.ui:436
 #, no-c-format
 msgid ""
 "If it is unchecked, you will just have black on white for the grades; if it "
@@ -4286,18 +4259,14 @@ msgstr ""
 msgid "Lesson Descriptions"
 msgstr ""
 
-#: docprop-dialogs/LessOptPageForm.ui:75
-#: docprop-dialogs/TenseOptPageForm.ui:75
-#: docprop-dialogs/TypeOptPageForm.ui:75
-#: docprop-dialogs/UsageOptPageForm.ui:75
+#: docprop-dialogs/LessOptPageForm.ui:75 docprop-dialogs/TenseOptPageForm.ui:75
+#: docprop-dialogs/TypeOptPageForm.ui:75 docprop-dialogs/UsageOptPageForm.ui:75
 #, no-c-format
 msgid "&New..."
 msgstr ""
 
-#: docprop-dialogs/LessOptPageForm.ui:91
-#: docprop-dialogs/TenseOptPageForm.ui:91
-#: docprop-dialogs/TypeOptPageForm.ui:91
-#: docprop-dialogs/UsageOptPageForm.ui:91
+#: docprop-dialogs/LessOptPageForm.ui:91 docprop-dialogs/TenseOptPageForm.ui:91
+#: docprop-dialogs/TypeOptPageForm.ui:91 docprop-dialogs/UsageOptPageForm.ui:91
 #, no-c-format
 msgid "&Modify..."
 msgstr ""
@@ -4474,32 +4443,27 @@ msgstr ""
 msgid "Suggestions for Multiple Choice"
 msgstr ""
 
-#: entry-dialogs/MCEntryPageForm.ui:58
-#: query-dialogs/MCQueryDlgForm.ui:106
+#: entry-dialogs/MCEntryPageForm.ui:58 query-dialogs/MCQueryDlgForm.ui:106
 #, no-c-format
 msgid "&1:"
 msgstr ""
 
-#: entry-dialogs/MCEntryPageForm.ui:77
-#: query-dialogs/MCQueryDlgForm.ui:90
+#: entry-dialogs/MCEntryPageForm.ui:77 query-dialogs/MCQueryDlgForm.ui:90
 #, no-c-format
 msgid "&2:"
 msgstr ""
 
-#: entry-dialogs/MCEntryPageForm.ui:96
-#: query-dialogs/MCQueryDlgForm.ui:98
+#: entry-dialogs/MCEntryPageForm.ui:96 query-dialogs/MCQueryDlgForm.ui:98
 #, no-c-format
 msgid "&3:"
 msgstr ""
 
-#: entry-dialogs/MCEntryPageForm.ui:180
-#: query-dialogs/MCQueryDlgForm.ui:114
+#: entry-dialogs/MCEntryPageForm.ui:180 query-dialogs/MCQueryDlgForm.ui:114
 #, no-c-format
 msgid "&4:"
 msgstr ""
 
-#: entry-dialogs/MCEntryPageForm.ui:199
-#: query-dialogs/MCQueryDlgForm.ui:122
+#: entry-dialogs/MCEntryPageForm.ui:199 query-dialogs/MCQueryDlgForm.ui:122
 #, no-c-format
 msgid "&5:"
 msgstr ""
@@ -4539,79 +4503,63 @@ msgstr ""
 msgid "Fill in the missing comparison expressions:"
 msgstr ""
 
-#: query-dialogs/AdjQueryDlgForm.ui:180
-#: query-dialogs/ArtQueryDlgForm.ui:254
-#: query-dialogs/MCQueryDlgForm.ui:305
-#: query-dialogs/RandomQueryDlgForm.ui:251
+#: query-dialogs/AdjQueryDlgForm.ui:180 query-dialogs/ArtQueryDlgForm.ui:254
+#: query-dialogs/MCQueryDlgForm.ui:305 query-dialogs/RandomQueryDlgForm.ui:251
 #: query-dialogs/SimpleQueryDlgForm.ui:326
 #: query-dialogs/VerbQueryDlgForm.ui:355
 #, no-c-format
 msgid "&Verify"
 msgstr ""
 
-#: query-dialogs/AdjQueryDlgForm.ui:196
-#: query-dialogs/ArtQueryDlgForm.ui:270
-#: query-dialogs/MCQueryDlgForm.ui:283
-#: query-dialogs/RandomQueryDlgForm.ui:315
+#: query-dialogs/AdjQueryDlgForm.ui:196 query-dialogs/ArtQueryDlgForm.ui:270
+#: query-dialogs/MCQueryDlgForm.ui:283 query-dialogs/RandomQueryDlgForm.ui:315
 #: query-dialogs/SimpleQueryDlgForm.ui:262
 #: query-dialogs/VerbQueryDlgForm.ui:339
 #, no-c-format
 msgid "I &Know It"
 msgstr ""
 
-#: query-dialogs/AdjQueryDlgForm.ui:212
-#: query-dialogs/ArtQueryDlgForm.ui:286
-#: query-dialogs/MCQueryDlgForm.ui:267
-#: query-dialogs/RandomQueryDlgForm.ui:283
+#: query-dialogs/AdjQueryDlgForm.ui:212 query-dialogs/ArtQueryDlgForm.ui:286
+#: query-dialogs/MCQueryDlgForm.ui:267 query-dialogs/RandomQueryDlgForm.ui:283
 #: query-dialogs/SimpleQueryDlgForm.ui:294
 #: query-dialogs/VerbQueryDlgForm.ui:371
 #, no-c-format
 msgid "Show &All"
 msgstr ""
 
-#: query-dialogs/AdjQueryDlgForm.ui:228
-#: query-dialogs/ArtQueryDlgForm.ui:302
-#: query-dialogs/MCQueryDlgForm.ui:251
-#: query-dialogs/RandomQueryDlgForm.ui:299
+#: query-dialogs/AdjQueryDlgForm.ui:228 query-dialogs/ArtQueryDlgForm.ui:302
+#: query-dialogs/MCQueryDlgForm.ui:251 query-dialogs/RandomQueryDlgForm.ui:299
 #: query-dialogs/VerbQueryDlgForm.ui:387
 #, no-c-format
 msgid "&Do Not Know"
 msgstr ""
 
-#: query-dialogs/AdjQueryDlgForm.ui:246
-#: query-dialogs/ArtQueryDlgForm.ui:142
-#: query-dialogs/MCQueryDlgForm.ui:323
-#: query-dialogs/RandomQueryDlgForm.ui:333
+#: query-dialogs/AdjQueryDlgForm.ui:246 query-dialogs/ArtQueryDlgForm.ui:142
+#: query-dialogs/MCQueryDlgForm.ui:323 query-dialogs/RandomQueryDlgForm.ui:333
 #: query-dialogs/SimpleQueryDlgForm.ui:159
 #: query-dialogs/VerbQueryDlgForm.ui:427
 #, no-c-format
 msgid "Progress"
 msgstr ""
 
-#: query-dialogs/AdjQueryDlgForm.ui:281
-#: query-dialogs/ArtQueryDlgForm.ui:177
-#: query-dialogs/MCQueryDlgForm.ui:358
-#: query-dialogs/RandomQueryDlgForm.ui:358
+#: query-dialogs/AdjQueryDlgForm.ui:281 query-dialogs/ArtQueryDlgForm.ui:177
+#: query-dialogs/MCQueryDlgForm.ui:358 query-dialogs/RandomQueryDlgForm.ui:358
 #: query-dialogs/SimpleQueryDlgForm.ui:196
 #: query-dialogs/VerbQueryDlgForm.ui:462
 #, no-c-format
 msgid "Count:"
 msgstr ""
 
-#: query-dialogs/AdjQueryDlgForm.ui:297
-#: query-dialogs/ArtQueryDlgForm.ui:193
-#: query-dialogs/MCQueryDlgForm.ui:374
-#: query-dialogs/RandomQueryDlgForm.ui:350
+#: query-dialogs/AdjQueryDlgForm.ui:297 query-dialogs/ArtQueryDlgForm.ui:193
+#: query-dialogs/MCQueryDlgForm.ui:374 query-dialogs/RandomQueryDlgForm.ui:350
 #: query-dialogs/SimpleQueryDlgForm.ui:212
 #: query-dialogs/VerbQueryDlgForm.ui:478
 #, no-c-format
 msgid "Time:"
 msgstr ""
 
-#: query-dialogs/AdjQueryDlgForm.ui:308
-#: query-dialogs/ArtQueryDlgForm.ui:212
-#: query-dialogs/MCQueryDlgForm.ui:385
-#: query-dialogs/RandomQueryDlgForm.ui:392
+#: query-dialogs/AdjQueryDlgForm.ui:308 query-dialogs/ArtQueryDlgForm.ui:212
+#: query-dialogs/MCQueryDlgForm.ui:385 query-dialogs/RandomQueryDlgForm.ui:392
 #: query-dialogs/SimpleQueryDlgForm.ui:223
 #: query-dialogs/VerbQueryDlgForm.ui:489
 #, no-c-format
diff --git a/template/messages/tdeedu/kwordquiz.pot b/template/messages/tdeedu/kwordquiz.pot
index fff66d7c531..fae7105880d 100644
--- a/template/messages/tdeedu/kwordquiz.pot
+++ b/template/messages/tdeedu/kwordquiz.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-11 13:09+0200\n"
+"POT-Creation-Date: 2021-07-07 22:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -406,8 +406,8 @@ msgstr ""
 
 #: kwordquiz.cpp:612
 msgid ""
-"<qt>The file<br><b>%1</b><br>already exists. Do you want to overwrite "
-"it?</qt>"
+"<qt>The file<br><b>%1</b><br>already exists. Do you want to overwrite it?</"
+"qt>"
 msgstr ""
 
 #: kwordquiz.cpp:613 kwqnewstuff.cpp:84
@@ -583,8 +583,7 @@ msgstr ""
 msgid "Editor Settings"
 msgstr ""
 
-#: kwordquizprefs.cpp:53 kwordquizui.rc:77
-#: prefquizbase.ui:22
+#: kwordquizprefs.cpp:53 kwordquizui.rc:77 prefquizbase.ui:22
 #, no-c-format
 msgid "Quiz"
 msgstr ""
@@ -809,14 +808,12 @@ msgstr ""
 msgid "Select to print flashcards"
 msgstr ""
 
-#: dlglanguagebase.ui:69 dlglanguagebase.ui:97
-#: dlglanguagebase.ui:114
+#: dlglanguagebase.ui:69 dlglanguagebase.ui:97 dlglanguagebase.ui:114
 #, no-c-format
 msgid "Title for the left column"
 msgstr ""
 
-#: dlglanguagebase.ui:72 dlglanguagebase.ui:100
-#: dlglanguagebase.ui:117
+#: dlglanguagebase.ui:72 dlglanguagebase.ui:100 dlglanguagebase.ui:117
 #, no-c-format
 msgid "Enter a title (identifier) for the left column"
 msgstr ""
@@ -826,14 +823,12 @@ msgstr ""
 msgid "&Column 1:"
 msgstr ""
 
-#: dlglanguagebase.ui:172 dlglanguagebase.ui:194
-#: dlglanguagebase.ui:211
+#: dlglanguagebase.ui:172 dlglanguagebase.ui:194 dlglanguagebase.ui:211
 #, no-c-format
 msgid "Title for the right column"
 msgstr ""
 
-#: dlglanguagebase.ui:175 dlglanguagebase.ui:197
-#: dlglanguagebase.ui:214
+#: dlglanguagebase.ui:175 dlglanguagebase.ui:197 dlglanguagebase.ui:214
 #, no-c-format
 msgid "Enter a title (identifier) for the right column"
 msgstr ""
@@ -898,8 +893,7 @@ msgstr ""
 msgid "Based On"
 msgstr ""
 
-#: dlgsortbase.ui:52 dlgsortbase.ui:69
-#: dlgsortbase.ui:83
+#: dlgsortbase.ui:52 dlgsortbase.ui:69 dlgsortbase.ui:83
 #, no-c-format
 msgid "Sort based on this column"
 msgstr ""
@@ -934,8 +928,7 @@ msgstr ""
 msgid "Direction"
 msgstr ""
 
-#: dlgsortbase.ui:99 dlgsortbase.ui:116
-#: dlgsortbase.ui:130
+#: dlgsortbase.ui:99 dlgsortbase.ui:116 dlgsortbase.ui:130
 #, no-c-format
 msgid "Sort in this direction"
 msgstr ""
@@ -965,18 +958,15 @@ msgstr ""
 msgid "Select to sort in descending order"
 msgstr ""
 
-#: flashviewbase.ui:96 flashviewbase.ui:133
-#: flashviewbase.ui:175 flashviewbase.ui:210
-#: prefcardappearancebase.ui:63
-#: prefcardappearancebase.ui:105
-#: prefcardappearancebase.ui:155
+#: flashviewbase.ui:96 flashviewbase.ui:133 flashviewbase.ui:175
+#: flashviewbase.ui:210 prefcardappearancebase.ui:63
+#: prefcardappearancebase.ui:105 prefcardappearancebase.ui:155
 #: prefcardappearancebase.ui:197
 #, no-c-format
 msgid "The flashcard"
 msgstr ""
 
-#: flashviewbase.ui:127 multipleviewbase.ui:65
-#: qaviewbase.ui:771
+#: flashviewbase.ui:127 multipleviewbase.ui:65 qaviewbase.ui:771
 #, no-c-format
 msgid "Language 1"
 msgstr ""
@@ -986,8 +976,7 @@ msgstr ""
 msgid "Language or other identifier for this card"
 msgstr ""
 
-#: flashviewbase.ui:198 multipleviewbase.ui:90
-#: qaviewbase.ui:824
+#: flashviewbase.ui:198 multipleviewbase.ui:90 qaviewbase.ui:824
 #, no-c-format
 msgid "This is your question"
 msgstr ""
@@ -997,19 +986,16 @@ msgstr ""
 msgid "The flashcard. Select Quiz -> Check to see the other side."
 msgstr ""
 
-#: flashviewbase.ui:293 flashviewbase.ui:361
-#: flashviewbase.ui:460 flashviewbase.ui:528
-#: multipleviewbase.ui:301 multipleviewbase.ui:369
-#: multipleviewbase.ui:468 multipleviewbase.ui:536
-#: qaviewbase.ui:89 qaviewbase.ui:180
-#: qaviewbase.ui:209 qaviewbase.ui:238
+#: flashviewbase.ui:293 flashviewbase.ui:361 flashviewbase.ui:460
+#: flashviewbase.ui:528 multipleviewbase.ui:301 multipleviewbase.ui:369
+#: multipleviewbase.ui:468 multipleviewbase.ui:536 qaviewbase.ui:89
+#: qaviewbase.ui:180 qaviewbase.ui:209 qaviewbase.ui:238
 #, no-c-format
 msgid "00"
 msgstr ""
 
-#: flashviewbase.ui:299 flashviewbase.ui:429
-#: multipleviewbase.ui:307 multipleviewbase.ui:437
-#: qaviewbase.ui:157 qaviewbase.ui:186
+#: flashviewbase.ui:299 flashviewbase.ui:429 multipleviewbase.ui:307
+#: multipleviewbase.ui:437 qaviewbase.ui:157 qaviewbase.ui:186
 #, no-c-format
 msgid "Questions"
 msgstr ""
@@ -1019,9 +1005,8 @@ msgstr ""
 msgid "The number of cards in the session"
 msgstr ""
 
-#: flashviewbase.ui:330 flashviewbase.ui:367
-#: multipleviewbase.ui:338 multipleviewbase.ui:375
-#: qaviewbase.ui:215 qaviewbase.ui:275
+#: flashviewbase.ui:330 flashviewbase.ui:367 multipleviewbase.ui:338
+#: multipleviewbase.ui:375 qaviewbase.ui:215 qaviewbase.ui:275
 #, no-c-format
 msgid "Correct answers"
 msgstr ""
@@ -1033,9 +1018,8 @@ msgid ""
 "percentage."
 msgstr ""
 
-#: flashviewbase.ui:398 flashviewbase.ui:534
-#: multipleviewbase.ui:406 multipleviewbase.ui:542
-#: qaviewbase.ui:66 qaviewbase.ui:95
+#: flashviewbase.ui:398 flashviewbase.ui:534 multipleviewbase.ui:406
+#: multipleviewbase.ui:542 qaviewbase.ui:66 qaviewbase.ui:95
 #, no-c-format
 msgid "Incorrect answers"
 msgstr ""
@@ -1047,9 +1031,8 @@ msgid ""
 "percentage."
 msgstr ""
 
-#: flashviewbase.ui:466 flashviewbase.ui:497
-#: multipleviewbase.ui:474 multipleviewbase.ui:505
-#: qaviewbase.ui:126 qaviewbase.ui:244
+#: flashviewbase.ui:466 flashviewbase.ui:497 multipleviewbase.ui:474
+#: multipleviewbase.ui:505 qaviewbase.ui:126 qaviewbase.ui:244
 #, no-c-format
 msgid "Answered questions"
 msgstr ""
@@ -1211,9 +1194,8 @@ msgstr ""
 msgid "Go to"
 msgstr ""
 
-#: multipleviewbase.ui:71 multipleviewbase.ui:102
-#: multipleviewbase.ui:105 multipleviewbase.ui:133
-#: qaviewbase.ui:777 qaviewbase.ui:808
+#: multipleviewbase.ui:71 multipleviewbase.ui:102 multipleviewbase.ui:105
+#: multipleviewbase.ui:133 qaviewbase.ui:777 qaviewbase.ui:808
 #: qaviewbase.ui:836 qaviewbase.ui:839
 #, no-c-format
 msgid "The question"
@@ -1224,15 +1206,14 @@ msgstr ""
 msgid "Language or other identifier for the question"
 msgstr ""
 
-#: multipleviewbase.ui:171 multipleviewbase.ui:204
-#: multipleviewbase.ui:235 qaviewbase.ui:426
-#: qaviewbase.ui:457 qaviewbase.ui:488
+#: multipleviewbase.ui:171 multipleviewbase.ui:204 multipleviewbase.ui:235
+#: qaviewbase.ui:426 qaviewbase.ui:457 qaviewbase.ui:488
 #, no-c-format
 msgid "Your previous answer"
 msgstr ""
 
-#: multipleviewbase.ui:207 multipleviewbase.ui:238
-#: qaviewbase.ui:429 qaviewbase.ui:460
+#: multipleviewbase.ui:207 multipleviewbase.ui:238 qaviewbase.ui:429
+#: qaviewbase.ui:460
 #, no-c-format
 msgid "Your answer to the previous question"
 msgstr ""
@@ -1242,41 +1223,40 @@ msgstr ""
 msgid "This was your answer"
 msgstr ""
 
-#: multipleviewbase.ui:310 multipleviewbase.ui:440
-#: qaviewbase.ui:160 qaviewbase.ui:189
+#: multipleviewbase.ui:310 multipleviewbase.ui:440 qaviewbase.ui:160
+#: qaviewbase.ui:189
 #, no-c-format
 msgid "The number of questions in the session"
 msgstr ""
 
-#: multipleviewbase.ui:341 multipleviewbase.ui:378
-#: qaviewbase.ui:218 qaviewbase.ui:278
+#: multipleviewbase.ui:341 multipleviewbase.ui:378 qaviewbase.ui:218
+#: qaviewbase.ui:278
 #, no-c-format
 msgid ""
 "The number of questions answered correctly. May be shown as a percentage."
 msgstr ""
 
-#: multipleviewbase.ui:409 multipleviewbase.ui:545
-#: qaviewbase.ui:69 qaviewbase.ui:98
+#: multipleviewbase.ui:409 multipleviewbase.ui:545 qaviewbase.ui:69
+#: qaviewbase.ui:98
 #, no-c-format
 msgid ""
 "The number of questions answered incorrectly. May be shown as a percentage."
 msgstr ""
 
-#: multipleviewbase.ui:477 multipleviewbase.ui:508
-#: qaviewbase.ui:129 qaviewbase.ui:247
+#: multipleviewbase.ui:477 multipleviewbase.ui:508 qaviewbase.ui:129
+#: qaviewbase.ui:247
 #, no-c-format
 msgid "The number of questions already answered. May be shown as a percentage."
 msgstr ""
 
-#: multipleviewbase.ui:590 multipleviewbase.ui:621
-#: multipleviewbase.ui:652 qaviewbase.ui:526
-#: qaviewbase.ui:559 qaviewbase.ui:590
+#: multipleviewbase.ui:590 multipleviewbase.ui:621 multipleviewbase.ui:652
+#: qaviewbase.ui:526 qaviewbase.ui:559 qaviewbase.ui:590
 #, no-c-format
 msgid "Previous correct answer"
 msgstr ""
 
-#: multipleviewbase.ui:593 multipleviewbase.ui:624
-#: qaviewbase.ui:562 qaviewbase.ui:593
+#: multipleviewbase.ui:593 multipleviewbase.ui:624 qaviewbase.ui:562
+#: qaviewbase.ui:593
 #, no-c-format
 msgid "The correct answer to the previous question"
 msgstr ""
@@ -1286,9 +1266,8 @@ msgstr ""
 msgid "This was the correct answer"
 msgstr ""
 
-#: multipleviewbase.ui:690 multipleviewbase.ui:715
-#: multipleviewbase.ui:743 multipleviewbase.ui:779
-#: multipleviewbase.ui:807
+#: multipleviewbase.ui:690 multipleviewbase.ui:715 multipleviewbase.ui:743
+#: multipleviewbase.ui:779 multipleviewbase.ui:807
 #, no-c-format
 msgid "Your choices"
 msgstr ""
@@ -1298,8 +1277,7 @@ msgstr ""
 msgid "&2 Option"
 msgstr ""
 
-#: multipleviewbase.ui:718 multipleviewbase.ui:746
-#: multipleviewbase.ui:810
+#: multipleviewbase.ui:718 multipleviewbase.ui:746 multipleviewbase.ui:810
 #, no-c-format
 msgid "Three choices for the answer. One is correct."
 msgstr ""
@@ -1324,15 +1302,14 @@ msgstr ""
 msgid "&3 Option"
 msgstr ""
 
-#: multipleviewbase.ui:853 multipleviewbase.ui:887
-#: multipleviewbase.ui:918 qaviewbase.ui:321
-#: qaviewbase.ui:352 qaviewbase.ui:383
+#: multipleviewbase.ui:853 multipleviewbase.ui:887 multipleviewbase.ui:918
+#: qaviewbase.ui:321 qaviewbase.ui:352 qaviewbase.ui:383
 #, no-c-format
 msgid "Previous question"
 msgstr ""
 
-#: multipleviewbase.ui:856 multipleviewbase.ui:890
-#: qaviewbase.ui:324 qaviewbase.ui:355
+#: multipleviewbase.ui:856 multipleviewbase.ui:890 qaviewbase.ui:324
+#: qaviewbase.ui:355
 #, no-c-format
 msgid "The previous question"
 msgstr ""
@@ -1377,8 +1354,7 @@ msgstr ""
 msgid "Frame color:"
 msgstr ""
 
-#: prefcardappearancebase.ui:269
-#: prefcardappearancebase.ui:336
+#: prefcardappearancebase.ui:269 prefcardappearancebase.ui:336
 #: prefcardappearancebase.ui:419
 #, no-c-format
 msgid "Font:"
@@ -1399,38 +1375,32 @@ msgstr ""
 msgid "Use to select the font for displaying text on the back of the card"
 msgstr ""
 
-#: prefcardappearancebase.ui:353
-#: prefcardappearancebase.ui:436
+#: prefcardappearancebase.ui:353 prefcardappearancebase.ui:436
 #, no-c-format
 msgid "Select text color"
 msgstr ""
 
-#: prefcardappearancebase.ui:356
-#: prefcardappearancebase.ui:439
+#: prefcardappearancebase.ui:356 prefcardappearancebase.ui:439
 #, no-c-format
 msgid "Use to select the color for text shown on the card"
 msgstr ""
 
-#: prefcardappearancebase.ui:367
-#: prefcardappearancebase.ui:450
+#: prefcardappearancebase.ui:367 prefcardappearancebase.ui:450
 #, no-c-format
 msgid "Select card frame color"
 msgstr ""
 
-#: prefcardappearancebase.ui:370
-#: prefcardappearancebase.ui:453
+#: prefcardappearancebase.ui:370 prefcardappearancebase.ui:453
 #, no-c-format
 msgid "Use to select the color for drawing the frame of the card"
 msgstr ""
 
-#: prefcardappearancebase.ui:381
-#: prefcardappearancebase.ui:464
+#: prefcardappearancebase.ui:381 prefcardappearancebase.ui:464
 #, no-c-format
 msgid "Select card color"
 msgstr ""
 
-#: prefcardappearancebase.ui:384
-#: prefcardappearancebase.ui:467
+#: prefcardappearancebase.ui:384 prefcardappearancebase.ui:467
 #, no-c-format
 msgid "Select color used to draw the card"
 msgstr ""
@@ -1597,8 +1567,8 @@ msgstr ""
 msgid "Enter Ke&y Moves"
 msgstr ""
 
-#: prefeditorbase.ui:39 prefeditorbase.ui:56
-#: prefeditorbase.ui:70 prefeditorbase.ui:84
+#: prefeditorbase.ui:39 prefeditorbase.ui:56 prefeditorbase.ui:70
+#: prefeditorbase.ui:84
 #, no-c-format
 msgid "How enter key moves"
 msgstr ""
@@ -1807,8 +1777,7 @@ msgstr ""
 msgid "This is _____ answer"
 msgstr ""
 
-#: qaviewbase.ui:631 qaviewbase.ui:653
-#: qaviewbase.ui:689 qaviewbase.ui:720
+#: qaviewbase.ui:631 qaviewbase.ui:653 qaviewbase.ui:689 qaviewbase.ui:720
 #, no-c-format
 msgid "Type your answer"
 msgstr ""
author	Automated System <[email protected]>	2021-07-07 22:34:53 +0000
committer	TDE Gitea <[email protected]>	2021-07-07 22:34:53 +0000
commit	7a6b3830304e3cdef4015378de3c1ea9ad479113 (patch)
tree	e6bc9a824cbda725ff3f8ca70dbe76ef49aa93d9 /template/messages/tdeedu
parent	44f5bf1bb27c8650acc7d05c39db48fa1f1fbe88 (diff)
download	tde-i18n-7a6b3830304e3cdef4015378de3c1ea9ad479113.tar.gz tde-i18n-7a6b3830304e3cdef4015378de3c1ea9ad479113.zip