Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: tdeedu/kstars Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/tdeedu/kstars/ (cherry picked from commit bd346ec93031e68a90e6e2127739addea7410c15)
author: TDE Weblate <weblate@mirror.git.trinitydesktop.org> 2018-12-27 18:34:52 +0000
committer: Slávek Banko <slavek.banko@axis.cz> 2018-12-27 19:38:51 +0100
commit: 3f92e0cc566442607e0420a95c1e6c4ec675ae4d (patch)
tree: a6a4f26402da287ee3719357b4c1a1006e7dc62a /tde-i18n-cy
parent: e4f197c9d51ab4471928776f722c9d23f70a192a (diff)
download: tde-i18n-3f92e0cc566442607e0420a95c1e6c4ec675ae4d.tar.gz
tde-i18n-3f92e0cc566442607e0420a95c1e6c4ec675ae4d.zip
1 files changed, 14276 insertions, 11921 deletions
diff --git a/tde-i18n-cy/messages/tdeedu/kstars.po b/tde-i18n-cy/messages/tdeedu/kstars.po
index 9d4e27a8187..83380efb833 100644
--- a/tde-i18n-cy/messages/tdeedu/kstars.po
+++ b/tde-i18n-cy/messages/tdeedu/kstars.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kstars\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-27 04:16+0100\n"
 "PO-Revision-Date: 2004-02-26 16:58+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "KD wrth KGyfieithu"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -39,20 +39,17 @@ msgstr "Ychwanegu Catalog ..."
 msgid "ID Number"
 msgstr ""
 
-#. i18n: file tools/argsetradec.ui line 75
-#: addcatdialog.cpp:51 addcatdialog.cpp:159 rc.cpp:2227
+#: addcatdialog.cpp:51 addcatdialog.cpp:159 tools/argsetradec.ui:75
 #, no-c-format
 msgid "Right Ascension"
 msgstr ""
 
-#. i18n: file tools/argsetradec.ui line 43
-#: addcatdialog.cpp:52 addcatdialog.cpp:161 rc.cpp:2216
+#: addcatdialog.cpp:52 addcatdialog.cpp:161 tools/argsetradec.ui:43
 #, no-c-format
 msgid "Declination"
 msgstr ""
 
-#. i18n: file details_data.ui line 121
-#: addcatdialog.cpp:53 addcatdialog.cpp:163 rc.cpp:150
+#: addcatdialog.cpp:53 addcatdialog.cpp:163 details_data.ui:121
 #, no-c-format
 msgid "Object Type"
 msgstr "Math Gwrthrych"
@@ -86,15 +83,15 @@ msgstr "Anwybyddu"
 
 #: addcatdialog.cpp:77
 msgid ""
-"A valid custom catalog file has one line per object, with the following fields "
-"in each line:"
+"A valid custom catalog file has one line per object, with the following "
+"fields in each line:"
 msgstr ""
 
 #: addcatdialog.cpp:79
 msgid ""
 "1. Type identifier.  Must be one of: 0 (star), 3 (open cluster), 4 (globular "
-"cluster), 5 (gaseous nebula), 6 (planetary nebula), 7 (supernova remnant), or 8 "
-"(galaxy)"
+"cluster), 5 (gaseous nebula), 6 (planetary nebula), 7 (supernova remnant), "
+"or 8 (galaxy)"
 msgstr ""
 
 #: addcatdialog.cpp:81
@@ -115,7 +112,8 @@ msgstr ""
 
 #: addcatdialog.cpp:85
 msgid ""
-"6. Star name (if type=0); otherwise object's common name. [field 6 is optional]"
+"6. Star name (if type=0); otherwise object's common name. [field 6 is "
+"optional]"
 msgstr ""
 
 #: addcatdialog.cpp:87
@@ -142,17 +140,17 @@ msgstr ""
 msgid "Catalog Preview"
 msgstr "Constellation names:"
 
-#: addcatdialog.cpp:212 fitsviewer.cpp:557 imageviewer.cpp:212
+#: addcatdialog.cpp:212 fitsviewer.cpp:561 imageviewer.cpp:212
 #: kstarsactions.cpp:454 tools/scriptbuilder.cpp:807
 msgid "A file named \"%1\" already exists. Overwrite it?"
 msgstr ""
 
-#: addcatdialog.cpp:214 fitsviewer.cpp:559 imageviewer.cpp:214
+#: addcatdialog.cpp:214 fitsviewer.cpp:563 imageviewer.cpp:214
 #: kstarsactions.cpp:456 tools/scriptbuilder.cpp:809
 msgid "Overwrite File?"
 msgstr "Trosysgrifo'r Ffeil?"
 
-#: addcatdialog.cpp:215 fitsviewer.cpp:560 imageviewer.cpp:215
+#: addcatdialog.cpp:215 fitsviewer.cpp:564 imageviewer.cpp:215
 #: kstarsactions.cpp:457 tools/scriptbuilder.cpp:810
 msgid "&Overwrite"
 msgstr "&Trosysgrifo"
@@ -182,7 +180,7 @@ msgid ""
 "to the Google search engine?"
 msgstr ""
 
-#: addlinkdialog.cpp:54 ccdpreviewwg.cpp:274 fitsviewer.cpp:696
+#: addlinkdialog.cpp:54 ccdpreviewwg.cpp:274 fitsviewer.cpp:700
 #: streamwg.cpp:265 tools/scriptbuilder.cpp:774 tools/scriptbuilder.cpp:846
 msgid "Invalid URL"
 msgstr "URL annilys"
@@ -199,6 +197,10 @@ msgstr ""
 msgid "Show webpage about "
 msgstr ""
 
+#: addlinkdialog.h:42
+msgid "object"
+msgstr "gwrthrych"
+
 #: ccdpreviewwg.cpp:266 kstarsactions.cpp:504 kstarsdcop.cpp:455
 #: streamwg.cpp:257 tools/scriptbuilder.cpp:837
 #, c-format
@@ -210,7 +212,7 @@ msgstr ""
 msgid "Could not upload file"
 msgstr "Methu llwytho ffeil"
 
-#: ccdpreviewwg.cpp:273 fitsviewer.cpp:695 streamwg.cpp:264
+#: ccdpreviewwg.cpp:273 fitsviewer.cpp:699 streamwg.cpp:264
 #: tools/scriptbuilder.cpp:773 tools/scriptbuilder.cpp:845
 #, c-format
 msgid "Invalid URL: %1"
@@ -279,8 +281,7 @@ msgstr ""
 msgid "Equator"
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 208
-#: colorscheme.cpp:75 rc.cpp:1507 skymapdraw.cpp:720
+#: colorscheme.cpp:75 opsguidesui.ui:208 skymapdraw.cpp:720
 #, no-c-format
 msgid "Ecliptic"
 msgstr ""
@@ -369,27 +370,24 @@ msgstr ""
 msgid "Invalid Filename"
 msgstr ""
 
-#: conbridlg.cpp:40 fitsviewer.cpp:146 fitsviewer.cpp:989
+#: conbridlg.cpp:40 fitsviewer.cpp:146 fitsviewer.cpp:993
 msgid "Brightness/Contrast"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 507
-#: detaildialog.cpp:77 rc.cpp:4186 skymap.cpp:741
+#: detaildialog.cpp:77 skymap.cpp:741 tools/wutdialogui.ui:507
 #, no-c-format
 msgid "Object Details"
 msgstr ""
 
-#. i18n: file indiconf.ui line 30
-#: detaildialog.cpp:102 rc.cpp:663
+#: detaildialog.cpp:102 indiconf.ui:30
 #, no-c-format
 msgid "General"
 msgstr "Cyffredinol"
 
 #: 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 "seren"
 
@@ -507,8 +505,7 @@ msgstr ""
 msgid "Edit Link"
 msgstr ""
 
-#. i18n: file addlinkdialogui.ui line 74
-#: detaildialog.cpp:555 rc.cpp:81
+#: addlinkdialogui.ui:74 detaildialog.cpp:555
 #, no-c-format
 msgid "URL:"
 msgstr "URL:"
@@ -547,9 +544,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
@@ -561,10 +558,10 @@ 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\", \"12:20:00\", "
-"\"12:20\", \"12 20.0\", etc.)."
+"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\", "
+"\"12:20:00\", \"12:20\", \"12 20.0\", etc.)."
 msgstr ""
 
 #: finddialog.cpp:37
@@ -579,10 +576,9 @@ msgstr ""
 msgid "Any"
 msgstr "Unrhyw"
 
-#. i18n: file opscatalogui.ui line 33
-#: finddialog.cpp:57 rc.cpp:1211 rc.cpp:3801 tools/obslistwizard.cpp:238
+#: finddialog.cpp:57 opscatalogui.ui:33 tools/obslistwizard.cpp:238
 #: tools/obslistwizard.cpp:310 tools/obslistwizard.cpp:357
-#: tools/wutdialog.cpp:112
+#: tools/obslistwizardui.ui:176 tools/wutdialog.cpp:112
 #, no-c-format
 msgid "Stars"
 msgstr ""
@@ -592,9 +588,8 @@ msgstr ""
 msgid "Solar System"
 msgstr ""
 
-#. i18n: file tools/obslistwizardui.ui line 196
-#: finddialog.cpp:60 rc.cpp:3813 tools/obslistwizard.cpp:211
-#: tools/obslistwizard.cpp:248 tools/obslistwizard.cpp:358
+#: finddialog.cpp:60 tools/obslistwizard.cpp:211 tools/obslistwizard.cpp:248
+#: tools/obslistwizard.cpp:358 tools/obslistwizardui.ui:196
 #, no-c-format
 msgid "Open Clusters"
 msgstr ""
@@ -611,26 +606,23 @@ msgstr ""
 msgid "Plan. Nebulae"
 msgstr ""
 
-#. i18n: file tools/obslistwizardui.ui line 216
-#: finddialog.cpp:65 rc.cpp:3825 tools/obslistwizard.cpp:215
-#: tools/obslistwizard.cpp:246 tools/obslistwizard.cpp:362
+#: finddialog.cpp:65 tools/obslistwizard.cpp:215 tools/obslistwizard.cpp:246
+#: tools/obslistwizard.cpp:362 tools/obslistwizardui.ui:216
 #: tools/wutdialog.cpp:116
 #, no-c-format
 msgid "Galaxies"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 291
-#: finddialog.cpp:66 rc.cpp:1669 rc.cpp:3807 tools/obslistwizard.cpp:222
+#: finddialog.cpp:66 opssolarsystemui.ui:291 tools/obslistwizard.cpp:222
 #: tools/obslistwizard.cpp:242 tools/obslistwizard.cpp:383
-#: tools/wutdialog.cpp:110
+#: tools/obslistwizardui.ui:186 tools/wutdialog.cpp:110
 #, no-c-format
 msgid "Comets"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 354
-#: finddialog.cpp:67 rc.cpp:1690 rc.cpp:3810 tools/obslistwizard.cpp:223
+#: finddialog.cpp:67 opssolarsystemui.ui:354 tools/obslistwizard.cpp:223
 #: tools/obslistwizard.cpp:244 tools/obslistwizard.cpp:391
-#: tools/wutdialog.cpp:111
+#: tools/obslistwizardui.ui:191 tools/wutdialog.cpp:111
 #, no-c-format
 msgid "Asteroids"
 msgstr ""
@@ -705,9 +697,8 @@ msgstr ""
 msgid "Image Reduction Process..."
 msgstr ""
 
-#. i18n: file imagereductionui.ui line 16
-#: fitsprocess.cpp:349 fitsviewer.cpp:134 fitsviewer.cpp:138
-#: fitsviewer.cpp:992 rc.cpp:504
+#: fitsprocess.cpp:349 fitsviewer.cpp:134 fitsviewer.cpp:138 fitsviewer.cpp:996
+#: imagereductionui.ui:16
 #, no-c-format
 msgid "Image Reduction"
 msgstr ""
@@ -716,8 +707,7 @@ msgstr ""
 msgid "Welcome to KStars FITS Viewer"
 msgstr ""
 
-#. i18n: file histdialog.ui line 36
-#: fitsviewer.cpp:150 fitsviewer.cpp:154 rc.cpp:468
+#: fitsviewer.cpp:150 fitsviewer.cpp:154 histdialog.ui:36
 #, no-c-format
 msgid "Histogram"
 msgstr "Histogram"
@@ -726,54 +716,51 @@ msgstr "Histogram"
 msgid "&Default Zoom"
 msgstr ""
 
-#. i18n: file statform.ui line 16
-#: fitsviewer.cpp:165 rc.cpp:1765
+#: fitsviewer.cpp:165 statform.ui:16
 #, no-c-format
 msgid "Statistics"
 msgstr "Ystadegau"
 
-#. i18n: file fitsheaderdialog.ui line 16
-#: fitsviewer.cpp:166 rc.cpp:381
+#: fitsheaderdialog.ui:16 fitsviewer.cpp:166
 #, no-c-format
 msgid "FITS Header"
 msgstr ""
 
-#: fitsviewer.cpp:214 fitsviewer.cpp:233 fitsviewer.cpp:499
+#: fitsviewer.cpp:214 fitsviewer.cpp:233 fitsviewer.cpp:503
 msgid "Save Changes to FITS?"
 msgstr ""
 
-#: fitsviewer.cpp:215 fitsviewer.cpp:234 fitsviewer.cpp:500
+#: fitsviewer.cpp:215 fitsviewer.cpp:234 fitsviewer.cpp:504
 msgid ""
 "The current FITS file has unsaved changes.  Would you like to save before "
 "closing it?"
 msgstr ""
 
 #: fitsviewer.cpp:314
-msgid ""
-"Unable to read FITS data from file. %1.\n"
+msgid "Unable to read FITS data from file. %1.\n"
 msgstr ""
 
-#: fitsviewer.cpp:571
+#: fitsviewer.cpp:575
 msgid "Error: Low memory. Saving is aborted."
 msgstr ""
 
-#: fitsviewer.cpp:578
+#: fitsviewer.cpp:582
 msgid "Error during open of FITS file."
 msgstr ""
 
-#: fitsviewer.cpp:685
+#: fitsviewer.cpp:689
 msgid "File saved."
 msgstr "Cadwyd y ffeil."
 
-#: fitsviewer.cpp:874
+#: fitsviewer.cpp:878
 msgid " [modified]"
 msgstr ""
 
-#: fitsviewer.cpp:995
+#: fitsviewer.cpp:999
 msgid "Image Filter"
 msgstr ""
 
-#: fitsviewer.cpp:998 ksmoon.cpp:216
+#: fitsviewer.cpp:1002 ksmoon.cpp:216
 msgid "unknown"
 msgstr "anhysbys"
 
@@ -811,22 +798,20 @@ msgstr ""
 
 #: fovdialog.cpp:187
 msgid ""
-"You have removed all FOV symbols.  If the list remains empty when you exit this "
-"tool, the default symbols will be regenerated."
+"You have removed all FOV symbols.  If the list remains empty when you exit "
+"this tool, the default symbols will be regenerated."
 msgstr ""
 
 #: fovdialog.cpp:188
 msgid "FOV list is empty"
 msgstr ""
 
-#. i18n: file newfovui.ui line 16
-#: fovdialog.cpp:196 rc.cpp:851
+#: fovdialog.cpp:196 newfovui.ui:16
 #, no-c-format
 msgid "New FOV Indicator"
 msgstr ""
 
-#. i18n: file imagereductionui.ui line 43
-#: imagereductiondlg.cpp:55 rc.cpp:507
+#: imagereductiondlg.cpp:55 imagereductionui.ui:43
 #, no-c-format
 msgid "Dark Frames"
 msgstr ""
@@ -861,8 +846,8 @@ msgstr ""
 
 #: imagesequence.cpp:328 imagesequence.cpp:406 imagesequence.cpp:464
 msgid ""
-"%1 is disconnected. Establish a connection to the device using the INDI Control "
-"Panel."
+"%1 is disconnected. Establish a connection to the device using the INDI "
+"Control Panel."
 msgstr ""
 
 #: imagesequence.cpp:476
@@ -875,8 +860,8 @@ msgstr ""
 
 #: imagesequence.cpp:571
 msgid ""
-"Expose duration is invalid. %1 supports expose durations from %2 to %3 seconds "
-"only."
+"Expose duration is invalid. %1 supports expose durations from %2 to %3 "
+"seconds only."
 msgstr ""
 
 #: imageviewer.cpp:40
@@ -899,20 +884,17 @@ msgstr ""
 msgid "Run Service"
 msgstr ""
 
-#. i18n: file devmanager.ui line 206
-#: indidriver.cpp:74 rc.cpp:342
+#: devmanager.ui:206 indidriver.cpp:74
 #, no-c-format
 msgid "Stop Service"
 msgstr "Stopio Gwasanaeth"
 
-#. i18n: file devmanager.ui line 343
-#: indidriver.cpp:83 rc.cpp:372
+#: devmanager.ui:343 indidriver.cpp:83
 #, no-c-format
 msgid "Connect"
 msgstr "Cysylltu"
 
-#. i18n: file devmanager.ui line 354
-#: indidriver.cpp:84 rc.cpp:375
+#: devmanager.ui:354 indidriver.cpp:84
 #, no-c-format
 msgid "Disconnect"
 msgstr "Datgysylltu"
@@ -972,8 +954,8 @@ msgstr ""
 
 #: indimenu.cpp:96 indimenu.cpp:102
 msgid ""
-"No INDI devices currently running. To run devices, please select devices from "
-"the Device Manager in the devices menu."
+"No INDI devices currently running. To run devices, please select devices "
+"from the Device Manager in the devices menu."
 msgstr ""
 
 #: indiproperty.cpp:181
@@ -1032,6 +1014,10 @@ msgstr "Mae %1 ar-lein."
 msgid "%1 is online and ready."
 msgstr ""
 
+#: indistd.cpp:813
+msgid "Cancel"
+msgstr ""
+
 #: infoboxes.cpp:343
 msgid ""
 "_: Local Time\n"
@@ -1120,8 +1106,8 @@ msgid ""
 "Callisto"
 msgstr ""
 
-#. i18n: file tools/modcalcplanetsdlg.ui line 129
-#: ksmoon.cpp:30 rc.cpp:3166 rc.cpp:3277 tools/modcalcplanets.cpp:385
+#: ksmoon.cpp:30 tools/modcalcplanets.cpp:385 tools/modcalcplanetsdlg.ui:129
+#: tools/modcalcplanetsdlg.ui:982
 #, no-c-format
 msgid "Moon"
 msgstr ""
@@ -1186,13 +1172,20 @@ msgstr ""
 msgid "Installing comet and asteroid ephemerides..."
 msgstr ""
 
+#: ksnewstuff.h:68
+msgid "Uploading data is not possible yet!"
+msgstr ""
+
 #: ksplanetbase.cpp:139
 msgid "KSPlanetBase::setRearth():  Error: Need an Earth pointer.  ("
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 102
-#: kspluto.cpp:33 rc.cpp:1576 rc.cpp:3163 rc.cpp:3274
-#: tools/modcalcplanets.cpp:383
+#: ksplanetbase.h:83 skyobject.cpp:35
+msgid "unnamed"
+msgstr "di-enw"
+
+#: kspluto.cpp:33 opssolarsystemui.ui:102 tools/modcalcplanets.cpp:383
+#: tools/modcalcplanetsdlg.ui:124 tools/modcalcplanetsdlg.ui:977
 #, no-c-format
 msgid "Pluto"
 msgstr ""
@@ -1219,8 +1212,7 @@ msgstr ""
 msgid "Spectral type: %1"
 msgstr ""
 
-#. i18n: file details_links.ui line 137
-#: kspopupmenu.cpp:132 rc.cpp:210
+#: details_links.ui:137 kspopupmenu.cpp:132
 #, no-c-format
 msgid "Add Link..."
 msgstr ""
@@ -1319,8 +1311,8 @@ msgstr ""
 msgid "Transit time: %1"
 msgstr ""
 
-#. i18n: file tools/modcalcplanetsdlg.ui line 134
-#: kssun.cpp:26 rc.cpp:3169 rc.cpp:3280 tools/modcalcplanets.cpp:384
+#: kssun.cpp:26 tools/modcalcplanets.cpp:384 tools/modcalcplanetsdlg.ui:134
+#: tools/modcalcplanetsdlg.ui:987
 #, no-c-format
 msgid "Sun"
 msgstr "Haul"
@@ -1329,23714 +1321,28753 @@ msgstr "Haul"
 msgid "Stop &Tracking"
 msgstr ""
 
-#: kstars_i18n.cpp:2
+#: kstarsactions.cpp:368
+msgid "Catalogs"
+msgstr ""
+
+#: kstarsactions.cpp:370
+msgid "Guides"
+msgstr ""
+
+#: kstarsactions.cpp:371
+msgid "Colors"
+msgstr "Lliwiau"
+
+#: kstarsactions.cpp:409
+msgid "KStars::slotFind() - Not enough memory for dialog"
+msgstr ""
+
+#: kstarsactions.cpp:473
+msgid ""
+"Warning:  You are about to execute a remote shell script on your machine. "
+msgstr ""
+
+#: kstarsactions.cpp:474
+msgid ""
+"If you absolutely trust the source of this script, press Continue to execute "
+"the script; "
+msgstr ""
+
+#: kstarsactions.cpp:475
+msgid "to save the file without executing it, press Save; "
+msgstr ""
+
+#: kstarsactions.cpp:476
+msgid "to cancel the download, press Cancel. "
+msgstr ""
+
+#: kstarsactions.cpp:478
+msgid "Really Execute Remote Script?"
+msgstr ""
+
+#: kstarsactions.cpp:488
+msgid "Save location is invalid. Try another location?"
+msgstr ""
+
+#: kstarsactions.cpp:489
+msgid "Invalid Save Location"
+msgstr ""
+
+#: kstarsactions.cpp:489 tools/observinglist.cpp:583
+msgid "Try Another"
+msgstr ""
+
+#: kstarsactions.cpp:489 tools/observinglist.cpp:583
+#: tools/observinglist.cpp:632
+msgid "Do Not Try"
+msgstr ""
+
+#: kstarsactions.cpp:509
+msgid "Could not download the file."
+msgstr ""
+
+#: kstarsactions.cpp:509 tools/scriptbuilder.cpp:757
+msgid "Download Error"
+msgstr ""
+
+#: kstarsactions.cpp:531 kstarsdata.cpp:2348 tools/observinglist.cpp:531
+#, c-format
+msgid "Could not open file %1"
+msgstr "Methwyd agor y ffeil %1"
+
+#: kstarsactions.cpp:556
+msgid ""
+"The selected script contains unrecognized elements,indicating that it was "
+"not created using the KStars script builder. This script may not function "
+"properly, and it may even contain malicious code. Would you like to execute "
+"it anyway?"
+msgstr ""
+
+#: kstarsactions.cpp:560
+msgid "Script Validation Failed"
+msgstr ""
+
+#: kstarsactions.cpp:560
+msgid "Run Nevertheless"
+msgstr ""
+
+#: kstarsactions.cpp:581
+msgid ""
+"You can save printer ink by using the \"Star Chart\" color scheme, which "
+"uses a white background. Would you like to temporarily switch to the Star "
+"Chart color scheme for printing?"
+msgstr ""
+
+#: kstarsactions.cpp:586
+msgid "Switch to Star Chart Colors?"
+msgstr ""
+
+#: kstarsactions.cpp:587
+#, fuzzy
+msgid "Switch Color Scheme"
+msgstr "Gwaredu Cynllun Lliw"
+
+#: kstarsactions.cpp:587
+msgid "Do Not Switch"
+msgstr ""
+
+#: kstarsactions.cpp:643 kstarsinit.cpp:96
+msgid "Engage &Tracking"
+msgstr ""
+
+#: kstarsactions.cpp:765
+msgid ""
+"_: The user should enter an angle for the field-of-view of the display\n"
+"Enter Desired Field-of-View Angle"
+msgstr ""
+
+#: kstarsactions.cpp:765
+msgid "Enter a field-of-view angle in degrees: "
+msgstr ""
+
+#: kstarsactions.cpp:853
+msgid "Could not open fov.dat for writing."
+msgstr ""
+
+#: kstarsactions.cpp:883 kstarsinit.cpp:338
+#, c-format
+msgid "Could not open file: %1"
+msgstr "Methwyd agor y ffeil : %1"
+
+#: kstarsactions.cpp:887 kstarsinit.cpp:342
+msgid "Edit FOV Symbols..."
+msgstr ""
+
+#: kstarsdata.cpp:129
+msgid "multiple star"
+msgstr ""
+
+#: kstarsdata.cpp:130
+msgid "planet"
+msgstr ""
+
+#: kstarsdata.cpp:131
+msgid "open cluster"
+msgstr ""
+
+#: kstarsdata.cpp:132
+msgid "globular cluster"
+msgstr ""
+
+#: kstarsdata.cpp:133
+msgid "gaseous nebula"
+msgstr ""
+
+#: kstarsdata.cpp:134
+msgid "planetary nebula"
+msgstr ""
+
+#: kstarsdata.cpp:135
+msgid "supernova remnant"
+msgstr ""
+
+#: kstarsdata.cpp:136
+msgid "galaxy"
+msgstr "galaeth"
+
+#: kstarsdata.cpp:137
+msgid "comet"
+msgstr ""
+
+#: kstarsdata.cpp:138
+msgid "asteroid"
+msgstr ""
+
+#: kstarsdata.cpp:139
+msgid "constellation"
+msgstr "cyfseriad"
+
+#: kstarsdata.cpp:436
+msgid "No star named %1 found."
+msgstr ""
+
+#: kstarsdata.cpp:519 kstarsdata.cpp:535
+msgid "Unable to parse boundary segment."
+msgstr ""
+
+#: kstarsdata.cpp:545
+#, fuzzy
+msgid "Bad Constellation Boundary data."
+msgstr "Constellation names"
+
+#: kstarsdata.cpp:587 kstarsdata.cpp:1842
+msgid "Loading Star Data (%1%)"
+msgstr ""
+
+#: kstarsdata.cpp:791 kstarsdata.cpp:1853
+msgid "Loading NGC/IC Data (%1%)"
+msgstr ""
+
+#: kstarsdata.cpp:887
+msgid "Unnamed Object"
+msgstr ""
+
+#: kstarsdata.cpp:1011
+msgid "No localized URL file; using default English file."
+msgstr ""
+
+#: kstarsdata.cpp:1026
+msgid ""
+"Failed to copy default URL file to locale folder, modifying default object "
+"links is not possible"
+msgstr ""
+
+#: kstarsdata.cpp:1145
+#, c-format
+msgid "Error adding catalog: %1"
+msgstr ""
+
+#: kstarsdata.cpp:1223
+msgid "Line %1 does not contain %2 fields.  Skipping it."
+msgstr ""
+
+#: kstarsdata.cpp:1230
+msgid ""
+"Some lines in the custom catalog could not be parsed; see error messages "
+"below."
+msgstr ""
+
+#: kstarsdata.cpp:1231
+msgid "To reject the file, press Cancel. "
+msgstr ""
+
+#: kstarsdata.cpp:1232
+msgid "To accept the file (ignoring unparsed lines), press Accept."
+msgstr ""
+
+#: kstarsdata.cpp:1234
+msgid "Some Lines in File Were Invalid"
+msgstr ""
+
+#: kstarsdata.cpp:1234
+msgid "Accept"
+msgstr "Derbyn"
+
+#: kstarsdata.cpp:1240
+msgid ""
+"No lines could be parsed from the specified file, see error messages below."
+msgstr ""
+
+#: kstarsdata.cpp:1242
+msgid "No Valid Data Found in File"
+msgstr ""
+
+#: kstarsdata.cpp:1249 kstarsdata.cpp:1252
+#, fuzzy, c-format
+msgid "Could not open custom data file: %1"
+msgstr "Methwyd agor y ffeil : %1"
+
+#: kstarsdata.cpp:1250
+msgid "Error opening file"
+msgstr "Gwall tra'n agor y ffeil"
+
+#: kstarsdata.cpp:1282
+msgid "Line %1, field %2: Unable to parse RA value: %3"
+msgstr ""
+
+#: kstarsdata.cpp:1291
+msgid "Line %1, field %2: Unable to parse Dec value: %3"
+msgstr ""
+
+#: kstarsdata.cpp:1303
+msgid "Line %1, field %2: Invalid object type: %3"
+msgstr ""
+
+#: kstarsdata.cpp:1305
+msgid "Must be one of 0, 1, 3, 4, 5, 6, 7, 8."
+msgstr ""
+
+#: kstarsdata.cpp:1310
+msgid "Line %1, field %2: Unable to parse Object type: %3"
+msgstr ""
+
+#: kstarsdata.cpp:1321
+msgid "Line %1, field %2: Unable to parse Magnitude: %3"
+msgstr ""
+
+#: kstarsdata.cpp:1332
+msgid "Line %1, field %2: Unable to parse Major Axis: %3"
+msgstr ""
+
+#: kstarsdata.cpp:1343
+msgid "Line %1, field %2: Unable to parse Minor Axis: %3"
+msgstr ""
+
+#: kstarsdata.cpp:1354
+msgid "Line %1, field %2: Unable to parse Position Angle: %3"
+msgstr ""
+
+#: kstarsdata.cpp:1402 kstarsdata.cpp:1411 kstarsdata.cpp:1420
+#: kstarsdata.cpp:1430 kstarsdata.cpp:1436 kstarsdata.cpp:1468
+#: kstarsdata.cpp:1473 kstarsdata.cpp:1484 kstarsdata.cpp:1490
+#: kstarsdata.cpp:1496 kstarsdata.cpp:1501 kstarsdata.cpp:1506
+#: kstarsdata.cpp:1511
+msgid "Parsing header: "
+msgstr ""
+
+#: kstarsdata.cpp:1403
+msgid "Extra Name field in header: %1.  Will be ignored"
+msgstr ""
+
+#: kstarsdata.cpp:1412
+msgid "Extra Prefix field in header: %1.  Will be ignored"
+msgstr ""
+
+#: kstarsdata.cpp:1421
+msgid "Extra Color field in header: %1.  Will be ignored"
+msgstr ""
+
+#: kstarsdata.cpp:1431
+msgid "Could not convert Epoch to float: %1.  Using 2000. instead"
+msgstr ""
+
+#: kstarsdata.cpp:1437
+msgid "Extra Epoch field in header: %1.  Will be ignored"
+msgstr ""
+
+#: kstarsdata.cpp:1469
+msgid "Duplicate data field descriptor \"%1\" will be ignored"
+msgstr ""
+
+#: kstarsdata.cpp:1474
+msgid "Invalid data field descriptor \"%1\" will be ignored"
+msgstr ""
+
+#: kstarsdata.cpp:1485
+msgid "No valid column descriptors found.  Exiting"
+msgstr ""
+
+#: kstarsdata.cpp:1491
+msgid "No data lines found after header.  Exiting."
+msgstr ""
+
+#: kstarsdata.cpp:1497
+msgid "No Catalog Name specified; setting to \"Custom\""
+msgstr ""
+
+#: kstarsdata.cpp:1502
+msgid "No Catalog Prefix specified; setting to \"CC\""
+msgstr ""
+
+#: kstarsdata.cpp:1507
+msgid "No Catalog Color specified; setting to Red"
+msgstr ""
+
+#: kstarsdata.cpp:1512
+msgid "No Catalog Epoch specified; assuming 2000."
+msgstr ""
+
+#: kstarsdata.cpp:1543
+msgid "Cities.dat: Ran out of fields.  Line was:"
+msgstr ""
+
+#: kstarsdata.cpp:1561 kstarsdata.cpp:1567 kstarsdata.cpp:1573
+#: kstarsdata.cpp:1586 kstarsdata.cpp:1592 kstarsdata.cpp:1598
+msgid ""
+"\n"
+"Cities.dat: Bad integer.  Line was:\n"
+msgstr ""
+
+#: kstarsdata.cpp:1580
+msgid ""
+"\n"
+"Cities.dat: Invalid latitude sign.  Line was:\n"
+msgstr ""
+
+#: kstarsdata.cpp:1605
+msgid ""
+"\n"
+"Cities.dat: Invalid longitude sign.  Line was:\n"
+msgstr ""
+
+#: kstarsdata.cpp:1623
+msgid ""
+"\n"
+"Cities.dat: Bad time zone.  Line was:\n"
+msgstr ""
+
+#: kstarsdata.cpp:1774
+msgid ""
+"The file %1 could not be found. KStars cannot run properly without this "
+"file. To continue loading, place the file in one of the following locations, "
+"then press Retry:\n"
+"\n"
+msgstr ""
+
+#: kstarsdata.cpp:1780
+msgid "Otherwise, press Cancel to shutdown."
+msgstr ""
+
+#: kstarsdata.cpp:1781
+#, c-format
+msgid "Critical File Not Found: %1"
+msgstr ""
+
+#: kstarsdata.cpp:1783
+msgid ""
+"The file %1 could not be found. KStars can still run without this file. "
+"However, to avoid seeing this message in the future, you can place the file "
+"in one of the following locations, then press Retry:\n"
+"\n"
+msgstr ""
+
+#: kstarsdata.cpp:1789
+msgid "Otherwise, press Cancel to continue loading without this file."
+msgstr ""
+
+#: kstarsdata.cpp:1790
+#, c-format
+msgid "Non-Critical File Not Found: %1"
+msgstr ""
+
+#: kstarsdata.cpp:1793
+msgid "Retry"
+msgstr "Ail-geisio..."
+
+#: kstarsdata.cpp:1816
+msgid "Reading Time Zone Rules"
+msgstr ""
+
+#: kstarsdata.cpp:1832
+msgid "Loading City Data"
+msgstr ""
+
+#: kstarsdata.cpp:1857
+#, fuzzy
+msgid "Loading Custom catalogs"
+msgstr "Ychwanegu Catalog"
+
+#: kstarsdata.cpp:1865
+msgid "Loading Constellations"
+msgstr ""
+
+#: kstarsdata.cpp:1872
+msgid "Loading Constellation Names"
+msgstr ""
+
+#: kstarsdata.cpp:1879
+#, fuzzy
+msgid "Loading Constellation Boundaries"
+msgstr "Defnyddio enwau cyfseriadau Lladin"
+
+#: kstarsdata.cpp:1886
+msgid "Loading Milky Way"
+msgstr ""
+
+#: kstarsdata.cpp:1893
+msgid "Creating Planets"
+msgstr ""
+
+#: kstarsdata.cpp:1902
+msgid "Creating Asteroids and Comets"
+msgstr ""
+
+#: kstarsdata.cpp:1912
+msgid "Creating Moon"
+msgstr ""
+
+#: kstarsdata.cpp:1920
+msgid "Loading Image URLs"
+msgstr ""
+
+#: kstarsdata.cpp:1934
+msgid "Loading Information URLs"
+msgstr ""
+
+#: kstarsdata.cpp:2447
+msgid "Could not set time: %1 / %2 / %3 ; %4:%5:%6"
+msgstr ""
+
+#: kstarsdata.cpp:2562
+msgid "Could not set location named %1, %2, %3"
+msgstr ""
+
+#: kstarsdcop.cpp:117
+msgid "Error [DCOP waitForKey()]: Invalid key requested."
+msgstr ""
+
+#: kstarsdcop.cpp:177 kstarsdcop.cpp:180
+msgid "Error [DCOP setGeoLocation]: city "
+msgstr ""
+
+#: kstarsdcop.cpp:178 kstarsdcop.cpp:181
+msgid " not found in database."
+msgstr ""
+
+#: kstarsdcop.cpp:349 opscolors.cpp:47 tools/scriptbuilder.cpp:699
+msgid ""
+"_: use default color scheme\n"
+"Default Colors"
+msgstr ""
+
+#: kstarsdcop.cpp:350 opscolors.cpp:48 tools/scriptbuilder.cpp:700
+msgid ""
+"_: use 'star chart' color scheme\n"
+"Star Chart"
+msgstr ""
+
+#: kstarsdcop.cpp:351 opscolors.cpp:49 tools/scriptbuilder.cpp:701
+msgid ""
+"_: use 'night vision' color scheme\n"
+"Night Vision"
+msgstr ""
+
+#: kstarsdcop.cpp:368
+msgid "Unable to load color scheme named %1. Also tried %2."
+msgstr ""
+
+#: kstarsdcop.cpp:421 main.cpp:82
+msgid "Could not parse image format of %1; assuming PNG."
+msgstr ""
+
+#: kstarsdcop.cpp:450
+msgid "Error: Unable to save image: %1 "
+msgstr "Fazi : Methu cadw'r ddelwedd : %1 "
+
+#: kstarsdcop.cpp:451
+#, c-format
+msgid "Image saved to file: %1"
+msgstr ""
+
+#: kstarsdcop.cpp:470
+msgid "Print Sky"
+msgstr ""
+
+#: kstarsinit.cpp:51
+#, fuzzy
+msgid "&New Window"
+msgstr "&Cau'r Ffenestr"
+
+#: kstarsinit.cpp:53
+msgid "&Close Window"
+msgstr "&Cau'r Ffenestr"
+
+#: kstarsinit.cpp:55
+msgid "&Download Data..."
+msgstr ""
+
+#: kstarsinit.cpp:57
+msgid "Open FITS..."
+msgstr ""
+
+#: kstarsinit.cpp:58
+msgid "&Save Sky Image..."
+msgstr ""
+
+#: kstarsinit.cpp:60
+msgid "&Run Script..."
+msgstr ""
+
+#: kstarsinit.cpp:66
+msgid "Set Time to &Now"
+msgstr ""
+
+#: kstarsinit.cpp:68
+msgid ""
+"_: set Clock to New Time\n"
+"&Set Time..."
+msgstr ""
+
+#: kstarsinit.cpp:70
+msgid "Stop &Clock"
+msgstr ""
+
+#: kstarsinit.cpp:71
+msgid "Start &Clock"
+msgstr ""
+
+#: kstarsinit.cpp:73
+msgid "Start Clock"
+msgstr ""
+
+#: kstarsinit.cpp:74
+msgid "Stop Clock"
+msgstr ""
+
+#: kstarsinit.cpp:81
+msgid "&Zenith"
+msgstr ""
+
+#: kstarsinit.cpp:83
+msgid "&North"
+msgstr "&Gogledd"
+
+#: kstarsinit.cpp:85
+msgid "&East"
+msgstr "&Dwyrain"
+
+#: kstarsinit.cpp:87
+msgid "&South"
+msgstr "&De"
+
+#: kstarsinit.cpp:89
+msgid "&West"
+msgstr "&Gorllewin"
+
+#: kstarsinit.cpp:93
+msgid "&Find Object..."
+msgstr ""
+
+#: kstarsinit.cpp:94
+msgid "Find object"
+msgstr ""
+
+#: kstarsinit.cpp:99
+msgid "Set Focus &Manually..."
+msgstr ""
+
+#: kstarsinit.cpp:107
+msgid "&Zoom to Angular Size..."
+msgstr ""
+
+#: kstarsinit.cpp:109
+msgid "Horizontal &Coordinates"
+msgstr ""
+
+#: kstarsinit.cpp:109
+msgid "Equatorial &Coordinates"
+msgstr ""
+
+#: kstarsinit.cpp:122
+msgid ""
+"_: Show the information boxes\n"
+"Show &Info Boxes"
+msgstr ""
+
+#: kstarsinit.cpp:128
+msgid ""
+"_: Show time-related info box\n"
+"Show &Time Box"
+msgstr ""
+
+#: kstarsinit.cpp:133
+msgid ""
+"_: Show focus-related info box\n"
+"Show &Focus Box"
+msgstr ""
+
+#: kstarsinit.cpp:138
+msgid ""
+"_: Show location-related info box\n"
+"Show &Location Box"
+msgstr ""
+
+#: kstarsinit.cpp:144
+msgid "Show Main Toolbar"
+msgstr "Dangos y Prif Bar Offer"
+
+#: kstarsinit.cpp:148
+msgid "Show View Toolbar"
+msgstr "Dangos Bar Offer Golwg"
+
+#: kstarsinit.cpp:153
+msgid "Show Statusbar"
+msgstr "Dangos bar cyflwr"
+
+#: kstarsinit.cpp:157
+msgid "Show Az/Alt Field"
+msgstr ""
+
+#: kstarsinit.cpp:161
+msgid "Show RA/Dec Field"
+msgstr ""
+
+#: kstarsinit.cpp:166
+msgid "C&olor Schemes"
+msgstr ""
+
+#: kstarsinit.cpp:167
+msgid "&Default"
+msgstr "&Rhagosod"
+
+#: kstarsinit.cpp:168
+msgid "&Star Chart"
+msgstr ""
+
+#: kstarsinit.cpp:169
+msgid "&Night Vision"
+msgstr ""
+
+#: kstarsinit.cpp:170
+msgid "&Moonless Night"
+msgstr ""
+
+#: kstarsinit.cpp:190
+msgid "&FOV Symbols"
+msgstr ""
+
+#: kstarsinit.cpp:193
+msgid ""
+"_: Location on Earth\n"
+"&Geographic..."
+msgstr ""
+
+#: kstarsinit.cpp:199
+msgid "Startup Wizard..."
+msgstr ""
+
+#: kstarsinit.cpp:203
+msgid "Calculator..."
+msgstr "Cyfrifiannell ..."
+
+#: kstarsinit.cpp:206
+msgid "Observing List..."
+msgstr ""
+
+#: kstarsinit.cpp:211
+msgid "AAVSO Light Curves..."
+msgstr ""
+
+#: kstarsinit.cpp:214
+msgid "Altitude vs. Time..."
+msgstr ""
+
+#: kstarsinit.cpp:216
+msgid "What's up Tonight..."
+msgstr ""
+
+#: kstarsinit.cpp:221
+msgid "Script Builder..."
+msgstr ""
+
+#: kstarsinit.cpp:223
+msgid "Solar System..."
+msgstr ""
+
+#: kstarsinit.cpp:225
+msgid "Jupiter's Moons..."
+msgstr ""
+
+#: kstarsinit.cpp:229
+msgid "Telescope Wizard..."
+msgstr ""
+
+#: kstarsinit.cpp:230
+msgid "Telescope Properties..."
+msgstr ""
+
+#: kstarsinit.cpp:231
+msgid "Device Manager..."
+msgstr "Rheolwr Dyfeisiau"
+
+#: kstarsinit.cpp:233
+msgid "Capture Image Sequence..."
+msgstr ""
+
+#: kstarsinit.cpp:236
+msgid "INDI Control Panel..."
+msgstr ""
+
+#: kstarsinit.cpp:239
+msgid "Configure INDI..."
+msgstr ""
+
+#: kstarsinit.cpp:244
+msgid "Tip of the Day"
+msgstr "Awgrymiad y Dydd"
+
+#: kstarsinit.cpp:248
+msgid "&Handbook"
+msgstr ""
+
+#: kstarsinit.cpp:256
+msgid "Toggle Stars"
+msgstr ""
+
+#: kstarsinit.cpp:260
+msgid "Toggle Deep Sky Objects"
+msgstr ""
+
+#: kstarsinit.cpp:264
+msgid "Toggle Solar System"
+msgstr ""
+
+#: kstarsinit.cpp:268
+msgid "Toggle Constellation Lines"
+msgstr ""
+
+#: kstarsinit.cpp:272
+msgid "Toggle Constellation Names"
+msgstr ""
+
+#: kstarsinit.cpp:276
+#, fuzzy
+msgid "Toggle Constellation Boundaries"
+msgstr "Constellation names"
+
+#: kstarsinit.cpp:280
+msgid "Toggle Milky Way"
+msgstr ""
+
+#: kstarsinit.cpp:284
+msgid "Toggle Coordinate Grid"
+msgstr ""
+
+#: kstarsinit.cpp:288
+msgid "Toggle Ground"
+msgstr ""
+
+#: kstarsinit.cpp:309
+msgid "Could not open fov.dat."
+msgstr ""
+
+#: kstarsinit.cpp:312
+msgid ""
+"_: Do not use a field-of-view indicator\n"
+"No FOV"
+msgstr ""
+
+#: kstarsinit.cpp:313
+msgid ""
+"_: use field-of-view for binoculars\n"
+"7x35 Binoculars"
+msgstr ""
+
+#: kstarsinit.cpp:314
+msgid ""
+"_: use 1-degree field-of-view indicator\n"
+"One Degree"
+msgstr ""
+
+#: kstarsinit.cpp:315
+msgid ""
+"_: use HST field-of-view indicator\n"
+"HST WFPC2"
+msgstr ""
+
+#: kstarsinit.cpp:316
+msgid ""
+"_: use Radiotelescope HPBW\n"
+"30m at 1.3cm"
+msgstr ""
+
+#: kstarsinit.cpp:346
+msgid " Welcome to KStars "
+msgstr ""
+
+#: kstarsinit.cpp:407
+msgid "Initial Position is Below Horizon"
+msgstr ""
+
+#: kstarsinit.cpp:408
+msgid ""
+"The initial position is below the horizon.\n"
+"Would you like to reset to the default position?"
+msgstr ""
+
+#: kstarsinit.cpp:410
+#, fuzzy
+msgid "Reset Position"
+msgstr "Lleoliad"
+
+#: kstarsinit.cpp:410
+msgid "Do Not Reset"
+msgstr ""
+
+#: kstarsinit.cpp:527 kstarsinit.cpp:543 skymap.cpp:175 skymap.cpp:489
+#: skymapevents.cpp:396 skymapevents.cpp:508 skymapevents.cpp:593
+msgid "nothing"
+msgstr "dim"
+
+#: kstarssplash.cpp:29
+msgid "Loading KStars..."
+msgstr ""
+
+#: kstarssplash.cpp:63
+msgid "Welcome to KStars. Please stand by while loading..."
+msgstr ""
+
+#: locationdialog.cpp:40
+msgid "Set Geographic Location"
+msgstr ""
+
+#: locationdialog.cpp:47
+msgid "Choose City"
+msgstr ""
+
+#: locationdialog.cpp:48
+msgid "Choose/Modify Coordinates"
+msgstr ""
+
+#: locationdialog.cpp:70
+msgid "City filter:"
+msgstr ""
+
+#: locationdialog.cpp:72
+msgid "Province filter:"
+msgstr ""
+
+#: locationdialog.cpp:74
+msgid "Country filter:"
+msgstr ""
+
+#: kswizardui.ui:278 locationdialog.cpp:90 tools/argsetgeolocation.ui:67
+#, no-c-format
+msgid "City:"
+msgstr "Dinas:"
+
+#: locationdialog.cpp:91
+msgid "State/Province:"
+msgstr "Talaith :"
+
+#: kswizardui.ui:262 locationdialog.cpp:92 tools/argsetgeolocation.ui:75
+#, no-c-format
+msgid "Country:"
+msgstr "Gwlad:"
+
+#: 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/modcalcvlsrdlg.ui:195 tools/modcalcvlsrdlg.ui:754
+#, no-c-format
+msgid "Longitude:"
+msgstr "Hydred:"
+
+#: 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/modcalcvlsrdlg.ui:187 tools/modcalcvlsrdlg.ui:782
+#, no-c-format
+msgid "Latitude:"
+msgstr "Lledred:"
+
+#: locationdialog.cpp:95
+msgid ""
+"_: timezone offset from universal time\n"
+"UT offset:"
+msgstr ""
+
+#: locationdialog.cpp:96
+msgid ""
+"_: daylight savings time rule\n"
+"DST rule:"
+msgstr ""
+
+#: locationdialog.cpp:120 tools/altvstimeui.ui:238
+#, no-c-format
+msgid "Clear Fields"
+msgstr ""
+
+#: locationdialog.cpp:121
+msgid "Explain DST Rules"
+msgstr ""
+
+#: locationdialog.cpp:240 locationdialog.cpp:281 locationdialog.cpp:435
+#, c-format
+msgid ""
+"_n: One city matches search criteria\n"
+"%n cities match search criteria"
+msgstr ""
+
+#: locationdialog.cpp:335
+msgid "This City already exists in the database."
+msgstr ""
+
+#: locationdialog.cpp:336
+msgid "Error: Duplicate Entry"
+msgstr "Fazi : Cofnod Dyblyg"
+
+#: locationdialog.cpp:346
+msgid "All fields (except province) must be filled to add this location."
+msgstr ""
+
+#: locationdialog.cpp:347
+msgid "Fields are Empty"
+msgstr ""
+
+#: locationdialog.cpp:352
+msgid "Could not parse coordinates."
+msgstr ""
+
+#: locationdialog.cpp:353
+msgid "Bad Coordinates"
+msgstr ""
+
+#: locationdialog.cpp:357
+msgid "Really override original data for this city?"
+msgstr ""
+
+#: locationdialog.cpp:358
+msgid "Override Existing Data?"
+msgstr ""
+
+#: locationdialog.cpp:358
+#, fuzzy
+msgid "Override Data"
+msgstr "&Trosysgrifo"
+
+#: locationdialog.cpp:358
+msgid "Do Not Override"
+msgstr ""
+
+#: locationdialog.cpp:374
+msgid ""
+"Local cities database could not be opened.\n"
+"Location will not be recorded."
+msgstr ""
+
+#: locationdialog.cpp:477
+msgid " Start Date (Start Time)  /  Revert Date (Revert Time)"
+msgstr ""
+
+#: locationdialog.cpp:479
+msgid "--: No DST correction"
+msgstr ""
+
+#: locationdialog.cpp:480
+msgid "AU: last Sun in Oct. (02:00) / last Sun in Mar. (02:00)"
+msgstr ""
+
+#: locationdialog.cpp:481
+msgid "BZ:  2nd Sun in Oct. (00:00) /  3rd Sun in Feb. (00:00)"
+msgstr ""
+
+#: locationdialog.cpp:482
+msgid "CH:  2nd Sun in Apr. (00:00) /  2nd Sun in Sep. (00:00)"
+msgstr ""
+
+#: locationdialog.cpp:483
+msgid "CL:  2nd Sun in Oct. (04:00) /  2nd Sun in Mar. (04:00)"
+msgstr ""
+
+#: locationdialog.cpp:484
+msgid "CZ:  1st Sun in Oct. (02:45) /  3rd Sun in Mar. (02:45)"
+msgstr ""
+
+#: locationdialog.cpp:485
+msgid "EE: Last Sun in Mar. (00:00) / Last Sun in Oct. (02:00)"
+msgstr ""
+
+#: locationdialog.cpp:486
+msgid "EG: Last Fri in Apr. (00:00) / Last Thu in Sep. (00:00)"
+msgstr ""
+
+#: locationdialog.cpp:487
+msgid "EU: Last Sun in Mar. (01:00) / Last Sun in Oct. (01:00)"
+msgstr ""
+
+#: locationdialog.cpp:488
+msgid "FK:  1st Sun in Sep. (02:00) /  3rd Sun in Apr. (02:00)"
+msgstr ""
+
+#: locationdialog.cpp:489
+msgid "HK:  2nd Sun in May  (03:30) /  3rd Sun in Oct. (03:30)"
+msgstr ""
+
+#: locationdialog.cpp:490
+msgid "IQ: Apr 1 (03:00) / Oct. 1 (00:00)"
+msgstr ""
+
+#: locationdialog.cpp:491
+msgid "IR: Mar 21 (00:00) / Sep. 22 (00:00)"
+msgstr ""
+
+#: locationdialog.cpp:492
+msgid "JD: Last Thu in Mar. (00:00) / Last Thu in Sep. (00:00)"
+msgstr ""
+
+#: locationdialog.cpp:493
+msgid "LB: Last Sun in Mar. (00:00) / Last Sun in Oct. (00:00)"
+msgstr ""
+
+#: locationdialog.cpp:494
+msgid "MX:  1st Sun in May  (02:00) / Last Sun in Sep. (02:00)"
+msgstr ""
+
+#: locationdialog.cpp:495
+msgid "NB:  1st Sun in Sep. (02:00) /  1st Sun in Apr. (02:00)"
+msgstr ""
+
+#: locationdialog.cpp:496
+msgid "NZ:  1st Sun in Oct. (02:00) /  3rd Sun in Mar. (02:00)"
+msgstr ""
+
+#: locationdialog.cpp:497
+msgid "PY:  1st Sun in Oct. (00:00) /  1st Sun in Mar. (00:00)"
+msgstr ""
+
+#: locationdialog.cpp:498
+msgid "RU: Last Sun in Mar. (02:00) / Last Sun in Oct. (02:00)"
+msgstr ""
+
+#: locationdialog.cpp:499
+msgid "SK:  2nd Sun in May  (00:00) /  2nd Sun in Oct. (00:00)"
+msgstr ""
+
+#: locationdialog.cpp:500
+msgid "SY: Apr. 1 (00:00) / Oct. 1 (00:00)"
+msgstr ""
+
+#: locationdialog.cpp:501
+msgid "TG:  1st Sun in Nov. (02:00) / Last Sun in Jan. (02:00)"
+msgstr ""
+
+#: locationdialog.cpp:502
+msgid "TS:  1st Sun in Oct. (02:00) / Last Sun in Mar. (02:00)"
+msgstr ""
+
+#: locationdialog.cpp:503
+msgid "US:  1st Sun in Apr. (02:00) / Last Sun in Oct. (02:00)"
+msgstr ""
+
+#: locationdialog.cpp:504
+msgid "ZN: Apr. 1 (01:00) / Oct. 1 (00:00)"
+msgstr ""
+
+#: locationdialog.cpp:506
+msgid "Daylight Saving Time Rules"
+msgstr ""
+
+#: main.cpp:35
+msgid "Desktop Planetarium"
+msgstr "Planetariwm Penbwrdd"
+
+#: main.cpp:37
+msgid ""
+"Some images in KStars are for non-commercial use only.  See README.images."
+msgstr ""
+
+#: main.cpp:42
+msgid "Dump sky image to file"
+msgstr ""
+
+#: main.cpp:43
+msgid "Script to execute"
+msgstr ""
+
+#: main.cpp:44
+msgid "Width of sky image"
+msgstr ""
+
+#: main.cpp:45
+msgid "Height of sky image"
+msgstr ""
+
+#: main.cpp:46
+msgid "Filename for sky image"
+msgstr ""
+
+#: main.cpp:47
+msgid "Date and time"
+msgstr "Dyddiad ac amser"
+
+#: main.cpp:48
+msgid "Start with clock paused"
+msgstr ""
+
+#: main.cpp:54
+msgid "KStars"
+msgstr "KSer"
+
+#: main.cpp:56
+msgid "(c) 2001-2003, The KStars Team"
+msgstr ""
+
+#: main.cpp:71
+msgid "Dumping sky image"
+msgstr ""
+
+#: main.cpp:124
+msgid "Could not parse Date/Time string: "
+msgstr ""
+
+#: main.cpp:125
+msgid "Valid date formats: "
+msgstr ""
+
+#: main.cpp:129
+msgid "Using CPU date/time instead."
+msgstr ""
+
+#: main.cpp:154
+msgid "Script executed."
+msgstr ""
+
+#: main.cpp:156
+msgid "Could not execute script."
+msgstr ""
+
+#: main.cpp:168
+msgid "Unable to save image: %1 "
+msgstr "Methu cadw'r ddelwedd : %1 "
+
+#: main.cpp:169
+#, c-format
+msgid "Saved to file: %1"
+msgstr ""
+
+#: main.cpp:182
+msgid "Specified date (%1) is invalid.  Will use current CPU date instead."
+msgstr ""
+
+#: opscatalog.cpp:38
+msgid "Index Catalog (IC)"
+msgstr ""
+
+#: opscatalog.cpp:41
+msgid "New General Catalog (NGC)"
+msgstr ""
+
+#: opscatalog.cpp:44
+msgid "Messier Catalog (images)"
+msgstr ""
+
+#: opscatalog.cpp:47
+msgid "Messier Catalog (symbols)"
+msgstr ""
+
+#: opscolors.cpp:50 tools/scriptbuilder.cpp:702
+msgid ""
+"_: use 'moonless night' color scheme\n"
+"Moonless Night"
+msgstr ""
+
+#: opscolors.cpp:74
+msgid ""
+"_: use realistic star colors\n"
+"Real Colors"
+msgstr ""
+
+#: opscolors.cpp:75
+msgid ""
+"_: show stars as red circles\n"
+"Solid Red"
+msgstr "Coch Solet"
+
+#: opscolors.cpp:76
+msgid ""
+"_: show stars as black circles\n"
+"Solid Black"
+msgstr ""
+
+#: opscolors.cpp:77
+msgid ""
+"_: show stars as white circles\n"
+"Solid White"
+msgstr ""
+
+#: opscolors.cpp:126
+msgid ""
+"The specified color scheme file (%1) could not be found, or was corrupt."
+msgstr ""
+
+#: opscolors.cpp:127
+msgid "Could Not Set Color Scheme"
+msgstr ""
+
+#: opscolors.cpp:162
+msgid "New Color Scheme"
+msgstr ""
+
+#: opscolors.cpp:163
+msgid "Enter a name for the new color scheme:"
+msgstr ""
+
+#: opscolors.cpp:187
+msgid ""
+"Local color scheme index file could not be opened.\n"
+"Scheme cannot be removed."
+msgstr ""
+
+#: opscolors.cpp:216
+#, c-format
+msgid "Could not delete the file: %1"
+msgstr ""
+
+#: opscolors.cpp:217
+msgid "Error Deleting File"
+msgstr ""
+
+#: opscolors.cpp:227
+msgid "Could not find an entry named %1 in colors.dat."
+msgstr ""
+
+#: opscolors.cpp:228
+msgid "Scheme Not Found"
+msgstr ""
+
+#: planetcatalog.cpp:49 tools/modcalcplanets.cpp:101
+#: tools/modcalcplanets.cpp:377 tools/modcalcplanets.cpp:514
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: tools/modcalcplanetsdlg.ui:972
+#, no-c-format
+msgid "Neptune"
+msgstr ""
+
+#: simclock.cpp:129
+msgid "Stopping the timer"
+msgstr ""
+
+#: simclock.cpp:147
+msgid "Starting the timer"
+msgstr ""
+
+#: simclock.cpp:165
+msgid "Setting clock:  UTC: %1  JD: %2"
+msgstr ""
+
+#: simclock.cpp:169
+msgid "Cannot set SimClock:  Invalid Date/Time."
+msgstr ""
+
+#: simclock.cpp:175
+msgid "New clock scale: %1 sec"
+msgstr ""
+
+#: skymap.cpp:508
+msgid "Requested Position Below Horizon"
+msgstr ""
+
+#: skymap.cpp:509
+msgid ""
+"The requested position is below the horizon.\n"
+"Would you like to go there anyway?"
+msgstr ""
+
+#: skymap.cpp:511
+msgid "Go Anyway"
+msgstr ""
+
+#: skymap.cpp:511
+#, fuzzy
+msgid "Keep Position"
+msgstr "Lleoliad"
+
+#: skymap.cpp:602 skymap.cpp:644
+msgid ""
+"Digitized Sky Survey image provided by the Space Telescope Science Institute."
+msgstr ""
+
+#: skymap.cpp:670 skymap.cpp:674
+msgid "Angular distance: "
+msgstr ""
+
+#: skymap.cpp:741
+msgid "No object selected."
+msgstr ""
+
+#: skymap.cpp:1337
+msgid ""
+"Custom image-links file could not be opened.\n"
+"Link cannot be recorded for future sessions."
+msgstr ""
+
+#: skymap.cpp:1355
+msgid ""
+"Custom information-links file could not be opened.\n"
+"Link cannot be recorded for future sessions."
+msgstr ""
+
+#: skymap.cpp:1355
+msgid "Could not Open File"
+msgstr "Methwyd agor y ffeil"
+
+#: skymapdraw.cpp:932
+msgid ""
+"_: North\n"
+"N"
+msgstr "N"
+
+#: skymapdraw.cpp:942
+msgid ""
+"_: Northeast\n"
+"NE"
+msgstr "Gogledd Ddwyrain"
+
+#: skymapdraw.cpp:952
+msgid ""
+"_: East\n"
+"E"
+msgstr "Dwyrain"
+
+#: skymapdraw.cpp:962
+msgid ""
+"_: Southeast\n"
+"SE"
+msgstr "De Ddwyrain"
+
+#: skymapdraw.cpp:972
+msgid ""
+"_: South\n"
+"S"
+msgstr "Eil"
+
+#: skymapdraw.cpp:982
+msgid ""
+"_: Southwest\n"
+"SW"
+msgstr "De Orllewin"
+
+#: skymapdraw.cpp:992
+msgid ""
+"_: West\n"
+"W"
+msgstr "W"
+
+#: skymapdraw.cpp:1002
+msgid ""
+"_: Northwest\n"
+"NW"
+msgstr "Gogledd Orllewin"
+
+#: skyobject.cpp:36
+msgid "unnamed object"
+msgstr ""
+
+#: skyobject.cpp:312
+msgid "Star"
+msgstr "Seren"
+
+#: skyobject.cpp:313
+msgid "Catalog Star"
+msgstr ""
+
+#: skyobject.cpp:314
+msgid "Planet"
+msgstr ""
+
+#: skyobject.cpp:315
+msgid "Open Cluster"
+msgstr ""
+
+#: skyobject.cpp:316
+msgid "Globular Cluster"
+msgstr ""
+
+#: skyobject.cpp:317
+msgid "Gaseous Nebula"
+msgstr ""
+
+#: skyobject.cpp:318
+msgid "Planetary Nebula"
+msgstr ""
+
+#: skyobject.cpp:319
+msgid "Supernova Remnant"
+msgstr ""
+
+#: skyobject.cpp:320
+msgid "Galaxy"
+msgstr "Galaeth"
+
+#: skyobject.cpp:321
+msgid "Comet"
+msgstr ""
+
+#: skyobject.cpp:322
+msgid "Asteroid"
+msgstr ""
+
+#: skyobject.cpp:323
+msgid "Unknown Type"
+msgstr "Math anhysbys"
+
+#: skyobject.cpp:346
+msgid "Show HST Image"
+msgstr ""
+
+#: skyobject.cpp:347
+msgid "%1: Hubble Space Telescope, operated by STScI for NASA [public domain]"
+msgstr ""
+
+#: skyobject.cpp:350
+msgid "Show Spitzer Image"
+msgstr ""
+
+#: skyobject.cpp:351
+msgid "%1: Spitzer Space Telescope, courtesy NASA/JPL-Caltech [public domain]"
+msgstr ""
+
+#: skyobject.cpp:354
+msgid "Show SEDS Image"
+msgstr ""
+
+#: skyobject.cpp:355
+msgid "%1: SEDS, http://www.seds.org [free for non-commercial use]"
+msgstr ""
+
+#: skyobject.cpp:358
+msgid "Show KPNO AOP Image"
+msgstr ""
+
+#: skyobject.cpp:359
+msgid ""
+"%1: Advanced Observing Program at Kitt Peak National Observatory [free for "
+"non-commercial use; no physical reproductions]"
+msgstr ""
+
+#: skyobject.cpp:362
+msgid "Show NOAO Image"
+msgstr ""
+
+#: skyobject.cpp:363
+msgid ""
+"%1: National Optical Astronomy Observatories and AURA [free for non-"
+"commercial use]"
+msgstr ""
+
+#: skyobject.cpp:367
+msgid ""
+"%1: Very Large Telescope, operated by the European Southern Observatory "
+"[free for non-commercial use; no reproductions]"
+msgstr ""
+
+#: skyobject.cpp:370
+msgid "Show"
+msgstr "Dangos"
+
+#: skyobject.cpp:427
+msgid "user log file could not be opened."
+msgstr ""
+
+#: skypoint.cpp:94 skypoint.cpp:97
+msgid "Coordinate out of range."
+msgstr ""
+
+#: skypoint.cpp:245
+msgid "lat and LST parameters should only be used in KSPlanetBase objects."
+msgstr ""
+
+#: skypoint.cpp:592 skypoint.cpp:633 skypoint.cpp:646 skypoint.cpp:666
+#: skypoint.cpp:679 skypoint.cpp:716 skypoint.cpp:735 skypoint.cpp:748
+#: skypoint.cpp:764
+msgid "No constellation found for point: (%1, %2)"
+msgstr ""
+
+#: starobject.cpp:98
+msgid "alpha"
+msgstr "alffa"
+
+#: starobject.cpp:99
+msgid "beta"
+msgstr ""
+
+#: starobject.cpp:100
+msgid "gamma"
+msgstr "gama"
+
+#: starobject.cpp:101
+msgid "delta"
+msgstr ""
+
+#: starobject.cpp:102
+msgid "epsilon"
+msgstr ""
+
+#: starobject.cpp:103
+msgid "zeta"
+msgstr ""
+
+#: starobject.cpp:104
+msgid "eta"
+msgstr ""
+
+#: starobject.cpp:105
+msgid "theta"
+msgstr ""
+
+#: starobject.cpp:106
+msgid "iota"
+msgstr ""
+
+#: starobject.cpp:107
+msgid "kappa"
+msgstr ""
+
+#: starobject.cpp:108
+msgid "lambda"
+msgstr ""
+
+#: starobject.cpp:109
+msgid "mu"
+msgstr ""
+
+#: starobject.cpp:110
+msgid "nu"
+msgstr ""
+
+#: starobject.cpp:111
+msgid "xi"
+msgstr ""
+
+#: starobject.cpp:112
+msgid "omicron"
+msgstr ""
+
+#: starobject.cpp:113
+msgid "pi"
+msgstr ""
+
+#: starobject.cpp:114
+msgid "rho"
+msgstr ""
+
+#: starobject.cpp:117
+msgid "sigma"
+msgstr ""
+
+#: starobject.cpp:118
+msgid "tau"
+msgstr ""
+
+#: starobject.cpp:119
+msgid "upsilon"
+msgstr ""
+
+#: starobject.cpp:120
+msgid "phi"
+msgstr ""
+
+#: starobject.cpp:121
+msgid "chi"
+msgstr ""
+
+#: starobject.cpp:122
+msgid "psi"
+msgstr ""
+
+#: starobject.cpp:123
+msgid "omega"
+msgstr ""
+
+#: telescopeprop.cpp:93
+msgid "Telescope label is missing."
+msgstr ""
+
+#: telescopeprop.cpp:99
+msgid "Telescope driver is missing."
+msgstr ""
+
+#: telescopeprop.cpp:105
+msgid "Telescope driver version is missing."
+msgstr ""
+
+#: telescopeprop.cpp:161
+msgid "You need to restart KStars for changes to take effect."
+msgstr ""
+
+#: telescopeprop.cpp:231
+msgid "Are you sure you want to remove %1?"
+msgstr "A ydych yn sicr eich bod am waredu %1?"
+
+#: telescopewizardprocess.cpp:143
+msgid "Autoscan"
+msgstr ""
+
+#: telescopewizardprocess.cpp:143
+msgid ""
+"Please wait while KStars scan communication ports for attached telescopes.\n"
+"This process might take few minutes to complete."
+msgstr ""
+
+#: telescopewizardprocess.cpp:152
+msgid "Please wait while KStars tries to connect to your telescope..."
+msgstr ""
+
+#: telescopewizardprocess.cpp:154
+msgid "Error. Unable to locate telescope drivers."
+msgstr ""
+
+#: telescopewizardprocess.cpp:279
+msgid "Error: connection timeout. Unable to communicate with an INDI server"
+msgstr ""
+
+#: telescopewizardprocess.cpp:336
+msgid ""
+"Sorry. KStars failed to detect any attached telescopes, please check your "
+"settings and try again."
+msgstr ""
+
+#: thumbnaileditor.cpp:33
+msgid "Edit Thumbnail Image"
+msgstr ""
+
+#: thumbnaileditor.cpp:65
+msgid "Crop region: [%1,%2  %3x%4]"
+msgstr ""
+
+#: thumbnailpicker.cpp:47
+msgid "Choose Thumbnail Image"
+msgstr ""
+
+#: thumbnailpicker.cpp:101
+msgid "Loading images..."
+msgstr ""
+
+#: thumbnailpicker.cpp:163 thumbnailpickerui.ui:46
+#, no-c-format
+msgid "Search results:"
+msgstr ""
+
+#: thumbnailpicker.cpp:316
+#, fuzzy, c-format
+msgid "Failed to load image at %1"
+msgstr "Methu cadw'r ddelwedd : %1 "
+
+#: thumbnailpicker.cpp:317
+#, fuzzy
+msgid "Failed to Load Image"
+msgstr "Methu cadw'r ddelwedd : %1 "
+
+#: timedialog.cpp:33
+msgid ""
+"_: set clock to a new time\n"
+"Set Time"
+msgstr ""
+
+#: timedialog.cpp:75 tools/modcalcjddlg.ui:323
+#, no-c-format
+msgid "Now"
+msgstr "Nawr"
+
+#: timespinbox.cpp:121 timespinbox.cpp:122 timespinbox.cpp:123
+#: timespinbox.cpp:124 timespinbox.cpp:126 timespinbox.cpp:127
+#: timespinbox.cpp:128 timespinbox.cpp:129 timespinbox.cpp:130
+msgid ""
+"_: seconds\n"
+"secs"
+msgstr ""
+
+#: timespinbox.cpp:125
+msgid ""
+"_: second\n"
+"sec"
+msgstr ""
+
+#: timespinbox.cpp:131
+msgid ""
+"_: minute\n"
+"min"
+msgstr "mun"
+
+#: timespinbox.cpp:132 timespinbox.cpp:133 timespinbox.cpp:134
+#: timespinbox.cpp:135 timespinbox.cpp:136
+msgid ""
+"_: minutes\n"
+"mins"
+msgstr ""
+
+#: timespinbox.cpp:137
+msgid "hour"
+msgstr "awr"
+
+#: timespinbox.cpp:138 timespinbox.cpp:139 timespinbox.cpp:140
+#: timespinbox.cpp:141
+msgid ""
+"_: hours\n"
+"hrs"
+msgstr ""
+
+#: timespinbox.cpp:143 timespinbox.cpp:146 timespinbox.cpp:147
+#: timespinbox.cpp:148 tools/lcgenerator.cpp:207
+msgid "days"
+msgstr "diwrnod"
+
+#: timespinbox.cpp:145
+msgid "day"
+msgstr "diwrnod"
+
+#: timespinbox.cpp:149
+msgid "week"
+msgstr "wythnos"
+
+#: timespinbox.cpp:150 timespinbox.cpp:151
+msgid ""
+"_: weeks\n"
+"wks"
+msgstr ""
+
+#: timespinbox.cpp:152
+msgid "month"
+msgstr "mis"
+
+#: timespinbox.cpp:153 timespinbox.cpp:154 timespinbox.cpp:155
+#: timespinbox.cpp:156 timespinbox.cpp:157
+msgid ""
+"_: months\n"
+"mths"
+msgstr ""
+
+#: timespinbox.cpp:158
+msgid "year"
+msgstr "blwyddyn"
+
+#: timespinbox.cpp:159 timespinbox.cpp:160 timespinbox.cpp:161
+#: timespinbox.cpp:162 timespinbox.cpp:163 timespinbox.cpp:164
+#: timespinbox.cpp:165
+msgid ""
+"_: years\n"
+"yrs"
+msgstr ""
+
+#: timespinbox.cpp:209
+msgid "Reporting new timestep value: "
+msgstr ""
+
+#: timestepbox.cpp:32
+msgid "Adjust time step"
+msgstr ""
+
+#: timestepbox.cpp:33
+msgid "Adjust time step units"
+msgstr ""
+
+#: timestepbox.cpp:35
+msgid ""
+"Set the timescale for the simulation clock.  A setting of \"1 sec\" means "
+"the clock advances in real-time, keeping up perfectly with your CPU clock.  "
+"Higher values make the simulation clock run faster, lower values make it run "
+"slower.  Negative values make it run backwards.\n"
+"\n"
+"There are two pairs of up/down buttons.  The left pair will cycle through "
+"all available timesteps in sequence.  Since there are a large number of "
+"timesteps, the right pair is provided to skip to the next higher/lower unit "
+"of time.  For example, if the timescale is currently \"1 min\", the right up "
+"button will make it \"1 hour\", and the right down button will make it \"1 "
+"sec\""
+msgstr ""
+
+#: timezonerule.cpp:51
+msgid "Error parsing TimeZoneRule, setting to empty rule."
+msgstr ""
+
+#: timezonerule.cpp:80
+msgid "Daylight Saving Time active"
+msgstr ""
+
+#: timezonerule.cpp:83
+msgid "Daylight Saving Time inactive"
+msgstr ""
+
+#: timezonerule.cpp:104 timezonerule.cpp:144
+msgid "Could not parse "
+msgstr ""
+
+#: timezonerule.cpp:104
+msgid " as a valid month code."
+msgstr ""
+
+#: timezonerule.cpp:144
+msgid " as a valid day code."
+msgstr ""
+
+#: timezonerule.cpp:256
+msgid "Next Daylight Savings Time change (Local Time): "
+msgstr ""
+
+#: timezonerule.cpp:290
+msgid "Previous Daylight Savings Time change (Local Time): "
+msgstr ""
+
+#: timezonerule.cpp:299
+msgid "Next Daylight Savings Time change (UTC): "
+msgstr ""
+
+#: timezonerule.cpp:312
+msgid "Previous Daylight Savings Time change (UTC): "
+msgstr ""
+
+#: tools/altvstime.cpp:45 tools/altvstimeui.ui:16
+#, no-c-format
+msgid "Altitude vs. Time"
+msgstr ""
+
+#: tools/altvstime.cpp:60
+#, fuzzy
+msgid "Local Time"
+msgstr "Wedi'u Lleoleiddio"
+
+#: tools/altvstime.cpp:61
+msgid "Local Sidereal Time"
+msgstr ""
+
+#: tools/altvstime.cpp:62
+msgid ""
+"_: the angle of an object above (or below) the horizon\n"
+"Altitude"
+msgstr "Uchder"
+
+#: tools/astrocalc.cpp:42
+msgid "Calculator"
+msgstr "Cyfrifiannell"
+
+#: tools/astrocalc.cpp:51
+msgid "<H2>KStars Astrocalculator</H2>"
+msgstr ""
+
+#: tools/astrocalc.cpp:67 tools/astrocalc.cpp:110
+msgid "Time Calculators"
+msgstr ""
+
+#: 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/modcalcsidtimedlg.ui:292
+#, no-c-format
+msgid "Sidereal Time"
+msgstr ""
+
+#: tools/astrocalc.cpp:74 tools/astrocalc.cpp:132
+msgid "Day Duration"
+msgstr ""
+
+#: tools/astrocalc.cpp:75 tools/astrocalc.cpp:134
+msgid "Equinoxes & Solstices"
+msgstr ""
+
+#: tools/astrocalc.cpp:78 tools/astrocalc.cpp:114
+msgid "Celestial Coordinates"
+msgstr ""
+
+#: tools/astrocalc.cpp:79 tools/astrocalc.cpp:118
+#: 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
+#, no-c-format
+msgid "Precession"
+msgstr ""
+
+#: 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
+#, no-c-format
+msgid "Horizontal Coordinates"
+msgstr ""
+
+#: tools/astrocalc.cpp:83 tools/astrocalc.cpp:126
+#: 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/modcalcangdistdlg.ui:243
+#, no-c-format
+msgid "Angular Distance"
+msgstr ""
+
+#: tools/astrocalc.cpp:85 tools/astrocalc.cpp:142 tools/modcalcvlsrdlg.ui:16
+#, no-c-format
+msgid "LSR Velocity"
+msgstr ""
+
+#: tools/astrocalc.cpp:87 tools/astrocalc.cpp:128
+msgid "Earth Coordinates"
+msgstr ""
+
+#: tools/astrocalc.cpp:89 tools/astrocalc.cpp:130 tools/modcalcgeoddlg.ui:16
+#, no-c-format
+msgid "Geodetic Coordinates"
+msgstr ""
+
+#: tools/astrocalc.cpp:93 tools/astrocalc.cpp:138
+msgid "Planets Coordinates"
+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>"
+msgstr ""
+
+#: tools/astrocalc.cpp:185
+msgid ""
+"<QT>Section with algorithms for the conversion of different astronomical "
+"systems of coordinates<UL><LI><B>Precessor:</B> Precession of coordinates "
+"between epochs</LI><LI><B>Galactic:</B> Galactic/Equatorial coordinates "
+"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>"
+msgstr ""
+
+#: tools/astrocalc.cpp:221
+msgid ""
+"<QT>Section with algorithms for the conversion of systems of coordinates for "
+"the Earth<UL><LI><B>Geodetic Coordinates:</B> Geodetic/XYZ coordinate "
+"conversion</LI></UL></QT>"
+msgstr ""
+
+#: tools/astrocalc.cpp:240
+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>"
+msgstr ""
+
+#: tools/jmoontool.cpp:34
+msgid "Jupiter Moons Tool"
+msgstr ""
+
+#: tools/jmoontool.cpp:80
+msgid "offset from Jupiter (arcmin)"
+msgstr ""
+
+#: tools/jmoontool.cpp:81
+msgid "time since now (days)"
+msgstr ""
+
+#: tools/lcgenerator.cpp:43
+msgid "AAVSO Light Curve Generator"
+msgstr ""
+
+#: tools/lcgenerator.cpp:189
+#, fuzzy
+msgid "Star Info"
+msgstr "Seren"
+
+#: tools/lcgenerator.cpp:190
+msgid "Designation:"
+msgstr ""
+
+#: tools/lcgenerator.cpp:191
+msgid "Or name:"
+msgstr ""
+
+#: tools/lcgenerator.cpp:192
+msgid "Start date:"
+msgstr "Dyddiad dechrau:"
+
+#: tools/lcgenerator.cpp:193
+msgid "Start date for the light curve plot in mm/dd/yy or JD"
+msgstr ""
+
+#: tools/lcgenerator.cpp:194
+msgid "End date:"
+msgstr "Dyddiad gorffen:"
+
+#: tools/lcgenerator.cpp:195
+msgid "End date for the light curve plot in mm/dd/yy or JD"
+msgstr ""
+
+#: tools/lcgenerator.cpp:196 tools/lcgenerator.cpp:197
+#: tools/lcgenerator.cpp:231 tools/lcgenerator.cpp:232
+#: tools/lcgenerator.cpp:292
+msgid "default"
+msgstr "rhagosodiad"
+
+#: tools/lcgenerator.cpp:198
+msgid "Data Selection"
+msgstr ""
+
+#: tools/lcgenerator.cpp:199
+msgid "Visual"
+msgstr ""
+
+#: tools/lcgenerator.cpp:200
+msgid "Fainter thans"
+msgstr ""
+
+#: tools/lcgenerator.cpp:201
+msgid "Discrepant data"
+msgstr ""
+
+#: tools/lcgenerator.cpp:202
+msgid "CCDB"
+msgstr ""
+
+#: tools/lcgenerator.cpp:203
+msgid "CCDV"
+msgstr ""
+
+#: tools/lcgenerator.cpp:204
+msgid "CCDR"
+msgstr ""
+
+#: tools/lcgenerator.cpp:205
+msgid "CCDI"
+msgstr ""
+
+#: tools/lcgenerator.cpp:206
+msgid "Plot average:"
+msgstr ""
+
+#: tools/lcgenerator.cpp:208
+msgid "Retrieve Curve"
+msgstr ""
+
+#: tools/lcgenerator.cpp:209
+msgid "Update List"
+msgstr "Adnewyddu'r Rhestr"
+
+#: tools/lcgenerator.cpp:210
+msgid "Close"
+msgstr ""
+
+#: tools/lcgenerator.cpp:246
+msgid "End date must occur after start date."
+msgstr ""
+
+#: tools/lcgenerator.cpp:256 tools/lcgenerator.cpp:263
+msgid "Average days must be a positive integer."
+msgstr ""
+
+#: tools/lcgenerator.cpp:286
+msgid ""
+"Invalid date format. Correct format is mm/dd/yyyy or JD, leave 'default' to "
+"generate light curves for the past 500 days."
+msgstr ""
+
+#: tools/lcgenerator.cpp:287
+msgid ""
+"Invalid date format. Correct format is mm/dd/yyyy or JD, leave 'default' to "
+"generate light curves until today."
+msgstr ""
+
+#: tools/lcgenerator.cpp:327 tools/lcgenerator.cpp:363
+#, c-format
+msgid "No data available for JD prior to %d"
+msgstr ""
+
+#: tools/lcgenerator.cpp:400
+msgid "Light Curve produced by the American Amateur Variable Star Observers"
+msgstr ""
+
+#: tools/lcgenerator.cpp:462
+msgid "AAVSO Star list downloaded successfully."
+msgstr ""
+
+#: tools/modcalcangdist.cpp:101 tools/modcalcapcoord.cpp:185
+#: tools/modcalcazel.cpp:331 tools/modcalceclipticcoords.cpp:226
+#: tools/modcalcequinox.cpp:141 tools/modcalcgalcoord.cpp:228
+#: tools/modcalcgeodcoord.cpp:239 tools/modcalcplanets.cpp:313
+#: tools/modcalcprec.cpp:179 tools/modcalcsidtime.cpp:195
+#: tools/modcalcvlsr.cpp:376 tools/scriptbuilder.cpp:762
+#: tools/scriptbuilder.cpp:822 tools/scriptbuilder.cpp:888
+#, c-format
+msgid "Could not open file %1."
+msgstr "Methwyd agor y ffeil %1."
+
+#: tools/modcalcangdist.cpp:113 tools/modcalcapcoord.cpp:197
+#: tools/modcalcazel.cpp:343 tools/modcalceclipticcoords.cpp:238
+#: tools/modcalcequinox.cpp:153 tools/modcalcgalcoord.cpp:240
+#: tools/modcalcgeodcoord.cpp:251 tools/modcalcplanets.cpp:323
+#: tools/modcalcprec.cpp:191 tools/modcalcsidtime.cpp:207
+#: tools/modcalcvlsr.cpp:388
+#, c-format
+msgid "Invalid file: %1"
+msgstr "Ffeil Annilys : %1"
+
+#: tools/modcalcangdist.cpp:114 tools/modcalcapcoord.cpp:198
+#: tools/modcalcazel.cpp:344 tools/modcalceclipticcoords.cpp:239
+#: tools/modcalcequinox.cpp:154 tools/modcalcgalcoord.cpp:241
+#: tools/modcalcgeodcoord.cpp:252 tools/modcalcplanets.cpp:324
+#: tools/modcalcprec.cpp:192 tools/modcalcsidtime.cpp:208
+#: tools/modcalcvlsr.cpp:389
+msgid "Invalid file"
+msgstr "Ffeil Annilys"
+
+#: tools/modcalcapcoord.cpp:84 tools/modcalcazel.cpp:104
+#: tools/modcalcequinox.cpp:52 tools/modcalcprec.cpp:76
+#: tools/modcalcvlsr.cpp:102
+msgid "Could not parse epoch string; assuming J2000"
+msgstr ""
+
+#: tools/modcalcplanets.cpp:400
+msgid "Incorrect number of fields in line %1: "
+msgstr ""
+
+#: tools/modcalcplanets.cpp:401
+msgid "Present fields %1. "
+msgstr ""
+
+#: tools/modcalcplanets.cpp:402
+msgid "Required fields %1. "
+msgstr ""
+
+#: tools/modcalcplanets.cpp:420
+#, fuzzy
+msgid "Unknown planet "
+msgstr "Math anhysbys"
+
+#: tools/modcalcplanets.cpp:422
+msgid " in line %1: "
+msgstr ""
+
+#: tools/modcalcplanets.cpp:444
+msgid "Line %1 contains an invalid time"
+msgstr ""
+
+#: tools/modcalcplanets.cpp:464
+msgid "Line %1 contains an invalid date: "
+msgstr ""
+
+#: tools/modcalcplanets.cpp:586
+msgid "Errors found while parsing some lines in the input file"
+msgstr ""
+
+#: tools/modcalcplanets.cpp:587
+msgid "Errors in lines"
+msgstr ""
+
+#: tools/modcalcvlsr.cpp:128
+msgid "Could not parse height string; assuming 0"
+msgstr ""
+
+#: tools/observinglist.cpp:57 tools/observinglistui.ui:16
+#, no-c-format
+msgid "Observing List"
+msgstr ""
+
+#: tools/observinglist.cpp:167
+msgid "Added %1 to observing list."
+msgstr ""
+
+#: tools/observinglist.cpp:203
+msgid "Cannot remove Object %1; not found in table."
+msgstr ""
+
+#: tools/observinglist.cpp:271
+msgid "Object %1 not found in obsList."
+msgstr ""
+
+#: tools/observinglist.cpp:283
+msgid "observing notes for %1:"
+msgstr ""
+
+#: tools/observinglist.cpp:507
+msgid "Observing notes for object:"
+msgstr ""
+
+#: tools/observinglist.cpp:582
+msgid "The specified file is invalid.  Try another file?"
+msgstr ""
+
+#: tools/observinglist.cpp:583
+msgid "Invalid File"
+msgstr "Ffeil Annilys"
+
+#: tools/observinglist.cpp:594
+msgid "Do you want to save the current list before opening a new list?"
+msgstr ""
+
+#: tools/observinglist.cpp:596
+#, fuzzy
+msgid "Save Current List?"
+msgstr "Cadw Lliwiau Cyfredol..."
+
+#: tools/observinglist.cpp:609
+#, fuzzy
+msgid "Enter List Name"
+msgstr "Dangos enw"
+
+#: tools/observinglist.cpp:610
+#, fuzzy
+msgid "List name:"
+msgstr "Enw:"
+
+#: tools/observinglist.cpp:630
+#, fuzzy
+msgid "Could not open file %1.  Try a different filename?"
+msgstr "Methwyd agor y ffeil %1."
+
+#: tools/observinglist.cpp:632
+msgid "Try Different"
+msgstr ""
+
+#: tools/observinglist.cpp:685
+msgid ""
+"_: First letter in 'Center'\n"
+"C"
+msgstr "C"
+
+#: tools/observinglist.cpp:686
+msgid ""
+"_: First letter in 'Scope'\n"
+"S"
+msgstr "Eil"
+
+#: tools/observinglist.cpp:687
+msgid ""
+"_: First letter in 'Details'\n"
+"D"
+msgstr "D"
+
+#: tools/observinglist.cpp:688
+msgid ""
+"_: First letter in 'Alt vs Time'\n"
+"A"
+msgstr "A"
+
+#: tools/observinglist.cpp:689
+msgid ""
+"_: First letter in 'Remove'\n"
+"R"
+msgstr "R"
+
+#: tools/observinglist.cpp:706
+#, fuzzy
+msgid "Center"
+msgstr "Ca&nol"
+
+#: tools/observinglist.cpp:707 tools/observinglistui.ui:262
+#, no-c-format
+msgid "Scope"
+msgstr "Amrediad"
+
+#: imagereductionui.ui:132 imagereductionui.ui:310 imagereductionui.ui:478
+#: tools/observinglist.cpp:708 tools/observinglistui.ui:287
+#, no-c-format
+msgid "Details"
+msgstr "Manylion"
+
+#: tools/observinglist.cpp:709
+#, fuzzy
+msgid "Alt vs Time"
+msgstr "Dyddiad ac Amser"
+
+#: devmanager.ui:319 fovdialogui.ui:97 imagereductionui.ui:121
+#: imagereductionui.ui:299 imagereductionui.ui:467 tools/observinglist.cpp:710
+#: tools/observinglistui.ui:334
+#, fuzzy, no-c-format
+msgid "Remove"
+msgstr "&Gwaredu"
+
+#: tools/observinglistui.ui:160 tools/obslistwizard.cpp:38
+#: tools/obslistwizardui.ui:16
+#, fuzzy, no-c-format
+msgid "Observing List Wizard"
+msgstr "Cadw Lliwiau Cyfredol..."
+
+#: tools/obslistwizard.cpp:198
+#, fuzzy
+msgid "Object type(s)"
+msgstr "Math Gwrthrych"
+
+#: tools/obslistwizard.cpp:199
+msgid "Region"
+msgstr "Ardal"
+
+#: tools/obslistwizard.cpp:200
+#, fuzzy
+msgid "In constellation(s)"
+msgstr "cyfseriad"
+
+#: tools/obslistwizard.cpp:201
+msgid "Circular"
+msgstr "Crwn"
+
+#: tools/obslistwizard.cpp:202
+msgid "Rectangular"
+msgstr "Hirsgwar"
+
+#: tools/obslistwizard.cpp:204
+#, fuzzy
+msgid "Magnitude limit"
+msgstr "Hydred"
+
+#: tools/obslistwizard.cpp:212 tools/obslistwizard.cpp:250
+#: tools/obslistwizard.cpp:359 tools/obslistwizardui.ui:201
+#, no-c-format
+msgid "Globular Clusters"
+msgstr ""
+
+#: tools/obslistwizard.cpp:213 tools/obslistwizard.cpp:252
+#: tools/obslistwizard.cpp:360 tools/obslistwizardui.ui:206
+#, no-c-format
+msgid "Gaseous Nebulae"
+msgstr ""
+
+#: tools/obslistwizard.cpp:214 tools/obslistwizard.cpp:254
+#: tools/obslistwizard.cpp:361 tools/obslistwizardui.ui:211
+#, no-c-format
+msgid "Planetary Nebulae"
+msgstr ""
+
+#: tools/obslistwizard.cpp:221 tools/obslistwizard.cpp:240
+#: tools/obslistwizard.cpp:341 tools/obslistwizardui.ui:181
+#, no-c-format
+msgid "Sun, Moon, Planets"
+msgstr ""
+
+#: tools/obslistwizard.cpp:414
+msgid "Current selection: %1 objects"
+msgstr ""
+
+#: tools/planetviewer.cpp:39
+msgid "Solar System Viewer"
+msgstr ""
+
+#: tools/planetviewer.cpp:45
+msgid ""
+"_: axis label for x-coordinate of solar system viewer.  AU means "
+"astronomical unit.\n"
+"X-position (AU)"
+msgstr ""
+
+#: tools/planetviewer.cpp:46
+msgid ""
+"_: axis label for y-coordinate of solar system viewer.  AU means "
+"astronomical unit.\n"
+"Y-position (AU)"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:104 tools/scriptbuilderui.ui:16
+#, no-c-format
+msgid "Script Builder"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:120
+msgid ""
+"Point the display at the specified location. %1 can be the name of an "
+"object, a cardinal point on the compass, or 'zenith'."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:122
+msgid ""
+"Point the display at the specified RA/Dec coordinates.  %1 is expressed in "
+"Hours; %2 is expressed in Degrees."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:124
+msgid ""
+"Point the display at the specified Alt/Az coordinates.  %1 and %2 are "
+"expressed in Degrees."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:126
+msgid "Increase the display Zoom Level."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:127
+msgid "Decrease the display Zoom Level."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:128
+msgid "Set the display Zoom Level to its default value."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:129
+msgid "Set the display Zoom Level manually."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:130
+msgid "Set the system clock to the specified Local Time."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:132
+msgid "Pause script execution for %1 seconds."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:133
+msgid ""
+"Halt script execution until the key %1 is pressed.  Only single-key strokes "
+"are possible; use 'space' for the spacebar."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:135
+msgid "Set whether the display is tracking the current location."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:136
+msgid "Change view option named %1 to value %2."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:137
+msgid "Set the geographic location to the city specified by %1, %2 and %3."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:139
+msgid "Set the color named %1 to the value %2."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:140
+#, c-format
+msgid "Load the color scheme named %1."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:141
+msgid "Export the sky image to the file %1, with width %2 and height %3."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:142
+msgid ""
+"Print the sky image to a printer or file.  If %1 is true, it will show the "
+"print dialog.  If %2 is true, it will use the Star Chart color scheme for "
+"printing."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:143
+msgid "Halt the simulation clock."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:144
+msgid "Start the simulation clock."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:145
+msgid ""
+"Set the timescale of the simulation clock to %1.  1.0 means real-time; 2.0 "
+"means twice real-time; etc."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:150
+msgid "Establish an INDI device either in local mode or server mode."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:153
+msgid "Shutdown an INDI device."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:156
+msgid "Connect or Disconnect an INDI device."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:160
+msgid "Set INDI's device connection port."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:164
+msgid ""
+"Set the telescope action. Available actions are SLEW, TRACK, SYNC, PARK, and "
+"ABORT."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:168
+msgid ""
+"Set the telescope target coordinates to the RA/Dec coordinates.  RA is "
+"expressed in Hours; DEC is expressed in Degrees."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:172
+msgid ""
+"Set the telescope target coorinates to the RA/Dec coordinates of the "
+"selected object."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:176
+msgid "Set the telescope longitude and latitude. The longitude is E of N."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:180
+msgid "Set the device UTC time in ISO 8601 format YYYY/MM/DDTHH:MM:SS."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:184
+msgid ""
+"Activate an INDI action. The action is the name of any INDI switch property "
+"element supported by the device."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:187
+msgid ""
+"Pause script execution until action returns with OK status. The action can "
+"be the name of any INDI property supported by the device."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:190
+msgid ""
+"Set the telescope focuser speed. Set speed to 0 to halt the focuser. 1-3 "
+"correspond to slow, medium, and fast speeds respectively."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:194
+msgid ""
+"Start moving the focuser in the direction Dir, and for the duration "
+"specified by setINDIFocusTimeout."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:198
+msgid ""
+"Set the telescope focuser timer in seconds. This is the duration of any "
+"focusing procedure performed by calling startINDIFocus."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:202
+msgid "Set the target CCD chip temperature."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:206
+msgid "Set the target filter position."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:210
+msgid ""
+"Set the CCD camera frame type. Available options are FRAME_LIGHT, "
+"FRAME_BIAS, FRAME_DARK, and FRAME_FLAT."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:214
+msgid "Start Camera/CCD exposure. The duration is in seconds."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:223
+msgid "Functions"
+msgstr "Ffwythiannau"
+
+#: tools/scriptbuilder.cpp:518
+msgid "InfoBoxes"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:519
+#, fuzzy
+msgid "Toggle display of all InfoBoxes"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:519 tools/scriptbuilder.cpp:520
+#: tools/scriptbuilder.cpp:521 tools/scriptbuilder.cpp:522
+#: tools/scriptbuilder.cpp:523 tools/scriptbuilder.cpp:524
+#: tools/scriptbuilder.cpp:525 tools/scriptbuilder.cpp:536
+#: tools/scriptbuilder.cpp:537 tools/scriptbuilder.cpp:543
+#: tools/scriptbuilder.cpp:544 tools/scriptbuilder.cpp:545
+#: tools/scriptbuilder.cpp:546 tools/scriptbuilder.cpp:547
+#: tools/scriptbuilder.cpp:548 tools/scriptbuilder.cpp:549
+#: tools/scriptbuilder.cpp:550 tools/scriptbuilder.cpp:551
+#: tools/scriptbuilder.cpp:552 tools/scriptbuilder.cpp:553
+#: tools/scriptbuilder.cpp:554 tools/scriptbuilder.cpp:555
+#: tools/scriptbuilder.cpp:556 tools/scriptbuilder.cpp:557
+#: tools/scriptbuilder.cpp:558 tools/scriptbuilder.cpp:559
+#: tools/scriptbuilder.cpp:560 tools/scriptbuilder.cpp:561
+#: tools/scriptbuilder.cpp:583 tools/scriptbuilder.cpp:584
+#: tools/scriptbuilder.cpp:585 tools/scriptbuilder.cpp:586
+#: tools/scriptbuilder.cpp:587 tools/scriptbuilder.cpp:588
+#: tools/scriptbuilder.cpp:589 tools/scriptbuilder.cpp:590
+#: tools/scriptbuilder.cpp:591 tools/scriptbuilder.cpp:592
+#: tools/scriptbuilder.cpp:593 tools/scriptbuilder.cpp:594
+#: tools/scriptbuilder.cpp:595 tools/scriptbuilder.cpp:596
+#: tools/scriptbuilder.cpp:597 tools/scriptbuilder.cpp:615
+#: tools/scriptbuilder.cpp:616 tools/scriptbuilder.cpp:617
+#: tools/scriptbuilder.cpp:623 tools/scriptbuilder.cpp:625
+#: tools/scriptbuilder.cpp:626 tools/scriptbuilder.cpp:627
+#: tools/scriptbuilder.cpp:628 tools/scriptbuilder.cpp:629
+#: tools/scriptbuilder.cpp:630 tools/scriptbuilder.cpp:631
+#: tools/scriptbuilder.cpp:632 tools/scriptbuilder.cpp:633
+#: tools/scriptbuilder.cpp:634 tools/scriptbuilder.cpp:649
+#: tools/scriptbuilder.cpp:654 tools/scriptbuilder.cpp:655
+#: tools/scriptbuilder.cpp:656 tools/scriptbuilder.cpp:657
+#: tools/scriptbuilder.cpp:658 tools/scriptbuilder.cpp:659
+msgid "bool"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:520
+#, fuzzy
+msgid "Toggle display of Time InfoBox"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:521
+#, fuzzy
+msgid "Toggle display of Geographic InfoBox"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:522
+#, fuzzy
+msgid "Toggle display of Focus InfoBox"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:523
+msgid "(un)Shade Time InfoBox"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:524
+msgid "(un)Shade Geographic InfoBox"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:525
+msgid "(un)Shade Focus InfoBox"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:535
+msgid "Toolbars"
+msgstr "Barrau Offer:"
+
+#: tools/scriptbuilder.cpp:536
+#, fuzzy
+msgid "Toggle display of main toolbar"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:537
+#, fuzzy
+msgid "Toggle display of view toolbar"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:542
+msgid "Show Objects"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:543
+#, fuzzy
+msgid "Toggle display of Stars"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:544
+#, fuzzy
+msgid "Toggle display of all deep-sky objects"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:545
+#, fuzzy
+msgid "Toggle display of Messier object symbols"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:546
+#, fuzzy
+msgid "Toggle display of Messier object images"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:547
+#, fuzzy
+msgid "Toggle display of NGC objects"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:548
+#, fuzzy
+msgid "Toggle display of IC objects"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:549
+#, fuzzy
+msgid "Toggle display of all solar system bodies"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:550
+#, fuzzy
+msgid "Toggle display of Sun"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:551
+#, fuzzy
+msgid "Toggle display of Moon"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:552
+#, fuzzy
+msgid "Toggle display of Mercury"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:553
+#, fuzzy
+msgid "Toggle display of Venus"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:554
+#, fuzzy
+msgid "Toggle display of Mars"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:555
+#, fuzzy
+msgid "Toggle display of Jupiter"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:556
+#, fuzzy
+msgid "Toggle display of Saturn"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:557
+#, fuzzy
+msgid "Toggle display of Uranus"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:558
+#, fuzzy
+msgid "Toggle display of Neptune"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:559
+#, fuzzy
+msgid "Toggle display of Pluto"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:560
+#, fuzzy
+msgid "Toggle display of Asteroids"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:561
+#, fuzzy
+msgid "Toggle display of Comets"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:582
+msgid "Show Other"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:583
+#, fuzzy
+msgid "Toggle display of constellation lines"
+msgstr "Dangos llinellau cyfseriadau?"
+
+#: tools/scriptbuilder.cpp:584
+#, fuzzy
+msgid "Toggle display of constellation boundaries"
+msgstr "Constellation names"
+
+#: tools/scriptbuilder.cpp:585
+#, fuzzy
+msgid "Toggle display of constellation names"
+msgstr "Constellation names"
+
+#: tools/scriptbuilder.cpp:586
+#, fuzzy
+msgid "Toggle display of Milky Way"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:587
+#, fuzzy
+msgid "Toggle display of the coordinate grid"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:588
+#, fuzzy
+msgid "Toggle display of the celestial equator"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:589
+#, fuzzy
+msgid "Toggle display of the ecliptic"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:590
+#, fuzzy
+msgid "Toggle display of the horizon line"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:591
+#, fuzzy
+msgid "Toggle display of the opaque ground"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:592
+#, fuzzy
+msgid "Toggle display of star name labels"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:593
+#, fuzzy
+msgid "Toggle display of star magnitude labels"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:594
+#, fuzzy
+msgid "Toggle display of asteroid name labels"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:595
+#, fuzzy
+msgid "Toggle display of comet name labels"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:596
+#, fuzzy
+msgid "Toggle display of planet name labels"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:597
+#, fuzzy
+msgid "Toggle display of planet images"
+msgstr "Toggle display of star name labels"
+
+#: tools/scriptbuilder.cpp:614
+msgid "Constellation Names"
+msgstr "Constellation names"
+
+#: tools/scriptbuilder.cpp:615
+#, fuzzy
+msgid "Show Latin constellation names"
+msgstr "Defnyddio enwau cyfseriadau Lladin"
+
+#: tools/scriptbuilder.cpp:616
+#, fuzzy
+msgid "Show constellation names in local language"
+msgstr "Llunio enwau'r cyfseriadau?"
+
+#: tools/scriptbuilder.cpp:617
+#, fuzzy
+msgid "Show IAU-standard constellation abbreviations"
+msgstr "Dangos llinellau cyfseriadau?"
+
+#: tools/scriptbuilder.cpp:622
+msgid "Hide Items"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:623
+msgid "Toggle whether objects hidden while slewing display"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:624
+msgid "Timestep threshold (in seconds) for hiding objects"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:624 tools/scriptbuilder.cpp:650
+#: tools/scriptbuilder.cpp:651 tools/scriptbuilder.cpp:674
+#: tools/scriptbuilder.cpp:675 tools/scriptbuilder.cpp:676
+#: tools/scriptbuilder.cpp:677 tools/scriptbuilder.cpp:678
+#: tools/scriptbuilder.cpp:679 tools/scriptbuilder.cpp:680
+#: tools/scriptbuilder.cpp:681 tools/scriptbuilder.cpp:682
+msgid "double"
+msgstr "dwbl"
+
+#: tools/scriptbuilder.cpp:625
+#, fuzzy
+msgid "Hide faint stars while slewing?"
+msgstr "Cuddio enwau cyfseriadau wrth symud?"
+
+#: tools/scriptbuilder.cpp:626
+#, fuzzy
+msgid "Hide solar system bodies while slewing?"
+msgstr "Cuddio enwau cyfseriadau wrth symud?"
+
+#: tools/scriptbuilder.cpp:627
+#, fuzzy
+msgid "Hide Messier objects while slewing?"
+msgstr "Cuddio enwau cyfseriadau wrth symud?"
+
+#: tools/scriptbuilder.cpp:628
+#, fuzzy
+msgid "Hide NGC objects while slewing?"
+msgstr "Cuddio enwau cyfseriadau wrth symud?"
+
+#: tools/scriptbuilder.cpp:629
+#, fuzzy
+msgid "Hide IC objects while slewing?"
+msgstr "Cuddio enwau cyfseriadau wrth symud?"
+
+#: tools/scriptbuilder.cpp:630
+#, fuzzy
+msgid "Hide Milky Way while slewing?"
+msgstr "Cuddio enwau cyfseriadau wrth symud?"
+
+#: tools/scriptbuilder.cpp:631
+#, fuzzy
+msgid "Hide constellation names while slewing?"
+msgstr "Cuddio enwau cyfseriadau wrth symud?"
+
+#: tools/scriptbuilder.cpp:632
+#, fuzzy
+msgid "Hide constellation lines while slewing?"
+msgstr "Cuddio enwau cyfseriadau wrth symud?"
+
+#: tools/scriptbuilder.cpp:633
+#, fuzzy
+msgid "Hide constellation boundaries while slewing?"
+msgstr "Cuddio enwau cyfseriadau wrth symud?"
+
+#: tools/scriptbuilder.cpp:634
+#, fuzzy
+msgid "Hide coordinate grid while slewing?"
+msgstr "Cuddio enwau cyfseriadau wrth symud?"
+
+#: tools/scriptbuilder.cpp:648
+msgid "Skymap Options"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:649
+msgid "Use Horizontal coordinates? (otherwise, use Equatorial)"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:650
+msgid "Set the Zoom Factor"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:651
+msgid "Select angular size for the FOV symbol (in arcmin)"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:652
+msgid ""
+"Select shape for the FOV symbol (0=Square, 1=Circle, 2=Crosshairs, "
+"4=Bullseye)"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:652
+msgid "int"
+msgstr "int"
+
+#: tools/scriptbuilder.cpp:653
+msgid "Select color for the FOV symbol"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:653
+msgid "string"
+msgstr "llinell"
+
+#: tools/scriptbuilder.cpp:654
+msgid "Use animated slewing? (otherwise, \"snap\" to new focus)"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:655
+msgid "Correct for atmospheric refraction?"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:656
+msgid "Automatically attach name label to centered object?"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:657
+msgid "Attach temporary name label when hovering mouse over an object?"
+msgstr ""
+
+#: kstars.kcfg:550 tools/scriptbuilder.cpp:658
+#, no-c-format
+msgid "Automatically add trail to centered solar system body?"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:659
+msgid "Planet trails fade to sky color? (otherwise color is constant)"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:673
+msgid "Limits"
+msgstr "Terfynau"
+
+#: tools/scriptbuilder.cpp:674
+msgid "magnitude of faintest star drawn on map when zoomed in"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:675
+msgid "magnitude of faintest star drawn on map when zoomed out"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:676
+msgid "magnitude of faintest nonstellar object drawn on map when zoomed in"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:677
+msgid "magnitude of faintest nonstellar object drawn on map when zoomed out"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:678
+msgid "magnitude of faintest star labeled on map"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:679
+msgid "magnitude of brightest star hidden while slewing"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:680
+msgid "magnitude of faintest asteroid drawn on map"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:681
+msgid "magnitude of faintest asteroid labeled on map"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:682
+msgid "comets nearer to the Sun than this (in AU) are labeled on map"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:757
+msgid "Could not download remote file."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:859
+msgid "Save Changes to Script?"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:860
+msgid ""
+"The current script has unsaved changes.  Would you like to save before "
+"closing it?"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:993
+#, c-format
+msgid "Could not parse script.  Line was: %1"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:1311 tools/scriptbuilder.cpp:1313
+#: tools/scriptbuilder.cpp:1349 tools/scriptbuilder.cpp:2050
+#: tools/scriptbuilder.cpp:2187 tools/scriptbuilder.cpp:2188
+msgid "true"
+msgstr "gwir"
+
+#: tools/scriptbuilder.cpp:1796
+msgid "Function index out of bounds."
+msgstr ""
+
+#: tools/scriptbuilder.cpp:1823 tools/scriptbuilder.cpp:1872
+#: tools/scriptbuilder.cpp:1896 tools/scriptbuilder.cpp:1920
+#: tools/scriptbuilder.cpp:1942 tools/scriptbuilder.cpp:1965
+#: tools/scriptbuilder.cpp:1982 tools/scriptbuilder.cpp:1999
+#: tools/scriptbuilder.cpp:2019 tools/scriptbuilder.cpp:2040
+#: tools/scriptbuilder.cpp:2053 tools/scriptbuilder.cpp:2072
+#: tools/scriptbuilder.cpp:2092 tools/scriptbuilder.cpp:2112
+#: tools/scriptbuilder.cpp:2132 tools/scriptbuilder.cpp:2145
+#: tools/scriptbuilder.cpp:2162 tools/scriptbuilder.cpp:2177
+#: tools/scriptbuilder.cpp:2191 tools/scriptbuilder.cpp:2208
+#: tools/scriptbuilder.cpp:2224 tools/scriptbuilder.cpp:2237
+#: tools/scriptbuilder.cpp:2266 tools/scriptbuilder.cpp:2285
+#: tools/scriptbuilder.cpp:2311 tools/scriptbuilder.cpp:2337
+#: tools/scriptbuilder.cpp:2359 tools/scriptbuilder.cpp:2387
+#: tools/scriptbuilder.cpp:2415 tools/scriptbuilder.cpp:2441
+#: tools/scriptbuilder.cpp:2474 tools/scriptbuilder.cpp:2507
+#: tools/scriptbuilder.cpp:2534 tools/scriptbuilder.cpp:2561
+#: tools/scriptbuilder.cpp:2588 tools/scriptbuilder.cpp:2614
+#: tools/scriptbuilder.cpp:2641 tools/scriptbuilder.cpp:2667
+#: tools/scriptbuilder.cpp:2693 tools/scriptbuilder.cpp:2714
+#: tools/scriptbuilder.cpp:2740 tools/scriptbuilder.cpp:2761
+#: tools/scriptbuilder.cpp:2787 tools/scriptbuilder.cpp:2807
+#: tools/scriptbuilder.cpp:2833 tools/scriptbuilder.cpp:2866
+#: tools/scriptbuilder.cpp:2899 tools/scriptbuilder.cpp:2925
+#: tools/scriptbuilder.cpp:2946 tools/scriptbuilder.cpp:2973
+#: tools/scriptbuilder.cpp:3001 tools/scriptbuilder.cpp:3029
+#: tools/scriptbuilder.cpp:3051 tools/scriptbuilder.cpp:3078
+#: tools/scriptbuilder.cpp:3099 tools/scriptbuilder.cpp:3125
+#: tools/scriptbuilder.cpp:3146 tools/scriptbuilder.cpp:3173
+#: tools/scriptbuilder.cpp:3194
+msgid "Mismatch between function and Arg widget (expected %1.)"
+msgstr ""
+
+#: tools/scriptbuilder.cpp:2050 tools/scriptbuilder.cpp:2187
+#: tools/scriptbuilder.cpp:2188
+msgid "false"
+msgstr "ffug"
+
+#: tools/wutdialog.cpp:48
+msgid "What's up Tonight"
+msgstr ""
+
+#: tools/wutdialog.cpp:84 tools/wutdialog.cpp:424
+#, c-format
+msgid "at %1"
+msgstr ""
+
+#: tools/wutdialog.cpp:85 tools/wutdialog.cpp:406
+#, c-format
+msgid "The night of %1"
+msgstr ""
+
+#: tools/wutdialog.cpp:109
+msgid "Planets"
+msgstr ""
+
+#: tools/wutdialog.cpp:114
+msgid "Star Clusters"
+msgstr ""
+
+#: tools/wutdialog.cpp:115
+msgid "Nebulae"
+msgstr ""
+
+#: tools/wutdialog.cpp:143 tools/wutdialog.cpp:144 tools/wutdialog.cpp:180
+#: tools/wutdialog.cpp:181 tools/wutdialog.cpp:330 tools/wutdialog.cpp:331
+msgid "circumpolar"
+msgstr ""
+
+#: tools/wutdialog.cpp:147 tools/wutdialog.cpp:148 tools/wutdialog.cpp:183
+#: tools/wutdialog.cpp:184 tools/wutdialog.cpp:333 tools/wutdialog.cpp:334
+msgid "does not rise"
+msgstr ""
+
+#: tools/wutdialog.cpp:167
+#, c-format
+msgid "Sunset: %1"
+msgstr "Machlud Haul: %1"
+
+#: tools/wutdialog.cpp:168
+#, c-format
+msgid "Sunrise: %1"
+msgstr "Codiad Haul: %1"
+
+#: tools/wutdialog.cpp:169
+msgid "Night duration: %1 hours"
+msgstr ""
+
+#: tools/wutdialog.cpp:192
+#, c-format
+msgid "Moon rises at: %1"
+msgstr ""
+
+#: tools/wutdialog.cpp:193
+#, c-format
+msgid "Moon sets at: %1"
+msgstr ""
+
+#: tools/wutdialog.cpp:318
+msgid "No Object Selected"
+msgstr ""
+
+#: tools/wutdialog.cpp:355
+#, c-format
+msgid "Rises at: %1"
+msgstr ""
+
+#: tools/wutdialog.cpp:356
+#, c-format
+msgid "Transits at: %1"
+msgstr ""
+
+#: tools/wutdialog.cpp:357
+#, c-format
+msgid "Sets at: %1"
+msgstr ""
+
+#: data/cnames.dat:1
 msgid ""
 "_: Constellation name (optional)\n"
 "ANDROMEDA"
 msgstr "ANDROMEDA"
 
-#: kstars_i18n.cpp:3
+#: data/cnames.dat:2
 msgid ""
 "_: Constellation name (optional)\n"
 "ANTLIA"
 msgstr "ANTLIA"
 
-#: kstars_i18n.cpp:4
+#: data/cnames.dat:3
 msgid ""
 "_: Constellation name (optional)\n"
 "APUS"
 msgstr "APUS"
 
-#: kstars_i18n.cpp:5
+#: data/cnames.dat:4
 msgid ""
 "_: Constellation name (optional)\n"
 "AQUARIUS"
 msgstr "AQUARIUS"
 
-#: kstars_i18n.cpp:6
+#: data/cnames.dat:5
 msgid ""
 "_: Constellation name (optional)\n"
 "AQUILA"
 msgstr "AQUILA"
 
-#: kstars_i18n.cpp:7
+#: data/cnames.dat:6
 msgid ""
 "_: Constellation name (optional)\n"
 "ARA"
 msgstr "ARA"
 
-#: kstars_i18n.cpp:8
+#: data/cnames.dat:7
 msgid ""
 "_: Constellation name (optional)\n"
 "ARIES"
 msgstr "ARIES"
 
-#: kstars_i18n.cpp:9
+#: data/cnames.dat:8
 msgid ""
 "_: Constellation name (optional)\n"
 "AURIGA"
 msgstr "AURIGA"
 
-#: kstars_i18n.cpp:10
+#: data/cnames.dat:9
 msgid ""
 "_: Constellation name (optional)\n"
 "BOOTES"
 msgstr "BOOTES"
 
-#: kstars_i18n.cpp:11
+#: data/cnames.dat:10
 msgid ""
 "_: Constellation name (optional)\n"
 "CAELUM"
 msgstr "CAELUM"
 
-#: kstars_i18n.cpp:12
+#: data/cnames.dat:11
 msgid ""
 "_: Constellation name (optional)\n"
 "CAMELOPARDALIS"
 msgstr "CAMELOPARDALIS"
 
-#: kstars_i18n.cpp:13
+#: data/cnames.dat:12
 msgid ""
 "_: Constellation name (optional)\n"
 "CANCER"
 msgstr "CANCER"
 
-#: kstars_i18n.cpp:14
+#: data/cnames.dat:13
 msgid ""
 "_: Constellation name (optional)\n"
 "CANES VENATICI"
 msgstr "CANES VENATICI"
 
-#: kstars_i18n.cpp:15
+#: data/cnames.dat:14
 msgid ""
 "_: Constellation name (optional)\n"
 "CANIS MAJOR"
 msgstr "CANIS MAJOR"
 
-#: kstars_i18n.cpp:16
+#: data/cnames.dat:15
 msgid ""
 "_: Constellation name (optional)\n"
 "CANIS MINOR"
 msgstr "CANIS MINOR"
 
-#: kstars_i18n.cpp:17
+#: data/cnames.dat:16
 msgid ""
 "_: Constellation name (optional)\n"
 "CAPRICORNUS"
 msgstr "CAPRICORNUS"
 
-#: kstars_i18n.cpp:18
+#: data/cnames.dat:17
 msgid ""
 "_: Constellation name (optional)\n"
 "CARINA"
 msgstr "CARINA"
 
-#: kstars_i18n.cpp:19
+#: data/cnames.dat:18
 msgid ""
 "_: Constellation name (optional)\n"
 "CASSIOPEIA"
 msgstr "CASSIOPEIA"
 
-#: kstars_i18n.cpp:20
+#: data/cnames.dat:19
 msgid ""
 "_: Constellation name (optional)\n"
 "CENTAURUS"
 msgstr "CENTAURUS"
 
-#: kstars_i18n.cpp:21
+#: data/cnames.dat:20
 msgid ""
 "_: Constellation name (optional)\n"
 "CEPHEUS"
 msgstr "CEPHEUS"
 
-#: kstars_i18n.cpp:22
+#: data/cnames.dat:21
 msgid ""
 "_: Constellation name (optional)\n"
 "CETUS"
 msgstr "CETUS"
 
-#: kstars_i18n.cpp:23
+#: data/cnames.dat:22
 msgid ""
 "_: Constellation name (optional)\n"
 "CHAMAELEON"
 msgstr "CHAMAELEON"
 
-#: kstars_i18n.cpp:24
+#: data/cnames.dat:23
 msgid ""
 "_: Constellation name (optional)\n"
 "CIRCINUS"
 msgstr "CIRCINUS"
 
-#: kstars_i18n.cpp:25
+#: data/cnames.dat:24
 msgid ""
 "_: Constellation name (optional)\n"
 "COLUMBA"
 msgstr "COLUMBA"
 
-#: kstars_i18n.cpp:26
+#: data/cnames.dat:25
 msgid ""
 "_: Constellation name (optional)\n"
 "COMA BERENICES"
 msgstr "COMA BERENICES"
 
-#: kstars_i18n.cpp:27
+#: data/cnames.dat:26
 msgid ""
 "_: Constellation name (optional)\n"
 "CORONA AUSTRALIS"
 msgstr "CORONA AUSTRALIS"
 
-#: kstars_i18n.cpp:28
+#: data/cnames.dat:27
 msgid ""
 "_: Constellation name (optional)\n"
 "CORONA BOREALIS"
 msgstr "CORONA BOREALIS"
 
-#: kstars_i18n.cpp:29
+#: data/cnames.dat:28
 msgid ""
 "_: Constellation name (optional)\n"
 "CORVUS"
 msgstr "CORVUS"
 
-#: kstars_i18n.cpp:30
+#: data/cnames.dat:29
 msgid ""
 "_: Constellation name (optional)\n"
 "CRATER"
 msgstr "CRATER"
 
-#: kstars_i18n.cpp:31
+#: data/cnames.dat:30
 msgid ""
 "_: Constellation name (optional)\n"
 "CRUX"
 msgstr "CRUX"
 
-#: kstars_i18n.cpp:32
+#: data/cnames.dat:31
 msgid ""
 "_: Constellation name (optional)\n"
 "CYGNUS"
 msgstr "CYGNUS"
 
-#: kstars_i18n.cpp:33
+#: data/cnames.dat:32
 msgid ""
 "_: Constellation name (optional)\n"
 "DELPHINUS"
 msgstr "DELPHINUS"
 
-#: kstars_i18n.cpp:34
+#: data/cnames.dat:33
 msgid ""
 "_: Constellation name (optional)\n"
 "DORADO"
 msgstr "DORADO"
 
-#: kstars_i18n.cpp:35
+#: data/cnames.dat:34
 msgid ""
 "_: Constellation name (optional)\n"
 "DRACO"
 msgstr "DRACO"
 
-#: kstars_i18n.cpp:36
+#: data/cnames.dat:35
 msgid ""
 "_: Constellation name (optional)\n"
 "EQUULEUS"
 msgstr "EQUULEUS"
 
-#: kstars_i18n.cpp:37
+#: data/cnames.dat:36
 msgid ""
 "_: Constellation name (optional)\n"
 "ERIDANUS"
 msgstr "ERIDANUS"
 
-#: kstars_i18n.cpp:38
+#: data/cnames.dat:37
 msgid ""
 "_: Constellation name (optional)\n"
 "FORNAX"
 msgstr "FORNAX"
 
-#: kstars_i18n.cpp:39
+#: data/cnames.dat:38
 msgid ""
 "_: Constellation name (optional)\n"
 "GEMINI"
 msgstr "GEMINI"
 
-#: kstars_i18n.cpp:40
+#: data/cnames.dat:39
 msgid ""
 "_: Constellation name (optional)\n"
 "GRUS"
 msgstr "GRUS"
 
-#: kstars_i18n.cpp:41
+#: data/cnames.dat:40
 msgid ""
 "_: Constellation name (optional)\n"
 "HERCULES"
 msgstr "HERCULES"
 
-#: kstars_i18n.cpp:42
+#: data/cnames.dat:41
 msgid ""
 "_: Constellation name (optional)\n"
 "HOROLOGIUM"
 msgstr "HOROLOGIUM"
 
-#: kstars_i18n.cpp:43
+#: data/cnames.dat:42
 msgid ""
 "_: Constellation name (optional)\n"
 "HYDRA"
 msgstr "HYDRA"
 
-#: kstars_i18n.cpp:44
+#: data/cnames.dat:43
 msgid ""
 "_: Constellation name (optional)\n"
 "HYDRUS"
 msgstr "HYDRUS"
 
-#: kstars_i18n.cpp:45
+#: data/cnames.dat:44
 msgid ""
 "_: Constellation name (optional)\n"
 "INDUS"
 msgstr "INDUS"
 
-#: kstars_i18n.cpp:46
+#: data/cnames.dat:45
 msgid ""
 "_: Constellation name (optional)\n"
 "LACERTA"
 msgstr "LACERTA"
 
-#: kstars_i18n.cpp:47
+#: data/cnames.dat:46
 msgid ""
 "_: Constellation name (optional)\n"
 "LEO"
 msgstr "LEO"
 
-#: kstars_i18n.cpp:48
+#: data/cnames.dat:47
 msgid ""
 "_: Constellation name (optional)\n"
 "LEO MINOR"
 msgstr "LEO MINOR"
 
-#: kstars_i18n.cpp:49
+#: data/cnames.dat:48
 msgid ""
 "_: Constellation name (optional)\n"
 "LEPUS"
 msgstr "LEPUS"
 
-#: kstars_i18n.cpp:50
+#: data/cnames.dat:49
 msgid ""
 "_: Constellation name (optional)\n"
 "LIBRA"
 msgstr "LIBRA"
 
-#: kstars_i18n.cpp:51
+#: data/cnames.dat:50
 msgid ""
 "_: Constellation name (optional)\n"
 "LUPUS"
 msgstr "LUPUS"
 
-#: kstars_i18n.cpp:52
+#: data/cnames.dat:51
 msgid ""
 "_: Constellation name (optional)\n"
 "LYNX"
 msgstr "LYNX"
 
-#: kstars_i18n.cpp:53
+#: data/cnames.dat:52
 msgid ""
 "_: Constellation name (optional)\n"
 "LYRA"
 msgstr "LYRA"
 
-#: kstars_i18n.cpp:54
+#: data/cnames.dat:53
 msgid ""
 "_: Constellation name (optional)\n"
 "MENSA"
 msgstr "MENSA"
 
-#: kstars_i18n.cpp:55
+#: data/cnames.dat:54
 msgid ""
 "_: Constellation name (optional)\n"
 "MICROSCOPIUM"
 msgstr "MICROSCOPIUM"
 
-#: kstars_i18n.cpp:56
+#: data/cnames.dat:55
 msgid ""
 "_: Constellation name (optional)\n"
 "MONOCEROS"
 msgstr "MONOCEROS"
 
-#: kstars_i18n.cpp:57
+#: data/cnames.dat:56
 msgid ""
 "_: Constellation name (optional)\n"
 "MUSCA"
 msgstr "MUSCA"
 
-#: kstars_i18n.cpp:58
+#: data/cnames.dat:57
 msgid ""
 "_: Constellation name (optional)\n"
 "NORMA"
 msgstr "NORMA"
 
-#: kstars_i18n.cpp:59
+#: data/cnames.dat:58
 msgid ""
 "_: Constellation name (optional)\n"
 "OCTANS"
 msgstr "OCTANS"
 
-#: kstars_i18n.cpp:60
+#: data/cnames.dat:59
 msgid ""
 "_: Constellation name (optional)\n"
 "OPHIUCHUS"
 msgstr "OPHIUCHUS"
 
-#: kstars_i18n.cpp:61
+#: data/cnames.dat:60
 msgid ""
 "_: Constellation name (optional)\n"
 "ORION"
 msgstr "ORION"
 
-#: kstars_i18n.cpp:62
+#: data/cnames.dat:61
 msgid ""
 "_: Constellation name (optional)\n"
 "PAVO"
 msgstr "PAVO"
 
-#: kstars_i18n.cpp:63
+#: data/cnames.dat:62
 msgid ""
 "_: Constellation name (optional)\n"
 "PEGASUS"
 msgstr "PEGASUS"
 
-#: kstars_i18n.cpp:64
+#: data/cnames.dat:63
 msgid ""
 "_: Constellation name (optional)\n"
 "PERSEUS"
 msgstr "PERSEUS"
 
-#: kstars_i18n.cpp:65
+#: data/cnames.dat:64
 msgid ""
 "_: Constellation name (optional)\n"
 "PHOENIX"
 msgstr "PHOENIX"
 
-#: kstars_i18n.cpp:66
+#: data/cnames.dat:65
 msgid ""
 "_: Constellation name (optional)\n"
 "PICTOR"
 msgstr "PICTOR"
 
-#: kstars_i18n.cpp:67
+#: data/cnames.dat:66
 msgid ""
 "_: Constellation name (optional)\n"
 "PISCES"
 msgstr "PISCES"
 
-#: kstars_i18n.cpp:68
+#: data/cnames.dat:67
 msgid ""
 "_: Constellation name (optional)\n"
 "PISCIS AUSTRINUS"
 msgstr "PISCIS AUSTRINUS"
 
-#: kstars_i18n.cpp:69
+#: data/cnames.dat:68
 msgid ""
 "_: Constellation name (optional)\n"
 "PUPPIS"
 msgstr "PUPPIS"
 
-#: kstars_i18n.cpp:70
+#: data/cnames.dat:69
 msgid ""
 "_: Constellation name (optional)\n"
 "PYXIS"
 msgstr "PYXIS"
 
-#: kstars_i18n.cpp:71
+#: data/cnames.dat:70
 msgid ""
 "_: Constellation name (optional)\n"
 "RETICULUM"
 msgstr "RETICULUM"
 
-#: kstars_i18n.cpp:72
+#: data/cnames.dat:71
 msgid ""
 "_: Constellation name (optional)\n"
 "SAGITTA"
 msgstr "SAGITTA"
 
-#: kstars_i18n.cpp:73
+#: data/cnames.dat:72
 msgid ""
 "_: Constellation name (optional)\n"
 "SAGITTARIUS"
 msgstr "SAGITTARIUS"
 
-#: kstars_i18n.cpp:74
+#: data/cnames.dat:73
 msgid ""
 "_: Constellation name (optional)\n"
 "SCORPIUS"
 msgstr "SCORPIUS"
 
-#: kstars_i18n.cpp:75
+#: data/cnames.dat:74
 msgid ""
 "_: Constellation name (optional)\n"
 "SCULPTOR"
 msgstr "SCULPTOR"
 
-#: kstars_i18n.cpp:76
+#: data/cnames.dat:75
 msgid ""
 "_: Constellation name (optional)\n"
 "SCUTUM"
 msgstr "SCUTUM"
 
-#: kstars_i18n.cpp:77
+#: data/cnames.dat:76
 msgid ""
 "_: Constellation name (optional)\n"
 "SERPENS CAPUT"
 msgstr "SERPENS CAPUT"
 
-#: kstars_i18n.cpp:78
+#: data/cnames.dat:77
 msgid ""
 "_: Constellation name (optional)\n"
 "SERPENS CAUDA"
 msgstr "SERPENS CAUDA"
 
-#: kstars_i18n.cpp:79
+#: data/cnames.dat:78
 msgid ""
 "_: Constellation name (optional)\n"
 "SEXTANS"
 msgstr "SEXTANS"
 
-#: kstars_i18n.cpp:80
+#: data/cnames.dat:79
 msgid ""
 "_: Constellation name (optional)\n"
 "TAURUS"
 msgstr "TAURUS"
 
-#: kstars_i18n.cpp:81
+#: data/cnames.dat:80
 msgid ""
 "_: Constellation name (optional)\n"
 "TELESCOPIUM"
 msgstr "TELESCOPIUM"
 
-#: kstars_i18n.cpp:82
+#: data/cnames.dat:81
 msgid ""
 "_: Constellation name (optional)\n"
 "TRIANGULUM"
 msgstr "TRIANGULUM"
 
-#: kstars_i18n.cpp:83
+#: data/cnames.dat:82
 msgid ""
 "_: Constellation name (optional)\n"
 "TRIANGULUM AUSTRALE"
 msgstr "TRIANGULUM AUSTRALE"
 
-#: kstars_i18n.cpp:84
+#: data/cnames.dat:83
 msgid ""
 "_: Constellation name (optional)\n"
 "TUCANA"
 msgstr " TUCANA"
 
-#: kstars_i18n.cpp:85
+#: data/cnames.dat:84
 msgid ""
 "_: Constellation name (optional)\n"
 "URSA MAJOR"
 msgstr "URSA MAJOR"
 
-#: kstars_i18n.cpp:86
+#: data/cnames.dat:85
 msgid ""
 "_: Constellation name (optional)\n"
 "URSA MINOR"
 msgstr "URSA MINOR"
 
-#: kstars_i18n.cpp:87
+#: data/cnames.dat:86
 msgid ""
 "_: Constellation name (optional)\n"
 "VELA"
 msgstr "VELA"
 
-#: kstars_i18n.cpp:88
+#: data/cnames.dat:87
 msgid ""
 "_: Constellation name (optional)\n"
 "VIRGO"
 msgstr "VIRGO"
 
-#: kstars_i18n.cpp:89
+#: data/cnames.dat:88
 msgid ""
 "_: Constellation name (optional)\n"
 "VOLANS"
 msgstr "VOLANS"
 
-#: kstars_i18n.cpp:90
+#: data/cnames.dat:89
 msgid ""
 "_: Constellation name (optional)\n"
 "VULPECULA"
 msgstr "VULPECULA"
 
-#: kstars_i18n.cpp:91
+#: data/Cities.dat:1
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Aabenraa"
 msgstr "Aabenraa"
 
-#: kstars_i18n.cpp:92
+#: 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 "Jylland"
+
+#: 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"
+msgstr "Denmarc"
+
+#: data/Cities.dat:2
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Aachen"
 msgstr " Aachen"
 
-#: kstars_i18n.cpp:93
+#: 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"
+msgstr "Yr Almaen"
+
+#: data/Cities.dat:3
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Aalborg"
 msgstr " Aalborg"
 
-#: kstars_i18n.cpp:94
+#: data/Cities.dat:4
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Aarhus"
 msgstr "Aarhus"
 
-#: kstars_i18n.cpp:95
+#: data/Cities.dat:5
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Abakan"
 msgstr "Kanab"
 
-#: kstars_i18n.cpp:96
+#: 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
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Siberia"
+msgstr "Georgia"
+
+#: 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"
+"Russia"
+msgstr "Rwsia"
+
+#: data/Cities.dat:6
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Abbotsford"
 msgstr "Abbotsford"
 
-#: kstars_i18n.cpp:97
+#: 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 "British Columbia"
+
+#: 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 "Canada"
+
+#: 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 "Aberdeen"
 
-#: kstars_i18n.cpp:98
+#: 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 "Idaho"
+
+#: 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 "Yr Unol Daleithiau America"
+
+#: 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 "Maryland"
+
+#: data/Cities.dat:9 data/Cities.dat:720 data/Cities.dat:923
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Scotland"
+msgstr "Yr Alban"
+
+#: 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 "Y Deyrnas Unedig"
+
+#: 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 "De Dakota"
+
+#: 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"
+msgstr "Washington"
+
+#: data/Cities.dat:12
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Abidjan"
 msgstr "Ada"
 
-#: kstars_i18n.cpp:99
+#: data/Cities.dat:12 data/Cities.dat:2802
+#, fuzzy
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Ivory coast"
+msgstr "Iran"
+
+#: data/Cities.dat:13 data/Cities.dat:14
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Abilene"
 msgstr "Abilene"
 
-#: kstars_i18n.cpp:100
+#: 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 "Kansas"
+
+#: 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"
+"Texas"
+msgstr "Texas"
+
+#: data/Cities.dat:15
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Abuja"
 msgstr "Aqaba"
 
-#: kstars_i18n.cpp:101
+#: 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"
+msgstr "Nigeria"
+
+#: data/Cities.dat:16
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Acapulco"
 msgstr "Acapulco"
 
-#: kstars_i18n.cpp:102
+#: 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"
+msgstr "Mecsico"
+
+#: data/Cities.dat:17
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Accra"
 msgstr "Accra"
 
-#: kstars_i18n.cpp:103
+#: data/Cities.dat:17 data/Cities.dat:305 data/Cities.dat:2490
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Ghana"
+msgstr "Ghana"
+
+#: data/Cities.dat:18
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ada"
 msgstr "Ada"
 
-#: kstars_i18n.cpp:104
+#: 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"
+msgstr "Minnesota"
+
+#: data/Cities.dat:19
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Adak"
 msgstr "Adak"
 
-#: kstars_i18n.cpp:105
+#: 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"
+"Alaska"
+msgstr "Alaska"
+
+#: data/Cities.dat:20
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Adams"
 msgstr "Adams"
 
-#: kstars_i18n.cpp:106
+#: 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"
+msgstr "Massachusetts"
+
+#: data/Cities.dat:21
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Adamstown"
 msgstr "Adamstown"
 
-#: kstars_i18n.cpp:107
+#: data/Cities.dat:21
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Pitcairn Islands"
+msgstr "Ynysoedd Pitcairn"
+
+#: data/Cities.dat:22
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Addis Ababa"
 msgstr "Addis Ababa"
 
-#: kstars_i18n.cpp:108
+#: data/Cities.dat:22
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Ethiopia"
+msgstr "Ethiopia"
+
+#: data/Cities.dat:23
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Adelaide"
 msgstr "Adelaide"
 
-#: kstars_i18n.cpp:109
+#: data/Cities.dat:23
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"South Australia"
+msgstr "De Australia"
+
+#: 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"
+msgstr "Australia"
+
+#: data/Cities.dat:24
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Aden"
 msgstr "Aden"
 
-#: kstars_i18n.cpp:110
+#: data/Cities.dat:24
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Yemen"
+msgstr "Yemen"
+
+#: data/Cities.dat:25 data/Cities.dat:26
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Afton"
 msgstr "Afton"
 
-#: kstars_i18n.cpp:111
+#: 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 "Oklahoma"
+
+#: 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"
+msgstr "Wyoming"
+
+#: data/Cities.dat:27
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Agadez"
 msgstr "Valdez"
 
-#: kstars_i18n.cpp:112
+#: data/Cities.dat:27 data/Cities.dat:901 data/Cities.dat:1831
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Niger"
+msgstr "Niger"
+
+#: data/Cities.dat:28
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Agadir"
 msgstr "Sugadaira"
 
-#: kstars_i18n.cpp:113
+#: 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"
+msgstr "Morocco"
+
+#: data/Cities.dat:29
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Agana"
 msgstr "Agana"
 
-#: kstars_i18n.cpp:114
+#: data/Cities.dat:29 data/Cities.dat:90
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Guam"
+msgstr "Guam"
+
+#: data/Cities.dat:30
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Aginskoe"
 msgstr "Aiken"
 
-#: kstars_i18n.cpp:115
+#: data/Cities.dat:31
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ahwahnee"
 msgstr "Ahwahnee"
 
-#: kstars_i18n.cpp:116
+#: 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"
+msgstr "California"
+
+#: data/Cities.dat:32
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Aiken"
 msgstr "Aiken"
 
-#: kstars_i18n.cpp:117
+#: 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"
+msgstr "De Carolina"
+
+#: data/Cities.dat:33
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ainsworth"
 msgstr "Ainsworth"
 
-#: kstars_i18n.cpp:118
+#: 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"
+msgstr "Nebraska"
+
+#: data/Cities.dat:34
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ajaccio"
 msgstr "Ajo"
 
-#: kstars_i18n.cpp:119
+#: data/Cities.dat:34
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Corse du Sud"
+msgstr "Colorado"
+
+#: 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"
+"France"
+msgstr "Ffrainc"
+
+#: data/Cities.dat:35
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ajo"
 msgstr "Ajo"
 
-#: kstars_i18n.cpp:120
+#: 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"
+msgstr "Arizona"
+
+#: data/Cities.dat:36
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Akron"
 msgstr "Akron"
 
-#: kstars_i18n.cpp:121
+#: 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"
+msgstr "Ohio"
+
+#: data/Cities.dat:37
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Al Jawf"
 msgstr "Alamo"
 
-#: kstars_i18n.cpp:122
+#: data/Cities.dat:37 data/Cities.dat:251 data/Cities.dat:1667
+#: data/Cities.dat:2543
+#, fuzzy
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Lybia"
+msgstr "Liberia"
+
+#: data/Cities.dat:38
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Al Manamah"
 msgstr "Al Manamah"
 
-#: kstars_i18n.cpp:123
+#: data/Cities.dat:38
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Bahrain"
+msgstr "Bahrain"
+
+#: data/Cities.dat:39
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Alameda"
 msgstr "Alameda"
 
-#: kstars_i18n.cpp:124
+#: data/Cities.dat:40
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Alamo"
 msgstr "Alamo"
 
-#: kstars_i18n.cpp:125
+#: 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"
+msgstr "Nevada"
+
+#: data/Cities.dat:41
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Alamogordo"
 msgstr "Alamogordo"
 
-#: kstars_i18n.cpp:126
+#: 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"
+msgstr "Mexico Newydd"
+
+#: data/Cities.dat:42
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Albacete"
 msgstr "Albacete"
 
-#: kstars_i18n.cpp:127
+#: 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 "Sbaen"
+
+#: 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 "Albany"
 
-#: kstars_i18n.cpp:128
+#: 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 "Georgia"
+
+#: 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 "Efrog Newydd"
+
+#: 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"
+msgstr "Oregon"
+
+#: data/Cities.dat:46
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Albion"
 msgstr "Albion"
 
-#: kstars_i18n.cpp:129
+#: data/Cities.dat:47
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Albuquerque"
 msgstr "Albuquerque"
 
-#: kstars_i18n.cpp:130
+#: data/Cities.dat:48
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Alcalá de Henares"
 msgstr "Alcalá de Henares"
 
-#: kstars_i18n.cpp:131
+#: data/Cities.dat:49
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Alcoa"
 msgstr "Alcoa"
 
-#: kstars_i18n.cpp:132
+#: 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"
+"Tennessee"
+msgstr "Tennessee"
+
+#: data/Cities.dat:50
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Aldermaston"
 msgstr "Aldermaston"
 
-#: kstars_i18n.cpp:133
+#: data/Cities.dat:51
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Alert"
 msgstr "Alert"
 
-#: kstars_i18n.cpp:134
+#: data/Cities.dat:51 data/Cities.dat:1144
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Nunavut"
+msgstr "Nunavut"
+
+#: data/Cities.dat:52
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Alessandria"
 msgstr "Alessandria"
 
-#: kstars_i18n.cpp:135
+#: 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"
+"Italy"
+msgstr "Yr Eidal"
+
+#: data/Cities.dat:53
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Alexander City"
 msgstr "Dinas Alexander"
 
-#: kstars_i18n.cpp:136
+#: 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 "Alabama"
+
+#: 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 "Alexandria"
 
-#: kstars_i18n.cpp:137
+#: 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 "Yr Aifft"
+
+#: 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 "Louisiana"
+
+#: 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"
+msgstr "Virginia"
+
+#: data/Cities.dat:57
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Algiers"
 msgstr "Algiers"
 
-#: kstars_i18n.cpp:138
+#: 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"
+msgstr "Algeria"
+
+#: data/Cities.dat:58
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Algonquin"
 msgstr "Algonquin"
 
-#: kstars_i18n.cpp:139
+#: data/Cities.dat:59
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Alhambra"
 msgstr "Alhambra"
 
-#: kstars_i18n.cpp:140
+#: data/Cities.dat:60
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Alicante"
 msgstr "Alicante"
 
-#: kstars_i18n.cpp:141
+#: data/Cities.dat:61
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Alice Springs"
 msgstr "Alice Springs"
 
-#: kstars_i18n.cpp:142
+#: data/Cities.dat:61 data/Cities.dat:617
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Northern Territory"
+msgstr "Northern Territory"
+
+#: data/Cities.dat:62
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Allegheny Obs."
 msgstr " Ars. Allegheny"
 
-#: kstars_i18n.cpp:143
+#: 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"
+msgstr "Pennsylvania"
+
+#: data/Cities.dat:63
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Allentown"
 msgstr " Allentown"
 
-#: kstars_i18n.cpp:144
+#: data/Cities.dat:64
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Alliance"
 msgstr " Alliance"
 
-#: kstars_i18n.cpp:145
+#: data/Cities.dat:65
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Alma Ata"
 msgstr " Alma Ata"
 
-#: kstars_i18n.cpp:146
+#: data/Cities.dat:65
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Kazakhstan"
+msgstr "Kazakhstan"
+
+#: data/Cities.dat:66
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Almería"
 msgstr "Almería"
 
-#: kstars_i18n.cpp:147
+#: data/Cities.dat:67
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Alpharetta"
 msgstr "Alpharetta"
 
-#: kstars_i18n.cpp:148
+#: data/Cities.dat:68
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Alpine"
 msgstr "Alpine"
 
-#: kstars_i18n.cpp:149
+#: data/Cities.dat:69
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Altenstadt"
 msgstr "Altenstadt"
 
-#: kstars_i18n.cpp:150
+#: data/Cities.dat:70
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Altoona"
 msgstr "Altoona"
 
-#: kstars_i18n.cpp:151
+#: data/Cities.dat:71
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Amami Island"
 msgstr "Amami Island"
 
-#: kstars_i18n.cpp:152
+#: 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"
+"Japan"
+msgstr "Siapan"
+
+#: data/Cities.dat:72
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Amarillo"
 msgstr "Amarillo"
 
-#: kstars_i18n.cpp:153
+#: data/Cities.dat:73
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ambler"
 msgstr "Ambler"
 
-#: kstars_i18n.cpp:154
+#: data/Cities.dat:74
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Amchitka"
 msgstr "Amchitka"
 
-#: kstars_i18n.cpp:155
+#: data/Cities.dat:75
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "American Falls"
 msgstr "American Falls"
 
-#: kstars_i18n.cpp:156
+#: data/Cities.dat:76
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ames"
 msgstr "Ames"
 
-#: kstars_i18n.cpp:157
+#: 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 ""
-"_: City name (optional, probably does not need a translation)\n"
-"Amherst Obs."
-msgstr "Ars. Amherst"
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Iowa"
+msgstr "Iowa"
 
-#: kstars_i18n.cpp:158
+#: data/Cities.dat:77
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Amherst"
 msgstr "Amherst"
 
-#: kstars_i18n.cpp:159
+#: data/Cities.dat:78
+msgid ""
+"_: City name (optional, probably does not need a translation)\n"
+"Amherst Obs."
+msgstr "Ars. Amherst"
+
+#: data/Cities.dat:79
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Amiens"
 msgstr "Ames"
 
-#: kstars_i18n.cpp:160
+#: data/Cities.dat:79
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Somme"
+msgstr "Azores"
+
+#: data/Cities.dat:80
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Amilcar Cabral"
 msgstr "Amilcar Cabral"
 
-#: kstars_i18n.cpp:161
+#: data/Cities.dat:80
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Cape Verde"
+msgstr "Cape Verde"
+
+#: data/Cities.dat:81
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Amman"
 msgstr "Amman"
 
-#: kstars_i18n.cpp:162
+#: data/Cities.dat:81 data/Cities.dat:109
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Jordan"
+msgstr "Jordan"
+
+#: data/Cities.dat:82
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Amsterdam"
 msgstr "Amsterdam"
 
-#: kstars_i18n.cpp:163
+#: 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"
+"Netherlands"
+msgstr "Iseldiroedd"
+
+#: data/Cities.dat:83
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Anaconda"
 msgstr "Anaconda"
 
-#: kstars_i18n.cpp:164
+#: 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"
+msgstr "Montana"
+
+#: data/Cities.dat:84
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Anadyr"
 msgstr "Ankara"
 
-#: kstars_i18n.cpp:165
+#: 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
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Far East"
+msgstr "Falster"
+
+#: data/Cities.dat:85
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Anaheim"
 msgstr "Anaheim"
 
-#: kstars_i18n.cpp:166
+#: data/Cities.dat:86
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Anchorage"
 msgstr "Anchorage"
 
-#: kstars_i18n.cpp:167
+#: data/Cities.dat:87
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ancona"
 msgstr "Ancona"
 
-#: kstars_i18n.cpp:168
+#: data/Cities.dat:88 data/Cities.dat:89
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Anderson AFB"
-msgstr "Anderson AFB"
+"Anderson"
+msgstr "Anderson"
+
+#: 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"
+"Indiana"
+msgstr "Indiana"
 
-#: kstars_i18n.cpp:169
+#: data/Cities.dat:90
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Anderson"
-msgstr "Anderson"
+"Anderson AFB"
+msgstr "Anderson AFB"
 
-#: kstars_i18n.cpp:170
+#: data/Cities.dat:91
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Andong"
 msgstr "Andong"
 
-#: kstars_i18n.cpp:171
+#: 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 "Gyeongbuk"
+
+#: 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"
+"Korea"
+msgstr "Corea"
+
+#: data/Cities.dat:92
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Andria"
 msgstr "Andria"
 
-#: kstars_i18n.cpp:172
+#: data/Cities.dat:93
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Angaur Island"
 msgstr "Ynys Angaur"
 
-#: kstars_i18n.cpp:173
+#: data/Cities.dat:93 data/Cities.dat:170
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Palau"
+msgstr "Palau"
+
+#: data/Cities.dat:94
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ankara"
 msgstr "Ankara"
 
-#: kstars_i18n.cpp:174
+#: 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"
+msgstr "Twrci"
+
+#: data/Cities.dat:95
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ann Arbor"
 msgstr "Ann Arbor"
 
-#: kstars_i18n.cpp:175
+#: 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"
+msgstr "Michigan"
+
+#: data/Cities.dat:96
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Annabah"
 msgstr "Ansbach"
 
-#: kstars_i18n.cpp:176
+#: data/Cities.dat:97
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Annapolis"
 msgstr "Annapolis"
 
-#: kstars_i18n.cpp:177
+#: data/Cities.dat:98
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Annecy"
 msgstr "Muncy"
 
-#: kstars_i18n.cpp:178
+#: data/Cities.dat:98
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Haute-Savoie"
+msgstr "Hawaii"
+
+#: data/Cities.dat:99
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Annette Island"
 msgstr "Annette Island"
 
-#: kstars_i18n.cpp:179
+#: data/Cities.dat:100
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Anniston"
 msgstr "Anniston"
 
-#: kstars_i18n.cpp:180
+#: data/Cities.dat:101
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ansbach"
 msgstr "Ansbach"
 
-#: kstars_i18n.cpp:181
+#: data/Cities.dat:102
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Antananarivo"
 msgstr "Ontario"
 
-#: kstars_i18n.cpp:182
+#: 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"
+msgstr "Madagascar"
+
+#: data/Cities.dat:103
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Antlers"
 msgstr "Antlers"
 
-#: kstars_i18n.cpp:183
+#: data/Cities.dat:104
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Antofagasta"
 msgstr "Antofagasta"
 
-#: kstars_i18n.cpp:184
+#: 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"
+msgstr "Chile"
+
+#: data/Cities.dat:105
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Antsirabe"
 msgstr "Kosrae"
 
-#: kstars_i18n.cpp:185
+#: data/Cities.dat:106
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Antwerp"
 msgstr "Antwerp"
 
-#: kstars_i18n.cpp:186
+#: 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"
+msgstr "Gwlad Belg"
+
+#: data/Cities.dat:107
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Aosta"
 msgstr "Aosta"
 
-#: kstars_i18n.cpp:187
+#: data/Cities.dat:108
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Appleton"
 msgstr "Appleton"
 
-#: kstars_i18n.cpp:188
+#: 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"
+"Wisconsin"
+msgstr "Wisconsin"
+
+#: data/Cities.dat:109
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Aqaba"
 msgstr "Aqaba"
 
-#: kstars_i18n.cpp:189
+#: data/Cities.dat:110
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Arcade-Arden"
 msgstr "Arcade-Arden"
 
-#: kstars_i18n.cpp:190
+#: data/Cities.dat:111
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Arcetri"
 msgstr "Arcetri"
 
-#: kstars_i18n.cpp:191
+#: data/Cities.dat:112
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Archenhold"
 msgstr "Archenhold"
 
-#: kstars_i18n.cpp:192
+#: data/Cities.dat:113
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ardmore"
 msgstr "Ardmore"
 
-#: kstars_i18n.cpp:193
+#: data/Cities.dat:114
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Arecibo Obs."
 msgstr "Ars. Arecibo"
 
-#: kstars_i18n.cpp:194
+#: 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"
+"Puerto Rico"
+msgstr "Puerto Rico"
+
+#: data/Cities.dat:115
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Arese"
 msgstr "Arese"
 
-#: kstars_i18n.cpp:195
+#: data/Cities.dat:116
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Arezzo"
 msgstr "Arezzo"
 
-#: kstars_i18n.cpp:196
+#: data/Cities.dat:117
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Argyle"
 msgstr "Argyle"
 
-#: kstars_i18n.cpp:197
+#: data/Cities.dat:118
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Arica"
 msgstr "Arica"
 
-#: kstars_i18n.cpp:198
+#: data/Cities.dat:119
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Arkadelphia"
 msgstr "Arkadelphia"
 
-#: kstars_i18n.cpp:199
+#: 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"
+msgstr "Arkansas"
+
+#: data/Cities.dat:120
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Arkhangelsk"
 msgstr "Orange"
 
-#: kstars_i18n.cpp:200
+#: 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
+#, fuzzy
 msgid ""
-"_: City name (optional, probably does not need a translation)\n"
-"Arlington Heights"
-msgstr "Arlington Heights"
+"_: Region/state name (optional, rarely needs a translation)\n"
+"North-West Region"
+msgstr "Northwest Territories"
 
-#: kstars_i18n.cpp:201
+#: data/Cities.dat:121 data/Cities.dat:122 data/Cities.dat:123
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Arlington"
 msgstr "Arlington"
 
-#: kstars_i18n.cpp:202
+#: data/Cities.dat:124
+msgid ""
+"_: City name (optional, probably does not need a translation)\n"
+"Arlington Heights"
+msgstr "Arlington Heights"
+
+#: 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"
+msgstr "Illinois"
+
+#: data/Cities.dat:125
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Armagh"
 msgstr "Armagh"
 
-#: kstars_i18n.cpp:203
+#: data/Cities.dat:125 data/Cities.dat:237
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Northern Ireland"
+msgstr "Gogledd Iwerddon"
+
+#: data/Cities.dat:126
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Armour"
 msgstr "Armour"
 
-#: kstars_i18n.cpp:204
+#: data/Cities.dat:127
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Arrecife"
 msgstr "Arrecife"
 
-#: kstars_i18n.cpp:205
+#: data/Cities.dat:127 data/Cities.dat:1372 data/Cities.dat:2118
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Gran Canaria"
+msgstr "Gran Canaria"
+
+#: data/Cities.dat:128
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Arua"
 msgstr "Arica"
 
-#: kstars_i18n.cpp:206
+#: 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"
+msgstr "Uganda"
+
+#: data/Cities.dat:129
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Arvada"
 msgstr "Arvada"
 
-#: kstars_i18n.cpp:207
+#: 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"
+msgstr "Colorado"
+
+#: data/Cities.dat:130
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ash Fork"
 msgstr "Ash Fork"
 
-#: kstars_i18n.cpp:208
+#: data/Cities.dat:131
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Asheville"
 msgstr "Asheville"
 
-#: kstars_i18n.cpp:209
+#: 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 "Gogledd Carolina"
+
+#: 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 "Ashland"
 
-#: kstars_i18n.cpp:210
+#: 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 "Kentucky"
+
+#: 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"
+"Maine"
+msgstr "Maine"
+
+#: data/Cities.dat:135
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ashley"
 msgstr "Ashley"
 
-#: kstars_i18n.cpp:211
+#: 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"
+msgstr "Gogledd Dakota"
+
+#: data/Cities.dat:136
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Asiago"
 msgstr "Asiago"
 
-#: kstars_i18n.cpp:212
+#: data/Cities.dat:137
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Asmera"
 msgstr "Asmera"
 
-#: kstars_i18n.cpp:213
+#: data/Cities.dat:137 data/Cities.dat:139 data/Cities.dat:1562
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Eritrea"
+msgstr "Eritrea"
+
+#: data/Cities.dat:138
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Aspen"
 msgstr "Aspen"
 
-#: kstars_i18n.cpp:214
+#: data/Cities.dat:139
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Assab"
 msgstr "Aosta"
 
-#: kstars_i18n.cpp:215
+#: data/Cities.dat:140
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Astoria"
 msgstr "Astoria"
 
-#: kstars_i18n.cpp:216
+#: data/Cities.dat:141
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Asunción"
 msgstr "Asuncion"
 
-#: kstars_i18n.cpp:217
+#: data/Cities.dat:141
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Paraguay"
+msgstr "Paraguay"
+
+#: data/Cities.dat:142
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Aswan"
 msgstr "Aswan"
 
-#: kstars_i18n.cpp:218
+#: data/Cities.dat:143
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Asyut"
 msgstr "Aosta"
 
-#: kstars_i18n.cpp:219
+#: data/Cities.dat:144
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Atenas"
 msgstr "Atenas"
 
-#: kstars_i18n.cpp:220
+#: 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 "Groeg"
+
+#: data/Cities.dat:145 data/Cities.dat:146 data/Cities.dat:147
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Athens"
 msgstr "Athens"
 
-#: kstars_i18n.cpp:221
+#: data/Cities.dat:148
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Atkinson"
 msgstr "Atkinson"
 
-#: kstars_i18n.cpp:222
+#: data/Cities.dat:149
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Atlanta"
 msgstr "Atlanta"
 
-#: kstars_i18n.cpp:223
+#: data/Cities.dat:150
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Atlantic City"
 msgstr "Atlantic City"
 
-#: kstars_i18n.cpp:224
+#: 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"
+"New Jersey"
+msgstr "Jersey Newydd"
+
+#: data/Cities.dat:151
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Atmore"
 msgstr "Atmore"
 
-#: kstars_i18n.cpp:225
+#: data/Cities.dat:152
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Attleboro"
 msgstr "Attleboro"
 
-#: kstars_i18n.cpp:226
+#: data/Cities.dat:153 data/Cities.dat:154
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Auburn"
 msgstr "Auburn"
 
-#: kstars_i18n.cpp:227
+#: data/Cities.dat:155
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Auckland"
 msgstr "Auckland"
 
-#: kstars_i18n.cpp:228
+#: 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"
+msgstr "Seland Newydd"
+
+#: data/Cities.dat:156
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Augsburg"
 msgstr "Augsburg"
 
-#: kstars_i18n.cpp:229
+#: 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 "Augusta"
 
-#: kstars_i18n.cpp:230
+#: data/Cities.dat:160 data/Cities.dat:161 data/Cities.dat:162
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Aurora"
 msgstr "Aurora"
 
-#: kstars_i18n.cpp:231
+#: data/Cities.dat:163 data/Cities.dat:164
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Austin"
 msgstr "Austin"
 
-#: kstars_i18n.cpp:232
+#: data/Cities.dat:165
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Avalon"
 msgstr "Avalon"
 
-#: kstars_i18n.cpp:233
+#: 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"
+msgstr "De Cymru Newydd"
+
+#: data/Cities.dat:166
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Aviano"
 msgstr "Aviano"
 
-#: kstars_i18n.cpp:234
+#: data/Cities.dat:167
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Avon"
 msgstr "Avon"
 
-#: kstars_i18n.cpp:235
+#: 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"
+"Connecticut"
+msgstr "Connecticut"
+
+#: data/Cities.dat:168
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ayase"
 msgstr "Ayase"
 
-#: kstars_i18n.cpp:236
+#: data/Cities.dat:169
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Aztec"
 msgstr "Aztec"
 
-#: kstars_i18n.cpp:237
+#: data/Cities.dat:170
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Babelthuap Island"
 msgstr "Ynys Babelthuap"
 
-#: kstars_i18n.cpp:238
+#: data/Cities.dat:171
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bacolod"
 msgstr "Bacolod"
 
-#: kstars_i18n.cpp:239
+#: 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"
+msgstr "Philippines"
+
+#: data/Cities.dat:172
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Badajoz"
 msgstr "Badajoz"
 
-#: kstars_i18n.cpp:240
+#: data/Cities.dat:173
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Badalona"
 msgstr "Badalona"
 
-#: kstars_i18n.cpp:241
+#: data/Cities.dat:174
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Baden-Baden"
 msgstr "Baden-Baden"
 
-#: kstars_i18n.cpp:242
+#: data/Cities.dat:175
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bafata"
 msgstr "Belfast"
 
-#: kstars_i18n.cpp:243
+#: data/Cities.dat:175 data/Cities.dat:281
+#, fuzzy
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Guinea Bissau"
+msgstr "Tunisia"
+
+#: data/Cities.dat:176
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Baghdad"
 msgstr "Baghdad"
 
-#: kstars_i18n.cpp:244
+#: data/Cities.dat:176 data/Cities.dat:212 data/Cities.dat:2259
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Iraq"
+msgstr "Iraq"
+
+#: data/Cities.dat:177
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bahrain"
 msgstr "Bahrain"
 
-#: kstars_i18n.cpp:245
+#: data/Cities.dat:177 data/Cities.dat:683
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"United Arab Emirates"
+msgstr "Emiraethau Arabaidd Unedig"
+
+#: data/Cities.dat:178
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Baie-Comeau"
 msgstr "Baie-Comeau"
 
-#: kstars_i18n.cpp:246
+#: 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"
+"Quebec"
+msgstr "Quebec"
+
+#: data/Cities.dat:179
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Baker"
 msgstr "Baker"
 
-#: kstars_i18n.cpp:247
+#: data/Cities.dat:180
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bakersfield"
 msgstr "Bakersfield"
 
-#: kstars_i18n.cpp:248
+#: data/Cities.dat:181
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Balboa"
 msgstr "Balboa"
 
-#: kstars_i18n.cpp:249
+#: data/Cities.dat:181 data/Cities.dat:541 data/Cities.dat:1971
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Panama"
+msgstr "Panama"
+
+#: data/Cities.dat:182
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Baldwin Park"
 msgstr "Baldwin Park"
 
-#: kstars_i18n.cpp:250
+#: data/Cities.dat:183
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bali"
 msgstr "Bali"
 
-#: kstars_i18n.cpp:251
+#: 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"
+"Indonesia"
+msgstr "Indonesia"
+
+#: data/Cities.dat:184
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Baltimore"
 msgstr "Baltimore"
 
-#: kstars_i18n.cpp:252
+#: data/Cities.dat:185
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bamako"
 msgstr "Badajoz"
 
-#: kstars_i18n.cpp:253
+#: 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"
+msgstr "Mali"
+
+#: data/Cities.dat:186
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bamberg"
 msgstr "Bamberg"
 
-#: kstars_i18n.cpp:254
+#: data/Cities.dat:187
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bandar Abbass"
 msgstr "Bandar Abbass"
 
-#: kstars_i18n.cpp:255
+#: 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"
+"Iran"
+msgstr "Iran"
+
+#: data/Cities.dat:188
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bandar Lengeh"
 msgstr "Bandar Lengeh"
 
-#: kstars_i18n.cpp:256
+#: data/Cities.dat:189
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bandar Seri Begawan"
 msgstr "Bandar Seri Begawan"
 
-#: kstars_i18n.cpp:257
+#: data/Cities.dat:189
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Brunei"
+msgstr "Brunei"
+
+#: data/Cities.dat:190
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bandirma"
 msgstr "Bandirma"
 
-#: kstars_i18n.cpp:258
+#: data/Cities.dat:191
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Banff"
 msgstr "Banff"
 
-#: kstars_i18n.cpp:259
+#: 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"
+msgstr "Alberta"
+
+#: data/Cities.dat:192
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bangalore"
 msgstr "Bangalore"
 
-#: kstars_i18n.cpp:260
+#: 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"
+"India"
+msgstr "India"
+
+#: data/Cities.dat:193
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bangassou"
 msgstr "Bangor"
 
-#: kstars_i18n.cpp:261
+#: data/Cities.dat:193 data/Cities.dat:196 data/Cities.dat:275
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Central African Republic"
+msgstr "Gweriniaeth Canolig Affrica"
+
+#: data/Cities.dat:194
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bangkok"
 msgstr "Bangkok"
 
-#: kstars_i18n.cpp:262
+#: 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"
+"Thailand"
+msgstr "Thailand"
+
+#: data/Cities.dat:195
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bangor"
 msgstr "Bangor"
 
-#: kstars_i18n.cpp:263
+#: data/Cities.dat:196
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bangui"
 msgstr "Mangum"
 
-#: kstars_i18n.cpp:264
+#: data/Cities.dat:197
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Banjul"
 msgstr "Banjul"
 
-#: kstars_i18n.cpp:265
+#: data/Cities.dat:197
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Gambia"
+msgstr "Gambia"
+
+#: data/Cities.dat:198
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bar Harbor"
 msgstr "Bar Harbor"
 
-#: kstars_i18n.cpp:266
+#: data/Cities.dat:199
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Baraboo"
 msgstr "Baraboo"
 
-#: kstars_i18n.cpp:267
+#: data/Cities.dat:200
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Barcelona"
 msgstr "Barcelona"
 
-#: kstars_i18n.cpp:268
+#: data/Cities.dat:201
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bari"
 msgstr "Bari"
 
-#: kstars_i18n.cpp:269
+#: data/Cities.dat:202
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Barletta"
 msgstr "Barletta"
 
-#: kstars_i18n.cpp:270
+#: data/Cities.dat:203
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Barnaul"
 msgstr "Banjul"
 
-#: kstars_i18n.cpp:271
+#: data/Cities.dat:204
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Barnesville"
 msgstr "Barnesville"
 
-#: kstars_i18n.cpp:272
+#: data/Cities.dat:205
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Barranquilla"
 msgstr "Barranquilla"
 
-#: kstars_i18n.cpp:273
+#: data/Cities.dat:205 data/Cities.dat:302
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Colombia"
+msgstr "Colombia"
+
+#: data/Cities.dat:206
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Barre"
 msgstr "Barre"
 
-#: kstars_i18n.cpp:274
+#: 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"
+"Vermont"
+msgstr "Vermont"
+
+#: data/Cities.dat:207
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Barron"
 msgstr "Barron"
 
-#: kstars_i18n.cpp:275
+#: data/Cities.dat:208
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Barrow"
 msgstr "Barrow"
 
-#: kstars_i18n.cpp:276
+#: data/Cities.dat:209
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Barstow"
 msgstr "Barstow"
 
-#: kstars_i18n.cpp:277
+#: data/Cities.dat:210
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bartlesville"
 msgstr "Bartlesville"
 
-#: kstars_i18n.cpp:278
+#: data/Cities.dat:211
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Barton"
 msgstr "Barton"
 
-#: kstars_i18n.cpp:279
+#: data/Cities.dat:212
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Basrah"
 msgstr "Basrah"
 
-#: kstars_i18n.cpp:280
+#: data/Cities.dat:213
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bastia"
 msgstr "Yalta"
 
-#: kstars_i18n.cpp:281
+#: data/Cities.dat:213
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Haute-Corse"
+msgstr "Guernsey"
+
+#: data/Cities.dat:214
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bata"
 msgstr "Yalta"
 
-#: kstars_i18n.cpp:282
+#: data/Cities.dat:214 data/Cities.dat:1510
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Equatorial Guinea"
+msgstr "Gini'r Cyhydedd"
+
+#: data/Cities.dat:215
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Batesburg"
 msgstr "Batesburg"
 
-#: kstars_i18n.cpp:283
+#: data/Cities.dat:216
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Baton Rouge"
 msgstr "Baton Rouge"
 
-#: kstars_i18n.cpp:284
+#: data/Cities.dat:217
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Battle Creek"
 msgstr "Battle Creek"
 
-#: kstars_i18n.cpp:285
+#: data/Cities.dat:218
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bay City"
 msgstr "Bay City"
 
-#: kstars_i18n.cpp:286
+#: data/Cities.dat:219
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bay St. Louis"
 msgstr "Bay St. Louis"
 
-#: kstars_i18n.cpp:287
+#: 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"
+"Mississippi"
+msgstr "Mississippi"
+
+#: data/Cities.dat:220 data/Cities.dat:221
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bayonne"
 msgstr "Bayonne"
 
-#: kstars_i18n.cpp:288
+#: data/Cities.dat:221 data/Cities.dat:1990
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Pyrénées atlantiques"
+msgstr "Zealand"
+
+#: data/Cities.dat:222
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Baytown"
 msgstr "Baytown"
 
-#: kstars_i18n.cpp:289
+#: data/Cities.dat:223
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Be'er Sheva"
 msgstr "Be'er Sheva"
 
-#: kstars_i18n.cpp:290
+#: 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"
+msgstr "Israel"
+
+#: data/Cities.dat:224
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Beach"
 msgstr "Beach"
 
-#: kstars_i18n.cpp:291
+#: data/Cities.dat:225
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Beatty"
 msgstr "Beatty"
 
-#: kstars_i18n.cpp:292
+#: data/Cities.dat:226
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Beaufort"
 msgstr "Beaufort"
 
-#: kstars_i18n.cpp:293
+#: data/Cities.dat:227
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Beaumont"
 msgstr "Beaumont"
 
-#: kstars_i18n.cpp:294
+#: data/Cities.dat:228
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Beaver"
 msgstr "Beaver"
 
-#: kstars_i18n.cpp:295
+#: 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"
+msgstr "Utah"
+
+#: data/Cities.dat:229
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Beaverton"
 msgstr "Beaverton"
 
-#: kstars_i18n.cpp:296
+#: data/Cities.dat:230
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Beckley"
 msgstr "Beckley"
 
-#: kstars_i18n.cpp:297
+#: 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"
+msgstr "Gorllewin Virginia"
+
+#: data/Cities.dat:231
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Beijing"
 msgstr "Beijing"
 
-#: kstars_i18n.cpp:298
+#: 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"
+"China"
+msgstr "Tseina"
+
+#: data/Cities.dat:232
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Beira"
 msgstr "Brera"
 
-#: kstars_i18n.cpp:299
+#: 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"
+msgstr "Mosambîc"
+
+#: data/Cities.dat:233
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Beirut"
 msgstr "Beirut"
 
-#: kstars_i18n.cpp:300
+#: data/Cities.dat:233 data/Cities.dat:1395
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Lebanon"
+msgstr "Lebanon"
+
+#: data/Cities.dat:234
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Beja"
 msgstr "Beja"
 
-#: kstars_i18n.cpp:301
+#: 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"
+msgstr "Portiwgal"
+
+#: data/Cities.dat:235
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Belem"
 msgstr "Belem"
 
-#: kstars_i18n.cpp:302
+#: 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"
+"Brazil"
+msgstr "Brasil"
+
+#: data/Cities.dat:236
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Belen"
 msgstr "Belen"
 
-#: kstars_i18n.cpp:303
+#: data/Cities.dat:237
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Belfast"
 msgstr "Belfast"
 
-#: kstars_i18n.cpp:304
+#: data/Cities.dat:238
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Belgorod"
 msgstr "Belgrade"
 
-#: kstars_i18n.cpp:305
+#: 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
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Central Region"
+msgstr "Oregon"
+
+#: data/Cities.dat:239
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Belgrade"
 msgstr "Belgrade"
 
-#: kstars_i18n.cpp:306
+#: data/Cities.dat:239
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Yugoslavia"
+msgstr "Iwgoslafia"
+
+#: data/Cities.dat:240
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Belize City"
 msgstr "Belize City"
 
-#: kstars_i18n.cpp:307
+#: data/Cities.dat:240
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Belize"
+msgstr "Belize"
+
+#: data/Cities.dat:241
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Belleville"
 msgstr "Belleville"
 
-#: kstars_i18n.cpp:308
+#: data/Cities.dat:242 data/Cities.dat:243
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bellevue"
 msgstr "Bellevue"
 
-#: kstars_i18n.cpp:309
+#: data/Cities.dat:244
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bellflower"
 msgstr "Bellflower"
 
-#: kstars_i18n.cpp:310
+#: data/Cities.dat:245
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bellingham"
 msgstr "Bellingham"
 
-#: kstars_i18n.cpp:311
+#: data/Cities.dat:246
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bellows Falls"
 msgstr "Bellows Falls"
 
-#: kstars_i18n.cpp:312
+#: data/Cities.dat:247
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ben Guerir"
 msgstr "Ben Guerir"
 
-#: kstars_i18n.cpp:313
+#: data/Cities.dat:248
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bend"
 msgstr "Bend"
 
-#: kstars_i18n.cpp:314
+#: data/Cities.dat:249
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bender Cassim"
 msgstr "Bend"
 
-#: kstars_i18n.cpp:315
+#: 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"
+msgstr "Somalia"
+
+#: data/Cities.dat:250
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bendigo"
 msgstr "Bendigo"
 
-#: kstars_i18n.cpp:316
+#: data/Cities.dat:250 data/Cities.dat:1595 data/Cities.dat:2242
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Victoria"
+msgstr "Victoria"
+
+#: data/Cities.dat:251
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Benghazi"
 msgstr "Kenai"
 
-#: kstars_i18n.cpp:317
+#: data/Cities.dat:252
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bennington"
 msgstr "Bennington"
 
-#: kstars_i18n.cpp:318
+#: data/Cities.dat:253
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Benton"
 msgstr "Benton"
 
-#: kstars_i18n.cpp:319
+#: data/Cities.dat:254
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Berbera"
 msgstr "Brera"
 
-#: kstars_i18n.cpp:320
+#: data/Cities.dat:255
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bergamo"
 msgstr "Bergamo"
 
-#: kstars_i18n.cpp:321
+#: data/Cities.dat:256
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bergen"
 msgstr "Bergen"
 
-#: kstars_i18n.cpp:322
+#: 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"
+"Norway"
+msgstr "Norwy"
+
+#: data/Cities.dat:257
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bergisch-Gladbach"
 msgstr "Bergisch-Gladbach"
 
-#: kstars_i18n.cpp:323
+#: data/Cities.dat:258
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Berkeley"
 msgstr "Berkeley"
 
-#: kstars_i18n.cpp:324
+#: data/Cities.dat:259 data/Cities.dat:260
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Berlin"
 msgstr "Berlin"
 
-#: kstars_i18n.cpp:325
+#: 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"
+msgstr "Hampshire Newydd"
+
+#: data/Cities.dat:261
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bern"
 msgstr "Bern"
 
-#: kstars_i18n.cpp:326
+#: 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"
+"Switzerland"
+msgstr "Swistir"
+
+#: data/Cities.dat:262
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bethel"
 msgstr "Bethel"
 
-#: kstars_i18n.cpp:327
+#: data/Cities.dat:263
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bethesda"
 msgstr "Bethesda"
 
-#: kstars_i18n.cpp:328
+#: data/Cities.dat:264
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bethlehem"
 msgstr "Bethlehem"
 
-#: kstars_i18n.cpp:329
+#: data/Cities.dat:265
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bettendorf"
 msgstr "Bettendorf"
 
-#: kstars_i18n.cpp:330
+#: data/Cities.dat:266
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bettles Field"
 msgstr "Bettles Field"
 
-#: kstars_i18n.cpp:331
+#: data/Cities.dat:267
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Biddeford"
 msgstr "Biddeford"
 
-#: kstars_i18n.cpp:332
+#: data/Cities.dat:268
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Big Bear Solar Obs."
 msgstr "Ars. Heulol Big Bear"
 
-#: kstars_i18n.cpp:333
+#: data/Cities.dat:269
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Big Delta"
 msgstr "Big Delta"
 
-#: kstars_i18n.cpp:334
+#: data/Cities.dat:270
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Big Lake"
 msgstr "Big Lake"
 
-#: kstars_i18n.cpp:335
+#: data/Cities.dat:271
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bilbao"
 msgstr "Bilbao"
 
-#: kstars_i18n.cpp:336
+#: data/Cities.dat:272
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Billings"
 msgstr "Billings"
 
-#: kstars_i18n.cpp:337
+#: data/Cities.dat:273
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Biloxi"
 msgstr "Biloxi"
 
-#: kstars_i18n.cpp:338
+#: data/Cities.dat:274
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Binghamton"
 msgstr "Binghamton"
 
-#: kstars_i18n.cpp:339
+#: data/Cities.dat:275
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Birao"
 msgstr "Bilbao"
 
-#: kstars_i18n.cpp:340
+#: data/Cities.dat:276 data/Cities.dat:277
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Birmingham"
 msgstr "Birmingham"
 
-#: kstars_i18n.cpp:341
+#: data/Cities.dat:278
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Birobidzhan"
 msgstr "Procida"
 
-#: kstars_i18n.cpp:342
+#: data/Cities.dat:279
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Biruni"
 msgstr "Biruni"
 
-#: kstars_i18n.cpp:343
+#: data/Cities.dat:280
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bismarck"
 msgstr "Bismarck"
 
-#: kstars_i18n.cpp:344
+#: data/Cities.dat:281
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bissau"
 msgstr "Nassau"
 
-#: kstars_i18n.cpp:345
+#: data/Cities.dat:282
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bitburg"
 msgstr "Bitburg"
 
-#: kstars_i18n.cpp:346
+#: data/Cities.dat:283
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Blaavands huk"
 msgstr "Blaavands huk"
 
-#: kstars_i18n.cpp:347
+#: data/Cities.dat:284
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Black Birch"
 msgstr "Black Birch"
 
-#: kstars_i18n.cpp:348
+#: data/Cities.dat:285
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Blackpool"
 msgstr "Blackpool"
 
-#: kstars_i18n.cpp:349
+#: data/Cities.dat:286
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Blackwell"
 msgstr "Blackwell"
 
-#: kstars_i18n.cpp:350
+#: data/Cities.dat:287
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Blantyre"
 msgstr "Barre"
 
-#: kstars_i18n.cpp:351
+#: 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"
+msgstr "Malawi"
+
+#: data/Cities.dat:288
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bleien"
 msgstr "Bleien"
 
-#: kstars_i18n.cpp:352
+#: data/Cities.dat:289
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bloomfield"
 msgstr "Bloomfield"
 
-#: kstars_i18n.cpp:353
+#: data/Cities.dat:290 data/Cities.dat:291 data/Cities.dat:292
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bloomington"
 msgstr "Bloomington"
 
-#: kstars_i18n.cpp:354
+#: data/Cities.dat:293
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bluefield"
 msgstr "Bluefield"
 
-#: kstars_i18n.cpp:355
+#: data/Cities.dat:294
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bluff"
 msgstr "Bluff"
 
-#: kstars_i18n.cpp:356
+#: data/Cities.dat:295
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bnei Brak"
 msgstr "Bnei Brak"
 
-#: kstars_i18n.cpp:357
+#: data/Cities.dat:296
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bobo-Dioulasso"
 msgstr "Douglas"
 
-#: kstars_i18n.cpp:358
+#: data/Cities.dat:296 data/Cities.dat:1937
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Burkina Faso"
+msgstr "Bwrcina Ffaso"
+
+#: data/Cities.dat:297
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Boca Raton"
 msgstr "Boca Raton"
 
-#: kstars_i18n.cpp:359
+#: 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"
+msgstr "Florida"
+
+#: data/Cities.dat:298
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bochum"
 msgstr "Bochum"
 
-#: kstars_i18n.cpp:360
+#: data/Cities.dat:299
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bodo"
 msgstr "Bodo"
 
-#: kstars_i18n.cpp:361
+#: data/Cities.dat:300
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Boeun"
 msgstr "Boeun"
 
-#: kstars_i18n.cpp:362
+#: 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"
+msgstr "Chungbuk"
+
+#: data/Cities.dat:301
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bogalusa"
 msgstr "Bogalusa"
 
-#: kstars_i18n.cpp:363
+#: data/Cities.dat:302
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bogotá"
 msgstr "Bogotá"
 
-#: kstars_i18n.cpp:364
+#: data/Cities.dat:303
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Boise City"
-msgstr "Boise City"
+"Boise"
+msgstr "Boise"
 
-#: kstars_i18n.cpp:365
+#: data/Cities.dat:304
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Boise"
-msgstr "Boise"
+"Boise City"
+msgstr "Boise City"
 
-#: kstars_i18n.cpp:366
+#: data/Cities.dat:305
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bolgatanga"
 msgstr "Bologna"
 
-#: kstars_i18n.cpp:367
+#: data/Cities.dat:306
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bologna"
 msgstr "Bologna"
 
-#: kstars_i18n.cpp:368
+#: data/Cities.dat:307
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bolzano"
 msgstr "Bolzano"
 
-#: kstars_i18n.cpp:369
+#: data/Cities.dat:308
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bombay"
 msgstr "Bombay"
 
-#: kstars_i18n.cpp:370
+#: data/Cities.dat:309
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bonn"
 msgstr "Bonn"
 
-#: kstars_i18n.cpp:371
+#: data/Cities.dat:310
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Boone"
 msgstr "Boone"
 
-#: kstars_i18n.cpp:372
+#: data/Cities.dat:311
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Booneville"
 msgstr "Booneville"
 
-#: kstars_i18n.cpp:373
+#: data/Cities.dat:312
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bordeaux"
 msgstr "Bordeaux"
 
-#: kstars_i18n.cpp:374
+#: data/Cities.dat:312
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Gironde"
+msgstr "Maine"
+
+#: data/Cities.dat:313
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bordentown"
 msgstr "Bordentown"
 
-#: kstars_i18n.cpp:375
+#: data/Cities.dat:314
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Borinquen"
 msgstr "Borinquen"
 
-#: kstars_i18n.cpp:376
+#: data/Cities.dat:315
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Borowiec"
 msgstr "Borowiec"
 
-#: kstars_i18n.cpp:377
+#: 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"
+"Poland"
+msgstr "Gwlad Pwyl"
+
+#: data/Cities.dat:316
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Boscobel"
 msgstr "Boscobel"
 
-#: kstars_i18n.cpp:378
+#: data/Cities.dat:317
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bosscha"
 msgstr "Bosscha"
 
-#: kstars_i18n.cpp:379
+#: data/Cities.dat:318
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bossier City"
 msgstr "Bossier City"
 
-#: kstars_i18n.cpp:380
+#: data/Cities.dat:319
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Boston"
 msgstr "Boston"
 
-#: kstars_i18n.cpp:381
+#: data/Cities.dat:320
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bottrop"
 msgstr "Bottrop"
 
-#: kstars_i18n.cpp:382
+#: data/Cities.dat:321
+msgid ""
+"_: City name (optional, probably does not need a translation)\n"
+"Boulder"
+msgstr "Boulder"
+
+#: data/Cities.dat:322
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Boulder City"
 msgstr "Dinas Boulder"
 
-#: kstars_i18n.cpp:383
+#: data/Cities.dat:323
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Boulder Creek"
 msgstr "Boulder Creek"
 
-#: kstars_i18n.cpp:384
-msgid ""
-"_: City name (optional, probably does not need a translation)\n"
-"Boulder"
-msgstr "Boulder"
-
-#: kstars_i18n.cpp:385
+#: data/Cities.dat:324
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Boulogne-sur-mer"
 msgstr "Boulogne"
 
-#: kstars_i18n.cpp:386
+#: data/Cities.dat:324 data/Cities.dat:401
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Pas-de-Calais"
+msgstr "Kansas"
+
+#: data/Cities.dat:325
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bountiful"
 msgstr "Bountiful"
 
-#: kstars_i18n.cpp:387
+#: data/Cities.dat:326
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bourges"
 msgstr "Burgos"
 
-#: kstars_i18n.cpp:388
+#: data/Cities.dat:326 data/Cities.dat:1774
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Cher"
+msgstr "DC"
+
+#: data/Cities.dat:327
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bowie"
 msgstr "Bowie"
 
-#: kstars_i18n.cpp:389
+#: data/Cities.dat:328
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bowling Green"
 msgstr "Bowling Green"
 
-#: kstars_i18n.cpp:390
+#: data/Cities.dat:329
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bowman"
 msgstr "Bowman"
 
-#: kstars_i18n.cpp:391
+#: data/Cities.dat:330
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Boyden"
 msgstr "Boyden"
 
-#: kstars_i18n.cpp:392
+#: 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"
+"South Africa"
+msgstr "De Affrica"
+
+#: data/Cities.dat:331
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bozeman"
 msgstr "Bozeman"
 
-#: kstars_i18n.cpp:393
+#: data/Cities.dat:332
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bradford"
 msgstr "Bradford"
 
-#: kstars_i18n.cpp:394
+#: data/Cities.dat:333 data/Cities.dat:334
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Brandon"
 msgstr "Brandon"
 
-#: kstars_i18n.cpp:395
+#: 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"
+msgstr "Manitoba"
+
+#: data/Cities.dat:335
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Brasilia"
 msgstr "Brasilia"
 
-#: kstars_i18n.cpp:396
+#: data/Cities.dat:336
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bratsk"
 msgstr "Yalta"
 
-#: kstars_i18n.cpp:397
+#: data/Cities.dat:337
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Brattleboro"
 msgstr "Brattleboro"
 
-#: kstars_i18n.cpp:398
+#: data/Cities.dat:338
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Braunschweig"
 msgstr "Braunschweig"
 
-#: kstars_i18n.cpp:399
+#: data/Cities.dat:339
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Brazzaville"
 msgstr "Vacaville"
 
-#: kstars_i18n.cpp:400
+#: data/Cities.dat:339 data/Cities.dat:2056
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Congo"
+msgstr "Congo"
+
+#: data/Cities.dat:340
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bremen"
 msgstr "Bremen"
 
-#: kstars_i18n.cpp:401
+#: data/Cities.dat:341
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bremerhaven"
 msgstr "Bremerhaven"
 
-#: kstars_i18n.cpp:402
+#: data/Cities.dat:342
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bremerton"
 msgstr "Bremerton"
 
-#: kstars_i18n.cpp:403
+#: data/Cities.dat:343
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Brera"
 msgstr "Brera"
 
-#: kstars_i18n.cpp:404
+#: data/Cities.dat:344
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Brescia"
 msgstr "Brescia"
 
-#: kstars_i18n.cpp:405
+#: data/Cities.dat:345
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Brest"
 msgstr "Brest"
 
-#: kstars_i18n.cpp:406
+#: data/Cities.dat:345
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Finistère"
+msgstr "Falster"
+
+#: data/Cities.dat:346
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bridgeport"
 msgstr "Bridgeport"
 
-#: kstars_i18n.cpp:407
+#: data/Cities.dat:347
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bridgeton"
 msgstr "Bridgeton"
 
-#: kstars_i18n.cpp:408
+#: data/Cities.dat:348
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bridgetown"
 msgstr "Bridgetown"
 
-#: kstars_i18n.cpp:409
+#: data/Cities.dat:348
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Barbados"
+msgstr "Barbados"
+
+#: data/Cities.dat:349
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Brilliant"
 msgstr "Brilliant"
 
-#: kstars_i18n.cpp:410
+#: data/Cities.dat:350
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Brindisi"
 msgstr "Brindisi"
 
-#: kstars_i18n.cpp:411
+#: data/Cities.dat:351
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Brisbane"
 msgstr "Brisbane"
 
-#: kstars_i18n.cpp:412
+#: 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 "Queensland"
+
+#: 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 "Bristol"
 
-#: kstars_i18n.cpp:413
+#: 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"
+msgstr "Ynys Rhode"
+
+#: data/Cities.dat:357
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Brize Norton"
 msgstr "Brize Norton"
 
-#: kstars_i18n.cpp:414
+#: data/Cities.dat:358
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Brockton"
 msgstr "Brockton"
 
-#: kstars_i18n.cpp:415
+#: data/Cities.dat:359
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Broken Arrow"
 msgstr "Broken Arrow"
 
-#: kstars_i18n.cpp:416
+#: data/Cities.dat:360 data/Cities.dat:361
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Brookings"
 msgstr "Brookings"
 
-#: kstars_i18n.cpp:417
+#: data/Cities.dat:362
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Brookline"
 msgstr "Brookline"
 
-#: kstars_i18n.cpp:418
+#: data/Cities.dat:363
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Brooklyn Park"
 msgstr "Brooklyn Park"
 
-#: kstars_i18n.cpp:419
+#: data/Cities.dat:364
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Brookside Park"
 msgstr "Brookside Park"
 
-#: kstars_i18n.cpp:420
+#: 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"
+msgstr "Delaware"
+
+#: data/Cities.dat:365
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Brownsville"
 msgstr "Brownsville"
 
-#: kstars_i18n.cpp:421
+#: data/Cities.dat:366 data/Cities.dat:367
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Brunswick"
 msgstr "Brunswick"
 
-#: kstars_i18n.cpp:422
+#: data/Cities.dat:368
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Brussels"
 msgstr "Brwsel"
 
-#: kstars_i18n.cpp:423
+#: data/Cities.dat:368
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Brabant"
+msgstr "Alabama"
+
+#: data/Cities.dat:369
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bryansk"
 msgstr "Burbank"
 
-#: kstars_i18n.cpp:424
+#: data/Cities.dat:370
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Buan"
 msgstr "Buan"
 
-#: kstars_i18n.cpp:425
+#: 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"
+"Jeonbuk"
+msgstr "Jeonbuk"
+
+#: data/Cities.dat:371
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bucarest"
 msgstr "Bwcarest"
 
-#: kstars_i18n.cpp:426
+#: data/Cities.dat:371 data/Cities.dat:372
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Romania"
+msgstr "Romania"
+
+#: data/Cities.dat:372
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bucharest"
 msgstr "Bwcharest"
 
-#: kstars_i18n.cpp:427
+#: data/Cities.dat:373
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Buckeburg"
 msgstr "Buckeburg"
 
-#: kstars_i18n.cpp:428
+#: data/Cities.dat:374
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Budapest"
 msgstr "Bwdapest"
 
-#: kstars_i18n.cpp:429
+#: 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"
+msgstr "Hwngari"
+
+#: data/Cities.dat:375
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Buena Park"
 msgstr "Buena Park"
 
-#: kstars_i18n.cpp:430
+#: data/Cities.dat:376
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Buenos Aires"
 msgstr "Buenos Aires"
 
-#: kstars_i18n.cpp:431
+#: data/Cities.dat:376
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Argentina"
+msgstr "Yr Ariandir"
+
+#: data/Cities.dat:377 data/Cities.dat:378
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Buffalo"
 msgstr "Buffalo"
 
-#: kstars_i18n.cpp:432
+#: data/Cities.dat:379
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bujumburo"
 msgstr "Majuro"
 
-#: kstars_i18n.cpp:433
+#: 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"
+msgstr "Bwrwndi"
+
+#: data/Cities.dat:380
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bukavu"
 msgstr "Buan"
 
-#: kstars_i18n.cpp:434
+#: data/Cities.dat:380 data/Cities.dat:1262
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Rwanda"
+msgstr "Rwanda"
+
+#: data/Cities.dat:381
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bulawayo"
 msgstr "Buyeo"
 
-#: kstars_i18n.cpp:435
+#: 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"
+msgstr "Simbabwe"
+
+#: data/Cities.dat:382
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Burbank"
 msgstr "Burbank"
 
-#: kstars_i18n.cpp:436
+#: data/Cities.dat:383
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Burgos"
 msgstr "Burgos"
 
-#: kstars_i18n.cpp:437
+#: 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"
 msgstr "Burlington"
 
-#: kstars_i18n.cpp:438
+#: data/Cities.dat:390
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Burns"
 msgstr "Burns"
 
-#: kstars_i18n.cpp:439
+#: data/Cities.dat:391
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Bururi"
 msgstr "Biruni"
 
-#: kstars_i18n.cpp:440
+#: data/Cities.dat:392
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Burwash"
 msgstr "Burwash"
 
-#: kstars_i18n.cpp:441
+#: 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"
+msgstr "Ontario"
+
+#: data/Cities.dat:393
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Busan"
 msgstr "Busan"
 
-#: kstars_i18n.cpp:442
+#: data/Cities.dat:394
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Butte"
 msgstr "Butte"
 
-#: kstars_i18n.cpp:443
+#: data/Cities.dat:395
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Butterworth"
 msgstr "Butterworth"
 
-#: kstars_i18n.cpp:444
+#: 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"
+msgstr "Malaysia"
+
+#: data/Cities.dat:396
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Buyeo"
 msgstr "Buyeo"
 
-#: kstars_i18n.cpp:445
+#: data/Cities.dat:396 data/Cities.dat:910 data/Cities.dat:2329
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Chungnam"
+msgstr "Chungnam"
+
+#: data/Cities.dat:397
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Byurakan"
 msgstr "Byurakan"
 
-#: kstars_i18n.cpp:446
+#: data/Cities.dat:397
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Armenia"
+msgstr "Armenia"
+
+#: data/Cities.dat:398
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Caen"
 msgstr "Camden"
 
-#: kstars_i18n.cpp:447
+#: data/Cities.dat:398
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Calvados"
+msgstr "Colorado"
+
+#: data/Cities.dat:399
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cagliari"
 msgstr "Cagliari"
 
-#: kstars_i18n.cpp:448
+#: data/Cities.dat:400
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cairo"
 msgstr "Cairo"
 
-#: kstars_i18n.cpp:449
+#: data/Cities.dat:401
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Calais/Dunkirk"
 msgstr "Calais/Dunkirk"
 
-#: kstars_i18n.cpp:450
+#: data/Cities.dat:402
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Calar Alto"
 msgstr "Calar Alto"
 
-#: kstars_i18n.cpp:451
+#: data/Cities.dat:403
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Calcutta"
 msgstr "Calcutta"
 
-#: kstars_i18n.cpp:452
+#: data/Cities.dat:404
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Caldwell"
 msgstr "Caldwell"
 
-#: kstars_i18n.cpp:453
+#: data/Cities.dat:405
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Calgary"
 msgstr "Calgary"
 
-#: kstars_i18n.cpp:454
+#: data/Cities.dat:406
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Caliente"
 msgstr "Caliente"
 
-#: kstars_i18n.cpp:455
+#: data/Cities.dat:407 data/Cities.dat:408 data/Cities.dat:409
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cambridge"
 msgstr "Cambridge"
 
-#: kstars_i18n.cpp:456
+#: data/Cities.dat:410
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Camden"
 msgstr "Camden"
 
-#: kstars_i18n.cpp:457
+#: data/Cities.dat:411
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Campobasso"
 msgstr "Campobasso"
 
-#: kstars_i18n.cpp:458
+#: data/Cities.dat:412
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Canberra"
 msgstr "Canberra"
 
-#: kstars_i18n.cpp:459
+#: data/Cities.dat:412 data/Cities.dat:1374
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"ACT"
+msgstr "ACT"
+
+#: data/Cities.dat:413
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cannes"
 msgstr "Cannes"
 
-#: kstars_i18n.cpp:460
+#: data/Cities.dat:413
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Alpes Maritimes"
+msgstr "Alberta"
+
+#: data/Cities.dat:414
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Canoga Park"
 msgstr "Canoga Park"
 
-#: kstars_i18n.cpp:461
+#: data/Cities.dat:415 data/Cities.dat:416
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Canton"
 msgstr "Canton"
 
-#: kstars_i18n.cpp:462
+#: data/Cities.dat:417
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cantonsville"
 msgstr "Cantonsville"
 
-#: kstars_i18n.cpp:463
+#: data/Cities.dat:418
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cape Canaveral"
 msgstr "Cape Canaveral"
 
-#: kstars_i18n.cpp:464
+#: data/Cities.dat:419
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cape Girardeau"
 msgstr "Cape Girardeau"
 
-#: kstars_i18n.cpp:465
+#: 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"
+"Missouri"
+msgstr "Missouri"
+
+#: data/Cities.dat:420
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cape May"
 msgstr "Cape May"
 
-#: kstars_i18n.cpp:466
+#: data/Cities.dat:421
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cape Town"
 msgstr "Cape Town"
 
-#: kstars_i18n.cpp:467
+#: data/Cities.dat:422
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Caracas"
 msgstr "Caracas"
 
-#: kstars_i18n.cpp:468
+#: data/Cities.dat:422 data/Cities.dat:1440 data/Cities.dat:1505
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Venezuela"
+msgstr "Venezuela"
+
+#: data/Cities.dat:423
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Carbonado"
 msgstr "Carbonado"
 
-#: kstars_i18n.cpp:469
+#: data/Cities.dat:424
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Carbondale"
 msgstr "Carbondale"
 
-#: kstars_i18n.cpp:470
+#: data/Cities.dat:425
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cardiff"
 msgstr "Caerdydd"
 
-#: kstars_i18n.cpp:471
+#: data/Cities.dat:425
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Wales"
+msgstr "Cymru"
+
+#: data/Cities.dat:426
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Carlton"
 msgstr "Carlton"
 
-#: kstars_i18n.cpp:472
+#: data/Cities.dat:427
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Carmichael"
 msgstr "Carmichael"
 
-#: kstars_i18n.cpp:473
+#: data/Cities.dat:428
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Carrizozo"
 msgstr "Carrizozo"
 
-#: kstars_i18n.cpp:474
+#: data/Cities.dat:429
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Carrollton"
 msgstr "Carrollton"
 
-#: kstars_i18n.cpp:475
+#: data/Cities.dat:430
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Carson City"
-msgstr "Dinas Carson"
+"Carson"
+msgstr " Carson"
 
-#: kstars_i18n.cpp:476
+#: data/Cities.dat:431
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Carson"
-msgstr " Carson"
+"Carson City"
+msgstr "Dinas Carson"
 
-#: kstars_i18n.cpp:477
+#: data/Cities.dat:432
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cartagena"
 msgstr "Cartagena"
 
-#: kstars_i18n.cpp:478
+#: data/Cities.dat:433
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cartersville"
 msgstr "Cartersville"
 
-#: kstars_i18n.cpp:479
+#: data/Cities.dat:434
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cary"
 msgstr "Cary"
 
-#: kstars_i18n.cpp:480
+#: data/Cities.dat:435
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Casa Grande"
 msgstr "Casa Grande"
 
-#: kstars_i18n.cpp:481
+#: data/Cities.dat:436
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Casablanca"
 msgstr "Casablanca"
 
-#: kstars_i18n.cpp:482
+#: data/Cities.dat:437
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Caserta"
 msgstr "Caserta"
 
-#: kstars_i18n.cpp:483
+#: data/Cities.dat:438
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Casper"
 msgstr "Casper"
 
-#: kstars_i18n.cpp:484
+#: data/Cities.dat:439
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Castellon de la Plana"
 msgstr "Castellon de la Plana"
 
-#: kstars_i18n.cpp:485
+#: data/Cities.dat:440
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Castlerock"
 msgstr "Castlerock"
 
-#: kstars_i18n.cpp:486
+#: data/Cities.dat:441
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Castries"
 msgstr "Castries"
 
-#: kstars_i18n.cpp:487
+#: data/Cities.dat:441
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"St. Lucia"
+msgstr "St. Lucia"
+
+#: data/Cities.dat:442
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Catania"
 msgstr "Catania"
 
-#: kstars_i18n.cpp:488
+#: data/Cities.dat:443
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Catanzaro"
 msgstr "Catanzaro"
 
-#: kstars_i18n.cpp:489
+#: data/Cities.dat:444
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cave Creek"
 msgstr "Cave Creek"
 
-#: kstars_i18n.cpp:490
+#: data/Cities.dat:445
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cayenne"
 msgstr "Cayenne"
 
-#: kstars_i18n.cpp:491
+#: data/Cities.dat:445
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"French Guiana"
+msgstr "Guiana Ffrengig"
+
+#: data/Cities.dat:446
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cedar City"
 msgstr "Dinas Cedar"
 
-#: kstars_i18n.cpp:492
+#: data/Cities.dat:447
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cedar Falls"
 msgstr "Cedar Falls"
 
-#: kstars_i18n.cpp:493
+#: data/Cities.dat:448
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cedar Rapids"
 msgstr "Cedar Rapids"
 
-#: kstars_i18n.cpp:494
+#: data/Cities.dat:449
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Central Islip"
 msgstr "Central Islip"
 
-#: kstars_i18n.cpp:495
+#: data/Cities.dat:450
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Centreville"
 msgstr "Centreville"
 
-#: kstars_i18n.cpp:496
+#: data/Cities.dat:451
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cerritos"
 msgstr "Cerritos"
 
-#: kstars_i18n.cpp:497
+#: data/Cities.dat:452
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cerro Calán"
 msgstr "Cerro Calán"
 
-#: kstars_i18n.cpp:498
+#: data/Cities.dat:453
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cerro Tololo Int'l Obs."
 msgstr "Ars. Rhyng. Cerro Tololo"
 
-#: kstars_i18n.cpp:499
+#: data/Cities.dat:454
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ceuta"
 msgstr "Ceuta"
 
-#: kstars_i18n.cpp:500
+#: data/Cities.dat:455
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ch'ongjin"
 msgstr "Ch'ongjin"
 
-#: kstars_i18n.cpp:501
+#: data/Cities.dat:456
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chagrin Falls"
 msgstr "Chagrin Falls"
 
-#: kstars_i18n.cpp:502
+#: data/Cities.dat:457
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Champaign"
 msgstr "Champaign"
 
-#: kstars_i18n.cpp:503
+#: data/Cities.dat:458
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chapel Hill"
 msgstr "Chapel Hill"
 
-#: kstars_i18n.cpp:504
+#: data/Cities.dat:459 data/Cities.dat:460
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Charleston"
 msgstr "Charleston"
 
-#: kstars_i18n.cpp:505
+#: data/Cities.dat:461
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Charlevoix"
 msgstr "Charlevoix"
 
-#: kstars_i18n.cpp:506
+#: data/Cities.dat:462
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Charlotte"
 msgstr "Charlotte"
 
-#: kstars_i18n.cpp:507
+#: data/Cities.dat:463
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Charlottesville"
 msgstr "Charlottesville"
 
-#: kstars_i18n.cpp:508
+#: data/Cities.dat:464
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Charlottetown"
 msgstr "Charlottetown"
 
-#: kstars_i18n.cpp:509
+#: data/Cities.dat:464
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Prince Edward Island"
+msgstr "Ynys Tywysog Edward"
+
+#: data/Cities.dat:465
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chatham"
 msgstr "Chatham"
 
-#: kstars_i18n.cpp:510
+#: data/Cities.dat:466
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chattanooga"
 msgstr "Chattanooga"
 
-#: kstars_i18n.cpp:511
+#: data/Cities.dat:467
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cheboksary"
 msgstr "Cary"
 
-#: kstars_i18n.cpp:512
+#: 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
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Volga Region"
+msgstr "Oregon"
+
+#: data/Cities.dat:468
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cheltenham"
 msgstr "Cheltenham"
 
-#: kstars_i18n.cpp:513
+#: data/Cities.dat:469
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chelyabinsk"
 msgstr "Chinook"
 
-#: kstars_i18n.cpp:514
+#: data/Cities.dat:469 data/Cities.dat:730 data/Cities.dat:1259
+#: data/Cities.dat:1319 data/Cities.dat:2591
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Ural"
+msgstr "Utah"
+
+#: data/Cities.dat:470
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chemnitz"
 msgstr "Chemnitz"
 
-#: kstars_i18n.cpp:515
+#: data/Cities.dat:471
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cheongju"
 msgstr "Cheongju"
 
-#: kstars_i18n.cpp:516
+#: data/Cities.dat:472
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cheorwon"
 msgstr "Cheorwon"
 
-#: kstars_i18n.cpp:517
+#: 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"
+msgstr "Gangwon"
+
+#: data/Cities.dat:473
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cheraw"
 msgstr "Cheraw"
 
-#: kstars_i18n.cpp:518
+#: data/Cities.dat:474
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cherbourg"
 msgstr "Cherbourg"
 
-#: kstars_i18n.cpp:519
+#: data/Cities.dat:474
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Manche"
+msgstr "Maine"
+
+#: data/Cities.dat:475
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cherkessk"
 msgstr "Cherokee"
 
-#: kstars_i18n.cpp:520
+#: 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
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"South Region"
+msgstr "De Carolina"
+
+#: data/Cities.dat:476
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cherokee"
 msgstr "Cherokee"
 
-#: kstars_i18n.cpp:521
+#: data/Cities.dat:477
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chesapeake"
 msgstr "Chesapeake"
 
-#: kstars_i18n.cpp:522
+#: data/Cities.dat:478 data/Cities.dat:479
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chester"
 msgstr "Caer"
 
-#: kstars_i18n.cpp:523
+#: data/Cities.dat:480
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cheyenne"
 msgstr "Cheyenne"
 
-#: kstars_i18n.cpp:524
+#: data/Cities.dat:481
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chiang Mai"
 msgstr "Chiang Mai"
 
-#: kstars_i18n.cpp:525
+#: data/Cities.dat:482
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chibougamau"
 msgstr "Chibougamau"
 
-#: kstars_i18n.cpp:526
+#: data/Cities.dat:483
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chicago"
 msgstr "Chicago"
 
-#: kstars_i18n.cpp:527
+#: data/Cities.dat:484
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chiclayo"
 msgstr "Chiclayo"
 
-#: kstars_i18n.cpp:528
+#: 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"
+msgstr "Peru"
+
+#: data/Cities.dat:485
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chicopee"
 msgstr "Chicopee"
 
-#: kstars_i18n.cpp:529
+#: data/Cities.dat:486
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chignik"
 msgstr "Chignik"
 
-#: kstars_i18n.cpp:530
+#: data/Cities.dat:487 data/Cities.dat:488 data/Cities.dat:489
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chillicothe"
 msgstr "Chillicothe"
 
-#: kstars_i18n.cpp:531
+#: data/Cities.dat:490
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chingola"
 msgstr "Chino"
 
-#: kstars_i18n.cpp:532
+#: data/Cities.dat:490 data/Cities.dat:1200 data/Cities.dat:1284
+#: data/Cities.dat:1436 data/Cities.dat:1477 data/Cities.dat:1789
+#, fuzzy
 msgid ""
-"_: City name (optional, probably does not need a translation)\n"
-"Chino Hills"
-msgstr "Chino Hills"
+"_: Country name (optional, but should be translated)\n"
+"Zambie"
+msgstr "Zambia"
 
-#: kstars_i18n.cpp:533
+#: data/Cities.dat:491
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chino"
 msgstr "Chino"
 
-#: kstars_i18n.cpp:534
+#: data/Cities.dat:492
+msgid ""
+"_: City name (optional, probably does not need a translation)\n"
+"Chino Hills"
+msgstr "Chino Hills"
+
+#: data/Cities.dat:493
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chinook"
 msgstr "Chinook"
 
-#: kstars_i18n.cpp:535
+#: data/Cities.dat:494
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chisimayu"
 msgstr "Chiclayo"
 
-#: kstars_i18n.cpp:536
+#: data/Cities.dat:495
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chita"
 msgstr "Wichita"
 
-#: kstars_i18n.cpp:537
+#: data/Cities.dat:496
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chitose"
 msgstr "Chitose"
 
-#: kstars_i18n.cpp:538
+#: data/Cities.dat:497
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chittagong"
 msgstr "Chittagong"
 
-#: kstars_i18n.cpp:539
+#: data/Cities.dat:497 data/Cities.dat:598
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Bangladesh"
+msgstr "Bangladesh"
+
+#: data/Cities.dat:498
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chitungwiza"
 msgstr "Chungju"
 
-#: kstars_i18n.cpp:540
+#: data/Cities.dat:499
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Christchurch"
 msgstr "Christchurch"
 
-#: kstars_i18n.cpp:541
+#: data/Cities.dat:500
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Christiansoe"
 msgstr "Christiansoe"
 
-#: kstars_i18n.cpp:542
+#: data/Cities.dat:500 data/Cities.dat:2204
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Bornholm"
+msgstr "Bornholm"
+
+#: data/Cities.dat:501
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Christmas Island"
 msgstr "Ynys Christmas"
 
-#: kstars_i18n.cpp:543
+#: data/Cities.dat:502
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chula Vista"
 msgstr "Chula Vista"
 
-#: kstars_i18n.cpp:544
+#: data/Cities.dat:503
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chuncheon"
 msgstr "Chuncheon"
 
-#: kstars_i18n.cpp:545
+#: data/Cities.dat:504
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chungju"
 msgstr "Chungju"
 
-#: kstars_i18n.cpp:546
+#: data/Cities.dat:505
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chupungryeong"
 msgstr "Chupungryeong"
 
-#: kstars_i18n.cpp:547
+#: data/Cities.dat:506
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Churchill"
 msgstr "Churchill"
 
-#: kstars_i18n.cpp:548
+#: data/Cities.dat:507
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Chuuk"
 msgstr "Chuuk"
 
-#: kstars_i18n.cpp:549
+#: 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"
+msgstr "Micronesia"
+
+#: data/Cities.dat:508
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cicero"
 msgstr "Cicero"
 
-#: kstars_i18n.cpp:550
+#: data/Cities.dat:509
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cincinnati"
 msgstr "Cincinnati"
 
-#: kstars_i18n.cpp:551
+#: data/Cities.dat:510
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Circle"
 msgstr "Circle"
 
-#: kstars_i18n.cpp:552
+#: data/Cities.dat:511
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Circleville"
 msgstr "Circleville"
 
-#: kstars_i18n.cpp:553
+#: data/Cities.dat:512
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ciudad Real"
 msgstr "Ciudad Real"
 
-#: kstars_i18n.cpp:554
+#: data/Cities.dat:513
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Claremont"
 msgstr "Claremont"
 
-#: kstars_i18n.cpp:555
+#: data/Cities.dat:514
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Clark"
 msgstr "Clark"
 
-#: kstars_i18n.cpp:556
+#: data/Cities.dat:515
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Clarksburg"
 msgstr "Clarksburg"
 
-#: kstars_i18n.cpp:557
+#: data/Cities.dat:516
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Clarksdale"
 msgstr "Clarksdale"
 
-#: kstars_i18n.cpp:558
+#: data/Cities.dat:517
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Clarksville"
 msgstr "Clarksville"
 
-#: kstars_i18n.cpp:559
+#: data/Cities.dat:518
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Claymont"
 msgstr "Claymont"
 
-#: kstars_i18n.cpp:560
+#: data/Cities.dat:519
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Clear Lake City"
-msgstr "Clear Lake City"
+"Clear"
+msgstr "Clear"
 
-#: kstars_i18n.cpp:561
+#: data/Cities.dat:520
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Clear"
-msgstr "Clear"
+"Clear Lake City"
+msgstr "Clear Lake City"
 
-#: kstars_i18n.cpp:562
+#: data/Cities.dat:521
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Clearlake"
 msgstr "Clearlake"
 
-#: kstars_i18n.cpp:563
+#: data/Cities.dat:522
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Clearwater"
 msgstr "Clearwater"
 
-#: kstars_i18n.cpp:564
+#: data/Cities.dat:523
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Clermont-Ferrand"
 msgstr "Cleveland"
 
-#: kstars_i18n.cpp:565
+#: data/Cities.dat:523
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Puy-de-Dôme"
+msgstr "Quebec"
+
+#: data/Cities.dat:524 data/Cities.dat:525
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cleveland"
 msgstr "Cleveland"
 
-#: kstars_i18n.cpp:566
+#: data/Cities.dat:526
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Clifton"
 msgstr "Clifton"
 
-#: kstars_i18n.cpp:567
+#: data/Cities.dat:527
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Clinton"
 msgstr "Clinton"
 
-#: kstars_i18n.cpp:568
+#: data/Cities.dat:528
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cloppenburg"
 msgstr "Cloppenburg"
 
-#: kstars_i18n.cpp:569
+#: data/Cities.dat:529
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Clovis"
 msgstr "Clovis"
 
-#: kstars_i18n.cpp:570
+#: data/Cities.dat:530
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cockburn Town"
 msgstr "Cockburn Town"
 
-#: kstars_i18n.cpp:571
+#: data/Cities.dat:530
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Turks and Caicos Islands"
+msgstr "Ynysoedd Turks a Caicos"
+
+#: data/Cities.dat:531
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cockeysville"
 msgstr "Cockeysville"
 
-#: kstars_i18n.cpp:572
+#: data/Cities.dat:532
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cocos Island"
 msgstr "Cocos Island"
 
-#: kstars_i18n.cpp:573
+#: data/Cities.dat:533
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cody"
 msgstr "Cody"
 
-#: kstars_i18n.cpp:574
+#: data/Cities.dat:534
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Coimbra"
 msgstr "Coimbra"
 
-#: kstars_i18n.cpp:575
+#: data/Cities.dat:535
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cold Bay"
 msgstr "Cold Bay"
 
-#: kstars_i18n.cpp:576
+#: data/Cities.dat:536
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cold Lake"
 msgstr "Cold Lake"
 
-#: kstars_i18n.cpp:577
+#: data/Cities.dat:537
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "College Park"
 msgstr "College Park"
 
-#: kstars_i18n.cpp:578
+#: data/Cities.dat:538
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Collegedale"
 msgstr "Collegedale"
 
-#: kstars_i18n.cpp:579
+#: data/Cities.dat:539
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cologne"
 msgstr "Cologne"
 
-#: kstars_i18n.cpp:580
+#: data/Cities.dat:540
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Colombo"
 msgstr "Colombo"
 
-#: kstars_i18n.cpp:581
+#: data/Cities.dat:540
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Sri Lanka"
+msgstr "Sri Lanka"
+
+#: data/Cities.dat:541
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Colon"
 msgstr "Colon"
 
-#: kstars_i18n.cpp:582
+#: data/Cities.dat:542
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Colorado Springs"
 msgstr "Colorado Springs"
 
-#: kstars_i18n.cpp:583
+#: data/Cities.dat:543 data/Cities.dat:544 data/Cities.dat:545
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Columbia Station"
-msgstr "Columbia Station"
+"Columbia"
+msgstr "Columbia"
 
-#: kstars_i18n.cpp:584
+#: data/Cities.dat:546
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Columbia"
-msgstr "Columbia"
+"Columbia Station"
+msgstr "Columbia Station"
 
-#: kstars_i18n.cpp:585
+#: 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"
 msgstr "Columbus"
 
-#: kstars_i18n.cpp:586
+#: data/Cities.dat:551
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Como"
 msgstr "Como"
 
-#: kstars_i18n.cpp:587
+#: data/Cities.dat:552
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Comox"
 msgstr "Comox"
 
-#: kstars_i18n.cpp:588
+#: data/Cities.dat:553
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Compton"
 msgstr "Compton"
 
-#: kstars_i18n.cpp:589
+#: data/Cities.dat:554
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Conakry"
 msgstr "Conway"
 
-#: kstars_i18n.cpp:590
+#: data/Cities.dat:554 data/Cities.dat:1222
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Guinea"
+msgstr "Gini"
+
+#: data/Cities.dat:555
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Concepcion"
 msgstr "Concepcion"
 
-#: kstars_i18n.cpp:591
+#: data/Cities.dat:556 data/Cities.dat:557
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Concord"
 msgstr "Concord"
 
-#: kstars_i18n.cpp:592
+#: data/Cities.dat:558
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Condon"
 msgstr "Condon"
 
-#: kstars_i18n.cpp:593
+#: data/Cities.dat:559
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Connabarabran"
 msgstr "Connabarabran"
 
-#: kstars_i18n.cpp:594
+#: data/Cities.dat:560 data/Cities.dat:561
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Conway"
 msgstr "Conway"
 
-#: kstars_i18n.cpp:595
+#: data/Cities.dat:562
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Copenhagen"
 msgstr " Copenhagen"
 
-#: kstars_i18n.cpp:596
+#: data/Cities.dat:563
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Coralville"
 msgstr " Coralville"
 
-#: kstars_i18n.cpp:597
+#: data/Cities.dat:564
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Corbin"
 msgstr " Corbin"
 
-#: kstars_i18n.cpp:598
+#: data/Cities.dat:565
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cordova"
 msgstr " Cordova"
 
-#: kstars_i18n.cpp:599
+#: data/Cities.dat:566
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Corinth"
 msgstr " Corinth"
 
-#: kstars_i18n.cpp:600
+#: data/Cities.dat:567
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Corning"
 msgstr " Corning"
 
-#: kstars_i18n.cpp:601
+#: data/Cities.dat:568
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Corpus Christi"
 msgstr "Corpus Christi"
 
-#: kstars_i18n.cpp:602
+#: data/Cities.dat:569
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cortez"
 msgstr "Cortez"
 
-#: kstars_i18n.cpp:603
+#: data/Cities.dat:570
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Corvallis"
 msgstr "Corvallis"
 
-#: kstars_i18n.cpp:604
+#: data/Cities.dat:571
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cosenza"
 msgstr "Cosenza"
 
-#: kstars_i18n.cpp:605
+#: data/Cities.dat:572
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Costa Mesa"
 msgstr "Costa Mesa"
 
-#: kstars_i18n.cpp:606
+#: data/Cities.dat:573
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cotonou"
 msgstr "Crofton"
 
-#: kstars_i18n.cpp:607
+#: data/Cities.dat:573 data/Cities.dat:2081
+#, fuzzy
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Bénin"
+msgstr "Brunei"
+
+#: data/Cities.dat:574
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cottbus"
 msgstr "Cottbus"
 
-#: kstars_i18n.cpp:608
+#: data/Cities.dat:575
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Couer d'Alene"
 msgstr "Couer d'Alene"
 
-#: kstars_i18n.cpp:609
+#: data/Cities.dat:576
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Council Bluffs"
 msgstr "Council Bluffs"
 
-#: kstars_i18n.cpp:610
+#: data/Cities.dat:577
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Covington"
 msgstr "Covington"
 
-#: kstars_i18n.cpp:611
+#: data/Cities.dat:578
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cranbrook"
 msgstr "Cranbrook"
 
-#: kstars_i18n.cpp:612
+#: data/Cities.dat:579
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cranford"
 msgstr "Cranford"
 
-#: kstars_i18n.cpp:613
+#: data/Cities.dat:580
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cranston"
 msgstr "Cranston"
 
-#: kstars_i18n.cpp:614
+#: data/Cities.dat:581
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Crawford Hill"
-msgstr "Crawford Hill"
+"Crawford"
+msgstr "Crawford"
 
-#: kstars_i18n.cpp:615
+#: data/Cities.dat:582
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Crawford"
-msgstr "Crawford"
+"Crawford Hill"
+msgstr "Crawford Hill"
 
-#: kstars_i18n.cpp:616
+#: data/Cities.dat:583 data/Cities.dat:584
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Crestwood"
 msgstr "Crestwood"
 
-#: kstars_i18n.cpp:617
+#: data/Cities.dat:585
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Creve Coeur"
 msgstr "Creve Coeur"
 
-#: kstars_i18n.cpp:618
+#: data/Cities.dat:586
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cripple Creek"
 msgstr "Cripple Creek"
 
-#: kstars_i18n.cpp:619
+#: data/Cities.dat:587
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Crocker"
 msgstr "Crocker"
 
-#: kstars_i18n.cpp:620
+#: data/Cities.dat:588
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Crofton"
 msgstr "Crofton"
 
-#: kstars_i18n.cpp:621
+#: data/Cities.dat:589
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cubi Point"
 msgstr "Cubi Point"
 
-#: kstars_i18n.cpp:622
+#: data/Cities.dat:590
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cuenca"
 msgstr "Cuenca"
 
-#: kstars_i18n.cpp:623
+#: data/Cities.dat:591
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Culgoora"
 msgstr "Culgoora"
 
-#: kstars_i18n.cpp:624
+#: data/Cities.dat:592
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Culver City"
 msgstr "Culver City"
 
-#: kstars_i18n.cpp:625
+#: data/Cities.dat:593
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cumberland"
 msgstr "Cumberland"
 
-#: kstars_i18n.cpp:626
+#: data/Cities.dat:594
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cut Bank"
 msgstr "Cut Bank"
 
-#: kstars_i18n.cpp:627
+#: data/Cities.dat:595
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cáceres"
 msgstr "Cáceres"
 
-#: kstars_i18n.cpp:628
+#: data/Cities.dat:596
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Cádiz"
 msgstr "Cádiz"
 
-#: kstars_i18n.cpp:629
+#: data/Cities.dat:597
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Córdoba"
 msgstr " Cordoba"
 
-#: kstars_i18n.cpp:630
+#: data/Cities.dat:598
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dacca"
 msgstr "Dacca"
 
-#: kstars_i18n.cpp:631
+#: data/Cities.dat:599
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Daegu"
 msgstr "Daegu"
 
-#: kstars_i18n.cpp:632
+#: data/Cities.dat:600
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Daegwallyeong"
 msgstr "Daegwallyeong"
 
-#: kstars_i18n.cpp:633
+#: data/Cities.dat:601
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Daejeon"
 msgstr "Daejeon"
 
-#: kstars_i18n.cpp:634
+#: data/Cities.dat:602
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dakar"
 msgstr "Dakar"
 
-#: kstars_i18n.cpp:635
+#: 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"
+msgstr "Senegal"
+
+#: data/Cities.dat:603
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dakhla"
 msgstr "Dakar"
 
-#: kstars_i18n.cpp:636
+#: data/Cities.dat:603 data/Cities.dat:731
+#, fuzzy
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Western sahara"
+msgstr "Iseldiroedd"
+
+#: data/Cities.dat:604
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dallas"
 msgstr "Dallas"
 
-#: kstars_i18n.cpp:637
+#: data/Cities.dat:605
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dalsbruk"
 msgstr "Dalsbruk"
 
-#: kstars_i18n.cpp:638
+#: 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"
+msgstr "Ffindir"
+
+#: data/Cities.dat:606
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Daly City"
 msgstr "Daly City"
 
-#: kstars_i18n.cpp:639
+#: data/Cities.dat:607
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Damascus"
 msgstr "Damascus"
 
-#: kstars_i18n.cpp:640
+#: data/Cities.dat:607
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Syria"
+msgstr "Syria"
+
+#: data/Cities.dat:608
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Damecuta"
 msgstr "Damecuta"
 
-#: kstars_i18n.cpp:641
+#: data/Cities.dat:609
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Danbury"
 msgstr "Danbury"
 
-#: kstars_i18n.cpp:642
+#: data/Cities.dat:610
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Danielson"
 msgstr "Danielson"
 
-#: kstars_i18n.cpp:643
+#: data/Cities.dat:611 data/Cities.dat:612
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Danville"
 msgstr "Danville"
 
-#: kstars_i18n.cpp:644
+#: data/Cities.dat:613
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Danyang"
 msgstr "Danyang"
 
-#: kstars_i18n.cpp:645
+#: data/Cities.dat:613
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"South Korea"
+msgstr "De Corea"
+
+#: data/Cities.dat:614
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dapaong"
 msgstr "Danyang"
 
-#: kstars_i18n.cpp:646
+#: data/Cities.dat:614 data/Cities.dat:1450
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Togo"
+msgstr "Togo"
+
+#: data/Cities.dat:615
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dar es Salaam"
 msgstr "Dar es Salaam"
 
-#: kstars_i18n.cpp:647
+#: data/Cities.dat:615
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Tanzania"
+msgstr "Tanzania"
+
+#: data/Cities.dat:616
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Darmstadt"
 msgstr "Darmstadt"
 
-#: kstars_i18n.cpp:648
+#: data/Cities.dat:617
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Darwin"
 msgstr "Darwin"
 
-#: kstars_i18n.cpp:649
+#: data/Cities.dat:618
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Davenport"
 msgstr "Davenport"
 
-#: kstars_i18n.cpp:650
+#: data/Cities.dat:619 data/Cities.dat:620
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dayton"
 msgstr "Dayton"
 
-#: kstars_i18n.cpp:651
+#: data/Cities.dat:621
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Daytona Beach"
 msgstr "Daytona Beach"
 
-#: kstars_i18n.cpp:652
+#: data/Cities.dat:622
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "De Aar"
 msgstr "Dover"
 
-#: kstars_i18n.cpp:653
+#: data/Cities.dat:623
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "DeMotte"
 msgstr "DeMotte"
 
-#: kstars_i18n.cpp:654
+#: data/Cities.dat:624
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Deadhorse"
 msgstr "Deadhorse"
 
-#: kstars_i18n.cpp:655
+#: data/Cities.dat:625
+msgid ""
+"_: City name (optional, probably does not need a translation)\n"
+"Dearborn"
+msgstr "Dearborn"
+
+#: data/Cities.dat:626
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dearborn Heights"
 msgstr "Dearborn Heights"
 
-#: kstars_i18n.cpp:656
+#: data/Cities.dat:627
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dearborn Obs."
 msgstr "Ars. Dearborn"
 
-#: kstars_i18n.cpp:657
-msgid ""
-"_: City name (optional, probably does not need a translation)\n"
-"Dearborn"
-msgstr "Dearborn"
-
-#: kstars_i18n.cpp:658
+#: data/Cities.dat:628
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Death Valley"
 msgstr " Death Valley"
 
-#: kstars_i18n.cpp:659
+#: data/Cities.dat:629
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Debrecen"
 msgstr "Debrecen"
 
-#: kstars_i18n.cpp:660
+#: data/Cities.dat:630
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Decataur"
 msgstr "Decataur"
 
-#: kstars_i18n.cpp:661
+#: data/Cities.dat:631
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Decimomannu"
 msgstr "Decimomannu"
 
-#: kstars_i18n.cpp:662
+#: data/Cities.dat:632
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dekalb"
 msgstr "Dekalb"
 
-#: kstars_i18n.cpp:663
+#: data/Cities.dat:633
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Del Rio"
 msgstr "Del Rio"
 
-#: kstars_i18n.cpp:664
+#: data/Cities.dat:634
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Delavan"
 msgstr "Delavan"
 
-#: kstars_i18n.cpp:665
+#: data/Cities.dat:635
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Delhi"
 msgstr "Delhi"
 
-#: kstars_i18n.cpp:666
+#: data/Cities.dat:636
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Delta Junction"
-msgstr "Delta Junction"
+"Delta"
+msgstr "Delta"
 
-#: kstars_i18n.cpp:667
+#: data/Cities.dat:637
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Delta"
-msgstr "Delta"
+"Delta Junction"
+msgstr "Delta Junction"
 
-#: kstars_i18n.cpp:668
+#: data/Cities.dat:638
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Denali National Park"
 msgstr "Denali National Park"
 
-#: kstars_i18n.cpp:669
+#: data/Cities.dat:639
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Denton"
 msgstr "Denton"
 
-#: kstars_i18n.cpp:670
+#: data/Cities.dat:640
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Denver"
 msgstr "Denver"
 
-#: kstars_i18n.cpp:671
+#: data/Cities.dat:641 data/Cities.dat:642
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Derby"
 msgstr "Derby"
 
-#: kstars_i18n.cpp:672
+#: data/Cities.dat:643
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Derry"
 msgstr "Derry"
 
-#: kstars_i18n.cpp:673
+#: data/Cities.dat:644
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Des Moines"
 msgstr "Des Moines"
 
-#: kstars_i18n.cpp:674
+#: data/Cities.dat:645
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Des Plaines"
 msgstr "Des Plaines"
 
-#: kstars_i18n.cpp:675
+#: data/Cities.dat:646
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dessau"
 msgstr "Dessau"
 
-#: kstars_i18n.cpp:676
+#: data/Cities.dat:647
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Detroit"
 msgstr "Detroit"
 
-#: kstars_i18n.cpp:677
+#: data/Cities.dat:648
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Devils Lake"
 msgstr "Devils Lake"
 
-#: kstars_i18n.cpp:678
+#: data/Cities.dat:649
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dhahran"
 msgstr "Dhahran"
 
-#: kstars_i18n.cpp:679
+#: data/Cities.dat:649 data/Cities.dat:1175 data/Cities.dat:2187
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Saudi Arabia"
+msgstr "Saudi Arabia"
+
+#: data/Cities.dat:650
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Diamond Bar"
 msgstr "Diamond Bar"
 
-#: kstars_i18n.cpp:680
+#: data/Cities.dat:651
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Diamond Springs"
 msgstr "Diamond Springs"
 
-#: kstars_i18n.cpp:681
+#: data/Cities.dat:652 data/Cities.dat:653
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dickinson"
 msgstr "Dickinson"
 
-#: kstars_i18n.cpp:682
+#: data/Cities.dat:654
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Diego Garcia"
 msgstr "Diego Garcia"
 
-#: kstars_i18n.cpp:683
+#: 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"
+"US Territory"
+msgstr "Tiriogaeth UD"
+
+#: data/Cities.dat:655
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dijon"
 msgstr "Dijon"
 
-#: kstars_i18n.cpp:684
+#: data/Cities.dat:655
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Côte d'or"
+msgstr "Efrog Newydd"
+
+#: data/Cities.dat:656
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dillingham"
 msgstr "Dillingham"
 
-#: kstars_i18n.cpp:685
+#: 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"
+"Hawaii"
+msgstr "Hawaii"
+
+#: data/Cities.dat:657 data/Cities.dat:658
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dillon"
 msgstr "Dillon"
 
-#: kstars_i18n.cpp:686
+#: data/Cities.dat:659
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Diyarbakir"
 msgstr "Diyarbakir"
 
-#: kstars_i18n.cpp:687
+#: data/Cities.dat:660
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Djakarta"
 msgstr "Djakarta"
 
-#: kstars_i18n.cpp:688
+#: data/Cities.dat:661
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Djerba"
 msgstr "Derby"
 
-#: kstars_i18n.cpp:689
+#: 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"
+msgstr "Tunisia"
+
+#: data/Cities.dat:662
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Djibouti"
 msgstr "Djibouti"
 
-#: kstars_i18n.cpp:690
+#: data/Cities.dat:662
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Djibouti"
+msgstr "Djibouti"
+
+#: data/Cities.dat:663
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dodge City"
 msgstr "Dodge City"
 
-#: kstars_i18n.cpp:691
+#: data/Cities.dat:664
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dodoma"
 msgstr "Dokdo"
 
-#: kstars_i18n.cpp:692
+#: data/Cities.dat:664 data/Cities.dat:1573 data/Cities.dat:1709
+#: data/Cities.dat:1748 data/Cities.dat:2830
+#, fuzzy
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Tanzanie"
+msgstr "Tanzania"
+
+#: data/Cities.dat:665
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Doha"
 msgstr "Doha"
 
-#: kstars_i18n.cpp:693
+#: data/Cities.dat:665
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Qatar"
+msgstr "Qatar"
+
+#: data/Cities.dat:666
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dokdo"
 msgstr "Dokdo"
 
-#: kstars_i18n.cpp:694
+#: data/Cities.dat:666
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Gyengnam"
+msgstr "Gyengnam"
+
+#: data/Cities.dat:667
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dominion"
 msgstr "Dominion"
 
-#: kstars_i18n.cpp:695
+#: data/Cities.dat:668
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dongducheon"
 msgstr "Dongducheon"
 
-#: kstars_i18n.cpp:696
+#: 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"
+msgstr "Gyeonggi"
+
+#: data/Cities.dat:669
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Donghae"
 msgstr "Donghae"
 
-#: kstars_i18n.cpp:697
+#: data/Cities.dat:670
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dortmund"
 msgstr "Dortmund"
 
-#: kstars_i18n.cpp:698
+#: data/Cities.dat:671
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dothan"
 msgstr "Dothan"
 
-#: kstars_i18n.cpp:699
+#: data/Cities.dat:672
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Douala"
 msgstr "Douala"
 
-#: kstars_i18n.cpp:700
+#: data/Cities.dat:672 data/Cities.dat:2534 data/Cities.dat:2805
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Cameroon"
+msgstr "Camerwn"
+
+#: data/Cities.dat:673
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Douglas"
 msgstr "Douglas"
 
-#: kstars_i18n.cpp:701
+#: data/Cities.dat:673
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Isle of Man"
+msgstr "Ynys Mannin"
+
+#: 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"
 msgstr "Dover"
 
-#: kstars_i18n.cpp:702
+#: data/Cities.dat:678
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Downey"
 msgstr "Downey"
 
-#: kstars_i18n.cpp:703
+#: data/Cities.dat:679
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dr. Remeis"
 msgstr "Dr. Remeis"
 
-#: kstars_i18n.cpp:704
+#: data/Cities.dat:680
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Drammen"
 msgstr "Drammen"
 
-#: kstars_i18n.cpp:705
+#: data/Cities.dat:681
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dresden"
 msgstr "Dresden"
 
-#: kstars_i18n.cpp:706
+#: data/Cities.dat:682
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dryden"
 msgstr "Dryden"
 
-#: kstars_i18n.cpp:707
+#: data/Cities.dat:683
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dubai"
 msgstr "Dubai"
 
-#: kstars_i18n.cpp:708
+#: data/Cities.dat:684
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dublin"
 msgstr "Dulyn"
 
-#: kstars_i18n.cpp:709
+#: data/Cities.dat:684 data/Cities.dat:693 data/Cities.dat:2337
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Ireland"
+msgstr "Iwerddon"
+
+#: data/Cities.dat:685
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dubrovnik"
 msgstr "Dubrovnik"
 
-#: kstars_i18n.cpp:710
+#: data/Cities.dat:685 data/Cities.dat:1125
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Croatia"
+msgstr "Croatia"
+
+#: data/Cities.dat:686
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dubuque"
 msgstr " Dubuque"
 
-#: kstars_i18n.cpp:711
+#: data/Cities.dat:687
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dudinka"
 msgstr "Dunsink"
 
-#: kstars_i18n.cpp:712
+#: data/Cities.dat:688
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Duisburg"
 msgstr "Duisburg"
 
-#: kstars_i18n.cpp:713
+#: data/Cities.dat:689
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Duluth"
 msgstr "Duluth"
 
-#: kstars_i18n.cpp:714
+#: data/Cities.dat:690
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dundalk"
 msgstr "Dundalk"
 
-#: kstars_i18n.cpp:715
+#: data/Cities.dat:691
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dunedin"
 msgstr "Dunedin"
 
-#: kstars_i18n.cpp:716
+#: data/Cities.dat:692
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dunlap"
 msgstr "Dunlap"
 
-#: kstars_i18n.cpp:717
+#: data/Cities.dat:693
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dunsink"
 msgstr "Dunsink"
 
-#: kstars_i18n.cpp:718
+#: data/Cities.dat:694
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Durango"
 msgstr "Durango"
 
-#: kstars_i18n.cpp:719
+#: data/Cities.dat:695
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Durban"
 msgstr "Burbank"
 
-#: kstars_i18n.cpp:720
+#: data/Cities.dat:696
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Durham"
 msgstr "Durham"
 
-#: kstars_i18n.cpp:721
+#: data/Cities.dat:697
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dutch Harbor"
 msgstr "Dutch Harbor"
 
-#: kstars_i18n.cpp:722
+#: data/Cities.dat:698
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dwingeloo Obs."
 msgstr "Ars. Dwingeloo"
 
-#: kstars_i18n.cpp:723
+#: data/Cities.dat:699
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Dyer Observatory"
 msgstr "Dyer Observatory"
 
-#: kstars_i18n.cpp:724
+#: data/Cities.dat:700
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Düsseldorf"
 msgstr "Düsseldorf"
 
-#: kstars_i18n.cpp:725
+#: data/Cities.dat:701
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Eagan"
 msgstr "Eagan"
 
-#: kstars_i18n.cpp:726
+#: data/Cities.dat:702
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Eagle River"
-msgstr "Eagle River"
+"Eagle"
+msgstr "Eagle"
 
-#: kstars_i18n.cpp:727
+#: data/Cities.dat:703
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Eagle"
-msgstr "Eagle"
+"Eagle River"
+msgstr "Eagle River"
 
-#: kstars_i18n.cpp:728
+#: data/Cities.dat:704
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "East Boston"
 msgstr "Gorllewin Boston"
 
-#: kstars_i18n.cpp:729
+#: data/Cities.dat:705
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "East Brunswick"
 msgstr "Gorllewin Brunswick"
 
-#: kstars_i18n.cpp:730
+#: data/Cities.dat:706
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "East Lansing"
 msgstr "Gorllewin Lansing"
 
-#: kstars_i18n.cpp:731
+#: data/Cities.dat:707
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "East Las Vegas"
 msgstr "Gorllewin Las Vegas"
 
-#: kstars_i18n.cpp:732
+#: data/Cities.dat:708
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "East London"
 msgstr "Eatonton"
 
-#: kstars_i18n.cpp:733
+#: data/Cities.dat:709
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "East Los Angeles"
 msgstr "Gorllewin Los Angeles"
 
-#: kstars_i18n.cpp:734
+#: data/Cities.dat:710
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "East Orange"
 msgstr "Gorllewin Orange"
 
-#: kstars_i18n.cpp:735
+#: data/Cities.dat:711
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "East Point"
 msgstr "Gorllewin Point"
 
-#: kstars_i18n.cpp:736
+#: data/Cities.dat:712
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "East St. Louis"
 msgstr "Gorllewin St. Louis"
 
-#: kstars_i18n.cpp:737
+#: data/Cities.dat:713
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "East Stroudsburg"
 msgstr "Gorllewin Stroudsburg"
 
-#: kstars_i18n.cpp:738
+#: data/Cities.dat:714
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "East Wenatchee"
 msgstr "Gorllewin Wenatchee"
 
-#: kstars_i18n.cpp:739
+#: data/Cities.dat:715
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Eastampton"
 msgstr "Eastampton"
 
-#: kstars_i18n.cpp:740
+#: data/Cities.dat:716
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Eatonton"
 msgstr "Eatonton"
 
-#: kstars_i18n.cpp:741
+#: data/Cities.dat:717
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Eau Claire"
 msgstr "Eau Claire"
 
-#: kstars_i18n.cpp:742
+#: data/Cities.dat:718
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ebro"
 msgstr "Ebro"
 
-#: kstars_i18n.cpp:743
+#: data/Cities.dat:719
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Edina"
 msgstr "Edina"
 
-#: kstars_i18n.cpp:744
+#: data/Cities.dat:720
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Edinburgh"
 msgstr "Caer Edin"
 
-#: kstars_i18n.cpp:745
+#: data/Cities.dat:721
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Edmond"
 msgstr "Edmond"
 
-#: kstars_i18n.cpp:746
+#: data/Cities.dat:722
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Edmonds"
 msgstr "Edmonds"
 
-#: kstars_i18n.cpp:747
+#: data/Cities.dat:723
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Edmonton"
 msgstr "Edmonton"
 
-#: kstars_i18n.cpp:748
+#: data/Cities.dat:724
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Edmundston"
 msgstr "Edmundston"
 
-#: kstars_i18n.cpp:749
+#: 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"
+msgstr "Brunswick Newydd"
+
+#: data/Cities.dat:725
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Edna"
 msgstr "Edna"
 
-#: kstars_i18n.cpp:750
+#: data/Cities.dat:726
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Efate"
 msgstr "Efate"
 
-#: kstars_i18n.cpp:751
+#: data/Cities.dat:726
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Vanuatu"
+msgstr "Vanuatu"
+
+#: data/Cities.dat:727
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Effelsberg"
 msgstr "Effelsberg"
 
-#: kstars_i18n.cpp:752
+#: data/Cities.dat:728
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Effingham"
 msgstr "Effingham"
 
-#: kstars_i18n.cpp:753
+#: data/Cities.dat:729
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Egvekinot"
 msgstr "Elgin"
 
-#: kstars_i18n.cpp:754
+#: data/Cities.dat:730
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ekaterinburg"
 msgstr "Martinsburg"
 
-#: kstars_i18n.cpp:755
+#: data/Cities.dat:731
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "El Aaiun"
 msgstr "Elgin"
 
-#: kstars_i18n.cpp:756
+#: data/Cities.dat:732
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "El Cajon"
 msgstr "El Cajon"
 
-#: kstars_i18n.cpp:757
+#: data/Cities.dat:733
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "El Dorado"
 msgstr "El Dorado"
 
-#: kstars_i18n.cpp:758
+#: data/Cities.dat:734
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "El Fasher"
 msgstr "Fisher"
 
-#: kstars_i18n.cpp:759
+#: 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"
+msgstr "Sudan"
+
+#: data/Cities.dat:735
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "El Mirage"
 msgstr "El Mirage"
 
-#: kstars_i18n.cpp:760
+#: data/Cities.dat:736
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "El Monte"
 msgstr "El Monte"
 
-#: kstars_i18n.cpp:761
+#: data/Cities.dat:737
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "El Obeid"
 msgstr "Euclid"
 
-#: kstars_i18n.cpp:762
+#: data/Cities.dat:738
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "El Paso"
 msgstr "El Paso"
 
-#: kstars_i18n.cpp:763
+#: data/Cities.dat:739
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "El fayum"
 msgstr "Elva"
 
-#: kstars_i18n.cpp:764
+#: data/Cities.dat:740
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Elche"
 msgstr "Elche"
 
-#: kstars_i18n.cpp:765
+#: data/Cities.dat:741
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Eldorado"
 msgstr "Eldorado"
 
-#: kstars_i18n.cpp:766
+#: data/Cities.dat:742
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Eldridge"
 msgstr "Eldridge"
 
-#: kstars_i18n.cpp:767
+#: data/Cities.dat:743
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Elgin"
 msgstr "Elgin"
 
-#: kstars_i18n.cpp:768
+#: data/Cities.dat:744
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Elizabeth City"
-msgstr "Elizabeth City"
+"Elizabeth"
+msgstr "Elizabeth"
 
-#: kstars_i18n.cpp:769
+#: data/Cities.dat:745
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Elizabeth"
-msgstr "Elizabeth"
+"Elizabeth City"
+msgstr "Elizabeth City"
 
-#: kstars_i18n.cpp:770
+#: data/Cities.dat:746
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Elizabethtown"
 msgstr "Elizabethtown"
 
-#: kstars_i18n.cpp:771
+#: data/Cities.dat:747
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Elk City"
 msgstr "Elk City"
 
-#: kstars_i18n.cpp:772
+#: data/Cities.dat:748
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Elk Point"
 msgstr "Elk Point"
 
-#: kstars_i18n.cpp:773
+#: data/Cities.dat:749
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Elkhart"
 msgstr "Elkhart"
 
-#: kstars_i18n.cpp:774
+#: data/Cities.dat:750
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Elkins"
 msgstr "Elkins"
 
-#: kstars_i18n.cpp:775
+#: data/Cities.dat:751
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Elko"
 msgstr "Elko"
 
-#: kstars_i18n.cpp:776
+#: data/Cities.dat:752
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Elmira"
 msgstr "Elmira"
 
-#: kstars_i18n.cpp:777
+#: data/Cities.dat:753
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Elsmere"
 msgstr "Elsmere"
 
-#: kstars_i18n.cpp:778
+#: data/Cities.dat:754
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Elva"
 msgstr "Elva"
 
-#: kstars_i18n.cpp:779
+#: 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"
+"Estonia"
+msgstr "Estonia"
+
+#: data/Cities.dat:755
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Elverson"
 msgstr "Elverson"
 
-#: kstars_i18n.cpp:780
+#: data/Cities.dat:756
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Elyria"
 msgstr "Elyria"
 
-#: kstars_i18n.cpp:781
+#: data/Cities.dat:757
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Enfield"
 msgstr "Enfield"
 
-#: kstars_i18n.cpp:782
+#: data/Cities.dat:758
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Englewood"
 msgstr "Englewood"
 
-#: kstars_i18n.cpp:783
+#: data/Cities.dat:759
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Enid"
 msgstr "Enid"
 
-#: kstars_i18n.cpp:784
+#: data/Cities.dat:760
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Entebbe"
 msgstr "Entebbe"
 
-#: kstars_i18n.cpp:785
+#: data/Cities.dat:761
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ephrata"
 msgstr "Ephrata"
 
-#: kstars_i18n.cpp:786
+#: data/Cities.dat:762
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Erding"
 msgstr "Erding"
 
-#: kstars_i18n.cpp:787
+#: data/Cities.dat:763
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Erfurt"
 msgstr "Erfurt"
 
-#: kstars_i18n.cpp:788
+#: data/Cities.dat:764
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Erie"
 msgstr "Erie"
 
-#: kstars_i18n.cpp:789
+#: data/Cities.dat:765
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Erlangen"
 msgstr "Erlangen"
 
-#: kstars_i18n.cpp:790
+#: data/Cities.dat:766
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Esbjerg"
 msgstr "Esbjerg"
 
-#: kstars_i18n.cpp:791
+#: data/Cities.dat:767
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Escondido"
 msgstr "Escondido"
 
-#: kstars_i18n.cpp:792
+#: data/Cities.dat:768
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Esfahan"
 msgstr "Esfahan"
 
-#: kstars_i18n.cpp:793
+#: data/Cities.dat:769
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Espoo"
 msgstr "Espoo"
 
-#: kstars_i18n.cpp:794
+#: data/Cities.dat:770
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Essen"
 msgstr "Essen"
 
-#: kstars_i18n.cpp:795
+#: data/Cities.dat:771
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Essex Junction"
 msgstr "Cyffordd Essex"
 
-#: kstars_i18n.cpp:796
+#: data/Cities.dat:772
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Euclid"
 msgstr "Euclid"
 
-#: kstars_i18n.cpp:797
+#: data/Cities.dat:773
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Eudora"
 msgstr "Eudora"
 
-#: kstars_i18n.cpp:798
+#: data/Cities.dat:774
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Eugene"
 msgstr "Eugene"
 
-#: kstars_i18n.cpp:799
+#: data/Cities.dat:775 data/Cities.dat:776 data/Cities.dat:777
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Eureka"
 msgstr "Eureka"
 
-#: kstars_i18n.cpp:800
+#: data/Cities.dat:778 data/Cities.dat:779
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Evanston"
 msgstr "Evanston"
 
-#: kstars_i18n.cpp:801
+#: data/Cities.dat:780
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Evansville"
 msgstr "Evansville"
 
-#: kstars_i18n.cpp:802
+#: data/Cities.dat:781
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Everett"
 msgstr "Everett"
 
-#: kstars_i18n.cpp:803
+#: data/Cities.dat:782
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Evergreen"
 msgstr "Evergreen"
 
-#: kstars_i18n.cpp:804
+#: data/Cities.dat:783
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ewa"
 msgstr "Ewa"
 
-#: kstars_i18n.cpp:805
+#: data/Cities.dat:784
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Exeter"
 msgstr "Exeter"
 
-#: kstars_i18n.cpp:806
+#: data/Cities.dat:785
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "F'Dérik"
 msgstr "Lérida"
 
-#: kstars_i18n.cpp:807
+#: data/Cities.dat:785 data/Cities.dat:1864
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Mauritania"
+msgstr "Mawritania"
+
+#: data/Cities.dat:786
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fabra"
 msgstr "Fabra"
 
-#: kstars_i18n.cpp:808
+#: data/Cities.dat:787
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fair Haven"
 msgstr "Fair Haven"
 
-#: kstars_i18n.cpp:809
+#: data/Cities.dat:788
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fairbanks"
 msgstr "Fairbanks"
 
-#: kstars_i18n.cpp:810
+#: data/Cities.dat:789 data/Cities.dat:790
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fairfax"
 msgstr "Fairfax"
 
-#: kstars_i18n.cpp:811
+#: data/Cities.dat:791 data/Cities.dat:792
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fairfield"
 msgstr "Fairfield"
 
-#: kstars_i18n.cpp:812
+#: data/Cities.dat:793
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fairmont"
 msgstr "Fairmont"
 
-#: kstars_i18n.cpp:813
+#: data/Cities.dat:794
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Faith"
 msgstr "Faith"
 
-#: kstars_i18n.cpp:814
+#: data/Cities.dat:795
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Falcon"
 msgstr "Falcon"
 
-#: kstars_i18n.cpp:815
+#: data/Cities.dat:796
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fall River"
 msgstr "Afon Fall"
 
-#: kstars_i18n.cpp:816
+#: data/Cities.dat:797
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fallon"
 msgstr "Fallon"
 
-#: kstars_i18n.cpp:817
+#: data/Cities.dat:798
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Falmouth"
 msgstr "Falmouth"
 
-#: kstars_i18n.cpp:818
+#: data/Cities.dat:799
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fargo"
 msgstr "Fargo"
 
-#: kstars_i18n.cpp:819
+#: data/Cities.dat:800
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Farmington"
 msgstr "Farmington"
 
-#: kstars_i18n.cpp:820
+#: data/Cities.dat:801
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Farnborough"
 msgstr "Farnborough"
 
-#: kstars_i18n.cpp:821
+#: data/Cities.dat:802 data/Cities.dat:803
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fayetteville"
 msgstr "Fayetteville"
 
-#: kstars_i18n.cpp:822
+#: data/Cities.dat:804
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ferrara"
 msgstr "Ferrara"
 
-#: kstars_i18n.cpp:823
+#: data/Cities.dat:805
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ferriday"
 msgstr "Ferriday"
 
-#: kstars_i18n.cpp:824
+#: data/Cities.dat:806
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fes"
 msgstr "Fresno"
 
-#: kstars_i18n.cpp:825
+#: data/Cities.dat:807
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Finningley"
 msgstr "Finningley"
 
-#: kstars_i18n.cpp:826
+#: data/Cities.dat:808
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fisher"
 msgstr "Fisher"
 
-#: kstars_i18n.cpp:827
+#: data/Cities.dat:809
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fitchburg"
 msgstr "Fitchburg"
 
-#: kstars_i18n.cpp:828
+#: data/Cities.dat:810
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Flagstaff"
 msgstr "Flagstaff"
 
-#: kstars_i18n.cpp:829
+#: data/Cities.dat:811
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Flint"
 msgstr "Flint"
 
-#: kstars_i18n.cpp:830
+#: data/Cities.dat:812
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Florala"
 msgstr "Florala"
 
-#: kstars_i18n.cpp:831
+#: data/Cities.dat:813 data/Cities.dat:814 data/Cities.dat:815
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Florence"
 msgstr "Fflorens"
 
-#: kstars_i18n.cpp:832
+#: data/Cities.dat:816
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Florissant"
 msgstr "Florissant"
 
-#: kstars_i18n.cpp:833
+#: data/Cities.dat:817
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Flower Mound"
 msgstr "Flower Mound"
 
-#: kstars_i18n.cpp:834
+#: data/Cities.dat:818
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Foggia"
 msgstr "Foggia"
 
-#: kstars_i18n.cpp:835
+#: data/Cities.dat:819
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Folsom"
 msgstr "Folsom"
 
-#: kstars_i18n.cpp:836
+#: data/Cities.dat:820
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fond du Lac"
 msgstr "Fond du Lac"
 
-#: kstars_i18n.cpp:837
+#: data/Cities.dat:821
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ford Island"
 msgstr "Ford Island"
 
-#: kstars_i18n.cpp:838
+#: data/Cities.dat:822
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Forli`"
 msgstr "Forli`"
 
-#: kstars_i18n.cpp:839
+#: data/Cities.dat:823
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Forrest City"
 msgstr "Forrest City"
 
-#: kstars_i18n.cpp:840
+#: data/Cities.dat:824
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Forsyth"
 msgstr "Forsyth"
 
-#: kstars_i18n.cpp:841
+#: data/Cities.dat:825
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fort Collins"
 msgstr "Fort Collins"
 
-#: kstars_i18n.cpp:842
+#: data/Cities.dat:826
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fort Dodge"
 msgstr "Fort Dodge"
 
-#: kstars_i18n.cpp:843
+#: data/Cities.dat:827
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fort Greely"
 msgstr "Fort Greely"
 
-#: kstars_i18n.cpp:844
+#: data/Cities.dat:828
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fort Lauderdale"
 msgstr "Fort Lauderdale"
 
-#: kstars_i18n.cpp:845
+#: data/Cities.dat:829
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fort McMurray"
 msgstr "Fort McMurray"
 
-#: kstars_i18n.cpp:846
+#: data/Cities.dat:830
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fort McPherson"
 msgstr "Fort McPherson"
 
-#: kstars_i18n.cpp:847
+#: 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"
+msgstr "Northwest Territories"
+
+#: data/Cities.dat:831
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fort Myers"
 msgstr "Fort Myers"
 
-#: kstars_i18n.cpp:848
+#: data/Cities.dat:832
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fort Nelson"
 msgstr "Fort Nelson"
 
-#: kstars_i18n.cpp:849
+#: data/Cities.dat:833
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fort Payne"
 msgstr "Fort Payne"
 
-#: kstars_i18n.cpp:850
+#: data/Cities.dat:834
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fort Richardson"
 msgstr "Fort Richardson"
 
-#: kstars_i18n.cpp:851
+#: data/Cities.dat:835
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fort Riley"
 msgstr "Fort Riley"
 
-#: kstars_i18n.cpp:852
+#: data/Cities.dat:836
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fort Salonga"
 msgstr "Fort Salonga"
 
-#: kstars_i18n.cpp:853
+#: data/Cities.dat:837
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fort Scott"
 msgstr "Fort Scott"
 
-#: kstars_i18n.cpp:854
+#: data/Cities.dat:838
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fort Simpson"
 msgstr "Fort Simpson"
 
-#: kstars_i18n.cpp:855
+#: data/Cities.dat:839
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fort Skala"
 msgstr "Fort Skala"
 
-#: kstars_i18n.cpp:856
+#: data/Cities.dat:840
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fort Smith"
 msgstr "Fort Smith"
 
-#: kstars_i18n.cpp:857
+#: data/Cities.dat:841
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fort Wayne"
 msgstr "Fort Wayne"
 
-#: kstars_i18n.cpp:858
+#: data/Cities.dat:842
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fort Worth"
 msgstr "Fort Worth"
 
-#: kstars_i18n.cpp:859
+#: data/Cities.dat:843
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fort Yukon"
 msgstr "Fort Yukon"
 
-#: kstars_i18n.cpp:860
+#: data/Cities.dat:844
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fountain Valley"
 msgstr "Fountain Valley"
 
-#: kstars_i18n.cpp:861
+#: data/Cities.dat:845
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Framingham"
 msgstr "Framingham"
 
-#: kstars_i18n.cpp:862
+#: data/Cities.dat:846
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Franceville"
 msgstr "Grangeville"
 
-#: kstars_i18n.cpp:863
+#: 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"
+msgstr "Gabon"
+
+#: data/Cities.dat:847
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Francistown"
 msgstr "Cranston"
 
-#: kstars_i18n.cpp:864
+#: data/Cities.dat:847 data/Cities.dat:877 data/Cities.dat:1441
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Botswana"
+msgstr "Botswana"
+
+#: data/Cities.dat:848
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Frankfort"
 msgstr "Frankfort"
 
-#: kstars_i18n.cpp:865
+#: data/Cities.dat:849
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Frankfurt"
 msgstr "Frankfurt"
 
-#: kstars_i18n.cpp:866
+#: data/Cities.dat:850 data/Cities.dat:851
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Franklin"
 msgstr "Franklin"
 
-#: kstars_i18n.cpp:867
+#: data/Cities.dat:852
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fred Lawrence Whipple Obs."
 msgstr "Ars. Fred Lawrence Whipple"
 
-#: kstars_i18n.cpp:868
+#: data/Cities.dat:853
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fredericia"
 msgstr "Fredericia"
 
-#: kstars_i18n.cpp:869
+#: data/Cities.dat:854
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Frederick"
 msgstr "Frederick"
 
-#: kstars_i18n.cpp:870
+#: data/Cities.dat:855
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fredericksburg"
 msgstr "Fredericksburg"
 
-#: kstars_i18n.cpp:871
+#: data/Cities.dat:856
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fredericktown"
 msgstr "Fredericktown"
 
-#: kstars_i18n.cpp:872
+#: data/Cities.dat:857
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fredericton"
 msgstr "Fredericton"
 
-#: kstars_i18n.cpp:873
+#: data/Cities.dat:858
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Frederikshavn"
 msgstr "Frederikshavn"
 
-#: kstars_i18n.cpp:874
+#: data/Cities.dat:859
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Frederiksvaerk"
 msgstr "Frederiksvaerk"
 
-#: kstars_i18n.cpp:875
+#: 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"
+msgstr "Zealand"
+
+#: data/Cities.dat:860
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Freehold"
 msgstr "Freehold"
 
-#: kstars_i18n.cpp:876
+#: data/Cities.dat:861
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Freeport"
 msgstr "Freeport"
 
-#: kstars_i18n.cpp:877
+#: data/Cities.dat:861 data/Cities.dat:1785
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Bahamas"
+msgstr "Bahamas"
+
+#: data/Cities.dat:862
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Freetown"
 msgstr "Fredericktown"
 
-#: kstars_i18n.cpp:878
+#: data/Cities.dat:862 data/Cities.dat:1250
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Sierra Leone"
+msgstr "Sierra Leone"
+
+#: data/Cities.dat:863
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Freiburg"
 msgstr "Freiburg"
 
-#: kstars_i18n.cpp:879
-#, fuzzy
+#: data/Cities.dat:864 data/Cities.dat:865
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Fremont Peak Observatory"
-msgstr "Dyer Observatory"
+"Fremont"
+msgstr "Fremont"
 
-#: kstars_i18n.cpp:880
+#: data/Cities.dat:866
+#, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Fremont"
-msgstr "Fremont"
+"Fremont Peak Observatory"
+msgstr "Dyer Observatory"
 
-#: kstars_i18n.cpp:881
+#: data/Cities.dat:867
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fresno"
 msgstr "Fresno"
 
-#: kstars_i18n.cpp:882
+#: data/Cities.dat:868
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fruitland Park"
 msgstr "Fruitland Park"
 
-#: kstars_i18n.cpp:883
+#: data/Cities.dat:869
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fujigane"
 msgstr "Fujigane"
 
-#: kstars_i18n.cpp:884
+#: data/Cities.dat:870
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fukuoka"
 msgstr "Fukuoka"
 
-#: kstars_i18n.cpp:885
+#: data/Cities.dat:871
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fullerton"
 msgstr "Fullerton"
 
-#: kstars_i18n.cpp:886
+#: data/Cities.dat:872
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Funchal"
 msgstr "Funchal"
 
-#: kstars_i18n.cpp:887
+#: data/Cities.dat:872
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Madeira"
+msgstr "Madeira"
+
+#: data/Cities.dat:873
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Furth (Mfr)"
 msgstr "Furth (Mfr)"
 
-#: kstars_i18n.cpp:888
+#: data/Cities.dat:874
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Fömi"
 msgstr "Fömi"
 
-#: kstars_i18n.cpp:889
+#: data/Cities.dat:875
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "GMRT"
 msgstr "GMRT"
 
-#: kstars_i18n.cpp:890
+#: data/Cities.dat:876
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gabes"
 msgstr "Gaspe"
 
-#: kstars_i18n.cpp:891
+#: data/Cities.dat:877
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gaborone"
 msgstr "Osborne"
 
-#: kstars_i18n.cpp:892
+#: data/Cities.dat:878
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gadsden"
 msgstr "Gadsden"
 
-#: kstars_i18n.cpp:893
+#: data/Cities.dat:879 data/Cities.dat:880
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gainesville"
 msgstr "Gainesville"
 
-#: kstars_i18n.cpp:894
+#: data/Cities.dat:881
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gaithersburg"
 msgstr "Gaithersburg"
 
-#: kstars_i18n.cpp:895
+#: data/Cities.dat:882
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Galena"
 msgstr "Galena"
 
-#: kstars_i18n.cpp:896
+#: data/Cities.dat:883
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gallup"
 msgstr "Gallup"
 
-#: kstars_i18n.cpp:897
+#: data/Cities.dat:884
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Galveston"
 msgstr "Galveston"
 
-#: kstars_i18n.cpp:898
+#: data/Cities.dat:885
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gander"
 msgstr "Gander"
 
-#: kstars_i18n.cpp:899
+#: data/Cities.dat:885 data/Cities.dat:2429
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Newfoundland"
+msgstr "Newfoundland"
+
+#: data/Cities.dat:886
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ganghwa"
 msgstr "Ganghwa"
 
-#: kstars_i18n.cpp:900
+#: data/Cities.dat:886
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Incheon"
+msgstr "Incheon"
+
+#: data/Cities.dat:887
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gangneung"
 msgstr "Gangneung"
 
-#: kstars_i18n.cpp:901
+#: data/Cities.dat:888
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gao"
 msgstr "Hao"
 
-#: kstars_i18n.cpp:902
+#: data/Cities.dat:889
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gardaia"
 msgstr "Grenaa"
 
-#: kstars_i18n.cpp:903
+#: data/Cities.dat:890
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Garden City"
 msgstr "Dinas Garden"
 
-#: kstars_i18n.cpp:904
+#: data/Cities.dat:891
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Garden Grove"
 msgstr "Garden Grove"
 
-#: kstars_i18n.cpp:905
+#: data/Cities.dat:892 data/Cities.dat:893
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Garland"
 msgstr "Garland"
 
-#: kstars_i18n.cpp:906
+#: data/Cities.dat:894
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Garrison"
 msgstr "Garrison"
 
-#: kstars_i18n.cpp:907
+#: data/Cities.dat:895
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gars am Inn"
 msgstr "Gars am Inn"
 
-#: kstars_i18n.cpp:908
+#: data/Cities.dat:896
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gary"
 msgstr "Gary"
 
-#: kstars_i18n.cpp:909
+#: data/Cities.dat:897
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gaspe"
 msgstr "Gaspe"
 
-#: kstars_i18n.cpp:910
+#: data/Cities.dat:898
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gassaway"
 msgstr "Gassaway"
 
-#: kstars_i18n.cpp:911
+#: data/Cities.dat:899
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gastonia"
 msgstr "Gastonia"
 
-#: kstars_i18n.cpp:912
+#: data/Cities.dat:900
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gauribidanur"
 msgstr "Gauribidanur"
 
-#: kstars_i18n.cpp:913
+#: data/Cities.dat:901
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gaya"
 msgstr "Gary"
 
-#: kstars_i18n.cpp:914
+#: data/Cities.dat:902
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gdansk"
 msgstr "Gdansk"
 
-#: kstars_i18n.cpp:915
+#: data/Cities.dat:903
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gedser"
 msgstr "Gedser"
 
-#: kstars_i18n.cpp:916
+#: data/Cities.dat:903 data/Cities.dat:1871
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Falster"
+msgstr "Falster"
+
+#: data/Cities.dat:904
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Geilenkirchen"
 msgstr "Geilenkirchen"
 
-#: kstars_i18n.cpp:917
+#: data/Cities.dat:905
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gelsenkirchen"
 msgstr "Gelsenkirchen"
 
-#: kstars_i18n.cpp:918
+#: data/Cities.dat:906
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Geneva"
 msgstr "Geneva"
 
-#: kstars_i18n.cpp:919
+#: data/Cities.dat:907
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Genoa"
 msgstr "Genoa"
 
-#: kstars_i18n.cpp:920
+#: data/Cities.dat:908
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Geochang"
 msgstr "Geochang"
 
-#: kstars_i18n.cpp:921
+#: 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"
+msgstr "Gyeongnam"
+
+#: data/Cities.dat:909
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Geoje"
 msgstr "Geoje"
 
-#: kstars_i18n.cpp:922
+#: data/Cities.dat:910
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Geomsan"
 msgstr "Geomsan"
 
-#: kstars_i18n.cpp:923
+#: 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"
 msgstr "Georgetown"
 
-#: kstars_i18n.cpp:924
+#: data/Cities.dat:911
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Ascension Island"
+msgstr "Ynys Ascension"
+
+#: data/Cities.dat:912
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Cayman Islands"
+msgstr "Ynysoedd Cayman"
+
+#: data/Cities.dat:913
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Guyana"
+msgstr "Guyana"
+
+#: data/Cities.dat:915
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gera"
 msgstr "Gera"
 
-#: kstars_i18n.cpp:925
+#: data/Cities.dat:916
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gerona"
 msgstr "Gerona"
 
-#: kstars_i18n.cpp:926
+#: data/Cities.dat:917
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gibraltar"
 msgstr "Gibraltar"
 
-#: kstars_i18n.cpp:927
+#: data/Cities.dat:918
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gijón"
 msgstr "Gijon"
 
-#: kstars_i18n.cpp:928
+#: data/Cities.dat:919
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gila Bend"
 msgstr "Gila Bend"
 
-#: kstars_i18n.cpp:929
+#: data/Cities.dat:920
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gillette"
 msgstr "Gillette"
 
-#: kstars_i18n.cpp:930
+#: data/Cities.dat:921
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gitega"
 msgstr "Gera"
 
-#: kstars_i18n.cpp:931
+#: data/Cities.dat:922 data/Cities.dat:923
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Glasgow"
 msgstr "Glasgow"
 
-#: kstars_i18n.cpp:932
+#: data/Cities.dat:924 data/Cities.dat:925
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Glendale"
 msgstr "Glendale"
 
-#: kstars_i18n.cpp:933
+#: data/Cities.dat:926
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Glendora"
 msgstr "Glendora"
 
-#: kstars_i18n.cpp:934
+#: data/Cities.dat:927
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Glenns Ferry"
 msgstr "Glenns Ferry"
 
-#: kstars_i18n.cpp:935
+#: data/Cities.dat:928
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Glens Falls"
 msgstr "Glens Falls"
 
-#: kstars_i18n.cpp:936
+#: data/Cities.dat:929
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Glenwood Springs"
-msgstr "Glenwood Springs"
+"Glenwood"
+msgstr "Glenwood"
 
-#: kstars_i18n.cpp:937
+#: data/Cities.dat:930
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Glenwood"
-msgstr "Glenwood"
+"Glenwood Springs"
+msgstr "Glenwood Springs"
 
-#: kstars_i18n.cpp:938
+#: data/Cities.dat:931
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Godthaab"
 msgstr "Godthåb"
 
-#: kstars_i18n.cpp:939
+#: data/Cities.dat:932
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Godthåb"
 msgstr "Godthåb"
 
-#: kstars_i18n.cpp:940
+#: data/Cities.dat:932 data/Cities.dat:2393 data/Cities.dat:2531
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Greenland"
+msgstr "Ynys Las"
+
+#: data/Cities.dat:933
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Goheung"
 msgstr "Goheung"
 
-#: kstars_i18n.cpp:941
+#: 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"
+msgstr "Jeonnam"
+
+#: data/Cities.dat:934
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Goldfield"
 msgstr "Goldfield"
 
-#: kstars_i18n.cpp:942
+#: data/Cities.dat:935
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Goldsboro"
 msgstr "Goldsboro"
 
-#: kstars_i18n.cpp:943
+#: data/Cities.dat:936
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Goldstone"
 msgstr "Goldstone"
 
-#: kstars_i18n.cpp:944
+#: data/Cities.dat:937
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Goose Bay"
 msgstr "Goose Bay"
 
-#: kstars_i18n.cpp:945
+#: data/Cities.dat:938
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Goose Creek"
 msgstr "Goose Creek"
 
-#: kstars_i18n.cpp:946
+#: data/Cities.dat:939
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gorham"
 msgstr "Gorham"
 
-#: kstars_i18n.cpp:947
+#: data/Cities.dat:940
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gornergrat"
 msgstr "Gornergrat"
 
-#: kstars_i18n.cpp:948
+#: data/Cities.dat:941
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gorno-Altaysk"
 msgstr "Norfolk"
 
-#: kstars_i18n.cpp:949
+#: data/Cities.dat:942
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gothenburg"
 msgstr "Gothenburg"
 
-#: kstars_i18n.cpp:950
+#: 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 ""
-"_: City name (optional, probably does not need a translation)\n"
-"Granada Hills"
-msgstr "Granada Hills"
+"_: Country name (optional, but should be translated)\n"
+"Sweden"
+msgstr "Sweden"
 
-#: kstars_i18n.cpp:951
+#: data/Cities.dat:943
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Granada"
 msgstr "Granada"
 
-#: kstars_i18n.cpp:952
+#: data/Cities.dat:944
+msgid ""
+"_: City name (optional, probably does not need a translation)\n"
+"Granada Hills"
+msgstr "Granada Hills"
+
+#: data/Cities.dat:945
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Grand Forks"
 msgstr "Grand Forks"
 
-#: kstars_i18n.cpp:953
+#: data/Cities.dat:946
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Grand Island"
 msgstr "Grand Island"
 
-#: kstars_i18n.cpp:954
+#: data/Cities.dat:947
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Grand Junction"
 msgstr "Grand Junction"
 
-#: kstars_i18n.cpp:955
+#: data/Cities.dat:948
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Grand Prairie"
 msgstr "Grand Prairie"
 
-#: kstars_i18n.cpp:956
+#: data/Cities.dat:949
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Grand Rapids"
 msgstr "Grand Rapids"
 
-#: kstars_i18n.cpp:957
+#: data/Cities.dat:950
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Granger"
 msgstr "Granger"
 
-#: kstars_i18n.cpp:958
+#: data/Cities.dat:951
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Grangeville"
 msgstr "Grangeville"
 
-#: kstars_i18n.cpp:959
+#: data/Cities.dat:952
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Granite Falls"
 msgstr "Granite Falls"
 
-#: kstars_i18n.cpp:960
+#: data/Cities.dat:953
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Grants Pass"
 msgstr "Grants Pass"
 
-#: kstars_i18n.cpp:961
+#: data/Cities.dat:954
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Grass Valley"
 msgstr "Grass Valley"
 
-#: kstars_i18n.cpp:962
+#: data/Cities.dat:955 data/Cities.dat:956
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Great Falls"
 msgstr "Great Falls"
 
-#: kstars_i18n.cpp:963
+#: data/Cities.dat:957
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Greeley"
 msgstr "Greeley"
 
-#: kstars_i18n.cpp:964
+#: data/Cities.dat:958
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Green Bank Obs."
 msgstr "Ars. Green Bank"
 
-#: kstars_i18n.cpp:965
+#: data/Cities.dat:959
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Green Bay"
 msgstr "Green Bay"
 
-#: kstars_i18n.cpp:966
+#: data/Cities.dat:960 data/Cities.dat:961
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Green River"
 msgstr "Green River"
 
-#: kstars_i18n.cpp:967
+#: data/Cities.dat:962
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Greenbelt"
 msgstr "Greenbelt"
 
-#: kstars_i18n.cpp:968
+#: data/Cities.dat:963
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Greensboro"
 msgstr "Greensboro"
 
-#: kstars_i18n.cpp:969
+#: 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"
 msgstr "Greenville"
 
-#: kstars_i18n.cpp:970
+#: data/Cities.dat:968 data/Cities.dat:969
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Greenwich"
 msgstr "Greenwich"
 
-#: kstars_i18n.cpp:971
+#: data/Cities.dat:970 data/Cities.dat:971
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Greenwood"
 msgstr "Greenwood"
 
-#: kstars_i18n.cpp:972
+#: data/Cities.dat:972
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Grenaa"
 msgstr "Grenaa"
 
-#: kstars_i18n.cpp:973
+#: data/Cities.dat:973
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Grenoble"
 msgstr "Grenoble"
 
-#: kstars_i18n.cpp:974
+#: data/Cities.dat:973
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Isère"
+msgstr "Azores"
+
+#: data/Cities.dat:974
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gresham"
 msgstr "Gresham"
 
-#: kstars_i18n.cpp:975
+#: data/Cities.dat:975
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Groningen"
 msgstr "Groningen"
 
-#: kstars_i18n.cpp:976
+#: data/Cities.dat:976
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Grosseto"
 msgstr "Grosseto"
 
-#: kstars_i18n.cpp:977
+#: data/Cities.dat:977
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Groton"
 msgstr "Groton"
 
-#: kstars_i18n.cpp:978
+#: data/Cities.dat:978
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Groveton"
 msgstr "Groveton"
 
-#: kstars_i18n.cpp:979
+#: data/Cities.dat:979
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Grozny"
 msgstr "Groton"
 
-#: kstars_i18n.cpp:980
+#: data/Cities.dat:980
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Guadalajara"
 msgstr "Guadalajara"
 
-#: kstars_i18n.cpp:981
+#: data/Cities.dat:981
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Guantanamo Bay"
 msgstr "Guantanamo Bay"
 
-#: kstars_i18n.cpp:982
+#: data/Cities.dat:981 data/Cities.dat:1048 data/Cities.dat:1332
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Cuba"
+msgstr "Cuba"
+
+#: data/Cities.dat:982
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Guatemala City"
 msgstr "Dinas Guatemala"
 
-#: kstars_i18n.cpp:983
+#: data/Cities.dat:982
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Guatemala"
+msgstr "Guatemala"
+
+#: data/Cities.dat:983
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Guayaquil"
 msgstr "Guayaquil"
 
-#: kstars_i18n.cpp:984
+#: data/Cities.dat:983 data/Cities.dat:2131
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Ecuador"
+msgstr "Ecuador"
+
+#: data/Cities.dat:984
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Guelph"
 msgstr "Guelph"
 
-#: kstars_i18n.cpp:985
+#: data/Cities.dat:985
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gulfport"
 msgstr "Gulfport"
 
-#: kstars_i18n.cpp:986
+#: data/Cities.dat:986
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gulkana"
 msgstr "Gulkana"
 
-#: kstars_i18n.cpp:987
+#: data/Cities.dat:987
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gumi"
 msgstr "Gumi"
 
-#: kstars_i18n.cpp:988
+#: data/Cities.dat:988
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gunsan"
 msgstr "Gunsan"
 
-#: kstars_i18n.cpp:989
+#: data/Cities.dat:989
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gurushikhar"
 msgstr "Gurushikhar"
 
-#: kstars_i18n.cpp:990
+#: data/Cities.dat:990
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gutersloh"
 msgstr "Gutersloh"
 
-#: kstars_i18n.cpp:991
+#: data/Cities.dat:991
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Guthrie"
 msgstr "Guthrie"
 
-#: kstars_i18n.cpp:992
+#: data/Cities.dat:992
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gwangju"
 msgstr "Gwangju"
 
-#: kstars_i18n.cpp:993
+#: data/Cities.dat:993
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gweru"
 msgstr "Peru"
 
-#: kstars_i18n.cpp:994
+#: data/Cities.dat:994
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Gönsdorf"
 msgstr "Gönsdorf"
 
-#: kstars_i18n.cpp:995
+#: data/Cities.dat:995
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Göttingen"
 msgstr "Göttingen"
 
-#: kstars_i18n.cpp:996
+#: data/Cities.dat:996
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "H. List"
 msgstr "H. List"
 
-#: kstars_i18n.cpp:997
+#: data/Cities.dat:997
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Haapsalu"
 msgstr "Haapsalu"
 
-#: kstars_i18n.cpp:998
+#: data/Cities.dat:998
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Haarlem"
 msgstr "Haarlem"
 
-#: kstars_i18n.cpp:999
+#: data/Cities.dat:999
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Haderslev"
 msgstr "Haderslev"
 
-#: kstars_i18n.cpp:1000
+#: data/Cities.dat:1000
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hadong"
 msgstr "Hadong"
 
-#: kstars_i18n.cpp:1001
+#: data/Cities.dat:1001
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Haenam"
 msgstr "Haenam"
 
-#: kstars_i18n.cpp:1002
+#: data/Cities.dat:1002
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hagen"
 msgstr "Hagen"
 
-#: kstars_i18n.cpp:1003
+#: data/Cities.dat:1003
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hagerstown"
 msgstr "Hagerstown"
 
-#: kstars_i18n.cpp:1004
+#: data/Cities.dat:1004
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Haifa"
 msgstr "Haifa"
 
-#: kstars_i18n.cpp:1005
+#: data/Cities.dat:1005
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Haiku"
 msgstr "Haiku"
 
-#: kstars_i18n.cpp:1006
+#: data/Cities.dat:1006
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hailey"
 msgstr "Hailey"
 
-#: kstars_i18n.cpp:1007
+#: data/Cities.dat:1007
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Haines"
 msgstr "Haines"
 
-#: kstars_i18n.cpp:1008
+#: data/Cities.dat:1008
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Haleakala"
 msgstr "Haleakala"
 
-#: kstars_i18n.cpp:1009
+#: data/Cities.dat:1009
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Halifax"
 msgstr "Halifax"
 
-#: kstars_i18n.cpp:1010
+#: data/Cities.dat:1009 data/Cities.dat:2480
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Nova Scotia"
+msgstr "Nova Scotia"
+
+#: data/Cities.dat:1010
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Halle"
 msgstr "Halle"
 
-#: kstars_i18n.cpp:1011
+#: data/Cities.dat:1011
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hamburg"
 msgstr "Hamburg"
 
-#: kstars_i18n.cpp:1012
+#: data/Cities.dat:1012
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hamden"
 msgstr "Hamden"
 
-#: kstars_i18n.cpp:1013
+#: data/Cities.dat:1013 data/Cities.dat:1014 data/Cities.dat:1015
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hamilton"
 msgstr "Hamilton"
 
-#: kstars_i18n.cpp:1014
+#: data/Cities.dat:1013
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Bermuda"
+msgstr "Bermiwda"
+
+#: data/Cities.dat:1016
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hamm"
 msgstr "Hamm"
 
-#: kstars_i18n.cpp:1015
+#: data/Cities.dat:1017
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hammond"
 msgstr "Hammond"
 
-#: kstars_i18n.cpp:1016
+#: data/Cities.dat:1018
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hampton"
 msgstr "Hampton"
 
-#: kstars_i18n.cpp:1017
+#: data/Cities.dat:1019
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hana"
 msgstr "Hana"
 
-#: kstars_i18n.cpp:1018
+#: data/Cities.dat:1020
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hancock"
 msgstr "Hancock"
 
-#: kstars_i18n.cpp:1019
+#: data/Cities.dat:1021
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hankinson"
 msgstr "Hankinson"
 
-#: kstars_i18n.cpp:1020
+#: data/Cities.dat:1022
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hannah"
 msgstr "Hannah"
 
-#: kstars_i18n.cpp:1021
+#: data/Cities.dat:1023
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hannibal"
 msgstr "Hannibal"
 
-#: kstars_i18n.cpp:1022
+#: data/Cities.dat:1024
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hannover"
 msgstr "Hannover"
 
-#: kstars_i18n.cpp:1023
+#: data/Cities.dat:1025
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hanstholm"
 msgstr "Hanstholm"
 
-#: kstars_i18n.cpp:1024
+#: data/Cities.dat:1026
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hao"
 msgstr "Hao"
 
-#: kstars_i18n.cpp:1025
+#: data/Cities.dat:1026 data/Cities.dat:1974 data/Cities.dat:2487
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"French Polynesia"
+msgstr "Polynesia Ffrengig"
+
+#: data/Cities.dat:1027
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hapcheon"
 msgstr "Hapcheon"
 
-#: kstars_i18n.cpp:1026
+#: data/Cities.dat:1028
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Harare"
 msgstr "Haarlem"
 
-#: kstars_i18n.cpp:1027
+#: data/Cities.dat:1029
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Harbel"
 msgstr "Havre"
 
-#: kstars_i18n.cpp:1028
+#: data/Cities.dat:1029 data/Cities.dat:1030 data/Cities.dat:1687
+#: data/Cities.dat:2809
 msgid ""
-"_: City name (optional, probably does not need a translation)\n"
-"Harper Woods"
-msgstr "Harper Woods"
+"_: Country name (optional, but should be translated)\n"
+"Liberia"
+msgstr "Liberia"
 
-#: kstars_i18n.cpp:1029
+#: data/Cities.dat:1030
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Harper"
 msgstr "Havre"
 
-#: kstars_i18n.cpp:1030
+#: data/Cities.dat:1031
+msgid ""
+"_: City name (optional, probably does not need a translation)\n"
+"Harper Woods"
+msgstr "Harper Woods"
+
+#: data/Cities.dat:1032
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Harpers Ferry"
 msgstr "Harpers Ferry"
 
-#: kstars_i18n.cpp:1031
+#: data/Cities.dat:1033
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Harrington"
 msgstr "Harrington"
 
-#: kstars_i18n.cpp:1032
+#: data/Cities.dat:1034 data/Cities.dat:1035
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Harrisburg"
 msgstr "Harrisburg"
 
-#: kstars_i18n.cpp:1033
+#: data/Cities.dat:1036
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Harrison"
 msgstr "Harrison"
 
-#: kstars_i18n.cpp:1034
+#: data/Cities.dat:1037
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Harrisonburg"
 msgstr "Harrisonburg"
 
-#: kstars_i18n.cpp:1035
+#: data/Cities.dat:1038
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hartford"
 msgstr "Hartford"
 
-#: kstars_i18n.cpp:1036
+#: data/Cities.dat:1039
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hartrao"
 msgstr "Hartrao"
 
-#: kstars_i18n.cpp:1037
+#: data/Cities.dat:1040
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Harvard Obs."
 msgstr "Ars. Harvard"
 
-#: kstars_i18n.cpp:1038
+#: data/Cities.dat:1041
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Harvey"
 msgstr "Harvey"
 
-#: kstars_i18n.cpp:1039
+#: data/Cities.dat:1042
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hassi Messaoud"
 msgstr "La Mesa"
 
-#: kstars_i18n.cpp:1040
+#: data/Cities.dat:1043
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hastings"
 msgstr "Hastings"
 
-#: kstars_i18n.cpp:1041
+#: data/Cities.dat:1044
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hat Creek Radio Obs."
 msgstr "Ars. Hat Creek Radio"
 
-#: kstars_i18n.cpp:1042
+#: data/Cities.dat:1045
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hat Yai"
 msgstr "Hat Yai"
 
-#: kstars_i18n.cpp:1043
+#: data/Cities.dat:1046
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hattiesburg"
 msgstr "Hattiesburg"
 
-#: kstars_i18n.cpp:1044
+#: data/Cities.dat:1047
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hauula"
 msgstr "Hauula"
 
-#: kstars_i18n.cpp:1045
+#: data/Cities.dat:1048
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Havana"
 msgstr "Havana"
 
-#: kstars_i18n.cpp:1046
+#: data/Cities.dat:1049
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Havre"
 msgstr "Havre"
 
-#: kstars_i18n.cpp:1047
+#: data/Cities.dat:1050 data/Cities.dat:1051
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hawthorne"
 msgstr "Hawthorne"
 
-#: kstars_i18n.cpp:1048
+#: data/Cities.dat:1052
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Haystack Obs."
 msgstr "Ars. Haystack"
 
-#: kstars_i18n.cpp:1049
+#: data/Cities.dat:1053
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hayward"
 msgstr "Hayward"
 
-#: kstars_i18n.cpp:1050
+#: data/Cities.dat:1054
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hazard"
 msgstr "Hazard"
 
-#: kstars_i18n.cpp:1051
+#: data/Cities.dat:1055
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Heidelberg"
 msgstr "Heidelberg"
 
-#: kstars_i18n.cpp:1052
+#: data/Cities.dat:1056
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Heilbronn"
 msgstr "Heilbronn"
 
-#: kstars_i18n.cpp:1053
+#: data/Cities.dat:1057
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Helena"
 msgstr "Helena"
 
-#: kstars_i18n.cpp:1054
+#: data/Cities.dat:1058
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Helgoland"
 msgstr "Helgoland"
 
-#: kstars_i18n.cpp:1055
+#: data/Cities.dat:1059
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Helsingoer"
 msgstr "Helsingoer"
 
-#: kstars_i18n.cpp:1056
+#: data/Cities.dat:1060
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Helsinki"
 msgstr "Helsinki"
 
-#: kstars_i18n.cpp:1057
+#: data/Cities.dat:1061
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Helwan"
 msgstr "Helwan"
 
-#: kstars_i18n.cpp:1058
+#: data/Cities.dat:1062 data/Cities.dat:1063
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Henderson"
 msgstr "Henderson"
 
-#: kstars_i18n.cpp:1059
+#: data/Cities.dat:1064
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hendersonville"
 msgstr "Hendersonville"
 
-#: kstars_i18n.cpp:1060
+#: data/Cities.dat:1065
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Herndon"
 msgstr "Herndon"
 
-#: kstars_i18n.cpp:1061
+#: data/Cities.dat:1066
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Herne"
 msgstr "Herne"
 
-#: kstars_i18n.cpp:1062
+#: data/Cities.dat:1067
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Herning"
 msgstr "Herning"
 
-#: kstars_i18n.cpp:1063
+#: data/Cities.dat:1068
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Herstmonceux"
 msgstr "Herstmonceux"
 
-#: kstars_i18n.cpp:1064
+#: data/Cities.dat:1069
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Heuksando"
 msgstr "Heuksando"
 
-#: kstars_i18n.cpp:1065
+#: data/Cities.dat:1070
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hialeah"
 msgstr "Hialeah"
 
-#: kstars_i18n.cpp:1066
+#: data/Cities.dat:1071
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hickory"
 msgstr "Hickory"
 
-#: kstars_i18n.cpp:1067
+#: data/Cities.dat:1072
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hida"
 msgstr "Hida"
 
-#: kstars_i18n.cpp:1068
+#: data/Cities.dat:1073
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "High Point"
 msgstr "High Point"
 
-#: kstars_i18n.cpp:1069
+#: data/Cities.dat:1074
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Highland Lakes"
 msgstr "Highland Lakes"
 
-#: kstars_i18n.cpp:1070
+#: data/Cities.dat:1075
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Highmore"
 msgstr "Highmore"
 
-#: kstars_i18n.cpp:1071
+#: data/Cities.dat:1076
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hill City"
 msgstr "Hill City"
 
-#: kstars_i18n.cpp:1072
+#: data/Cities.dat:1077
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hilleroed"
 msgstr "Hilleroed"
 
-#: kstars_i18n.cpp:1073
+#: data/Cities.dat:1078 data/Cities.dat:1079
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hillsboro"
 msgstr "Hillsboro"
 
-#: kstars_i18n.cpp:1074
+#: data/Cities.dat:1080
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hilo"
 msgstr "Hilo"
 
-#: kstars_i18n.cpp:1075
+#: data/Cities.dat:1081
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hinnerup"
 msgstr "Hinnerup"
 
-#: kstars_i18n.cpp:1076
+#: data/Cities.dat:1082
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hinton"
 msgstr "Hinton"
 
-#: kstars_i18n.cpp:1077
+#: data/Cities.dat:1083
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hjoerring"
 msgstr "Hjoerring"
 
-#: kstars_i18n.cpp:1078
+#: data/Cities.dat:1084
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hobbs"
 msgstr "Hobbs"
 
-#: kstars_i18n.cpp:1079
+#: data/Cities.dat:1085
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hobro"
 msgstr "Hobro"
 
-#: kstars_i18n.cpp:1080
+#: data/Cities.dat:1086
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Holbaek"
 msgstr "Holbaek"
 
-#: kstars_i18n.cpp:1081
+#: data/Cities.dat:1087
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Holbrook"
 msgstr "Holbrook"
 
-#: kstars_i18n.cpp:1082
+#: data/Cities.dat:1088
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hollis Hills"
 msgstr "Hollis Hills"
 
-#: kstars_i18n.cpp:1083
+#: data/Cities.dat:1089
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Holliston"
 msgstr "Holliston"
 
-#: kstars_i18n.cpp:1084
+#: data/Cities.dat:1090
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Holly Springs"
 msgstr "Holly Springs"
 
-#: kstars_i18n.cpp:1085
+#: data/Cities.dat:1091 data/Cities.dat:1092
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hollywood"
 msgstr "Hollywood"
 
-#: kstars_i18n.cpp:1086
+#: data/Cities.dat:1093
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Holon"
 msgstr "Holon"
 
-#: kstars_i18n.cpp:1087
+#: data/Cities.dat:1094
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Holstebro"
 msgstr "Holstebro"
 
-#: kstars_i18n.cpp:1088
+#: data/Cities.dat:1095
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Holyoke"
 msgstr "Holyoke"
 
-#: kstars_i18n.cpp:1089
+#: data/Cities.dat:1096
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Homer"
 msgstr "Homer"
 
-#: kstars_i18n.cpp:1090
+#: data/Cities.dat:1097
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hong Kong"
 msgstr "Hong Kong"
 
-#: kstars_i18n.cpp:1091
+#: data/Cities.dat:1098
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hongcheon"
 msgstr "Hongcheon"
 
-#: kstars_i18n.cpp:1092
+#: data/Cities.dat:1099
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Honiara"
 msgstr "Honiara"
 
-#: kstars_i18n.cpp:1093
+#: data/Cities.dat:1099
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Guadalcanal"
+msgstr "Guadalcanal"
+
+#: data/Cities.dat:1099
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Solomon Islands"
+msgstr "Ynysoedd Solomon"
+
+#: data/Cities.dat:1100
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Honington"
 msgstr "Honington"
 
-#: kstars_i18n.cpp:1094
+#: data/Cities.dat:1101
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Honolulu"
 msgstr "Honolulu"
 
-#: kstars_i18n.cpp:1095
+#: data/Cities.dat:1102
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hooker"
 msgstr "Hooker"
 
-#: kstars_i18n.cpp:1096
+#: data/Cities.dat:1103
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hooper Bay"
 msgstr "Hooper Bay"
 
-#: kstars_i18n.cpp:1097
+#: data/Cities.dat:1104
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hopkinsville"
 msgstr "Hopkinsville"
 
-#: kstars_i18n.cpp:1098
+#: data/Cities.dat:1105
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Horsens"
 msgstr "Horsens"
 
-#: kstars_i18n.cpp:1099
+#: data/Cities.dat:1106
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hospit. de Llobregat, L'"
 msgstr "Hospit. de Llobregat, L'"
 
-#: kstars_i18n.cpp:1100
+#: data/Cities.dat:1107
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hot Springs National Park"
 msgstr "Parc Cenedlaethol Hot Springs"
 
-#: kstars_i18n.cpp:1101
+#: data/Cities.dat:1108
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Houma"
 msgstr "Houma"
 
-#: kstars_i18n.cpp:1102
+#: data/Cities.dat:1109
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Houston"
 msgstr "Houston"
 
-#: kstars_i18n.cpp:1103
+#: data/Cities.dat:1110
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Huambo"
 msgstr "Hao"
 
-#: kstars_i18n.cpp:1104
+#: 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"
+msgstr "Angola"
+
+#: data/Cities.dat:1111
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Huancayo"
 msgstr "Huancayo"
 
-#: kstars_i18n.cpp:1105
+#: data/Cities.dat:1112
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Huelva"
 msgstr "Huelva"
 
-#: kstars_i18n.cpp:1106
+#: data/Cities.dat:1113
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Huesca"
 msgstr "Huesca"
 
-#: kstars_i18n.cpp:1107
+#: data/Cities.dat:1114
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Humain"
 msgstr "Humain"
 
-#: kstars_i18n.cpp:1108
+#: data/Cities.dat:1115
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Humboldt"
 msgstr "Humboldt"
 
-#: kstars_i18n.cpp:1109
+#: data/Cities.dat:1116
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hungnam"
 msgstr "Hungnam"
 
-#: kstars_i18n.cpp:1110
+#: data/Cities.dat:1117
+msgid ""
+"_: City name (optional, probably does not need a translation)\n"
+"Huntington"
+msgstr "Huntington"
+
+#: data/Cities.dat:1118
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Huntington Beach"
 msgstr "Traeth Huntington"
 
-#: kstars_i18n.cpp:1111
+#: data/Cities.dat:1119
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Huntington Station"
 msgstr "Gorsaf Huntington"
 
-#: kstars_i18n.cpp:1112
-msgid ""
-"_: City name (optional, probably does not need a translation)\n"
-"Huntington"
-msgstr "Huntington"
-
-#: kstars_i18n.cpp:1113
+#: data/Cities.dat:1120
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Huntsville"
 msgstr "Huntsville"
 
-#: kstars_i18n.cpp:1114
+#: data/Cities.dat:1121
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hurley"
 msgstr "Hurley"
 
-#: kstars_i18n.cpp:1115
+#: data/Cities.dat:1122
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Huron"
 msgstr "Huron"
 
-#: kstars_i18n.cpp:1116
+#: data/Cities.dat:1123 data/Cities.dat:1124
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hutchinson"
 msgstr "Hutchinson"
 
-#: kstars_i18n.cpp:1117
+#: data/Cities.dat:1125
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hvar"
 msgstr "Hvar"
 
-#: kstars_i18n.cpp:1118
+#: data/Cities.dat:1126
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hyderabad"
 msgstr "Hazard"
 
-#: kstars_i18n.cpp:1119
+#: data/Cities.dat:1126
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Andhra Pradesh"
+msgstr "Arkansas"
+
+#: data/Cities.dat:1127
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Hyltebruk"
 msgstr "Hyltebruk"
 
-#: kstars_i18n.cpp:1120
+#: data/Cities.dat:1128
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ibadan"
 msgstr "Mandan"
 
-#: kstars_i18n.cpp:1121
+#: data/Cities.dat:1129
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Icheon"
 msgstr "Icheon"
 
-#: kstars_i18n.cpp:1122
+#: data/Cities.dat:1130
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Idaho Falls"
 msgstr "Idaho Falls"
 
-#: kstars_i18n.cpp:1123
+#: data/Cities.dat:1131
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Imsil"
 msgstr "Imsil"
 
-#: kstars_i18n.cpp:1124
+#: data/Cities.dat:1132
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Incheon"
 msgstr "Incheon"
 
-#: kstars_i18n.cpp:1125
+#: data/Cities.dat:1133
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Incirlik"
 msgstr "Incirlik"
 
-#: kstars_i18n.cpp:1126
+#: data/Cities.dat:1134 data/Cities.dat:1135
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Independence"
 msgstr "Independence"
 
-#: kstars_i18n.cpp:1127
+#: data/Cities.dat:1136
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Indianapolis"
 msgstr "Indianapolis"
 
-#: kstars_i18n.cpp:1128
+#: data/Cities.dat:1137
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ine"
 msgstr "Ine"
 
-#: kstars_i18n.cpp:1129
+#: 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"
+msgstr "Ynysoedd Marshall"
+
+#: data/Cities.dat:1138
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Inglewood"
 msgstr "Inglewood"
 
-#: kstars_i18n.cpp:1130
+#: data/Cities.dat:1139
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Innsbruck"
 msgstr "Innsbruck"
 
-#: kstars_i18n.cpp:1131
+#: 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"
+msgstr "Austria"
+
+#: data/Cities.dat:1140
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Inuvik"
 msgstr "Inuvik"
 
-#: kstars_i18n.cpp:1132
+#: data/Cities.dat:1141
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Invercargill"
 msgstr "Invercargill"
 
-#: kstars_i18n.cpp:1133
+#: data/Cities.dat:1142
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Iowa City"
 msgstr "Iowa City"
 
-#: kstars_i18n.cpp:1134
+#: data/Cities.dat:1143
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ipswich"
 msgstr "Ipswich"
 
-#: kstars_i18n.cpp:1135
+#: data/Cities.dat:1144
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Iqaluit"
 msgstr "Iqaluit"
 
-#: kstars_i18n.cpp:1136
+#: data/Cities.dat:1145
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Irkutsk"
 msgstr "Turku"
 
-#: kstars_i18n.cpp:1137
+#: data/Cities.dat:1146
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Iron River"
 msgstr "Afon Iron"
 
-#: kstars_i18n.cpp:1138
+#: data/Cities.dat:1147
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Irvine"
 msgstr "Irvine"
 
-#: kstars_i18n.cpp:1139
+#: data/Cities.dat:1148
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Irving"
 msgstr "Irving"
 
-#: kstars_i18n.cpp:1140
+#: data/Cities.dat:1149
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Irvington"
 msgstr "Irvington"
 
-#: kstars_i18n.cpp:1141
+#: data/Cities.dat:1150
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ischia"
 msgstr "Ischia"
 
-#: kstars_i18n.cpp:1142
+#: data/Cities.dat:1151
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Islamabad"
 msgstr "Islamabad"
 
-#: kstars_i18n.cpp:1143
+#: 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"
+msgstr "Pakistan"
+
+#: data/Cities.dat:1152
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Istanbul"
 msgstr "Istanbul"
 
-#: kstars_i18n.cpp:1144
+#: data/Cities.dat:1153
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Istrana"
 msgstr "Istrana"
 
-#: kstars_i18n.cpp:1145
+#: data/Cities.dat:1154
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Itapetinga"
 msgstr "Itapetinga"
 
-#: kstars_i18n.cpp:1146
+#: data/Cities.dat:1155
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ivanovo"
 msgstr "Aviano"
 
-#: kstars_i18n.cpp:1147
+#: data/Cities.dat:1156
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Izaña"
 msgstr "Izaña"
 
-#: kstars_i18n.cpp:1148
+#: 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"
+msgstr "Tenerife"
+
+#: data/Cities.dat:1157
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Izhevsk"
 msgstr "Trieste"
 
-#: kstars_i18n.cpp:1149
+#: data/Cities.dat:1158
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "J. Horrocks"
 msgstr "J. Horrocks"
 
-#: kstars_i18n.cpp:1150
+#: data/Cities.dat:1159 data/Cities.dat:1160 data/Cities.dat:1161
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jackson"
 msgstr "Jackson"
 
-#: kstars_i18n.cpp:1151
+#: data/Cities.dat:1162 data/Cities.dat:1163
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jacksonville"
 msgstr "Jacksonville"
 
-#: kstars_i18n.cpp:1152
+#: data/Cities.dat:1164
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jakarta"
 msgstr "Jakarta"
 
-#: kstars_i18n.cpp:1153
+#: data/Cities.dat:1165
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jaluit"
 msgstr "Jaluit"
 
-#: kstars_i18n.cpp:1154
+#: data/Cities.dat:1166
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jamestown"
 msgstr "Jamestown"
 
-#: kstars_i18n.cpp:1155
+#: data/Cities.dat:1167
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Janesville"
 msgstr "Janesville"
 
-#: kstars_i18n.cpp:1156
+#: data/Cities.dat:1168
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jangheung"
 msgstr "Jangheung"
 
-#: kstars_i18n.cpp:1157
+#: data/Cities.dat:1169
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jangsu"
 msgstr "Jangsu"
 
-#: kstars_i18n.cpp:1158
+#: data/Cities.dat:1170
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jarkov"
 msgstr "Jarkov"
 
-#: kstars_i18n.cpp:1159
+#: data/Cities.dat:1170 data/Cities.dat:1890 data/Cities.dat:2801
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Ukraine"
+msgstr "Wcrain"
+
+#: data/Cities.dat:1171
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jasper"
 msgstr "Jasper"
 
-#: kstars_i18n.cpp:1160
+#: data/Cities.dat:1172
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jatiluhur"
 msgstr "Jatiluhur"
 
-#: kstars_i18n.cpp:1161
+#: data/Cities.dat:1173
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jaén"
 msgstr "Jaén"
 
-#: kstars_i18n.cpp:1162
+#: data/Cities.dat:1174
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jecheon"
 msgstr "Jecheon"
 
-#: kstars_i18n.cpp:1163
+#: data/Cities.dat:1175
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jeddah"
 msgstr "Jeddah"
 
-#: kstars_i18n.cpp:1164
+#: data/Cities.dat:1176
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jefferson City"
 msgstr "Dinas Jefferson"
 
-#: kstars_i18n.cpp:1165
+#: data/Cities.dat:1177
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jeju"
 msgstr "Jeju"
 
-#: kstars_i18n.cpp:1166
+#: data/Cities.dat:1178
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jena"
 msgstr "Jena"
 
-#: kstars_i18n.cpp:1167
+#: data/Cities.dat:1179
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jensen Beach"
 msgstr "Traeth Jensen"
 
-#: kstars_i18n.cpp:1168
+#: data/Cities.dat:1180
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jeongeup"
 msgstr "Jeongeup"
 
-#: kstars_i18n.cpp:1169
+#: data/Cities.dat:1181
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jeonju"
 msgstr "Jeonju"
 
-#: kstars_i18n.cpp:1170
+#: data/Cities.dat:1182
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jerez de la Frontera"
 msgstr "Jerez de la Frontera"
 
-#: kstars_i18n.cpp:1171
+#: data/Cities.dat:1183
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jersey City"
 msgstr "Dinas Jersey"
 
-#: kstars_i18n.cpp:1172
+#: data/Cities.dat:1184
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jerusalem"
 msgstr "Jerusalem"
 
-#: kstars_i18n.cpp:1173
+#: data/Cities.dat:1185
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jinja"
 msgstr "Jinju"
 
-#: kstars_i18n.cpp:1174
+#: data/Cities.dat:1186
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jinju"
 msgstr "Jinju"
 
-#: kstars_i18n.cpp:1175
+#: data/Cities.dat:1187
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jodrell Bank"
 msgstr "Jodrell Bank"
 
-#: kstars_i18n.cpp:1176
+#: data/Cities.dat:1188
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Johannesburg"
 msgstr "Johannesburg"
 
-#: kstars_i18n.cpp:1177
+#: data/Cities.dat:1189
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Johnson City"
 msgstr "Dinas Johnson"
 
-#: kstars_i18n.cpp:1178
+#: data/Cities.dat:1190
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Johnston Atoll"
 msgstr "Johnston Atoll"
 
-#: kstars_i18n.cpp:1179
+#: data/Cities.dat:1191
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Johnstown"
 msgstr "Johnstown"
 
-#: kstars_i18n.cpp:1180
+#: data/Cities.dat:1192
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Joliet"
 msgstr "Joliet"
 
-#: kstars_i18n.cpp:1181
+#: data/Cities.dat:1193
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jonesboro"
 msgstr "Jonesboro"
 
-#: kstars_i18n.cpp:1182
+#: data/Cities.dat:1194
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Joplin"
 msgstr "Joplin"
 
-#: kstars_i18n.cpp:1183
+#: data/Cities.dat:1195
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Julian"
 msgstr "Julian"
 
-#: kstars_i18n.cpp:1184
+#: data/Cities.dat:1196
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Juneau"
 msgstr "Juneau"
 
-#: kstars_i18n.cpp:1185
+#: data/Cities.dat:1197
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jõgeva"
 msgstr "Jõgeva"
 
-#: kstars_i18n.cpp:1186
+#: data/Cities.dat:1198
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Jõvi"
 msgstr "Jõvi"
 
-#: kstars_i18n.cpp:1187
+#: data/Cities.dat:1199
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kabul"
 msgstr "Kabul"
 
-#: kstars_i18n.cpp:1188
+#: data/Cities.dat:1199
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Afghanistan"
+msgstr "Afghanistan"
+
+#: data/Cities.dat:1200
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kabwe"
 msgstr "Kabul"
 
-#: kstars_i18n.cpp:1189
+#: data/Cities.dat:1201
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kaduna"
 msgstr "Kunda"
 
-#: kstars_i18n.cpp:1190
+#: data/Cities.dat:1202
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kaena Point"
 msgstr "Kaena Point"
 
-#: kstars_i18n.cpp:1191
+#: data/Cities.dat:1203
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kaesong"
 msgstr "Kaesong"
 
-#: kstars_i18n.cpp:1192
+#: data/Cities.dat:1204
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kahului"
 msgstr "Kahului"
 
-#: kstars_i18n.cpp:1193
+#: data/Cities.dat:1205
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kailua Kona"
 msgstr "Kailua Kona"
 
-#: kstars_i18n.cpp:1194
+#: data/Cities.dat:1206
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kairouan"
 msgstr "Kunda"
 
-#: kstars_i18n.cpp:1195
+#: data/Cities.dat:1207
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kaiserslautern"
 msgstr "Kaiserslautern"
 
-#: kstars_i18n.cpp:1196
+#: data/Cities.dat:1208
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kalamazoo"
 msgstr "Kalamazoo"
 
-#: kstars_i18n.cpp:1197
+#: data/Cities.dat:1209
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kalapana"
 msgstr "Kalapana"
 
-#: kstars_i18n.cpp:1198
+#: data/Cities.dat:1210
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kalaupapa"
 msgstr "Kalaupapa"
 
-#: kstars_i18n.cpp:1199
+#: data/Cities.dat:1211
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kaliningrad"
 msgstr "Salina"
 
-#: kstars_i18n.cpp:1200
+#: data/Cities.dat:1212
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kalispell"
 msgstr "Kalispell"
 
-#: kstars_i18n.cpp:1201
+#: data/Cities.dat:1213
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kallaste"
 msgstr "Kallaste"
 
-#: kstars_i18n.cpp:1202
+#: data/Cities.dat:1214
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kaluga"
 msgstr "Kapalua"
 
-#: kstars_i18n.cpp:1203
+#: data/Cities.dat:1215
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kalundborg"
 msgstr "Kalundborg"
 
-#: kstars_i18n.cpp:1204
+#: data/Cities.dat:1216
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kamloops"
 msgstr "Kamloops"
 
-#: kstars_i18n.cpp:1205
+#: data/Cities.dat:1217
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kampala"
 msgstr "Kapalua"
 
-#: kstars_i18n.cpp:1206
+#: data/Cities.dat:1218
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kamuela"
 msgstr "Kamuela"
 
-#: kstars_i18n.cpp:1207
+#: data/Cities.dat:1219
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kanab"
 msgstr "Kanab"
 
-#: kstars_i18n.cpp:1208
+#: data/Cities.dat:1220
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kaneohe Bay"
 msgstr "Kaneohe Bay"
 
-#: kstars_i18n.cpp:1209
+#: data/Cities.dat:1221
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kankakee"
 msgstr "Kankakee"
 
-#: kstars_i18n.cpp:1210
+#: data/Cities.dat:1222
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kankan"
 msgstr "Kanab"
 
-#: kstars_i18n.cpp:1211
+#: data/Cities.dat:1223
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kannapolis"
 msgstr "Kannapolis"
 
-#: kstars_i18n.cpp:1212
+#: data/Cities.dat:1224
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kano"
 msgstr "Kano"
 
-#: kstars_i18n.cpp:1213
+#: data/Cities.dat:1225 data/Cities.dat:1226
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kansas City"
 msgstr "Dinas Kansas"
 
-#: kstars_i18n.cpp:1214
+#: data/Cities.dat:1227
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kanzelheohe"
 msgstr "Kanzelheohe"
 
-#: kstars_i18n.cpp:1215
+#: data/Cities.dat:1228
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kaolack"
 msgstr "Koloa"
 
-#: kstars_i18n.cpp:1216
+#: data/Cities.dat:1229
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kapaa"
 msgstr "Kapaa"
 
-#: kstars_i18n.cpp:1217
+#: data/Cities.dat:1230
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kapalua"
 msgstr "Kapalua"
 
-#: kstars_i18n.cpp:1218
+#: data/Cities.dat:1231
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kapuskasing"
 msgstr "Kapuskasing"
 
-#: kstars_i18n.cpp:1219
+#: data/Cities.dat:1232
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Karachi"
 msgstr "Karachi"
 
-#: kstars_i18n.cpp:1220
+#: data/Cities.dat:1233
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Karlsruhe"
 msgstr "Karlsruhe"
 
-#: kstars_i18n.cpp:1221
+#: data/Cities.dat:1234
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Karonga"
 msgstr "Kona"
 
-#: kstars_i18n.cpp:1222
+#: data/Cities.dat:1235
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kassel"
 msgstr "Kassel"
 
-#: kstars_i18n.cpp:1223
+#: data/Cities.dat:1236
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kathmandu"
 msgstr "Kathmandu"
 
-#: kstars_i18n.cpp:1224
+#: data/Cities.dat:1236
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Nepal"
+msgstr "Nepal"
+
+#: data/Cities.dat:1237
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Katima Mulilo"
 msgstr "Paauilo"
 
-#: kstars_i18n.cpp:1225
+#: 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"
+msgstr "Namibia"
+
+#: data/Cities.dat:1238
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kaunakakai"
 msgstr "Kaunakakai"
 
-#: kstars_i18n.cpp:1226
+#: data/Cities.dat:1239
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kazan"
 msgstr "Kwasan"
 
-#: kstars_i18n.cpp:1227
+#: data/Cities.dat:1240
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Keahole"
 msgstr "Keahole"
 
-#: kstars_i18n.cpp:1228
+#: data/Cities.dat:1241
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kearney"
 msgstr "Kearney"
 
-#: kstars_i18n.cpp:1229
+#: data/Cities.dat:1242
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Keene"
 msgstr "Keene"
 
-#: kstars_i18n.cpp:1230
+#: data/Cities.dat:1243
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Keflavik"
 msgstr "Keflavik"
 
-#: kstars_i18n.cpp:1231
+#: data/Cities.dat:1243 data/Cities.dat:2168
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Iceland"
+msgstr "Gwlad yr Iâ"
+
+#: data/Cities.dat:1244
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kehra"
 msgstr "Kehra"
 
-#: kstars_i18n.cpp:1232
+#: data/Cities.dat:1245
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Keila"
 msgstr "Keila"
 
-#: kstars_i18n.cpp:1233
+#: data/Cities.dat:1246
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kekaha"
 msgstr "Kekaha"
 
-#: kstars_i18n.cpp:1234
+#: data/Cities.dat:1247
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kelso"
 msgstr "Kelso"
 
-#: kstars_i18n.cpp:1235
+#: data/Cities.dat:1248
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kemerovo"
 msgstr "Provo"
 
-#: kstars_i18n.cpp:1236
+#: data/Cities.dat:1249
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kenai"
 msgstr "Kenai"
 
-#: kstars_i18n.cpp:1237
+#: data/Cities.dat:1250
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kenema"
 msgstr "Kenai"
 
-#: kstars_i18n.cpp:1238
+#: data/Cities.dat:1251
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kennebunk"
 msgstr "Kennebunk"
 
-#: kstars_i18n.cpp:1239
+#: data/Cities.dat:1252
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kenner"
 msgstr "Kenner"
 
-#: kstars_i18n.cpp:1240
+#: data/Cities.dat:1253
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kenora"
 msgstr "Kenora"
 
-#: kstars_i18n.cpp:1241
+#: data/Cities.dat:1254
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kenosha"
 msgstr "Kenosha"
 
-#: kstars_i18n.cpp:1242
+#: data/Cities.dat:1255
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ketchikan"
 msgstr "Ketchikan"
 
-#: kstars_i18n.cpp:1243
+#: data/Cities.dat:1256
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kettering"
 msgstr "Kettering"
 
-#: kstars_i18n.cpp:1244
+#: data/Cities.dat:1257
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Khabarovsk"
 msgstr "Seabrook"
 
-#: kstars_i18n.cpp:1245
+#: data/Cities.dat:1258
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Khaniá"
 msgstr "Khaniá"
 
-#: kstars_i18n.cpp:1246
+#: data/Cities.dat:1259
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Khanty-Mansiysk"
 msgstr "Kanab"
 
-#: kstars_i18n.cpp:1247
+#: data/Cities.dat:1260
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Khartoum"
 msgstr "Khartoum"
 
-#: kstars_i18n.cpp:1248
+#: data/Cities.dat:1261
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kiel"
 msgstr "Kiel"
 
-#: kstars_i18n.cpp:1249
+#: data/Cities.dat:1262
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kigali"
 msgstr "Kili"
 
-#: kstars_i18n.cpp:1250
+#: data/Cities.dat:1263
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kili"
 msgstr "Kili"
 
-#: kstars_i18n.cpp:1251
+#: data/Cities.dat:1264
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kilingi-Nõmme"
 msgstr "Kilingi-Nõmme"
 
-#: kstars_i18n.cpp:1252
+#: data/Cities.dat:1265
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kimball"
 msgstr "Kimball"
 
-#: kstars_i18n.cpp:1253
+#: data/Cities.dat:1266
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kimch'aek"
 msgstr "Kimch'aek"
 
-#: kstars_i18n.cpp:1254
+#: data/Cities.dat:1267
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "King George"
 msgstr "King George"
 
-#: kstars_i18n.cpp:1255
+#: data/Cities.dat:1268
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "King Salmon"
 msgstr "King Salmon"
 
-#: kstars_i18n.cpp:1256
+#: data/Cities.dat:1269
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kingman"
 msgstr "Kingman"
 
-#: kstars_i18n.cpp:1257
+#: data/Cities.dat:1270
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kings Beach"
 msgstr "Kings Beach"
 
-#: kstars_i18n.cpp:1258
+#: data/Cities.dat:1271
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kingsport"
 msgstr "Kingsport"
 
-#: kstars_i18n.cpp:1259
+#: data/Cities.dat:1272 data/Cities.dat:1273
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kingston"
 msgstr "Kingston"
 
-#: kstars_i18n.cpp:1260
+#: data/Cities.dat:1272 data/Cities.dat:1691
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Jamaica"
+msgstr "Jamaica"
+
+#: data/Cities.dat:1274
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kinshasa"
 msgstr "Kinshasa"
 
-#: kstars_i18n.cpp:1261
+#: data/Cities.dat:1274
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Congo (Democratic Republic)"
+msgstr "Congo (Gweriniaeth Democrataidd)"
+
+#: data/Cities.dat:1275
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kiruna"
 msgstr "Kunda"
 
-#: kstars_i18n.cpp:1262
+#: data/Cities.dat:1276
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kisangani"
 msgstr "Kingman"
 
-#: kstars_i18n.cpp:1263
+#: data/Cities.dat:1276 data/Cities.dat:1564 data/Cities.dat:1572
+#, fuzzy
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Dem rep of Congo"
+msgstr "Yemen"
+
+#: data/Cities.dat:1277
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kismayu"
 msgstr "Pisa"
 
-#: kstars_i18n.cpp:1264
+#: data/Cities.dat:1278
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kiso"
 msgstr "Kiso"
 
-#: kstars_i18n.cpp:1265
+#: data/Cities.dat:1279
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kissimmee"
 msgstr "Kissimmee"
 
-#: kstars_i18n.cpp:1266
+#: data/Cities.dat:1280
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kisumu"
 msgstr "Kiso"
 
-#: kstars_i18n.cpp:1267
+#: data/Cities.dat:1280 data/Cities.dat:1684 data/Cities.dat:1765
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Kenya"
+msgstr "Kenya"
+
+#: data/Cities.dat:1281
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kit Carson"
 msgstr "Kit Carson"
 
-#: kstars_i18n.cpp:1268
+#: data/Cities.dat:1282
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kitchener"
 msgstr "Kitchener"
 
-#: kstars_i18n.cpp:1269
+#: data/Cities.dat:1283
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kitt Peak Nat'l. Obs."
 msgstr "Ars. Gened. Kitt Peak"
 
-#: kstars_i18n.cpp:1270
+#: data/Cities.dat:1284
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kitwe"
 msgstr "Sittwe"
 
-#: kstars_i18n.cpp:1271
+#: data/Cities.dat:1285
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kiviõli"
 msgstr "Kiviõli"
 
-#: kstars_i18n.cpp:1272
+#: data/Cities.dat:1286
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Klamath Falls"
 msgstr "Klamath Falls"
 
-#: kstars_i18n.cpp:1273
+#: data/Cities.dat:1287
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Knightdale"
 msgstr "Knightdale"
 
-#: kstars_i18n.cpp:1274
+#: data/Cities.dat:1288
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Knoxville"
 msgstr "Knoxville"
 
-#: kstars_i18n.cpp:1275
+#: data/Cities.dat:1289
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Koblenz"
 msgstr "Koblenz"
 
-#: kstars_i18n.cpp:1276
+#: data/Cities.dat:1290
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kodaikanal"
 msgstr "Kodaikanal"
 
-#: kstars_i18n.cpp:1277
+#: data/Cities.dat:1291
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kodiak"
 msgstr "Kodiak"
 
-#: kstars_i18n.cpp:1278
+#: data/Cities.dat:1292
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Koege"
 msgstr "Koege"
 
-#: kstars_i18n.cpp:1279
+#: data/Cities.dat:1293
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kohala"
 msgstr "Kohala"
 
-#: kstars_i18n.cpp:1280
+#: data/Cities.dat:1294
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kohtla-Järve"
 msgstr "Kohtla-Järve"
 
-#: kstars_i18n.cpp:1281
+#: data/Cities.dat:1295
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Koko Head"
 msgstr "Koko Head"
 
-#: kstars_i18n.cpp:1282
+#: data/Cities.dat:1296
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kokomo"
 msgstr "Kokomo"
 
-#: kstars_i18n.cpp:1283
+#: data/Cities.dat:1297
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kolding"
 msgstr "Kolding"
 
-#: kstars_i18n.cpp:1284
+#: data/Cities.dat:1298
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Koln"
 msgstr "Koln"
 
-#: kstars_i18n.cpp:1285
+#: data/Cities.dat:1299
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Koloa"
 msgstr "Koloa"
 
-#: kstars_i18n.cpp:1286
+#: data/Cities.dat:1300
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kona"
 msgstr "Kona"
 
-#: kstars_i18n.cpp:1287
+#: data/Cities.dat:1301
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Konkoli"
 msgstr "Konkoli"
 
-#: kstars_i18n.cpp:1288
+#: data/Cities.dat:1302
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Korat"
 msgstr "Korat"
 
-#: kstars_i18n.cpp:1289
+#: data/Cities.dat:1303
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Korsoer"
 msgstr "Korsoer"
 
-#: kstars_i18n.cpp:1290
+#: data/Cities.dat:1304
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kosrae"
 msgstr "Kosrae"
 
-#: kstars_i18n.cpp:1291
+#: data/Cities.dat:1305
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kostroma"
 msgstr "Kosrae"
 
-#: kstars_i18n.cpp:1292
+#: data/Cities.dat:1306
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kota Kinabalu"
 msgstr "Kota Kinabalu"
 
-#: kstars_i18n.cpp:1293
+#: data/Cities.dat:1307
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kotzebue"
 msgstr "Kotzebue"
 
-#: kstars_i18n.cpp:1294
+#: data/Cities.dat:1308
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Krasnodar"
 msgstr "Kano"
 
-#: kstars_i18n.cpp:1295
+#: data/Cities.dat:1309
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Krasnoyarsk"
 msgstr "Kano"
 
-#: kstars_i18n.cpp:1296
+#: data/Cities.dat:1310
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Krefeld"
 msgstr "Krefeld"
 
-#: kstars_i18n.cpp:1297
+#: data/Cities.dat:1311
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kristiansand"
 msgstr "Kristiansand"
 
-#: kstars_i18n.cpp:1298
+#: data/Cities.dat:1312
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kuala Lumpur"
 msgstr "Kuala Lumpur"
 
-#: kstars_i18n.cpp:1299
+#: data/Cities.dat:1313
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kuching"
 msgstr "Kuching"
 
-#: kstars_i18n.cpp:1300
+#: data/Cities.dat:1314
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kuffner"
 msgstr "Kuffner"
 
-#: kstars_i18n.cpp:1301
+#: data/Cities.dat:1315
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kunda"
 msgstr "Kunda"
 
-#: kstars_i18n.cpp:1302
+#: data/Cities.dat:1316
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kuopio"
 msgstr "Kuopio"
 
-#: kstars_i18n.cpp:1303
+#: data/Cities.dat:1317
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kure Island"
 msgstr "Kure Island"
 
-#: kstars_i18n.cpp:1304
+#: data/Cities.dat:1318
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kuressaare"
 msgstr "Kuressaare"
 
-#: kstars_i18n.cpp:1305
+#: data/Cities.dat:1319
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kurgan"
 msgstr "Burbank"
 
-#: kstars_i18n.cpp:1306
+#: data/Cities.dat:1320
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kursk"
 msgstr "Burns"
 
-#: kstars_i18n.cpp:1307
+#: data/Cities.dat:1321
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kuwait City"
 msgstr "Kuwait City"
 
-#: kstars_i18n.cpp:1308
+#: data/Cities.dat:1321 data/Cities.dat:2682
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Kuwait"
+msgstr "Kuwait"
+
+#: data/Cities.dat:1322
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kwajalein Atoll"
 msgstr "Kwajalein Atoll"
 
-#: kstars_i18n.cpp:1309
+#: data/Cities.dat:1323
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kwasan"
 msgstr "Kwasan"
 
-#: kstars_i18n.cpp:1310
+#: data/Cities.dat:1324
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kyoto"
 msgstr "Kyoto"
 
-#: kstars_i18n.cpp:1311
+#: data/Cities.dat:1325
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kyzyl"
 msgstr "Koln"
 
-#: kstars_i18n.cpp:1312
+#: data/Cities.dat:1326
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Kärdla"
 msgstr "Kärdla"
 
-#: kstars_i18n.cpp:1313
+#: data/Cities.dat:1327
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "L'Aquila"
 msgstr "L'Aquila"
 
-#: kstars_i18n.cpp:1314
+#: data/Cities.dat:1328
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "La Coruña"
 msgstr "La Coruña"
 
-#: kstars_i18n.cpp:1315
+#: data/Cities.dat:1329
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "La Crosse"
 msgstr "La Crosse"
 
-#: kstars_i18n.cpp:1316
+#: data/Cities.dat:1330
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "La Grande"
 msgstr "La Grande"
 
-#: kstars_i18n.cpp:1317
+#: data/Cities.dat:1331
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "La Grange"
 msgstr "La Grange"
 
-#: kstars_i18n.cpp:1318
+#: data/Cities.dat:1332
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "La Habana"
 msgstr "La Habana"
 
-#: kstars_i18n.cpp:1319
+#: data/Cities.dat:1333
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "La Mesa"
 msgstr "La Mesa"
 
-#: kstars_i18n.cpp:1320
+#: data/Cities.dat:1334
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "La Palma Obs."
 msgstr "Las Palmas"
 
-#: kstars_i18n.cpp:1321
+#: data/Cities.dat:1334
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Canary Islands"
+msgstr "Ynysoedd Canary"
+
+#: data/Cities.dat:1335
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "La Paz"
 msgstr "La Paz"
 
-#: kstars_i18n.cpp:1322
+#: data/Cities.dat:1335 data/Cities.dat:2285
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Bolivia"
+msgstr "Bolivia"
+
+#: data/Cities.dat:1336
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "La Rochelle"
 msgstr "La Rochelle"
 
-#: kstars_i18n.cpp:1323
+#: data/Cities.dat:1336
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Charente-Maritime"
+msgstr "Tenerife"
+
+#: data/Cities.dat:1337
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "La Silla Obs."
 msgstr "Ars. La Silla"
 
-#: kstars_i18n.cpp:1324
+#: data/Cities.dat:1338
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "La Spezia"
 msgstr "La Spezia"
 
-#: kstars_i18n.cpp:1325
+#: data/Cities.dat:1339
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "La Verne"
 msgstr "La Verne"
 
-#: kstars_i18n.cpp:1326
+#: data/Cities.dat:1340
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "LaPeer"
 msgstr "LaPeer"
 
-#: kstars_i18n.cpp:1327
+#: data/Cities.dat:1341
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Laconia"
 msgstr "Laconia"
 
-#: kstars_i18n.cpp:1328
+#: data/Cities.dat:1342 data/Cities.dat:1343
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lafayette"
 msgstr "Lafayette"
 
-#: kstars_i18n.cpp:1329
+#: data/Cities.dat:1344
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lagos"
 msgstr "Lagos"
 
-#: kstars_i18n.cpp:1330
+#: data/Cities.dat:1345
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lahore"
 msgstr "Lahore"
 
-#: kstars_i18n.cpp:1331
+#: data/Cities.dat:1346
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lahr"
 msgstr "Lahr"
 
-#: kstars_i18n.cpp:1332
+#: data/Cities.dat:1347
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lahti"
 msgstr "Lahti"
 
-#: kstars_i18n.cpp:1333
+#: data/Cities.dat:1348
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lajes"
 msgstr "Lajes"
 
-#: kstars_i18n.cpp:1334
+#: data/Cities.dat:1348
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Azores"
+msgstr "Azores"
+
+#: data/Cities.dat:1349
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lake Charles"
 msgstr "Lake Charles"
 
-#: kstars_i18n.cpp:1335
+#: data/Cities.dat:1350
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lake City"
 msgstr "Lake City"
 
-#: kstars_i18n.cpp:1336
+#: data/Cities.dat:1351
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lake Oswego"
 msgstr "Lake Oswego"
 
-#: kstars_i18n.cpp:1337
+#: data/Cities.dat:1352
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lake Villa"
 msgstr "Lake Villa"
 
-#: kstars_i18n.cpp:1338
+#: data/Cities.dat:1353
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lake Village"
 msgstr "Lake Village"
 
-#: kstars_i18n.cpp:1339
+#: data/Cities.dat:1354
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lakeland"
 msgstr "Lakeland"
 
-#: kstars_i18n.cpp:1340
+#: data/Cities.dat:1355 data/Cities.dat:1356 data/Cities.dat:1357
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lakewood"
 msgstr "Lakewood"
 
-#: kstars_i18n.cpp:1341
+#: data/Cities.dat:1358
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lakota"
 msgstr "Lakota"
 
-#: kstars_i18n.cpp:1342
+#: data/Cities.dat:1359
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lamar"
 msgstr "Lamar"
 
-#: kstars_i18n.cpp:1343
+#: data/Cities.dat:1360
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lambarene"
 msgstr "Lamar"
 
-#: kstars_i18n.cpp:1344
+#: data/Cities.dat:1361
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lampedusa"
 msgstr "Lampedusa"
 
-#: kstars_i18n.cpp:1345
+#: data/Cities.dat:1362
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lanai City"
 msgstr "Dinas Lanai"
 
-#: kstars_i18n.cpp:1346
+#: data/Cities.dat:1363 data/Cities.dat:1364
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lancaster"
 msgstr "Lancaster"
 
-#: kstars_i18n.cpp:1347
+#: data/Cities.dat:1365
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lander"
 msgstr "Lander"
 
-#: kstars_i18n.cpp:1348
+#: data/Cities.dat:1366
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lansing"
 msgstr "Lansing"
 
-#: kstars_i18n.cpp:1349
+#: data/Cities.dat:1367
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Laramie"
 msgstr "Laramie"
 
-#: kstars_i18n.cpp:1350
+#: data/Cities.dat:1368
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Laredo"
 msgstr "Laredo"
 
-#: kstars_i18n.cpp:1351
+#: data/Cities.dat:1369
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Largo"
 msgstr "Largo"
 
-#: kstars_i18n.cpp:1352
+#: data/Cities.dat:1370
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Las Campanas Obs."
 msgstr "Ars. Las Campanas"
 
-#: kstars_i18n.cpp:1353
+#: data/Cities.dat:1371
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Las Cruces"
 msgstr "Las Cruces"
 
-#: kstars_i18n.cpp:1354
+#: data/Cities.dat:1372
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Las Palmas de Gran Canaria"
 msgstr "Las Palmas"
 
-#: kstars_i18n.cpp:1355
+#: data/Cities.dat:1373
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Las Vegas"
 msgstr "Las Vegas"
 
-#: kstars_i18n.cpp:1356
+#: data/Cities.dat:1374
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Latham"
 msgstr "Latham"
 
-#: kstars_i18n.cpp:1357
+#: data/Cities.dat:1375
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Latina"
 msgstr "Latina"
 
-#: kstars_i18n.cpp:1358
+#: data/Cities.dat:1376 data/Cities.dat:1377 data/Cities.dat:1378
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Laurel"
 msgstr "Laurel"
 
-#: kstars_i18n.cpp:1359
+#: data/Cities.dat:1379
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lausanne"
 msgstr "Lausana"
 
-#: kstars_i18n.cpp:1360
+#: data/Cities.dat:1380
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Laval"
 msgstr "Laval"
 
-#: kstars_i18n.cpp:1361
+#: data/Cities.dat:1381 data/Cities.dat:1382
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lawrence"
 msgstr "Lawrence"
 
-#: kstars_i18n.cpp:1362
+#: data/Cities.dat:1383
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lawton"
 msgstr "Lawton"
 
-#: kstars_i18n.cpp:1363
+#: data/Cities.dat:1384
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Layton"
 msgstr "Layton"
 
-#: kstars_i18n.cpp:1364
+#: data/Cities.dat:1385
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Le Havre"
 msgstr "Le Havre"
 
-#: kstars_i18n.cpp:1365
+#: data/Cities.dat:1385
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Seine-maritime"
+msgstr "Tenerife"
+
+#: data/Cities.dat:1386
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Learmonth"
 msgstr "Learmonth"
 
-#: kstars_i18n.cpp:1366
+#: data/Cities.dat:1386 data/Cities.dat:1993 data/Cities.dat:2005
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Western Australia"
+msgstr "Gorllewin Australia"
+
+#: data/Cities.dat:1387 data/Cities.dat:1388
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Leavenworth"
 msgstr "Leavenworth"
 
-#: kstars_i18n.cpp:1367
+#: data/Cities.dat:1389 data/Cities.dat:1390 data/Cities.dat:1391
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lebanon"
 msgstr "Lebanon"
 
-#: kstars_i18n.cpp:1368
+#: data/Cities.dat:1392
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lecce"
 msgstr "Lecce"
 
-#: kstars_i18n.cpp:1369
+#: data/Cities.dat:1393
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lecco"
 msgstr "Lecco"
 
-#: kstars_i18n.cpp:1370
+#: data/Cities.dat:1393 data/Cities.dat:1895
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Lecco"
+msgstr "Lecco"
+
+#: data/Cities.dat:1394
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Leck"
 msgstr "Leck"
 
-#: kstars_i18n.cpp:1371
+#: data/Cities.dat:1395
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lee"
 msgstr "Lee"
 
-#: kstars_i18n.cpp:1372
+#: data/Cities.dat:1396
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Leeds"
 msgstr "Leeds"
 
-#: kstars_i18n.cpp:1373
+#: data/Cities.dat:1397
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Leganés"
 msgstr "Leganés"
 
-#: kstars_i18n.cpp:1374
+#: data/Cities.dat:1398
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Leiden Sur"
-msgstr "Leiden Sur"
+"Leiden"
+msgstr "Leiden"
 
-#: kstars_i18n.cpp:1375
+#: data/Cities.dat:1399
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Leiden"
-msgstr "Leiden"
+"Leiden Sur"
+msgstr "Leiden Sur"
 
-#: kstars_i18n.cpp:1376
+#: data/Cities.dat:1400
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Leipzig"
 msgstr "Leipzig"
 
-#: kstars_i18n.cpp:1377
+#: data/Cities.dat:1401
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lemmon"
 msgstr "Lemmon"
 
-#: kstars_i18n.cpp:1378
+#: data/Cities.dat:1402
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lemvig"
 msgstr "Lemvig"
 
-#: kstars_i18n.cpp:1379
+#: data/Cities.dat:1403
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Leopold Figl"
 msgstr "Leopold Figl"
 
-#: kstars_i18n.cpp:1380
+#: data/Cities.dat:1404
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lethbridge"
 msgstr "Lethbridge"
 
-#: kstars_i18n.cpp:1381
+#: data/Cities.dat:1405
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Leverkusen"
 msgstr "Leverkusen"
 
-#: kstars_i18n.cpp:1382
+#: data/Cities.dat:1406
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lewes"
 msgstr "Lewes"
 
-#: kstars_i18n.cpp:1383
+#: data/Cities.dat:1407
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lewisburg"
 msgstr "Lewisburg"
 
-#: kstars_i18n.cpp:1384
+#: data/Cities.dat:1408 data/Cities.dat:1409 data/Cities.dat:1410
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lewiston"
 msgstr "Lewiston"
 
-#: kstars_i18n.cpp:1385
+#: data/Cities.dat:1411
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lewistown"
 msgstr "Lewistown"
 
-#: kstars_i18n.cpp:1386
+#: data/Cities.dat:1412
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lexington"
 msgstr "Lexington"
 
-#: kstars_i18n.cpp:1387
+#: data/Cities.dat:1413
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "León"
 msgstr "Leon"
 
-#: kstars_i18n.cpp:1388
+#: data/Cities.dat:1414
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lhasa"
 msgstr "Lhasa"
 
-#: kstars_i18n.cpp:1389
+#: data/Cities.dat:1414
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Tibet"
+msgstr "Tibet"
+
+#: data/Cities.dat:1415
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Libreville"
 msgstr "Libreville"
 
-#: kstars_i18n.cpp:1390
+#: data/Cities.dat:1416
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lick Obs."
 msgstr "Ars. Lick"
 
-#: kstars_i18n.cpp:1391
+#: data/Cities.dat:1417
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lihue"
 msgstr "Lihue"
 
-#: kstars_i18n.cpp:1392
+#: data/Cities.dat:1418
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lille"
 msgstr "Miller"
 
-#: kstars_i18n.cpp:1393
+#: data/Cities.dat:1418
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Nord"
+msgstr "Florida"
+
+#: data/Cities.dat:1419
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lilongwe"
 msgstr "Longview"
 
-#: kstars_i18n.cpp:1394
+#: data/Cities.dat:1420 data/Cities.dat:1421
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lima"
 msgstr "Lima"
 
-#: kstars_i18n.cpp:1395
+#: data/Cities.dat:1422 data/Cities.dat:1423 data/Cities.dat:1424
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lincoln"
 msgstr "Lincoln"
 
-#: kstars_i18n.cpp:1396
+#: data/Cities.dat:1425
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lindenhurst"
 msgstr "Lindenhurst"
 
-#: kstars_i18n.cpp:1397
+#: data/Cities.dat:1426
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Linz"
 msgstr "Linz"
 
-#: kstars_i18n.cpp:1398
+#: data/Cities.dat:1427
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lipetsk"
 msgstr "Leck"
 
-#: kstars_i18n.cpp:1399
+#: data/Cities.dat:1428 data/Cities.dat:1429
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lisbon"
 msgstr "Lisbon"
 
-#: kstars_i18n.cpp:1400
+#: data/Cities.dat:1430
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Litchville"
 msgstr "Libreville"
 
-#: kstars_i18n.cpp:1401
+#: data/Cities.dat:1431
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Little Rock"
 msgstr "Little Rock"
 
-#: kstars_i18n.cpp:1402
+#: data/Cities.dat:1432
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Littleton"
 msgstr "Littleton"
 
-#: kstars_i18n.cpp:1403
+#: data/Cities.dat:1433
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Liverpool"
 msgstr "Liverpool"
 
-#: kstars_i18n.cpp:1404
+#: data/Cities.dat:1434 data/Cities.dat:1435
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Livingston"
 msgstr "Livingston"
 
-#: kstars_i18n.cpp:1405
+#: data/Cities.dat:1436
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Livingstone"
 msgstr "Livingston"
 
-#: kstars_i18n.cpp:1406
+#: data/Cities.dat:1437
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Livonia"
 msgstr "Livonia"
 
-#: kstars_i18n.cpp:1407
+#: data/Cities.dat:1438
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Livorno"
 msgstr "Livorno"
 
-#: kstars_i18n.cpp:1408
+#: data/Cities.dat:1439
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ljubljana"
 msgstr "Ljubljana"
 
-#: kstars_i18n.cpp:1409
+#: data/Cities.dat:1439
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Slovenia"
+msgstr "Slovenia"
+
+#: data/Cities.dat:1440
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Llano del Hato"
 msgstr "Llano del Hato"
 
-#: kstars_i18n.cpp:1410
+#: data/Cities.dat:1441
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lobatsi"
 msgstr "Lahti"
 
-#: kstars_i18n.cpp:1411
+#: data/Cities.dat:1442
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lockwood Valley"
 msgstr "Lockwood Valley"
 
-#: kstars_i18n.cpp:1412
+#: data/Cities.dat:1443
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Logan"
 msgstr "Logan"
 
-#: kstars_i18n.cpp:1413
+#: data/Cities.dat:1444
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Logroño"
 msgstr "Logroño"
 
-#: kstars_i18n.cpp:1414
+#: data/Cities.dat:1445
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Loiano"
 msgstr "Loiano"
 
-#: kstars_i18n.cpp:1415
+#: data/Cities.dat:1446
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Loksa"
 msgstr "Loksa"
 
-#: kstars_i18n.cpp:1416
+#: data/Cities.dat:1447
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lolo"
 msgstr "Lolo"
 
-#: kstars_i18n.cpp:1417
+#: data/Cities.dat:1448
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lomnicky stit"
 msgstr "Lomniky Stit"
 
-#: kstars_i18n.cpp:1418
+#: data/Cities.dat:1448 data/Cities.dat:2373 data/Cities.dat:2443
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Slovakia"
+msgstr "Slovakia"
+
+#: data/Cities.dat:1449
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lompoc"
 msgstr "Lompoc"
 
-#: kstars_i18n.cpp:1419
+#: data/Cities.dat:1450
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lomé"
 msgstr "Lompoc"
 
-#: kstars_i18n.cpp:1420
+#: data/Cities.dat:1451 data/Cities.dat:1452
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "London"
 msgstr "Llundain"
 
-#: kstars_i18n.cpp:1421
+#: data/Cities.dat:1453
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Long Beach"
 msgstr "Long Beach"
 
-#: kstars_i18n.cpp:1422
+#: data/Cities.dat:1454 data/Cities.dat:1455
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Longview"
 msgstr "Longview"
 
-#: kstars_i18n.cpp:1423
+#: data/Cities.dat:1456
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lorain"
 msgstr "Lorain"
 
-#: kstars_i18n.cpp:1424
+#: data/Cities.dat:1457
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lordsburg"
 msgstr "Lordsburg"
 
-#: kstars_i18n.cpp:1425
+#: data/Cities.dat:1458
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Los Alamos"
 msgstr "Los Alamos"
 
-#: kstars_i18n.cpp:1426
+#: data/Cities.dat:1459
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Los Altos Hills"
 msgstr "Los Altos Hills"
 
-#: kstars_i18n.cpp:1427
+#: data/Cities.dat:1460
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Los Angeles"
 msgstr "Los Angeles"
 
-#: kstars_i18n.cpp:1428
+#: data/Cities.dat:1461 data/Cities.dat:1462
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Louisville"
 msgstr "Louisville"
 
-#: kstars_i18n.cpp:1429
+#: data/Cities.dat:1463
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Louxor"
 msgstr "Lolo"
 
-#: kstars_i18n.cpp:1430
+#: data/Cities.dat:1464
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Loveland"
 msgstr "Loveland"
 
-#: kstars_i18n.cpp:1431
+#: data/Cities.dat:1465
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lovelock"
 msgstr "Lovelock"
 
-#: kstars_i18n.cpp:1432
+#: data/Cities.dat:1466
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Lowell Obs."
-msgstr "Ars. Lowell"
+"Lowell"
+msgstr "Lowell"
 
-#: kstars_i18n.cpp:1433
+#: data/Cities.dat:1467
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Lowell"
-msgstr "Lowell"
+"Lowell Obs."
+msgstr "Ars. Lowell"
 
-#: kstars_i18n.cpp:1434
+#: data/Cities.dat:1468
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Luanda"
 msgstr "Lund"
 
-#: kstars_i18n.cpp:1435
+#: data/Cities.dat:1469
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lubbock"
 msgstr "Lubbock"
 
-#: kstars_i18n.cpp:1436
+#: data/Cities.dat:1470
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lucca"
 msgstr "Lucca"
 
-#: kstars_i18n.cpp:1437
+#: data/Cities.dat:1471
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ludwigshafen"
 msgstr "Ludwigshafen"
 
-#: kstars_i18n.cpp:1438
+#: data/Cities.dat:1472
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Luena"
 msgstr "Cuenca"
 
-#: kstars_i18n.cpp:1439
+#: data/Cities.dat:1473
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lugo"
 msgstr "Lugo"
 
-#: kstars_i18n.cpp:1440
+#: data/Cities.dat:1474
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Luleå"
 msgstr "Thule"
 
-#: kstars_i18n.cpp:1441
+#: data/Cities.dat:1475
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lund"
 msgstr "Lund"
 
-#: kstars_i18n.cpp:1442
+#: data/Cities.dat:1476 data/Cities.dat:1477
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lusaka"
 msgstr "Lusaka"
 
-#: kstars_i18n.cpp:1443
+#: data/Cities.dat:1476
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Zambia"
+msgstr "Zambia"
+
+#: data/Cities.dat:1478
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Luxembourg City"
 msgstr "Dinas Luxembourg"
 
-#: kstars_i18n.cpp:1444
+#: data/Cities.dat:1478
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Luxembourg"
+msgstr "Luxembourg"
+
+#: data/Cities.dat:1479
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lynchburg"
 msgstr "Lynchburg"
 
-#: kstars_i18n.cpp:1445
+#: data/Cities.dat:1480
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lynden"
 msgstr "Lynden"
 
-#: kstars_i18n.cpp:1446
+#: data/Cities.dat:1481
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Lynn Haven"
-msgstr "Lynn Haven"
+"Lynn"
+msgstr "Lynn"
 
-#: kstars_i18n.cpp:1447
+#: data/Cities.dat:1482
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Lynn"
-msgstr "Lynn"
+"Lynn Haven"
+msgstr "Lynn Haven"
 
-#: kstars_i18n.cpp:1448
+#: data/Cities.dat:1483
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lyon"
 msgstr "Lyon"
 
-#: kstars_i18n.cpp:1449
+#: data/Cities.dat:1483
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Rhône"
+msgstr "Maine"
+
+#: data/Cities.dat:1484
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lérida"
 msgstr "Lérida"
 
-#: kstars_i18n.cpp:1450
+#: data/Cities.dat:1485
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Lübeck"
 msgstr "Lübeck"
 
-#: kstars_i18n.cpp:1451
+#: data/Cities.dat:1486
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Maando"
 msgstr "Maando"
 
-#: kstars_i18n.cpp:1452
+#: data/Cities.dat:1486
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Pyungbuk"
+msgstr "Pyungbuk"
+
+#: data/Cities.dat:1487
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Maardu"
 msgstr "Maardu"
 
-#: kstars_i18n.cpp:1453
+#: data/Cities.dat:1488
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Maastricht"
 msgstr "Maastricht"
 
-#: kstars_i18n.cpp:1454
+#: data/Cities.dat:1489
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Macao"
 msgstr "Macao"
 
-#: kstars_i18n.cpp:1455
+#: data/Cities.dat:1490
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Machern"
 msgstr "Machern"
 
-#: kstars_i18n.cpp:1456
+#: data/Cities.dat:1491
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mackay"
 msgstr "Mackay"
 
-#: kstars_i18n.cpp:1457
+#: data/Cities.dat:1492
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Macon"
 msgstr "Macon"
 
-#: kstars_i18n.cpp:1458
+#: data/Cities.dat:1493
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Madelia"
 msgstr "Madelia"
 
-#: kstars_i18n.cpp:1459
+#: data/Cities.dat:1494 data/Cities.dat:1495 data/Cities.dat:1496
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Madison"
 msgstr "Madison"
 
-#: kstars_i18n.cpp:1460
+#: data/Cities.dat:1497
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Madras"
 msgstr "Madras"
 
-#: kstars_i18n.cpp:1461
+#: data/Cities.dat:1498
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Madrid"
 msgstr "Madrid"
 
-#: kstars_i18n.cpp:1462
+#: data/Cities.dat:1499
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Magadan"
 msgstr "Mandan"
 
-#: kstars_i18n.cpp:1463
+#: data/Cities.dat:1500
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Magdalena"
 msgstr "Magdalena"
 
-#: kstars_i18n.cpp:1464
+#: data/Cities.dat:1501
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Magdeburg"
 msgstr "Magdeburg"
 
-#: kstars_i18n.cpp:1465
+#: data/Cities.dat:1502
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Magnolia"
 msgstr "Magnolia"
 
-#: kstars_i18n.cpp:1466
+#: data/Cities.dat:1503
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mahlow"
 msgstr "Mahlow"
 
-#: kstars_i18n.cpp:1467
+#: data/Cities.dat:1504
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mainz"
 msgstr "Mainz"
 
-#: kstars_i18n.cpp:1468
+#: data/Cities.dat:1505
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Maiquetia"
 msgstr "Maiquetia"
 
-#: kstars_i18n.cpp:1469
+#: data/Cities.dat:1506
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Majunga"
 msgstr "Managua"
 
-#: kstars_i18n.cpp:1470
+#: data/Cities.dat:1507
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Majuro"
 msgstr "Majuro"
 
-#: kstars_i18n.cpp:1471
+#: data/Cities.dat:1508
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Makhachkala"
 msgstr "Dakar"
 
-#: kstars_i18n.cpp:1472
+#: data/Cities.dat:1509
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Makokou"
 msgstr "Mokpo"
 
-#: kstars_i18n.cpp:1473
+#: data/Cities.dat:1510
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Malabo"
 msgstr "Macao"
 
-#: kstars_i18n.cpp:1474
+#: data/Cities.dat:1511
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Malchin"
 msgstr "Malchin"
 
-#: kstars_i18n.cpp:1475
+#: data/Cities.dat:1512
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Malchow"
 msgstr "Malchow"
 
-#: kstars_i18n.cpp:1476
+#: data/Cities.dat:1513
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Malden"
 msgstr "Malden"
 
-#: kstars_i18n.cpp:1477
+#: data/Cities.dat:1514
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Male"
 msgstr "Male"
 
-#: kstars_i18n.cpp:1478
+#: data/Cities.dat:1514
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Maldives"
+msgstr "Maldifau"
+
+#: data/Cities.dat:1515
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Malmö"
 msgstr "Male"
 
-#: kstars_i18n.cpp:1479
+#: data/Cities.dat:1516
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Maloelap"
 msgstr "Maloelap"
 
-#: kstars_i18n.cpp:1480
+#: data/Cities.dat:1517
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Malone"
 msgstr "Malone"
 
-#: kstars_i18n.cpp:1481
+#: data/Cities.dat:1518
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mamoudzou"
 msgstr "Mamoudzou"
 
-#: kstars_i18n.cpp:1482
+#: data/Cities.dat:1518
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Mayotte"
+msgstr "Mayotte"
+
+#: data/Cities.dat:1519
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Managua"
 msgstr "Managua"
 
-#: kstars_i18n.cpp:1483
+#: data/Cities.dat:1519
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Nicaragua"
+msgstr "Nicaragua"
+
+#: data/Cities.dat:1520
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Manaus"
 msgstr "Manaus"
 
-#: kstars_i18n.cpp:1484
+#: data/Cities.dat:1521 data/Cities.dat:1522 data/Cities.dat:1523
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Manchester"
 msgstr "Manchester"
 
-#: kstars_i18n.cpp:1485
+#: data/Cities.dat:1524
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mandalay"
 msgstr "Mandalay"
 
-#: kstars_i18n.cpp:1486
+#: data/Cities.dat:1524 data/Cities.dat:2145 data/Cities.dat:2371
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Myanmar"
+msgstr "Myanmar"
+
+#: data/Cities.dat:1525
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mandan"
 msgstr "Mandan"
 
-#: kstars_i18n.cpp:1487
+#: data/Cities.dat:1526
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Manebach"
 msgstr "Manebach"
 
-#: kstars_i18n.cpp:1488
+#: data/Cities.dat:1527
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mangum"
 msgstr "Mangum"
 
-#: kstars_i18n.cpp:1489
+#: data/Cities.dat:1528
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Manhattan Beach"
-msgstr "Manhattan Beach"
+"Manhattan"
+msgstr "Manhattan"
 
-#: kstars_i18n.cpp:1490
+#: data/Cities.dat:1529
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Manhattan"
-msgstr "Manhattan"
+"Manhattan Beach"
+msgstr "Manhattan Beach"
 
-#: kstars_i18n.cpp:1491
+#: data/Cities.dat:1530
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Manila"
 msgstr "Manila"
 
-#: kstars_i18n.cpp:1492
+#: data/Cities.dat:1531
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Manitowoc"
 msgstr "Manitowoc"
 
-#: kstars_i18n.cpp:1493
+#: data/Cities.dat:1532
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mannheim"
 msgstr "Mannheim"
 
-#: kstars_i18n.cpp:1494
+#: data/Cities.dat:1533
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mansfeld"
 msgstr "Mansfeld"
 
-#: kstars_i18n.cpp:1495
+#: data/Cities.dat:1534
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mansfield"
 msgstr "Mansfield"
 
-#: kstars_i18n.cpp:1496
+#: data/Cities.dat:1535
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Manton"
 msgstr "Manton"
 
-#: kstars_i18n.cpp:1497
+#: data/Cities.dat:1536
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mantorville"
 msgstr "Mantorville"
 
-#: kstars_i18n.cpp:1498
+#: data/Cities.dat:1537
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Manzini"
 msgstr "Mainz"
 
-#: kstars_i18n.cpp:1499
+#: 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"
+msgstr "Gwlad y Swasi"
+
+#: data/Cities.dat:1538
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Maputo"
 msgstr "Manton"
 
-#: kstars_i18n.cpp:1500
+#: data/Cities.dat:1539
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Marado"
 msgstr "Marado"
 
-#: kstars_i18n.cpp:1501
+#: data/Cities.dat:1539 data/Cities.dat:2327 data/Cities.dat:2328
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Jeju"
+msgstr "Jeju"
+
+#: data/Cities.dat:1540
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Marbach"
 msgstr "Marbach"
 
-#: kstars_i18n.cpp:1502
+#: data/Cities.dat:1541
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Marienberg"
 msgstr "Marienberg"
 
-#: kstars_i18n.cpp:1503
+#: data/Cities.dat:1542
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Marietta"
 msgstr "Marietta"
 
-#: kstars_i18n.cpp:1504
+#: data/Cities.dat:1543
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Marion"
 msgstr "Marion"
 
-#: kstars_i18n.cpp:1505
+#: data/Cities.dat:1544
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Markersbach"
 msgstr "Markersbach"
 
-#: kstars_i18n.cpp:1506
+#: data/Cities.dat:1545
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Markersdorf"
 msgstr "Markersdorf"
 
-#: kstars_i18n.cpp:1507
+#: data/Cities.dat:1546
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Markkleeberg"
 msgstr "Markkleeberg"
 
-#: kstars_i18n.cpp:1508
+#: data/Cities.dat:1547
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Markneukirchen"
 msgstr "Markneukirchen"
 
-#: kstars_i18n.cpp:1509
+#: data/Cities.dat:1548
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Markranstät"
 msgstr "Markranstät"
 
-#: kstars_i18n.cpp:1510
+#: data/Cities.dat:1549
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Marlow"
 msgstr "Marlow"
 
-#: kstars_i18n.cpp:1511
+#: data/Cities.dat:1550
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Marlton"
 msgstr "Marlton"
 
-#: kstars_i18n.cpp:1512
+#: data/Cities.dat:1551
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Marquette"
 msgstr "Marquette"
 
-#: kstars_i18n.cpp:1513
+#: data/Cities.dat:1552
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Marrakech"
 msgstr "Marbach"
 
-#: kstars_i18n.cpp:1514
+#: data/Cities.dat:1553
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Marseille"
 msgstr "Marseille"
 
-#: kstars_i18n.cpp:1515
+#: data/Cities.dat:1553
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Bouches-du-rhône"
+msgstr "Guernsey"
+
+#: data/Cities.dat:1554
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Marshall"
 msgstr "Marshall"
 
-#: kstars_i18n.cpp:1516
+#: data/Cities.dat:1555
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Martinsburg"
 msgstr "Martinsburg"
 
-#: kstars_i18n.cpp:1517
+#: data/Cities.dat:1556
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Martinsville"
 msgstr "Martinsville"
 
-#: kstars_i18n.cpp:1518
+#: data/Cities.dat:1557
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Masan"
 msgstr "Masan"
 
-#: kstars_i18n.cpp:1519
+#: data/Cities.dat:1558
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Maseru"
 msgstr "Massen"
 
-#: kstars_i18n.cpp:1520
+#: data/Cities.dat:1558 data/Cities.dat:2522
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Lesotho"
+msgstr "Lesotho"
+
+#: data/Cities.dat:1559
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mashpee"
 msgstr "Mashpee"
 
-#: kstars_i18n.cpp:1521
+#: data/Cities.dat:1560
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mason City"
 msgstr "Mason City"
 
-#: kstars_i18n.cpp:1522
+#: data/Cities.dat:1561
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Massa"
 msgstr "Massa"
 
-#: kstars_i18n.cpp:1523
+#: data/Cities.dat:1562
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Massawa"
 msgstr "Massa"
 
-#: kstars_i18n.cpp:1524
+#: data/Cities.dat:1563
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Massen"
 msgstr "Massen"
 
-#: kstars_i18n.cpp:1525
+#: data/Cities.dat:1564
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Matadi"
 msgstr "Marado"
 
-#: kstars_i18n.cpp:1526
+#: data/Cities.dat:1565
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Matsapha"
 msgstr "Masan"
 
-#: kstars_i18n.cpp:1527
+#: data/Cities.dat:1566
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mauldin"
 msgstr "Mauldin"
 
-#: kstars_i18n.cpp:1528
+#: data/Cities.dat:1567
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mauna Kea Obs."
 msgstr "Ars. Mauna Kea"
 
-#: kstars_i18n.cpp:1529
+#: data/Cities.dat:1568
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mayaguez"
 msgstr "Mayaguez"
 
-#: kstars_i18n.cpp:1530
+#: data/Cities.dat:1569
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Maykop"
 msgstr "Mokpo"
 
-#: kstars_i18n.cpp:1531
+#: data/Cities.dat:1570
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Maysville"
 msgstr "Maysville"
 
-#: kstars_i18n.cpp:1532
+#: data/Cities.dat:1571
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mbabane"
 msgstr "Masan"
 
-#: kstars_i18n.cpp:1533
+#: data/Cities.dat:1572
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mbandaka"
 msgstr "Mandalay"
 
-#: kstars_i18n.cpp:1534
+#: data/Cities.dat:1573
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mbeya"
 msgstr "Mesa"
 
-#: kstars_i18n.cpp:1535
+#: data/Cities.dat:1574
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "McAlester"
 msgstr "McAlester"
 
-#: kstars_i18n.cpp:1536
+#: data/Cities.dat:1575
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "McAllen"
 msgstr "McAllen"
 
-#: kstars_i18n.cpp:1537
+#: data/Cities.dat:1576
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "McCook"
 msgstr "McCook"
 
-#: kstars_i18n.cpp:1538
+#: data/Cities.dat:1577
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "McCormick Obs."
 msgstr "Ars. McCormick"
 
-#: kstars_i18n.cpp:1539
+#: data/Cities.dat:1578
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "McDonald Obs."
 msgstr "Ars. McDonald"
 
-#: kstars_i18n.cpp:1540
+#: data/Cities.dat:1579
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "McGill"
 msgstr "McGill"
 
-#: kstars_i18n.cpp:1541
+#: data/Cities.dat:1580
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "McGrath"
 msgstr "McGrath"
 
-#: kstars_i18n.cpp:1542
+#: data/Cities.dat:1581
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "McKeesport"
 msgstr "McKeesport"
 
-#: kstars_i18n.cpp:1543
+#: data/Cities.dat:1582 data/Cities.dat:1583
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "McNary"
 msgstr "McNary"
 
-#: kstars_i18n.cpp:1544
+#: data/Cities.dat:1584
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Medenine"
 msgstr "Medingen"
 
-#: kstars_i18n.cpp:1545
+#: data/Cities.dat:1585 data/Cities.dat:1586
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Medford"
 msgstr "Medford"
 
-#: kstars_i18n.cpp:1546
+#: data/Cities.dat:1587
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Medicine Hat"
 msgstr "Medicine Hat"
 
-#: kstars_i18n.cpp:1547
+#: data/Cities.dat:1588
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Medingen"
 msgstr "Medingen"
 
-#: kstars_i18n.cpp:1548
+#: data/Cities.dat:1589
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Meerane"
 msgstr "Meerane"
 
-#: kstars_i18n.cpp:1549
+#: data/Cities.dat:1590
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Meinersdorf"
 msgstr "Meinersdorf"
 
-#: kstars_i18n.cpp:1550
+#: data/Cities.dat:1591
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Meiningen"
 msgstr "Meiningen"
 
-#: kstars_i18n.cpp:1551
+#: data/Cities.dat:1592
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Meiän"
 msgstr "Meiän"
 
-#: kstars_i18n.cpp:1552
+#: data/Cities.dat:1593
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Meknès"
 msgstr "Mesa"
 
-#: kstars_i18n.cpp:1553
+#: data/Cities.dat:1594 data/Cities.dat:1595
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Melbourne"
 msgstr "Melbourne"
 
-#: kstars_i18n.cpp:1554
+#: data/Cities.dat:1596
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Melilla"
 msgstr "Melilla"
 
-#: kstars_i18n.cpp:1555
+#: data/Cities.dat:1597
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Melksham"
 msgstr "Melksham"
 
-#: kstars_i18n.cpp:1556
+#: data/Cities.dat:1598
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mellenbach-Glasbach"
 msgstr "Mellenbach-Glasbach"
 
-#: kstars_i18n.cpp:1557
+#: data/Cities.dat:1599
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mellensee"
 msgstr "Mellensee"
 
-#: kstars_i18n.cpp:1558
+#: data/Cities.dat:1600
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mellingen"
 msgstr "Mellingen"
 
-#: kstars_i18n.cpp:1559
+#: data/Cities.dat:1601
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Melrose Park"
 msgstr "Melrose Park"
 
-#: kstars_i18n.cpp:1560
+#: data/Cities.dat:1602
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Memphis"
 msgstr "Memphis"
 
-#: kstars_i18n.cpp:1561
+#: data/Cities.dat:1603
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mena"
 msgstr "Mena"
 
-#: kstars_i18n.cpp:1562
+#: data/Cities.dat:1604
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mengersgereuth-Hämern"
 msgstr "Mengersgereuth-Hämern"
 
-#: kstars_i18n.cpp:1563
+#: data/Cities.dat:1605
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Menongue"
 msgstr "Meiningen"
 
-#: kstars_i18n.cpp:1564
+#: data/Cities.dat:1606
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Menteroda"
 msgstr "Menteroda"
 
-#: kstars_i18n.cpp:1565
+#: data/Cities.dat:1607
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Meredith"
 msgstr "Meredith"
 
-#: kstars_i18n.cpp:1566
+#: data/Cities.dat:1608
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Meriden"
 msgstr "Meriden"
 
-#: kstars_i18n.cpp:1567
+#: data/Cities.dat:1609
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Meridian"
 msgstr "Meridian"
 
-#: kstars_i18n.cpp:1568
+#: data/Cities.dat:1610
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Meridianville"
 msgstr "Meridianville"
 
-#: kstars_i18n.cpp:1569
+#: data/Cities.dat:1611
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Merkers"
 msgstr "Merkers"
 
-#: kstars_i18n.cpp:1570
+#: data/Cities.dat:1612
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Merrimack"
 msgstr "Merrimack"
 
-#: kstars_i18n.cpp:1571
+#: data/Cities.dat:1613
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Merritt Island"
 msgstr "Ynys Merritt"
 
-#: kstars_i18n.cpp:1572
+#: data/Cities.dat:1614
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Merschwitz"
 msgstr "Merschwitz"
 
-#: kstars_i18n.cpp:1573
+#: data/Cities.dat:1615
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Merseburg"
 msgstr "Merseburg"
 
-#: kstars_i18n.cpp:1574
+#: data/Cities.dat:1616
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Merzdorf"
 msgstr "Merzdorf"
 
-#: kstars_i18n.cpp:1575
+#: data/Cities.dat:1617
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mesa"
 msgstr "Mesa"
 
-#: kstars_i18n.cpp:1576
+#: data/Cities.dat:1618
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mesquite"
 msgstr "Mesquite"
 
-#: kstars_i18n.cpp:1577
+#: data/Cities.dat:1619
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Messina"
 msgstr "Messina"
 
-#: kstars_i18n.cpp:1578
+#: data/Cities.dat:1620
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Metairie"
 msgstr "Metairie"
 
-#: kstars_i18n.cpp:1579
+#: data/Cities.dat:1621
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Metsähovi"
 msgstr "Metsähovi"
 
-#: kstars_i18n.cpp:1580
+#: data/Cities.dat:1622
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Metz"
 msgstr "Male"
 
-#: kstars_i18n.cpp:1581
+#: data/Cities.dat:1622
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Moselle"
+msgstr "Lolland"
+
+#: data/Cities.dat:1623
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Meudon (observatory)"
 msgstr "Dyer Observatory"
 
-#: kstars_i18n.cpp:1582
+#: data/Cities.dat:1623
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Hauts-de-Seine"
+msgstr "Maine"
+
+#: data/Cities.dat:1624
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Meuselbach-Schwarzmühle"
 msgstr "Meuselbach-Schwarzmühle"
 
-#: kstars_i18n.cpp:1583
+#: data/Cities.dat:1625
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Meuselwitz"
 msgstr "Meuselwitz"
 
-#: kstars_i18n.cpp:1584
+#: data/Cities.dat:1626
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Mexico City"
-msgstr "Mexico City"
+"Mexico"
+msgstr "Mexico"
 
-#: kstars_i18n.cpp:1585
+#: data/Cities.dat:1627
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Mexico"
-msgstr "Mexico"
+"Mexico City"
+msgstr "Mexico City"
 
-#: kstars_i18n.cpp:1586
+#: data/Cities.dat:1628
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Meyenburg"
 msgstr "Meyenburg"
 
-#: kstars_i18n.cpp:1587
+#: data/Cities.dat:1629
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mhlume"
 msgstr "Male"
 
-#: kstars_i18n.cpp:1588
+#: data/Cities.dat:1630
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Miami Beach"
-msgstr "Traeth Miami"
+"Miami"
+msgstr "Miami"
 
-#: kstars_i18n.cpp:1589
+#: data/Cities.dat:1631
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Miami"
-msgstr "Miami"
+"Miami Beach"
+msgstr "Traeth Miami"
 
-#: kstars_i18n.cpp:1590
+#: data/Cities.dat:1632
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Michendorf"
 msgstr "Michendorf"
 
-#: kstars_i18n.cpp:1591
+#: data/Cities.dat:1633
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Midas"
 msgstr "Midas"
 
-#: kstars_i18n.cpp:1592
+#: data/Cities.dat:1634
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Middelburg"
 msgstr "Middelburg"
 
-#: kstars_i18n.cpp:1593
+#: data/Cities.dat:1635
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Middelfart"
 msgstr "Middelfart"
 
-#: kstars_i18n.cpp:1594
+#: 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"
+msgstr "Fyn"
+
+#: data/Cities.dat:1636
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Middlebury"
 msgstr "Middlebury"
 
-#: kstars_i18n.cpp:1595
+#: data/Cities.dat:1637
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Middletown"
 msgstr "Middletown"
 
-#: kstars_i18n.cpp:1596
+#: data/Cities.dat:1638
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Midland"
 msgstr "Midland"
 
-#: kstars_i18n.cpp:1597
+#: data/Cities.dat:1639
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Midnapore"
 msgstr "Midnapore"
 
-#: kstars_i18n.cpp:1598
+#: data/Cities.dat:1640
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Midway Island"
 msgstr "Ynys Midway"
 
-#: kstars_i18n.cpp:1599
+#: data/Cities.dat:1641
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Midwest City"
 msgstr "Dinas Midwest"
 
-#: kstars_i18n.cpp:1600
+#: data/Cities.dat:1642
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mieäste"
 msgstr "Mieäste"
 
-#: kstars_i18n.cpp:1601
+#: data/Cities.dat:1643
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Milan"
 msgstr "Milan"
 
-#: kstars_i18n.cpp:1602
+#: data/Cities.dat:1644
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Milbank"
 msgstr "Milbank"
 
-#: kstars_i18n.cpp:1603
+#: data/Cities.dat:1645
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mildenau"
 msgstr "Mildenau"
 
-#: kstars_i18n.cpp:1604
+#: 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"
 msgstr "Milford"
 
-#: kstars_i18n.cpp:1605
+#: data/Cities.dat:1650
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mili"
 msgstr "Mili"
 
-#: kstars_i18n.cpp:1606
+#: data/Cities.dat:1651
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Milkau"
 msgstr "Milkau"
 
-#: kstars_i18n.cpp:1607
+#: data/Cities.dat:1652
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Milledgeville"
 msgstr "Milledgeville"
 
-#: kstars_i18n.cpp:1608
+#: data/Cities.dat:1653
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Miller"
 msgstr "Miller"
 
-#: kstars_i18n.cpp:1609
+#: data/Cities.dat:1654
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Millinocket"
 msgstr "Millinocket"
 
-#: kstars_i18n.cpp:1610
+#: data/Cities.dat:1655
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Millville"
 msgstr "Millville"
 
-#: kstars_i18n.cpp:1611
+#: data/Cities.dat:1656
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Milpitas"
 msgstr "Milpitas"
 
-#: kstars_i18n.cpp:1612
+#: data/Cities.dat:1657
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Milwaukee"
 msgstr "Milwaukee"
 
-#: kstars_i18n.cpp:1613
+#: data/Cities.dat:1658
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mine Hill"
 msgstr "Mine Hill"
 
-#: kstars_i18n.cpp:1614
+#: data/Cities.dat:1659
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Minneapolis"
 msgstr "Minneapolis"
 
-#: kstars_i18n.cpp:1615
+#: data/Cities.dat:1660
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Minnetonka"
 msgstr "Minnetonka"
 
-#: kstars_i18n.cpp:1616
+#: data/Cities.dat:1661
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Minot"
 msgstr "Minot"
 
-#: kstars_i18n.cpp:1617
+#: data/Cities.dat:1662
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Miquelon Island"
 msgstr "Ynys Miquelon"
 
-#: kstars_i18n.cpp:1618
+#: data/Cities.dat:1662
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"St-Pierre and Miquelon"
+msgstr "Yr Alban"
+
+#: data/Cities.dat:1663
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Miramar"
 msgstr "Miramar"
 
-#: kstars_i18n.cpp:1619
+#: data/Cities.dat:1664
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mirnyi"
 msgstr "Biruni"
 
-#: kstars_i18n.cpp:1620
+#: data/Cities.dat:1665
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Miryang"
 msgstr "Miryang"
 
-#: kstars_i18n.cpp:1621
+#: data/Cities.dat:1666
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mishawaka"
 msgstr "Mishawaka"
 
-#: kstars_i18n.cpp:1622
+#: data/Cities.dat:1667
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Misratah"
 msgstr "McGrath"
 
-#: kstars_i18n.cpp:1623
+#: data/Cities.dat:1668
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mississauga"
 msgstr "Mississauga"
 
-#: kstars_i18n.cpp:1624
+#: data/Cities.dat:1669
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Missoula"
 msgstr "Missoula"
 
-#: kstars_i18n.cpp:1625
+#: data/Cities.dat:1670
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mitchell"
 msgstr "Mitchell"
 
-#: kstars_i18n.cpp:1626
+#: data/Cities.dat:1671
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mitzpe Ramon"
 msgstr "Mitzpe Ramon"
 
-#: kstars_i18n.cpp:1627
+#: data/Cities.dat:1672
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mizusawa"
 msgstr "Mizusawa"
 
-#: kstars_i18n.cpp:1628
+#: data/Cities.dat:1673
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mobile"
 msgstr "Mobile"
 
-#: kstars_i18n.cpp:1629
+#: data/Cities.dat:1674
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mobridge"
 msgstr "Mobridge"
 
-#: kstars_i18n.cpp:1630
+#: data/Cities.dat:1675
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Modena"
 msgstr "Modena"
 
-#: kstars_i18n.cpp:1631
+#: data/Cities.dat:1676
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Modesto"
 msgstr "Modesto"
 
-#: kstars_i18n.cpp:1632
+#: data/Cities.dat:1677
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Moenkopi"
 msgstr "Moenkopi"
 
-#: kstars_i18n.cpp:1633
+#: data/Cities.dat:1678
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Moers"
 msgstr "Moers"
 
-#: kstars_i18n.cpp:1634
+#: data/Cities.dat:1679
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mogadishu"
 msgstr "Madison"
 
-#: kstars_i18n.cpp:1635
+#: data/Cities.dat:1680
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mokpo"
 msgstr "Mokpo"
 
-#: kstars_i18n.cpp:1636
+#: data/Cities.dat:1681
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Moline"
 msgstr "Moline"
 
-#: kstars_i18n.cpp:1637
+#: data/Cities.dat:1682
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Molokai"
 msgstr "Molokai"
 
-#: kstars_i18n.cpp:1638
+#: data/Cities.dat:1683
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Molonglo"
 msgstr "Molonglo"
 
-#: kstars_i18n.cpp:1639
+#: data/Cities.dat:1684
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mombasa"
 msgstr "Massa"
 
-#: kstars_i18n.cpp:1640
+#: data/Cities.dat:1685
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Moncton"
 msgstr "Moncton"
 
-#: kstars_i18n.cpp:1641
+#: data/Cities.dat:1686
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Monroe"
 msgstr "Monroe"
 
-#: kstars_i18n.cpp:1642
+#: data/Cities.dat:1687
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Monrovia"
 msgstr "Monrovia"
 
-#: kstars_i18n.cpp:1643
+#: data/Cities.dat:1688
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mont-Joli"
 msgstr "Mont-Joli"
 
-#: kstars_i18n.cpp:1644
+#: data/Cities.dat:1689
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Monte Carlo"
 msgstr "Monte Carlo"
 
-#: kstars_i18n.cpp:1645
+#: data/Cities.dat:1689
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Monaco"
+msgstr "Monaco"
+
+#: data/Cities.dat:1690
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Montebello"
 msgstr "Montebello"
 
-#: kstars_i18n.cpp:1646
+#: data/Cities.dat:1691
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Montego Bay"
 msgstr "Montego Bay"
 
-#: kstars_i18n.cpp:1647
+#: data/Cities.dat:1692
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Monterey Park"
-msgstr "Monterey Park"
+"Monterey"
+msgstr "Monterey"
 
-#: kstars_i18n.cpp:1648
+#: data/Cities.dat:1693
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Monterey"
-msgstr "Monterey"
+"Monterey Park"
+msgstr "Monterey Park"
 
-#: kstars_i18n.cpp:1649
+#: data/Cities.dat:1694
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Montevideo"
 msgstr "Montevideo"
 
-#: kstars_i18n.cpp:1650
+#: data/Cities.dat:1694
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Uruguay"
+msgstr "Uruguay"
+
+#: data/Cities.dat:1695
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Montgomery"
 msgstr "Montgomery"
 
-#: kstars_i18n.cpp:1651
+#: data/Cities.dat:1696 data/Cities.dat:1697 data/Cities.dat:1698
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Monticello"
 msgstr "Monticello"
 
-#: kstars_i18n.cpp:1652
+#: data/Cities.dat:1699
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Montour Falls"
 msgstr "Montour Falls"
 
-#: kstars_i18n.cpp:1653
+#: data/Cities.dat:1700 data/Cities.dat:1701
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Montpelier"
 msgstr "Montpelier"
 
-#: kstars_i18n.cpp:1654
+#: data/Cities.dat:1702
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Montpellier"
 msgstr "Montpellier"
 
-#: kstars_i18n.cpp:1655
+#: data/Cities.dat:1702
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Herault"
+msgstr "Hambuk"
+
+#: data/Cities.dat:1703
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Montreal"
 msgstr "Montreal"
 
-#: kstars_i18n.cpp:1656
+#: data/Cities.dat:1704
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Moore"
 msgstr "Moore"
 
-#: kstars_i18n.cpp:1657
+#: data/Cities.dat:1705
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Moose Jaw"
 msgstr "Moose Jaw"
 
-#: kstars_i18n.cpp:1658
+#: 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"
+msgstr "Saskatchewan"
+
+#: data/Cities.dat:1706
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Morehead"
 msgstr "Morehead"
 
-#: kstars_i18n.cpp:1659
+#: data/Cities.dat:1707
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Morgan City"
 msgstr "Morgan City"
 
-#: kstars_i18n.cpp:1660
+#: data/Cities.dat:1708
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Morgantown"
 msgstr "Morgantown"
 
-#: kstars_i18n.cpp:1661
+#: data/Cities.dat:1709
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Morogoro"
 msgstr "Morrow"
 
-#: kstars_i18n.cpp:1662
+#: data/Cities.dat:1710
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Moroto"
 msgstr "Toronto"
 
-#: kstars_i18n.cpp:1663
+#: data/Cities.dat:1711 data/Cities.dat:1712
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Morristown"
 msgstr "Morristown"
 
-#: kstars_i18n.cpp:1664
+#: data/Cities.dat:1713
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Morrow"
 msgstr "Morrow"
 
-#: kstars_i18n.cpp:1665
+#: data/Cities.dat:1714
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Morón"
 msgstr "Moron"
 
-#: kstars_i18n.cpp:1666
+#: data/Cities.dat:1715 data/Cities.dat:1716
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Moscow"
 msgstr "Mosgo"
 
-#: kstars_i18n.cpp:1667
+#: data/Cities.dat:1717
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Moses Lake"
 msgstr "Llyn Moses"
 
-#: kstars_i18n.cpp:1668
+#: data/Cities.dat:1718
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mosselbaai"
 msgstr "Molokai"
 
-#: kstars_i18n.cpp:1669
+#: data/Cities.dat:1719
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mount Ekar"
 msgstr "Mynydd Ekar"
 
-#: kstars_i18n.cpp:1670
+#: data/Cities.dat:1720
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mount Erebus"
 msgstr "Mynydd Erebus"
 
-#: kstars_i18n.cpp:1671
+#: data/Cities.dat:1720
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Antarctica"
+msgstr "Antarctica"
+
+#: data/Cities.dat:1721
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mount Evans Obs."
 msgstr "Ars. Mynydd Evans"
 
-#: kstars_i18n.cpp:1672
+#: data/Cities.dat:1722
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mount Graham Obs."
 msgstr "Ars. Mynydd Graham"
 
-#: kstars_i18n.cpp:1673
+#: data/Cities.dat:1723
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mount John"
 msgstr "Mynydd John"
 
-#: kstars_i18n.cpp:1674
+#: data/Cities.dat:1724
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mount Lemmon Obs."
 msgstr "Ars. Mynydd Lemmon"
 
-#: kstars_i18n.cpp:1675
+#: data/Cities.dat:1725
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mount Mario"
 msgstr "Mynydd Mario"
 
-#: kstars_i18n.cpp:1676
+#: data/Cities.dat:1726
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mount Palomar Obs."
 msgstr "Ars. Mynydd Palomar"
 
-#: kstars_i18n.cpp:1677
+#: data/Cities.dat:1727
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mount Pleasant"
 msgstr "Mynydd Pleasant"
 
-#: kstars_i18n.cpp:1678
+#: data/Cities.dat:1728
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mount Stromlo"
 msgstr "Mynydd Stromlo"
 
-#: kstars_i18n.cpp:1679
+#: data/Cities.dat:1729
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mount Vernon"
 msgstr "Mynydd Vernon"
 
-#: kstars_i18n.cpp:1680
+#: data/Cities.dat:1730
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mount Wilson Obs."
 msgstr "Ars. Mynydd Wilson"
 
-#: kstars_i18n.cpp:1681
+#: data/Cities.dat:1731
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mountain Brook"
 msgstr "Mountain Brook"
 
-#: kstars_i18n.cpp:1682
+#: data/Cities.dat:1732 data/Cities.dat:1733
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mountain View"
 msgstr "Mountain View"
 
-#: kstars_i18n.cpp:1683
+#: data/Cities.dat:1734
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Muan"
 msgstr "Muan"
 
-#: kstars_i18n.cpp:1684
+#: data/Cities.dat:1735
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mullard"
 msgstr "Mullard"
 
-#: kstars_i18n.cpp:1685
+#: data/Cities.dat:1736
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Muncie"
 msgstr "Muncie"
 
-#: kstars_i18n.cpp:1686
+#: data/Cities.dat:1737
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Muncy"
 msgstr "Muncy"
 
-#: kstars_i18n.cpp:1687
+#: data/Cities.dat:1738
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mungyeong"
 msgstr "Mungyeong"
 
-#: kstars_i18n.cpp:1688
+#: data/Cities.dat:1739
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Munich"
 msgstr "Munich"
 
-#: kstars_i18n.cpp:1689
+#: data/Cities.dat:1740
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Murfreesboro"
 msgstr "Murfreesboro"
 
-#: kstars_i18n.cpp:1690
+#: data/Cities.dat:1741
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Murmansk"
 msgstr "Muan"
 
-#: kstars_i18n.cpp:1691
+#: data/Cities.dat:1742
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Murray"
 msgstr "Murray"
 
-#: kstars_i18n.cpp:1692
+#: data/Cities.dat:1743
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Muskegon"
 msgstr "Muskegon"
 
-#: kstars_i18n.cpp:1693
+#: data/Cities.dat:1744
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Muskogee"
 msgstr "Muskogee"
 
-#: kstars_i18n.cpp:1694
+#: data/Cities.dat:1745
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mustvee"
 msgstr "Mustvee"
 
-#: kstars_i18n.cpp:1695
+#: data/Cities.dat:1746
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mutare"
 msgstr "Metairie"
 
-#: kstars_i18n.cpp:1696
+#: data/Cities.dat:1747
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Muyinga"
 msgstr "Riga"
 
-#: kstars_i18n.cpp:1697
+#: data/Cities.dat:1748
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mwanza"
 msgstr "Mainz"
 
-#: kstars_i18n.cpp:1698
+#: data/Cities.dat:1749
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Myrtle Beach"
 msgstr "Traeth Myrtle"
 
-#: kstars_i18n.cpp:1699
+#: data/Cities.dat:1750
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mzuzu"
 msgstr "Oulu"
 
-#: kstars_i18n.cpp:1700
+#: data/Cities.dat:1751
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Málaga"
 msgstr "Málaga"
 
-#: kstars_i18n.cpp:1701
+#: data/Cities.dat:1752
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Móstoles"
 msgstr "Mostoles"
 
-#: kstars_i18n.cpp:1702
+#: data/Cities.dat:1753
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mõisaküla"
 msgstr "Mõisaküla"
 
-#: kstars_i18n.cpp:1703
+#: data/Cities.dat:1754
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Múrcia"
 msgstr "Murcia"
 
-#: kstars_i18n.cpp:1704
+#: data/Cities.dat:1755
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Mülheim"
 msgstr "Mülheim"
 
-#: kstars_i18n.cpp:1705
+#: data/Cities.dat:1756
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Münchengladbach"
 msgstr "Münchengladbach"
 
-#: kstars_i18n.cpp:1706
+#: data/Cities.dat:1757
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Münster"
 msgstr "Münster"
 
-#: kstars_i18n.cpp:1707
+#: data/Cities.dat:1758
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "N'djamina"
 msgstr "N'djamina"
 
-#: kstars_i18n.cpp:1708
+#: data/Cities.dat:1758
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Chad"
+msgstr "Chad"
+
+#: data/Cities.dat:1759
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Naalehu"
 msgstr "Naalehu"
 
-#: kstars_i18n.cpp:1709
+#: data/Cities.dat:1760
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Naestved"
 msgstr "Naestved"
 
-#: kstars_i18n.cpp:1710
+#: data/Cities.dat:1761
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nagasaki"
 msgstr "Nagasaki"
 
-#: kstars_i18n.cpp:1711
+#: data/Cities.dat:1762
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nagoya"
 msgstr "Nagoya"
 
-#: kstars_i18n.cpp:1712
+#: data/Cities.dat:1763
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nagpur"
 msgstr "Nagpur"
 
-#: kstars_i18n.cpp:1713
+#: data/Cities.dat:1764
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Naini Tal"
 msgstr "Naini Tal"
 
-#: kstars_i18n.cpp:1714
+#: data/Cities.dat:1765
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nairobi"
 msgstr "Nairobi"
 
-#: kstars_i18n.cpp:1715
+#: data/Cities.dat:1766
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nakskov"
 msgstr "Nakskov"
 
-#: kstars_i18n.cpp:1716
+#: data/Cities.dat:1766
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Lolland"
+msgstr "Lolland"
+
+#: data/Cities.dat:1767
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nal'chik"
 msgstr "Malchin"
 
-#: kstars_i18n.cpp:1717
+#: data/Cities.dat:1768
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Namhae"
 msgstr "Namhae"
 
-#: kstars_i18n.cpp:1718
+#: data/Cities.dat:1769
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Namibe"
 msgstr "Namhae"
 
-#: kstars_i18n.cpp:1719
+#: data/Cities.dat:1770
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Namorik"
 msgstr "Namorik"
 
-#: kstars_i18n.cpp:1720
+#: data/Cities.dat:1771
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nampa"
 msgstr "Nampa"
 
-#: kstars_i18n.cpp:1721
+#: data/Cities.dat:1772
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nampula"
 msgstr "Nampa"
 
-#: kstars_i18n.cpp:1722
+#: data/Cities.dat:1773
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Namwon"
 msgstr "Namwon"
 
-#: kstars_i18n.cpp:1723
+#: data/Cities.dat:1774
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nancay (observatory)"
 msgstr "Arsyllfa Morlu'r UD"
 
-#: kstars_i18n.cpp:1724
+#: data/Cities.dat:1775
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nandi"
 msgstr "Nandi"
 
-#: kstars_i18n.cpp:1725
+#: data/Cities.dat:1775
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Fiji"
+msgstr "Fiji"
+
+#: data/Cities.dat:1776
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nantes"
 msgstr "Nantes"
 
-#: kstars_i18n.cpp:1726
+#: data/Cities.dat:1776
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Loire atlantique"
+msgstr "Zealand"
+
+#: data/Cities.dat:1777
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Napa"
 msgstr "Napa"
 
-#: kstars_i18n.cpp:1727
+#: data/Cities.dat:1778
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Naperville"
 msgstr "Naperville"
 
-#: kstars_i18n.cpp:1728
+#: data/Cities.dat:1779 data/Cities.dat:1780
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Naples"
 msgstr "Naples"
 
-#: kstars_i18n.cpp:1729
+#: data/Cities.dat:1781
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Narva"
 msgstr "Narva"
 
-#: kstars_i18n.cpp:1730
+#: data/Cities.dat:1782
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Narva-Jõesuu"
 msgstr "Narva-Jõesuu"
 
-#: kstars_i18n.cpp:1731
+#: data/Cities.dat:1783
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nashua"
 msgstr "Nashua"
 
-#: kstars_i18n.cpp:1732
+#: data/Cities.dat:1784
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nashville"
 msgstr "Nashville"
 
-#: kstars_i18n.cpp:1733
+#: data/Cities.dat:1785
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Nassau Obs."
-msgstr "Ars. Nassau"
+"Nassau"
+msgstr "Nassau"
 
-#: kstars_i18n.cpp:1734
+#: data/Cities.dat:1786
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Nassau"
-msgstr "Nassau"
+"Nassau Obs."
+msgstr "Ars. Nassau"
 
-#: kstars_i18n.cpp:1735
+#: data/Cities.dat:1787
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Natal"
 msgstr "Natal"
 
-#: kstars_i18n.cpp:1736
+#: data/Cities.dat:1788
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Natchez"
 msgstr "Natchez"
 
-#: kstars_i18n.cpp:1737
+#: data/Cities.dat:1789
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ndola"
 msgstr "Koloa"
 
-#: kstars_i18n.cpp:1738
+#: data/Cities.dat:1790
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Needles"
 msgstr "Needles"
 
-#: kstars_i18n.cpp:1739
+#: data/Cities.dat:1791
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nenana"
 msgstr "Nenana"
 
-#: kstars_i18n.cpp:1740
+#: data/Cities.dat:1792
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Neponsit"
 msgstr "Neponsit"
 
-#: kstars_i18n.cpp:1741
+#: data/Cities.dat:1793
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Neuss"
 msgstr "Neuss"
 
-#: kstars_i18n.cpp:1742
+#: data/Cities.dat:1794
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nevada"
 msgstr "Nevada"
 
-#: kstars_i18n.cpp:1743
+#: data/Cities.dat:1795
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "New Albany"
 msgstr "New Albany"
 
-#: kstars_i18n.cpp:1744
+#: data/Cities.dat:1796
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "New Bedford"
 msgstr "New Bedford"
 
-#: kstars_i18n.cpp:1745
+#: data/Cities.dat:1797
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "New Britian"
 msgstr "New Britian"
 
-#: kstars_i18n.cpp:1746
+#: data/Cities.dat:1798
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "New Brunswick"
 msgstr "New Brunswick"
 
-#: kstars_i18n.cpp:1747
+#: data/Cities.dat:1799
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "New Carrollton"
 msgstr "New Carrollton"
 
-#: kstars_i18n.cpp:1748
+#: 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"
 msgstr "New Castle"
 
-#: kstars_i18n.cpp:1749
+#: data/Cities.dat:1804
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "New Delhi"
 msgstr "New Delhi"
 
-#: kstars_i18n.cpp:1750
+#: data/Cities.dat:1805
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "New Hampton"
 msgstr "New Hampton"
 
-#: kstars_i18n.cpp:1751
+#: data/Cities.dat:1806
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "New Hartford"
 msgstr "New Hartford"
 
-#: kstars_i18n.cpp:1752
+#: data/Cities.dat:1807
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "New Haven"
 msgstr "New Haven"
 
-#: kstars_i18n.cpp:1753
+#: data/Cities.dat:1808
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "New Iberia"
 msgstr "New Iberia"
 
-#: kstars_i18n.cpp:1754
+#: data/Cities.dat:1809
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "New London"
 msgstr "New London"
 
-#: kstars_i18n.cpp:1755
+#: data/Cities.dat:1810
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "New Meadows"
 msgstr "New Meadows"
 
-#: kstars_i18n.cpp:1756
+#: data/Cities.dat:1811
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "New Orleans"
 msgstr "New Orleans"
 
-#: kstars_i18n.cpp:1757
+#: data/Cities.dat:1812
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "New Rochelle"
 msgstr "New Rochelle"
 
-#: kstars_i18n.cpp:1758
+#: data/Cities.dat:1813
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "New Rockford"
 msgstr "New Rockford"
 
-#: kstars_i18n.cpp:1759
+#: data/Cities.dat:1814
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "New Washoe City"
 msgstr "New Washoe City"
 
-#: kstars_i18n.cpp:1760
+#: data/Cities.dat:1815
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "New York"
 msgstr "Efrog Newydd"
 
-#: kstars_i18n.cpp:1761
+#: data/Cities.dat:1816 data/Cities.dat:1817
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Newark"
 msgstr "Newark"
 
-#: kstars_i18n.cpp:1762
+#: data/Cities.dat:1818
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Newcastle"
 msgstr "Newcastle"
 
-#: kstars_i18n.cpp:1763
+#: data/Cities.dat:1819
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Newell"
 msgstr "Newell"
 
-#: kstars_i18n.cpp:1764
+#: 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"
+msgstr "Newport"
+
+#: data/Cities.dat:1825
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Newport Beach"
 msgstr "Traeth Newport"
 
-#: kstars_i18n.cpp:1765
+#: data/Cities.dat:1826
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Newport News"
 msgstr "Newport News"
 
-#: kstars_i18n.cpp:1766
-msgid ""
-"_: City name (optional, probably does not need a translation)\n"
-"Newport"
-msgstr "Newport"
-
-#: kstars_i18n.cpp:1767
+#: data/Cities.dat:1827 data/Cities.dat:1828
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Newton"
 msgstr "Newton"
 
-#: kstars_i18n.cpp:1768
+#: data/Cities.dat:1829
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ngozi"
 msgstr "Novi"
 
-#: kstars_i18n.cpp:1769
+#: data/Cities.dat:1830
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: kstars_i18n.cpp:1770
+#: data/Cities.dat:1831
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Niamey"
 msgstr "Namhae"
 
-#: kstars_i18n.cpp:1771
+#: data/Cities.dat:1832
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nice"
 msgstr "Nice"
 
-#: kstars_i18n.cpp:1772
+#: data/Cities.dat:1832
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Alpes maritimes"
+msgstr "Alberta"
+
+#: data/Cities.dat:1833
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nicosia"
 msgstr "Nicosia"
 
-#: kstars_i18n.cpp:1773
+#: data/Cities.dat:1833
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Cyprus"
+msgstr "Cyprus"
+
+#: data/Cities.dat:1834
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nijmegen"
 msgstr "Nijmegen"
 
-#: kstars_i18n.cpp:1774
+#: data/Cities.dat:1835
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nitro"
 msgstr "Nitro"
 
-#: kstars_i18n.cpp:1775
+#: data/Cities.dat:1836
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nizhnii Novgorod"
 msgstr "Livorno"
 
-#: kstars_i18n.cpp:1776
+#: data/Cities.dat:1837
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nobeyama"
 msgstr "Nobeyama"
 
-#: kstars_i18n.cpp:1777
+#: data/Cities.dat:1838
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nogales"
 msgstr "Nogales"
 
-#: kstars_i18n.cpp:1778
+#: data/Cities.dat:1839
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nome"
 msgstr "Nome"
 
-#: kstars_i18n.cpp:1779
+#: data/Cities.dat:1840
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Norco"
 msgstr "Norco"
 
-#: kstars_i18n.cpp:1780
+#: data/Cities.dat:1841 data/Cities.dat:1842
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Norfolk"
 msgstr "Norfolk"
 
-#: kstars_i18n.cpp:1781
+#: data/Cities.dat:1843
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Norman"
 msgstr "Norman"
 
-#: kstars_i18n.cpp:1782
+#: data/Cities.dat:1844
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "North Bay"
 msgstr "North Bay"
 
-#: kstars_i18n.cpp:1783
+#: data/Cities.dat:1845
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "North Bellmore"
 msgstr "Gogledd Bellmore"
 
-#: kstars_i18n.cpp:1784
+#: data/Cities.dat:1846
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "North Cape May"
 msgstr "Gogledd Cape May"
 
-#: kstars_i18n.cpp:1785
+#: data/Cities.dat:1847
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "North Charleston"
 msgstr "Gogledd Charleston"
 
-#: kstars_i18n.cpp:1786
+#: data/Cities.dat:1848
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "North Hollywood"
 msgstr "Gogledd Hollywood"
 
-#: kstars_i18n.cpp:1787
+#: data/Cities.dat:1849
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "North Las Vegas"
 msgstr "Gogledd Las Vegas"
 
-#: kstars_i18n.cpp:1788
+#: data/Cities.dat:1850
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "North Liberty Obs."
 msgstr "Ars. Gogledd Liberty"
 
-#: kstars_i18n.cpp:1789
+#: data/Cities.dat:1851
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "North Little Rock"
 msgstr "Gogledd Little Rock"
 
-#: kstars_i18n.cpp:1790
+#: data/Cities.dat:1852
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "North Olmstead"
 msgstr "Gogledd Olmstead"
 
-#: kstars_i18n.cpp:1791
+#: data/Cities.dat:1853
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "North Platte"
 msgstr "Gogledd Platte"
 
-#: kstars_i18n.cpp:1792
+#: data/Cities.dat:1854
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Northfield"
 msgstr "Northfield"
 
-#: kstars_i18n.cpp:1793
+#: data/Cities.dat:1855
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Northport"
 msgstr "Northport"
 
-#: kstars_i18n.cpp:1794
+#: data/Cities.dat:1856
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Northrop Strip"
 msgstr "Northrop Strip"
 
-#: kstars_i18n.cpp:1795
+#: data/Cities.dat:1857
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Northway"
 msgstr "Northway"
 
-#: kstars_i18n.cpp:1796
+#: data/Cities.dat:1858 data/Cities.dat:1859
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Norton"
 msgstr "Norton"
 
-#: kstars_i18n.cpp:1797
+#: data/Cities.dat:1860 data/Cities.dat:1861
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Norwalk"
 msgstr "Norwalk"
 
-#: kstars_i18n.cpp:1798
+#: data/Cities.dat:1862
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Norway"
 msgstr "Norway"
 
-#: kstars_i18n.cpp:1799
+#: data/Cities.dat:1863
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nottingham"
 msgstr "Nottingham"
 
-#: kstars_i18n.cpp:1800
+#: data/Cities.dat:1864
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nouakchott"
 msgstr "Sokcho"
 
-#: kstars_i18n.cpp:1801
+#: data/Cities.dat:1865
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Noumea"
 msgstr "Noumea"
 
-#: kstars_i18n.cpp:1802
+#: data/Cities.dat:1865
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"New Caledonia"
+msgstr "Caledonia Newydd"
+
+#: data/Cities.dat:1866
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Novara"
 msgstr "Novara"
 
-#: kstars_i18n.cpp:1803
+#: data/Cities.dat:1867
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Novgorod"
 msgstr "Norco"
 
-#: kstars_i18n.cpp:1804
+#: data/Cities.dat:1868
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Novi"
 msgstr "Novi"
 
-#: kstars_i18n.cpp:1805
+#: data/Cities.dat:1869
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Novosibirsk"
 msgstr "Novi"
 
-#: kstars_i18n.cpp:1806
+#: data/Cities.dat:1870
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nyborg"
 msgstr "Nyborg"
 
-#: kstars_i18n.cpp:1807
+#: data/Cities.dat:1871
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nykoebing Falster"
 msgstr "Nykoebing Falster"
 
-#: kstars_i18n.cpp:1808
+#: data/Cities.dat:1872
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Nürnberg"
 msgstr "Nürnberg"
 
-#: kstars_i18n.cpp:1809
+#: data/Cities.dat:1873
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oak Park"
 msgstr "Oak Park"
 
-#: kstars_i18n.cpp:1810
+#: data/Cities.dat:1874
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Oak Ridge Obs."
-msgstr "Ars. Oak Ridge"
+"Oak Ridge"
+msgstr "Oak Ridge"
 
-#: kstars_i18n.cpp:1811
+#: data/Cities.dat:1875
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Oak Ridge"
-msgstr "Oak Ridge"
+"Oak Ridge Obs."
+msgstr "Ars. Oak Ridge"
 
-#: kstars_i18n.cpp:1812
+#: data/Cities.dat:1876
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oakfield"
 msgstr "Oakfield"
 
-#: kstars_i18n.cpp:1813
+#: data/Cities.dat:1877
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oakland"
 msgstr "Oakland"
 
-#: kstars_i18n.cpp:1814
+#: data/Cities.dat:1878
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oakley"
 msgstr "Oakley"
 
-#: kstars_i18n.cpp:1815
+#: data/Cities.dat:1879
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oberhausen"
 msgstr "Oberhausen"
 
-#: kstars_i18n.cpp:1816
+#: data/Cities.dat:1880
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oberlin"
 msgstr "Oberlin"
 
-#: kstars_i18n.cpp:1817
+#: data/Cities.dat:1881
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: kstars_i18n.cpp:1818
+#: data/Cities.dat:1882
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Obs. Astronomico de Madrid"
 msgstr "Ars. Astronomico de Madrid"
 
-#: kstars_i18n.cpp:1819
+#: data/Cities.dat:1883
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Obs. Milan"
 msgstr "Ars. Milan"
 
-#: kstars_i18n.cpp:1820
+#: data/Cities.dat:1884
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Observatoire de Haute Provence"
 msgstr "Haute Provence"
 
-#: kstars_i18n.cpp:1821
+#: data/Cities.dat:1884
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Alpes de Haute Provence"
+msgstr "Falster"
+
+#: data/Cities.dat:1885
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ocala"
 msgstr "Ocala"
 
-#: kstars_i18n.cpp:1822
+#: data/Cities.dat:1886
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ocean City"
 msgstr "Ocean City"
 
-#: kstars_i18n.cpp:1823
+#: data/Cities.dat:1887
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ocean Grove"
 msgstr "Ocean Grove"
 
-#: kstars_i18n.cpp:1824
+#: data/Cities.dat:1888
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oceanside"
 msgstr "Oceanside"
 
-#: kstars_i18n.cpp:1825
+#: data/Cities.dat:1889
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Odense"
 msgstr "Odense"
 
-#: kstars_i18n.cpp:1826
+#: data/Cities.dat:1890 data/Cities.dat:1891
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Odessa"
 msgstr "Odessa"
 
-#: kstars_i18n.cpp:1827
+#: data/Cities.dat:1892
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Offenbach"
 msgstr "Offenbach"
 
-#: kstars_i18n.cpp:1828
+#: data/Cities.dat:1893
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ogallala"
 msgstr "Ogallala"
 
-#: kstars_i18n.cpp:1829
+#: data/Cities.dat:1894
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ogden"
 msgstr "Ogden"
 
-#: kstars_i18n.cpp:1830
+#: data/Cities.dat:1895
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oggiono"
 msgstr "Oggiono"
 
-#: kstars_i18n.cpp:1831
+#: data/Cities.dat:1896
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ohakea"
 msgstr "Ohakea"
 
-#: kstars_i18n.cpp:1832
+#: data/Cities.dat:1897
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Okayama"
 msgstr "Okayama"
 
-#: kstars_i18n.cpp:1833
+#: data/Cities.dat:1898
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Okinawa"
 msgstr "Okinawa"
 
-#: kstars_i18n.cpp:1834
+#: data/Cities.dat:1899
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oklahoma City"
 msgstr "Dinas Oklahoma"
 
-#: kstars_i18n.cpp:1835
+#: data/Cities.dat:1900
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Olathe"
 msgstr "Olathe"
 
-#: kstars_i18n.cpp:1836
+#: data/Cities.dat:1901
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Olbia"
 msgstr "Olbia"
 
-#: kstars_i18n.cpp:1837
+#: data/Cities.dat:1902
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oldenburg"
 msgstr "Oldenburg"
 
-#: kstars_i18n.cpp:1838
+#: data/Cities.dat:1903
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oldendorf"
 msgstr "Oldendorf"
 
-#: kstars_i18n.cpp:1839
+#: data/Cities.dat:1904
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Olean"
 msgstr "Olean"
 
-#: kstars_i18n.cpp:1840
+#: data/Cities.dat:1905
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Olympia"
 msgstr "Olympia"
 
-#: kstars_i18n.cpp:1841
+#: data/Cities.dat:1906
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Omaha"
 msgstr "Omaha"
 
-#: kstars_i18n.cpp:1842
+#: data/Cities.dat:1907
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Omsk"
 msgstr "Osaka"
 
-#: kstars_i18n.cpp:1843
+#: data/Cities.dat:1908
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ondangwa"
 msgstr "Ganghwa"
 
-#: kstars_i18n.cpp:1844
+#: data/Cities.dat:1909
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Onsala"
 msgstr "Onsala"
 
-#: kstars_i18n.cpp:1845
+#: data/Cities.dat:1910
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ontario"
 msgstr "Ontario"
 
-#: kstars_i18n.cpp:1846
+#: data/Cities.dat:1911
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oostende"
 msgstr "Oostende"
 
-#: kstars_i18n.cpp:1847
+#: data/Cities.dat:1911
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Flandre occidentale"
+msgstr "Florida"
+
+#: data/Cities.dat:1912
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ooty"
 msgstr "Ooty"
 
-#: kstars_i18n.cpp:1848
+#: data/Cities.dat:1913
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Opelika"
 msgstr "Opelika"
 
-#: kstars_i18n.cpp:1849
+#: data/Cities.dat:1914
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Opheim"
 msgstr "Opheim"
 
-#: kstars_i18n.cpp:1850
+#: data/Cities.dat:1915
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oporto"
 msgstr "Oporto"
 
-#: kstars_i18n.cpp:1851
+#: data/Cities.dat:1916
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oran"
 msgstr "Oran"
 
-#: kstars_i18n.cpp:1852
+#: data/Cities.dat:1917 data/Cities.dat:1918 data/Cities.dat:1919
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Orange Park"
-msgstr "Orange Park"
+"Orange"
+msgstr "Orange"
+
+#: data/Cities.dat:1919
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Vaucluse"
+msgstr "Falster"
 
-#: kstars_i18n.cpp:1853
+#: data/Cities.dat:1920
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Orange"
-msgstr "Orange"
+"Orange Park"
+msgstr "Orange Park"
 
-#: kstars_i18n.cpp:1854
+#: data/Cities.dat:1921
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Orangeburg"
 msgstr "Orangeburg"
 
-#: kstars_i18n.cpp:1855
+#: data/Cities.dat:1922
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Orel"
 msgstr "Orem"
 
-#: kstars_i18n.cpp:1856
+#: data/Cities.dat:1923
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Orem"
 msgstr "Orem"
 
-#: kstars_i18n.cpp:1857
+#: data/Cities.dat:1924
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Orenburg"
 msgstr "Oldenburg"
 
-#: kstars_i18n.cpp:1858
+#: data/Cities.dat:1925
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Orense"
 msgstr "Orense"
 
-#: kstars_i18n.cpp:1859
+#: data/Cities.dat:1926
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Orlando"
 msgstr "Orlando"
 
-#: kstars_i18n.cpp:1860
+#: data/Cities.dat:1927
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Orleans"
 msgstr "Orleans"
 
-#: kstars_i18n.cpp:1861
+#: data/Cities.dat:1927
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Loiret"
+msgstr "Tibet"
+
+#: data/Cities.dat:1928
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Osaka"
 msgstr "Osaka"
 
-#: kstars_i18n.cpp:1862
+#: data/Cities.dat:1929
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Osborne"
 msgstr "Osborne"
 
-#: kstars_i18n.cpp:1863
+#: data/Cities.dat:1930
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oshkosh"
 msgstr "Oshkosh"
 
-#: kstars_i18n.cpp:1864
+#: data/Cities.dat:1931
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oslo"
 msgstr "Oslo"
 
-#: kstars_i18n.cpp:1865
+#: data/Cities.dat:1932
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Osnabrück"
 msgstr "Osnabrück"
 
-#: kstars_i18n.cpp:1866
+#: data/Cities.dat:1933
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Otranto"
 msgstr "Otranto"
 
-#: kstars_i18n.cpp:1867
+#: data/Cities.dat:1934 data/Cities.dat:1935
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ottawa"
 msgstr "Ottawa"
 
-#: kstars_i18n.cpp:1868
+#: data/Cities.dat:1936
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ottumwa"
 msgstr "Ottumwa"
 
-#: kstars_i18n.cpp:1869
+#: data/Cities.dat:1937
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ouagadougou"
 msgstr "Hadong"
 
-#: kstars_i18n.cpp:1870
+#: data/Cities.dat:1938
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ouarzazate"
 msgstr "Zaragoza"
 
-#: kstars_i18n.cpp:1871
+#: data/Cities.dat:1939
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oulu"
 msgstr "Oulu"
 
-#: kstars_i18n.cpp:1872
+#: data/Cities.dat:1940
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Overland Park"
 msgstr "Overland Park"
 
-#: kstars_i18n.cpp:1873
+#: data/Cities.dat:1941
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oviedo"
 msgstr "Oviedo"
 
-#: kstars_i18n.cpp:1874
+#: data/Cities.dat:1942
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Owens Valley Radio Obs."
 msgstr "Ars. Radio Dyffryn Owens"
 
-#: kstars_i18n.cpp:1875
+#: data/Cities.dat:1943
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Owensboro"
 msgstr "Owensboro"
 
-#: kstars_i18n.cpp:1876
+#: data/Cities.dat:1944 data/Cities.dat:1945 data/Cities.dat:1946
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oxford"
 msgstr "Rhydychen"
 
-#: kstars_i18n.cpp:1877
+#: data/Cities.dat:1947
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oxnard"
 msgstr "Oxnard"
 
-#: kstars_i18n.cpp:1878
+#: data/Cities.dat:1948
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Oymiakon"
 msgstr "Olympia"
 
-#: kstars_i18n.cpp:1879
+#: data/Cities.dat:1949
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ozark"
 msgstr "Ozark"
 
-#: kstars_i18n.cpp:1880
+#: data/Cities.dat:1950
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "P'yongyang"
 msgstr "P'yongyang"
 
-#: kstars_i18n.cpp:1881
+#: data/Cities.dat:1951
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Paauilo"
 msgstr "Paauilo"
 
-#: kstars_i18n.cpp:1882
+#: data/Cities.dat:1952
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Pacific Beach"
-msgstr "Traeth Pacific"
+"Pacific"
+msgstr "Pacific"
 
-#: kstars_i18n.cpp:1883
+#: data/Cities.dat:1953
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Pacific"
-msgstr "Pacific"
+"Pacific Beach"
+msgstr "Traeth Pacific"
 
-#: kstars_i18n.cpp:1884
+#: data/Cities.dat:1954
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Paderborn"
 msgstr "Paderborn"
 
-#: kstars_i18n.cpp:1885
+#: data/Cities.dat:1955
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Padova"
 msgstr "Padova"
 
-#: kstars_i18n.cpp:1886
+#: data/Cities.dat:1956
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Paducah"
 msgstr "Paducah"
 
-#: kstars_i18n.cpp:1887
+#: data/Cities.dat:1957
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pagan Island"
 msgstr "Ynys Pagan"
 
-#: kstars_i18n.cpp:1888
+#: data/Cities.dat:1958
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pago Pago"
 msgstr "Pago Pago"
 
-#: kstars_i18n.cpp:1889
+#: data/Cities.dat:1958
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Samoa"
+msgstr "Samoa"
+
+#: data/Cities.dat:1959
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Paide"
 msgstr "Paide"
 
-#: kstars_i18n.cpp:1890
+#: data/Cities.dat:1960
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Palana"
 msgstr "Plano"
 
-#: kstars_i18n.cpp:1891
+#: data/Cities.dat:1961
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Paldiski"
 msgstr "Paldiski"
 
-#: kstars_i18n.cpp:1892
+#: data/Cities.dat:1962
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Palembang"
 msgstr "Palembang"
 
-#: kstars_i18n.cpp:1893
+#: data/Cities.dat:1963
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Palencia"
 msgstr "Palencia"
 
-#: kstars_i18n.cpp:1894
+#: data/Cities.dat:1964
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Palermo"
 msgstr "Palermo"
 
-#: kstars_i18n.cpp:1895
+#: data/Cities.dat:1965
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Palm City"
 msgstr "Dinas Palm"
 
-#: kstars_i18n.cpp:1896
+#: data/Cities.dat:1966
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: kstars_i18n.cpp:1897
+#: data/Cities.dat:1967
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Palmdale"
 msgstr "Palmdale"
 
-#: kstars_i18n.cpp:1898
+#: data/Cities.dat:1968
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Palmer"
 msgstr "Palmer"
 
-#: kstars_i18n.cpp:1899
+#: data/Cities.dat:1969
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Palo Alto"
 msgstr "Palo Alto"
 
-#: kstars_i18n.cpp:1900
+#: data/Cities.dat:1970
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pamplona"
 msgstr "Pamplona"
 
-#: kstars_i18n.cpp:1901
+#: data/Cities.dat:1971 data/Cities.dat:1972
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Panama City"
 msgstr "Dinas Panama"
 
-#: kstars_i18n.cpp:1902
+#: data/Cities.dat:1973
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pantelleria"
 msgstr "Pantelleria"
 
-#: kstars_i18n.cpp:1903
+#: data/Cities.dat:1974
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Papeete"
 msgstr "Papeete"
 
-#: kstars_i18n.cpp:1904
+#: data/Cities.dat:1975
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Paradise"
 msgstr "Paradise"
 
-#: kstars_i18n.cpp:1905
+#: data/Cities.dat:1976 data/Cities.dat:1977 data/Cities.dat:1978
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Paris"
 msgstr "Paris"
 
-#: kstars_i18n.cpp:1906
+#: data/Cities.dat:1976
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Christmas Island"
+msgstr "Ynys y Nadolig"
+
+#: data/Cities.dat:1976
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Kiribati"
+msgstr "Ciribati"
+
+#: data/Cities.dat:1978
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Paris"
+msgstr "Ontario"
+
+#: data/Cities.dat:1979
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Park Rapids"
 msgstr "Park Rapids"
 
-#: kstars_i18n.cpp:1907
+#: data/Cities.dat:1980
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Park View"
 msgstr "Park View"
 
-#: kstars_i18n.cpp:1908
+#: data/Cities.dat:1981
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Parkersburg"
 msgstr "Parkersburg"
 
-#: kstars_i18n.cpp:1909
+#: data/Cities.dat:1982
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Parkes"
 msgstr "Parkes"
 
-#: kstars_i18n.cpp:1910
+#: data/Cities.dat:1983 data/Cities.dat:1984
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Parma"
 msgstr "Parma"
 
-#: kstars_i18n.cpp:1911
+#: data/Cities.dat:1985
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Parsons"
 msgstr "Parsons"
 
-#: kstars_i18n.cpp:1912
+#: data/Cities.dat:1986 data/Cities.dat:1987
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pasadena"
 msgstr "Pasadena"
 
-#: kstars_i18n.cpp:1913
+#: data/Cities.dat:1988
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pascagoula"
 msgstr "Pascagoula"
 
-#: kstars_i18n.cpp:1914
+#: data/Cities.dat:1989
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Paterson"
 msgstr "Paterson"
 
-#: kstars_i18n.cpp:1915
+#: data/Cities.dat:1990
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pau"
 msgstr "Pau"
 
-#: kstars_i18n.cpp:1916
+#: data/Cities.dat:1991
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pawtucket"
 msgstr "Pawtucket"
 
-#: kstars_i18n.cpp:1917
+#: data/Cities.dat:1992
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Peace River"
 msgstr "Afon Peace"
 
-#: kstars_i18n.cpp:1918
+#: data/Cities.dat:1993
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pearce"
 msgstr "Pearce"
 
-#: kstars_i18n.cpp:1919
+#: data/Cities.dat:1994
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Peking"
 msgstr "Peking"
 
-#: kstars_i18n.cpp:1920
+#: data/Cities.dat:1995
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pemba"
 msgstr "Pembina"
 
-#: kstars_i18n.cpp:1921
+#: data/Cities.dat:1996
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pembina"
 msgstr "Pembina"
 
-#: kstars_i18n.cpp:1922
+#: data/Cities.dat:1997
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Penang"
 msgstr "Penang"
 
-#: kstars_i18n.cpp:1923
+#: data/Cities.dat:1998
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pendleton"
 msgstr "Pendleton"
 
-#: kstars_i18n.cpp:1924
+#: data/Cities.dat:1999
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pensacola"
 msgstr "Pensacola"
 
-#: kstars_i18n.cpp:1925
+#: data/Cities.dat:2000
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Penza"
 msgstr "Potenza"
 
-#: kstars_i18n.cpp:1926
+#: data/Cities.dat:2001
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Peoria"
 msgstr "Peoria"
 
-#: kstars_i18n.cpp:1927
+#: data/Cities.dat:2002
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Perkins Obs."
 msgstr "Ars. Perkins"
 
-#: kstars_i18n.cpp:1928
+#: data/Cities.dat:2003
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Perm"
 msgstr "Peru"
 
-#: kstars_i18n.cpp:1929
+#: data/Cities.dat:2004
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Perpignan"
 msgstr "Penang"
 
-#: kstars_i18n.cpp:1930
+#: data/Cities.dat:2004
+#, fuzzy
 msgid ""
-"_: City name (optional, probably does not need a translation)\n"
-"Perth Amboy"
-msgstr "Perth Amboy"
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Pyrénées Orientales"
+msgstr "Cymru"
 
-#: kstars_i18n.cpp:1931
+#: data/Cities.dat:2005
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Perth"
 msgstr "Perth"
 
-#: kstars_i18n.cpp:1932
+#: data/Cities.dat:2006
+msgid ""
+"_: City name (optional, probably does not need a translation)\n"
+"Perth Amboy"
+msgstr "Perth Amboy"
+
+#: data/Cities.dat:2007
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Peru"
 msgstr "Peru"
 
-#: kstars_i18n.cpp:1933
+#: data/Cities.dat:2008
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Perugia"
 msgstr "Perugia"
 
-#: kstars_i18n.cpp:1934
+#: data/Cities.dat:2009
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pesaro"
 msgstr "Pesaro"
 
-#: kstars_i18n.cpp:1935
+#: data/Cities.dat:2010
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pescara"
 msgstr "Pescara"
 
-#: kstars_i18n.cpp:1936
+#: data/Cities.dat:2011
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Peshawar"
 msgstr "Peshawar"
 
-#: kstars_i18n.cpp:1937
+#: data/Cities.dat:2012
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Petach Tikva"
 msgstr "Petach Tikva"
 
-#: kstars_i18n.cpp:1938
+#: data/Cities.dat:2013 data/Cities.dat:2014
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Petersburg"
 msgstr "Petersburg"
 
-#: kstars_i18n.cpp:1939
+#: data/Cities.dat:2015
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Petropavlovsk-Kamchatskiy"
 msgstr "Molokai"
 
-#: kstars_i18n.cpp:1940
+#: data/Cities.dat:2016
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Petrozavodsk"
 msgstr "Provo"
 
-#: kstars_i18n.cpp:1941
+#: data/Cities.dat:2017
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Petseri"
 msgstr "Petseri"
 
-#: kstars_i18n.cpp:1942
+#: data/Cities.dat:2018
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pevek"
 msgstr "Lee"
 
-#: kstars_i18n.cpp:1943
+#: data/Cities.dat:2019
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pforzheim"
 msgstr "Pforzheim"
 
-#: kstars_i18n.cpp:1944
+#: data/Cities.dat:2020
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Phenix City"
 msgstr "Dinas Phenix"
 
-#: kstars_i18n.cpp:1945
+#: data/Cities.dat:2021
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Philadelphia"
 msgstr "Philadelphia"
 
-#: kstars_i18n.cpp:1946
+#: data/Cities.dat:2022
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Philip"
 msgstr "Philip"
 
-#: kstars_i18n.cpp:1947
+#: data/Cities.dat:2023
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Phoenix"
 msgstr "Phoenix"
 
-#: kstars_i18n.cpp:1948
+#: data/Cities.dat:2024
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Phuket"
 msgstr "Phuket"
 
-#: kstars_i18n.cpp:1949
+#: data/Cities.dat:2025
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Piacenza"
 msgstr "Piacenza"
 
-#: kstars_i18n.cpp:1950
+#: data/Cities.dat:2026
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pic du Midi (observatory)"
 msgstr "Pic du Midi"
 
-#: kstars_i18n.cpp:1951
+#: data/Cities.dat:2026
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Hautes-Pyrénées"
+msgstr "Guernsey"
+
+#: data/Cities.dat:2027
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Picayune"
 msgstr "Picayune"
 
-#: kstars_i18n.cpp:1952
+#: data/Cities.dat:2028
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pico Rivera"
 msgstr "Pico Rivera"
 
-#: kstars_i18n.cpp:1953
+#: data/Cities.dat:2029
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pico de Veleta"
 msgstr "Pico de Veleta"
 
-#: kstars_i18n.cpp:1954
+#: data/Cities.dat:2030
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pierce"
 msgstr "Pierce"
 
-#: kstars_i18n.cpp:1955
+#: data/Cities.dat:2031
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pierre"
 msgstr "Pierre"
 
-#: kstars_i18n.cpp:1956
+#: data/Cities.dat:2032
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pilot Hill"
 msgstr "Pilot Hill"
 
-#: kstars_i18n.cpp:1957
+#: data/Cities.dat:2033
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: kstars_i18n.cpp:1958
+#: data/Cities.dat:2034
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pine City"
 msgstr "Dinas Pine"
 
-#: kstars_i18n.cpp:1959
+#: data/Cities.dat:2035
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pisa"
 msgstr "Pisa"
 
-#: kstars_i18n.cpp:1960
+#: data/Cities.dat:2036
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: kstars_i18n.cpp:1961
+#: data/Cities.dat:2037
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pittsfield"
 msgstr "Pittsfield"
 
-#: kstars_i18n.cpp:1962
+#: data/Cities.dat:2038
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Piwnice"
 msgstr "Piwnice"
 
-#: kstars_i18n.cpp:1963
+#: data/Cities.dat:2039
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Placerville"
 msgstr "Placerville"
 
-#: kstars_i18n.cpp:1964
+#: data/Cities.dat:2040
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Plainfield"
 msgstr "Plainfield"
 
-#: kstars_i18n.cpp:1965
+#: data/Cities.dat:2041
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Plaisance"
 msgstr "Plaisance"
 
-#: kstars_i18n.cpp:1966
+#: data/Cities.dat:2041
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Mauritius"
+msgstr "Mauritius"
+
+#: data/Cities.dat:2042
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Plano"
 msgstr "Plano"
 
-#: kstars_i18n.cpp:1967
+#: data/Cities.dat:2043
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Plateau de Bure (observatory)"
 msgstr "Plateau de Bure"
 
-#: kstars_i18n.cpp:1968
+#: data/Cities.dat:2043
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Hautes Alpes"
+msgstr "Cymru"
+
+#: data/Cities.dat:2044
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Plateau de Calern (observatory)"
 msgstr "Plateau de Calern"
 
-#: kstars_i18n.cpp:1969
+#: data/Cities.dat:2044
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Alpes-Maritimes"
+msgstr "Alberta"
+
+#: data/Cities.dat:2045
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Plattsburgh"
 msgstr "Plattsburgh"
 
-#: kstars_i18n.cpp:1970
+#: 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"
 msgstr "Plymouth"
 
-#: kstars_i18n.cpp:1971
+#: data/Cities.dat:2050
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pocatello"
 msgstr "Pocatello"
 
-#: kstars_i18n.cpp:1972
+#: data/Cities.dat:2051
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pocomoke City"
 msgstr "Dinas Pocomoke"
 
-#: kstars_i18n.cpp:1973
+#: data/Cities.dat:2052
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Podor"
 msgstr "Pori"
 
-#: kstars_i18n.cpp:1974
+#: data/Cities.dat:2053
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pohang"
 msgstr "Pohang"
 
-#: kstars_i18n.cpp:1975
+#: data/Cities.dat:2054
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pohnpei"
 msgstr "Pohnpei"
 
-#: kstars_i18n.cpp:1976
+#: data/Cities.dat:2055
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Point Hope"
 msgstr "Point Hope"
 
-#: kstars_i18n.cpp:1977
+#: data/Cities.dat:2056
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pointe Noire"
 msgstr "Point Hope"
 
-#: kstars_i18n.cpp:1978
+#: data/Cities.dat:2057
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Polson"
 msgstr "Polson"
 
-#: kstars_i18n.cpp:1979
+#: data/Cities.dat:2058
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pomona"
 msgstr "Pomona"
 
-#: kstars_i18n.cpp:1980
+#: data/Cities.dat:2059
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pompano Beach"
 msgstr "Traeth Pompano"
 
-#: kstars_i18n.cpp:1981
+#: data/Cities.dat:2060
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ponca City"
 msgstr "Dinas Ponca"
 
-#: kstars_i18n.cpp:1982
+#: data/Cities.dat:2061
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ponce"
 msgstr "Ponce"
 
-#: kstars_i18n.cpp:1983
+#: data/Cities.dat:2062
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pontevedra"
 msgstr "Pontevedra"
 
-#: kstars_i18n.cpp:1984
+#: data/Cities.dat:2063
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pontiac"
 msgstr "Pontiac"
 
-#: kstars_i18n.cpp:1985
+#: data/Cities.dat:2064
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Poplar Bluff"
-msgstr "Poplar Bluff"
+"Poplar"
+msgstr "Poplar"
 
-#: kstars_i18n.cpp:1986
+#: data/Cities.dat:2065
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Poplar"
-msgstr "Poplar"
+"Poplar Bluff"
+msgstr "Poplar Bluff"
 
-#: kstars_i18n.cpp:1987
+#: data/Cities.dat:2066
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pori"
 msgstr "Pori"
 
-#: kstars_i18n.cpp:1988
+#: data/Cities.dat:2067
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Port Allen"
 msgstr "Porth Allen"
 
-#: kstars_i18n.cpp:1989
+#: data/Cities.dat:2068
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Port Arthur"
 msgstr "Porth Arthur"
 
-#: kstars_i18n.cpp:1990
+#: data/Cities.dat:2069
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Port Elizabeth"
 msgstr "Elizabeth"
 
-#: kstars_i18n.cpp:1991
+#: data/Cities.dat:2070
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Port Gentil"
 msgstr "Porth Allen"
 
-#: kstars_i18n.cpp:1992
+#: data/Cities.dat:2071
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Port Harcourt"
 msgstr "Porth Huron"
 
-#: kstars_i18n.cpp:1993
+#: data/Cities.dat:2072
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Port Huron"
 msgstr "Porth Huron"
 
-#: kstars_i18n.cpp:1994
+#: data/Cities.dat:2073
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Port Moresby"
 msgstr "Porth Moresby"
 
-#: kstars_i18n.cpp:1995
+#: data/Cities.dat:2073
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Papua New Guinea"
+msgstr "Papwa Gini Newydd "
+
+#: data/Cities.dat:2074
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Port Salerno"
 msgstr "Porth Salerno"
 
-#: kstars_i18n.cpp:1996
+#: data/Cities.dat:2075
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Port Soudan"
 msgstr "Porth Salerno"
 
-#: kstars_i18n.cpp:1997
+#: data/Cities.dat:2076
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Port Sulphur"
 msgstr "Porth Sulphur"
 
-#: kstars_i18n.cpp:1998
+#: data/Cities.dat:2077
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Port of Spain"
 msgstr "Porth Sbaen"
 
-#: kstars_i18n.cpp:1999
+#: data/Cities.dat:2077
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Trinidad and Tobago"
+msgstr "Trinidad a Tobago"
+
+#: data/Cities.dat:2078
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Port-au-Prince"
 msgstr "Port-au-Prince"
 
-#: kstars_i18n.cpp:2000
+#: data/Cities.dat:2078
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Haiti"
+msgstr "Haiti"
+
+#: data/Cities.dat:2079 data/Cities.dat:2080
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Portland"
 msgstr "Portland"
 
-#: kstars_i18n.cpp:2001
+#: data/Cities.dat:2081
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Porto Novo"
 msgstr "Provo"
 
-#: kstars_i18n.cpp:2002
+#: 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"
 msgstr "Portsmouth"
 
-#: kstars_i18n.cpp:2003
+#: data/Cities.dat:2086
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Potchefstroom"
 msgstr "Potchefstroom"
 
-#: kstars_i18n.cpp:2004
+#: data/Cities.dat:2087
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Potenza"
 msgstr "Potenza"
 
-#: kstars_i18n.cpp:2005
+#: data/Cities.dat:2088
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Potomac"
 msgstr "Potomac"
 
-#: kstars_i18n.cpp:2006
+#: data/Cities.dat:2089
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Potsdam"
 msgstr "Potsdam"
 
-#: kstars_i18n.cpp:2007
+#: data/Cities.dat:2090
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pottstown"
 msgstr "Pottstown"
 
-#: kstars_i18n.cpp:2008
+#: data/Cities.dat:2091
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: kstars_i18n.cpp:2009
+#: data/Cities.dat:2092
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Poznan"
 msgstr "Poznan"
 
-#: kstars_i18n.cpp:2010
+#: data/Cities.dat:2093
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Prague"
 msgstr "Prague"
 
-#: kstars_i18n.cpp:2011
+#: data/Cities.dat:2093
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Czech Republic"
+msgstr "Gweriniaeth Tsiec"
+
+#: data/Cities.dat:2094
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Prato"
 msgstr "Prato"
 
-#: kstars_i18n.cpp:2012
+#: data/Cities.dat:2095
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pratt"
 msgstr "Pratt"
 
-#: kstars_i18n.cpp:2013
+#: data/Cities.dat:2096
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Prescott"
 msgstr "Prescott"
 
-#: kstars_i18n.cpp:2014
+#: data/Cities.dat:2097
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Preston"
 msgstr "Preston"
 
-#: kstars_i18n.cpp:2015
+#: data/Cities.dat:2098
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pretoria"
 msgstr "Pretoria"
 
-#: kstars_i18n.cpp:2016
+#: data/Cities.dat:2099
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Primghar"
 msgstr "Primghar"
 
-#: kstars_i18n.cpp:2017
+#: data/Cities.dat:2100
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Prince Albert"
 msgstr "Prince Albert"
 
-#: kstars_i18n.cpp:2018
+#: data/Cities.dat:2101
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Prince George"
 msgstr "Prince George"
 
-#: kstars_i18n.cpp:2019
+#: data/Cities.dat:2102
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Prince Rupert"
 msgstr "Prince Rupert"
 
-#: kstars_i18n.cpp:2020
+#: data/Cities.dat:2103 data/Cities.dat:2104 data/Cities.dat:2105
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Princeton Obs."
-msgstr "Ars. Princeton"
+"Princeton"
+msgstr "Princeton"
 
-#: kstars_i18n.cpp:2021
+#: data/Cities.dat:2106
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Princeton"
-msgstr "Princeton"
+"Princeton Obs."
+msgstr "Ars. Princeton"
 
-#: kstars_i18n.cpp:2022
+#: data/Cities.dat:2107
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Procida"
 msgstr "Procida"
 
-#: kstars_i18n.cpp:2023
+#: data/Cities.dat:2108
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Proctor"
 msgstr "Proctor"
 
-#: kstars_i18n.cpp:2024
+#: data/Cities.dat:2109
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Prosser"
 msgstr "Prosser"
 
-#: kstars_i18n.cpp:2025
+#: data/Cities.dat:2110
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Providence"
 msgstr "Providence"
 
-#: kstars_i18n.cpp:2026
+#: data/Cities.dat:2111
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Provideniya Bay"
 msgstr "Providence"
 
-#: kstars_i18n.cpp:2027
+#: data/Cities.dat:2112
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Provo"
 msgstr "Provo"
 
-#: kstars_i18n.cpp:2028
+#: data/Cities.dat:2113
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Prudhoe Bay"
 msgstr "Prudhoe Bay"
 
-#: kstars_i18n.cpp:2029
+#: data/Cities.dat:2114
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pskov"
 msgstr "Pulkovo"
 
-#: kstars_i18n.cpp:2030
+#: data/Cities.dat:2115
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pueblo"
 msgstr "Pueblo"
 
-#: kstars_i18n.cpp:2031
+#: data/Cities.dat:2116
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: kstars_i18n.cpp:2032
+#: data/Cities.dat:2117
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Puerto Real"
 msgstr "Puerto Real"
 
-#: kstars_i18n.cpp:2033
+#: data/Cities.dat:2118
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Puerto del Rosario"
 msgstr "Puerto del Rosario"
 
-#: kstars_i18n.cpp:2034
+#: data/Cities.dat:2119
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pulkovo"
 msgstr "Pulkovo"
 
-#: kstars_i18n.cpp:2035
+#: data/Cities.dat:2120
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Purple Mountain"
 msgstr "Mynydd Purple"
 
-#: kstars_i18n.cpp:2036
+#: data/Cities.dat:2121
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Putnam"
 msgstr "Putnam"
 
-#: kstars_i18n.cpp:2037
+#: data/Cities.dat:2122
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Puyallup"
 msgstr "Puyallup"
 
-#: kstars_i18n.cpp:2038
+#: data/Cities.dat:2123
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Pärnu"
 msgstr "Pärnu"
 
-#: kstars_i18n.cpp:2039
+#: data/Cities.dat:2124
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Põltsamaa"
 msgstr "Põltsamaa"
 
-#: kstars_i18n.cpp:2040
+#: data/Cities.dat:2125
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Põlva"
 msgstr "Põlva"
 
-#: kstars_i18n.cpp:2041
+#: data/Cities.dat:2126
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Püssi"
 msgstr "Püssi"
 
-#: kstars_i18n.cpp:2042
+#: data/Cities.dat:2127
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Quakertown"
 msgstr "Quakertown"
 
-#: kstars_i18n.cpp:2043
+#: data/Cities.dat:2128
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Quebec"
 msgstr "Quebec"
 
-#: kstars_i18n.cpp:2044
+#: data/Cities.dat:2129
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Quezon"
 msgstr "Quezon"
 
-#: kstars_i18n.cpp:2045
+#: data/Cities.dat:2130
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Quincy"
 msgstr "Quincy"
 
-#: kstars_i18n.cpp:2046
+#: data/Cities.dat:2131
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Quito"
 msgstr "Quito"
 
-#: kstars_i18n.cpp:2047
+#: data/Cities.dat:2132
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Qustantinah"
 msgstr "Austin"
 
-#: kstars_i18n.cpp:2048
+#: data/Cities.dat:2133
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "R.M. Aller de S. de Compostela"
 msgstr "R.M. Aller de S. de Compostela"
 
-#: kstars_i18n.cpp:2049
+#: data/Cities.dat:2134
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ra'anana"
 msgstr "Ra'anana"
 
-#: kstars_i18n.cpp:2050
+#: data/Cities.dat:2135
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rabat"
 msgstr "Rabat"
 
-#: kstars_i18n.cpp:2051
+#: data/Cities.dat:2136
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Racine"
 msgstr "Racine"
 
-#: kstars_i18n.cpp:2052
+#: data/Cities.dat:2137
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rakvere"
 msgstr "Rakvere"
 
-#: kstars_i18n.cpp:2053
+#: data/Cities.dat:2138
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Raleigh"
 msgstr "Raleigh"
 
-#: kstars_i18n.cpp:2054
+#: data/Cities.dat:2139
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ramat Gan"
 msgstr "Ramat Gan"
 
-#: kstars_i18n.cpp:2055
+#: data/Cities.dat:2140
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ramstein"
 msgstr "Ramstein"
 
-#: kstars_i18n.cpp:2056
+#: data/Cities.dat:2141
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rancho Palos Verdes"
 msgstr "Rancho Palos Verdes"
 
-#: kstars_i18n.cpp:2057
+#: data/Cities.dat:2142
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Randers"
 msgstr "Randers"
 
-#: kstars_i18n.cpp:2058
+#: data/Cities.dat:2143
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Randolph"
 msgstr "Randolph"
 
-#: kstars_i18n.cpp:2059
+#: data/Cities.dat:2144
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rangeley"
 msgstr "Rangeley"
 
-#: kstars_i18n.cpp:2060
+#: data/Cities.dat:2145
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rangoon"
 msgstr "Rangoon"
 
-#: kstars_i18n.cpp:2061
+#: data/Cities.dat:2146
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rapid City"
 msgstr "Dinas Rapid"
 
-#: kstars_i18n.cpp:2062
+#: data/Cities.dat:2147
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rapla"
 msgstr "Rapla"
 
-#: kstars_i18n.cpp:2063
+#: data/Cities.dat:2148
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rastede"
 msgstr "Rastede"
 
-#: kstars_i18n.cpp:2064
+#: data/Cities.dat:2149
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ravenna"
 msgstr "Ravenna"
 
-#: kstars_i18n.cpp:2065
+#: data/Cities.dat:2150
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rawalpindi"
 msgstr "Rawalpindi"
 
-#: kstars_i18n.cpp:2066
+#: data/Cities.dat:2151
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rawlins"
 msgstr "Rawlins"
 
-#: kstars_i18n.cpp:2067
+#: data/Cities.dat:2152
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Reading"
 msgstr "Reading"
 
-#: kstars_i18n.cpp:2068
+#: data/Cities.dat:2153
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Recife"
 msgstr "Recife"
 
-#: kstars_i18n.cpp:2069
+#: data/Cities.dat:2154
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Recklinghausen"
 msgstr "Recklinghausen"
 
-#: kstars_i18n.cpp:2070
+#: data/Cities.dat:2155
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Redding"
 msgstr "Redding"
 
-#: kstars_i18n.cpp:2071
+#: data/Cities.dat:2156
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Redondo Beach"
 msgstr "Traeth Redondo"
 
-#: kstars_i18n.cpp:2072
+#: data/Cities.dat:2157
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Redwood City"
 msgstr "Dinas Redwood"
 
-#: kstars_i18n.cpp:2073
+#: data/Cities.dat:2158
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Regensburg"
 msgstr "Regensburg"
 
-#: kstars_i18n.cpp:2074
+#: data/Cities.dat:2159
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Reggio di Calabria"
 msgstr "Reggio di Calabria"
 
-#: kstars_i18n.cpp:2075
+#: data/Cities.dat:2160
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Regina"
 msgstr "Regina"
 
-#: kstars_i18n.cpp:2076
+#: data/Cities.dat:2161
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rehovot"
 msgstr "Rehovot"
 
-#: kstars_i18n.cpp:2077
+#: data/Cities.dat:2162
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Reims"
 msgstr "Reims"
 
-#: kstars_i18n.cpp:2078
+#: data/Cities.dat:2162
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Marne"
+msgstr "Maine"
+
+#: data/Cities.dat:2163
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Remscheid"
 msgstr "Remscheid"
 
-#: kstars_i18n.cpp:2079
+#: data/Cities.dat:2164
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rennes"
 msgstr "Rennes"
 
-#: kstars_i18n.cpp:2080
+#: data/Cities.dat:2164
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Ille-et-vilaine"
+msgstr "Maine"
+
+#: data/Cities.dat:2165
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Reno"
 msgstr "Reno"
 
-#: kstars_i18n.cpp:2081
+#: data/Cities.dat:2166
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Reseda"
 msgstr "Reseda"
 
-#: kstars_i18n.cpp:2082
+#: data/Cities.dat:2167
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rexburg"
 msgstr "Rexburg"
 
-#: kstars_i18n.cpp:2083
+#: data/Cities.dat:2168
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Reykjavik"
 msgstr "Reykjavik"
 
-#: kstars_i18n.cpp:2084
+#: data/Cities.dat:2169
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rhinelander"
 msgstr "Rhinelander"
 
-#: kstars_i18n.cpp:2085
+#: data/Cities.dat:2170
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ribe"
 msgstr "Ribe"
 
-#: kstars_i18n.cpp:2086
+#: data/Cities.dat:2171
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Richardson"
 msgstr "Richardson"
 
-#: kstars_i18n.cpp:2087
+#: data/Cities.dat:2172
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Richland"
 msgstr "Richland"
 
-#: kstars_i18n.cpp:2088
+#: 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"
 msgstr "Richmond"
 
-#: kstars_i18n.cpp:2089
+#: data/Cities.dat:2178
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rifle"
 msgstr "Rifle"
 
-#: kstars_i18n.cpp:2090
+#: data/Cities.dat:2179
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Riga"
 msgstr "Riga"
 
-#: kstars_i18n.cpp:2091
+#: data/Cities.dat:2179
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Latvia"
+msgstr "Latvia"
+
+#: data/Cities.dat:2180
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rimini"
 msgstr "Rimini"
 
-#: kstars_i18n.cpp:2092
+#: data/Cities.dat:2181
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ringkoebing"
 msgstr "Ringkoebing"
 
-#: kstars_i18n.cpp:2093
+#: data/Cities.dat:2182
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ringsted"
 msgstr "Ringsted"
 
-#: kstars_i18n.cpp:2094
+#: data/Cities.dat:2183
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rio de Janeiro"
 msgstr "Rio de Janeiro"
 
-#: kstars_i18n.cpp:2095
+#: data/Cities.dat:2184
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "River Ottawa"
 msgstr "Afon Ottawa"
 
-#: kstars_i18n.cpp:2096
+#: data/Cities.dat:2185
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Riverside"
 msgstr "Riverside"
 
-#: kstars_i18n.cpp:2097
+#: data/Cities.dat:2186
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Riverton"
 msgstr "Riverton"
 
-#: kstars_i18n.cpp:2098
+#: data/Cities.dat:2187
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Riyadh"
 msgstr "Riyadh"
 
-#: kstars_i18n.cpp:2099
+#: data/Cities.dat:2188
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Roanoke"
 msgstr "Roanoke"
 
-#: kstars_i18n.cpp:2100
+#: data/Cities.dat:2189
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Robinson"
 msgstr "Robinson"
 
-#: kstars_i18n.cpp:2101
+#: data/Cities.dat:2190
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Robledo de Chavela"
 msgstr "Robledo de Chavela"
 
-#: kstars_i18n.cpp:2102
+#: data/Cities.dat:2191
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rochdale Lanc"
 msgstr "Rochdale Lanc"
 
-#: kstars_i18n.cpp:2103
+#: data/Cities.dat:2192 data/Cities.dat:2193 data/Cities.dat:2194
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Rochester Hills"
-msgstr "Rochester Hills"
+"Rochester"
+msgstr "Rochester"
 
-#: kstars_i18n.cpp:2104
+#: data/Cities.dat:2195
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Rochester"
-msgstr "Rochester"
+"Rochester Hills"
+msgstr "Rochester Hills"
 
-#: kstars_i18n.cpp:2105
+#: data/Cities.dat:2196
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rock Hill"
 msgstr "Rock Hill"
 
-#: kstars_i18n.cpp:2106
+#: data/Cities.dat:2197
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rock Springs"
 msgstr "Rock Springs"
 
-#: kstars_i18n.cpp:2107
+#: data/Cities.dat:2198
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rockford"
 msgstr "Rockford"
 
-#: kstars_i18n.cpp:2108
+#: data/Cities.dat:2199
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rockland"
 msgstr "Rockland"
 
-#: kstars_i18n.cpp:2109
+#: data/Cities.dat:2200
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rockport"
 msgstr "Rockport"
 
-#: kstars_i18n.cpp:2110
+#: data/Cities.dat:2201
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rockville"
 msgstr "Rockville"
 
-#: kstars_i18n.cpp:2111
+#: data/Cities.dat:2202
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rockwood"
 msgstr "Rockwood"
 
-#: kstars_i18n.cpp:2112
+#: data/Cities.dat:2203
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: kstars_i18n.cpp:2113
+#: data/Cities.dat:2204
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Roenne"
 msgstr "Roenne"
 
-#: kstars_i18n.cpp:2114
+#: data/Cities.dat:2205
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rogers"
 msgstr "Rogers"
 
-#: kstars_i18n.cpp:2115
+#: data/Cities.dat:2206
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rome"
 msgstr "Rhufain"
 
-#: kstars_i18n.cpp:2116
+#: data/Cities.dat:2207
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Roosevelt Roads"
 msgstr "Roosevelt Roads"
 
-#: kstars_i18n.cpp:2117
+#: data/Cities.dat:2208
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Roque de los Muchachos"
 msgstr "Roque de los Muchachos"
 
-#: kstars_i18n.cpp:2118
+#: data/Cities.dat:2209
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rosemead"
 msgstr "Rosemead"
 
-#: kstars_i18n.cpp:2119
+#: data/Cities.dat:2210 data/Cities.dat:2211
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Roseville"
 msgstr "Roseville"
 
-#: kstars_i18n.cpp:2120
+#: data/Cities.dat:2212
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Roskilde"
 msgstr "Roskilde"
 
-#: kstars_i18n.cpp:2121
+#: data/Cities.dat:2213
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rostock"
 msgstr "Rostock"
 
-#: kstars_i18n.cpp:2122
+#: data/Cities.dat:2214
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rostov na Donu"
 msgstr "Crofton"
 
-#: kstars_i18n.cpp:2123
+#: data/Cities.dat:2215 data/Cities.dat:2216
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Roswell"
 msgstr "Roswell"
 
-#: kstars_i18n.cpp:2124
+#: data/Cities.dat:2217
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rota Island"
 msgstr "Ynys Rota"
 
-#: kstars_i18n.cpp:2125
+#: data/Cities.dat:2218
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rotterdam"
 msgstr "Rotterdam"
 
-#: kstars_i18n.cpp:2126
+#: data/Cities.dat:2219
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rouen"
 msgstr "Rouen"
 
-#: kstars_i18n.cpp:2127
+#: data/Cities.dat:2219
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Seine maritime"
+msgstr "Tenerife"
+
+#: data/Cities.dat:2220
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Roundup"
 msgstr "Roundup"
 
-#: kstars_i18n.cpp:2128
+#: data/Cities.dat:2221
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rowland Heights"
 msgstr "Rowland Heights"
 
-#: kstars_i18n.cpp:2129
+#: data/Cities.dat:2222
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Royal Oak"
 msgstr "Royal Oak"
 
-#: kstars_i18n.cpp:2130
+#: data/Cities.dat:2223
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ruby"
 msgstr "Ruby"
 
-#: kstars_i18n.cpp:2131
+#: data/Cities.dat:2224
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rugby"
 msgstr "Rugby"
 
-#: kstars_i18n.cpp:2132
+#: data/Cities.dat:2225
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rumford"
 msgstr "Rumford"
 
-#: kstars_i18n.cpp:2133
+#: data/Cities.dat:2226
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Russell"
 msgstr "Russell"
 
-#: kstars_i18n.cpp:2134
+#: data/Cities.dat:2227
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ruston"
 msgstr "Ruston"
 
-#: kstars_i18n.cpp:2135
+#: data/Cities.dat:2228
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rutherford Appleton Lab."
 msgstr "Rutherford Appleton Lab."
 
-#: kstars_i18n.cpp:2136
+#: data/Cities.dat:2229
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Rutland"
 msgstr "Rutland"
 
-#: kstars_i18n.cpp:2137
+#: data/Cities.dat:2230
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ruyigi"
 msgstr "Riga"
 
-#: kstars_i18n.cpp:2138
+#: data/Cities.dat:2231
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ryazan"
 msgstr "Rapla"
 
-#: kstars_i18n.cpp:2139
+#: data/Cities.dat:2232
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Räpina"
 msgstr "Räpina"
 
-#: kstars_i18n.cpp:2140
+#: data/Cities.dat:2233
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Saarbrücken"
 msgstr "Saarbrücken"
 
-#: kstars_i18n.cpp:2141
+#: data/Cities.dat:2234
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sabadell"
 msgstr "Sabadell"
 
-#: kstars_i18n.cpp:2142
+#: data/Cities.dat:2235
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Saco"
 msgstr "Saco"
 
-#: kstars_i18n.cpp:2143
+#: data/Cities.dat:2236
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sacramento"
 msgstr "Sacramento"
 
-#: kstars_i18n.cpp:2144
+#: data/Cities.dat:2237 data/Cities.dat:2238
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Saginaw"
 msgstr "Saginaw"
 
-#: kstars_i18n.cpp:2145
+#: data/Cities.dat:2239
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Saint-Etienne"
 msgstr "Saint-Etienne"
 
-#: kstars_i18n.cpp:2146
+#: data/Cities.dat:2239
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Loire"
+msgstr "Azores"
+
+#: data/Cities.dat:2240
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Saipan Island"
 msgstr "Ynys Saipan"
 
-#: kstars_i18n.cpp:2147
+#: data/Cities.dat:2241
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Salamanca"
 msgstr "Salamanca"
 
-#: kstars_i18n.cpp:2148
+#: data/Cities.dat:2242
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sale"
 msgstr "Sale"
 
-#: kstars_i18n.cpp:2149
+#: 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"
 msgstr "Salem"
 
-#: kstars_i18n.cpp:2150
+#: data/Cities.dat:2247
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Salerno"
 msgstr "Salerno"
 
-#: kstars_i18n.cpp:2151
+#: data/Cities.dat:2248 data/Cities.dat:2249
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Salina"
 msgstr "Salina"
 
-#: kstars_i18n.cpp:2152
+#: data/Cities.dat:2250
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Salinas"
 msgstr "Salinas"
 
-#: kstars_i18n.cpp:2153
+#: data/Cities.dat:2251
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Salisbury"
 msgstr "Salisbury"
 
-#: kstars_i18n.cpp:2154
+#: data/Cities.dat:2252
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sallisaw"
 msgstr "Sallisaw"
 
-#: kstars_i18n.cpp:2155
+#: data/Cities.dat:2253
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Salmon"
 msgstr "Salmon"
 
-#: kstars_i18n.cpp:2156
+#: data/Cities.dat:2254
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Salt Lake City"
 msgstr "Dinas Salt Lake"
 
-#: kstars_i18n.cpp:2157
+#: data/Cities.dat:2255
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Salton City"
 msgstr "Dinas Salton"
 
-#: kstars_i18n.cpp:2158
+#: data/Cities.dat:2256
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Salzburg"
 msgstr "Salzburg"
 
-#: kstars_i18n.cpp:2159
+#: data/Cities.dat:2257
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Salzgitter"
 msgstr "Salzgitter"
 
-#: kstars_i18n.cpp:2160
+#: data/Cities.dat:2258
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Samara"
 msgstr "Samarrah"
 
-#: kstars_i18n.cpp:2161
+#: data/Cities.dat:2259
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Samarrah"
 msgstr "Samarrah"
 
-#: kstars_i18n.cpp:2162
+#: data/Cities.dat:2260
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "San Angelo"
 msgstr "San Angelo"
 
-#: kstars_i18n.cpp:2163
+#: data/Cities.dat:2261
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "San Antonio"
 msgstr "San Antonio"
 
-#: kstars_i18n.cpp:2164
+#: data/Cities.dat:2262
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "San Bernardino"
 msgstr "San Bernardino"
 
-#: kstars_i18n.cpp:2165
+#: data/Cities.dat:2263
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "San Diego"
 msgstr "San Diego"
 
-#: kstars_i18n.cpp:2166
+#: data/Cities.dat:2264
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "San Fernando"
 msgstr "San Fernando"
 
-#: kstars_i18n.cpp:2167
+#: data/Cities.dat:2265
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "San Francisco"
 msgstr "San Francisco"
 
-#: kstars_i18n.cpp:2168
+#: data/Cities.dat:2266 data/Cities.dat:2267
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "San Jose"
 msgstr "San Jose"
 
-#: kstars_i18n.cpp:2169
+#: data/Cities.dat:2266
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Costa Rica"
+msgstr "Costa Rica"
+
+#: data/Cities.dat:2268
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "San Juan"
 msgstr "San Juan"
 
-#: kstars_i18n.cpp:2170
+#: data/Cities.dat:2269
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "San Leandro"
 msgstr "San Leandro"
 
-#: kstars_i18n.cpp:2171
+#: data/Cities.dat:2270
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "San Mateo"
 msgstr "San Mateo"
 
-#: kstars_i18n.cpp:2172
+#: data/Cities.dat:2271
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"San Pedro Martir"
-msgstr "San Pedro Martir"
+"San Pedro"
+msgstr "San Pedro"
 
-#: kstars_i18n.cpp:2173
+#: data/Cities.dat:2272
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"San Pedro"
-msgstr "San Pedro"
+"San Pedro Martir"
+msgstr "San Pedro Martir"
 
-#: kstars_i18n.cpp:2174
+#: data/Cities.dat:2273
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "San Salvador"
 msgstr "San Salvador"
 
-#: kstars_i18n.cpp:2175
+#: data/Cities.dat:2273
 msgid ""
-"_: City name (optional, probably does not need a translation)\n"
-"San Sebastián de la Gomera"
-msgstr "San Sebastián de la Gomera"
+"_: Country name (optional, but should be translated)\n"
+"El Salvador"
+msgstr "El Salvador"
 
-#: kstars_i18n.cpp:2176
+#: data/Cities.dat:2274
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "San Sebastián"
 msgstr "San Sebastián"
 
-#: kstars_i18n.cpp:2177
+#: data/Cities.dat:2275
+msgid ""
+"_: City name (optional, probably does not need a translation)\n"
+"San Sebastián de la Gomera"
+msgstr "San Sebastián de la Gomera"
+
+#: data/Cities.dat:2276
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sancheong"
 msgstr "Sancheong"
 
-#: kstars_i18n.cpp:2178
+#: data/Cities.dat:2277
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sanders"
 msgstr "Sanders"
 
-#: kstars_i18n.cpp:2179
+#: data/Cities.dat:2278
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sandersville"
 msgstr "Sandersville"
 
-#: kstars_i18n.cpp:2180
+#: data/Cities.dat:2279
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sandhurst Surrey"
 msgstr "Sandhurst Surrey"
 
-#: kstars_i18n.cpp:2181
+#: data/Cities.dat:2280
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sandpoint"
 msgstr "Sandpoint"
 
-#: kstars_i18n.cpp:2182
+#: data/Cities.dat:2281
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sanford"
 msgstr "Sanford"
 
-#: kstars_i18n.cpp:2183
+#: data/Cities.dat:2282
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Santa Ana"
 msgstr "Santa Ana"
 
-#: kstars_i18n.cpp:2184
+#: data/Cities.dat:2283
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: kstars_i18n.cpp:2185
+#: data/Cities.dat:2284
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Santa Clara"
 msgstr "Santa Clara"
 
-#: kstars_i18n.cpp:2186
+#: data/Cities.dat:2285
+msgid ""
+"_: City name (optional, probably does not need a translation)\n"
+"Santa Cruz"
+msgstr "Santa Cruz"
+
+#: data/Cities.dat:2286
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Santa Cruz de Tenerife"
 msgstr "Santa Cruz de Tenerife"
 
-#: kstars_i18n.cpp:2187
+#: data/Cities.dat:2287
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Santa Cruz de la Palma"
 msgstr "Santa Cruz de la Palma"
 
-#: kstars_i18n.cpp:2188
-msgid ""
-"_: City name (optional, probably does not need a translation)\n"
-"Santa Cruz"
-msgstr "Santa Cruz"
-
-#: kstars_i18n.cpp:2189
+#: data/Cities.dat:2288
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Santa Fe"
 msgstr "Santa Fe"
 
-#: kstars_i18n.cpp:2190
+#: data/Cities.dat:2289
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Santa Maria Capua Vetere"
-msgstr "Santa Maria Capua Vetere"
+"Santa Maria"
+msgstr "Santa Maria"
 
-#: kstars_i18n.cpp:2191
+#: data/Cities.dat:2290
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Santa Maria"
-msgstr "Santa Maria"
+"Santa Maria Capua Vetere"
+msgstr "Santa Maria Capua Vetere"
 
-#: kstars_i18n.cpp:2192
+#: data/Cities.dat:2291
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Santa Monica"
 msgstr "Santa Monica"
 
-#: kstars_i18n.cpp:2193
+#: data/Cities.dat:2292 data/Cities.dat:2293
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: kstars_i18n.cpp:2194
+#: data/Cities.dat:2294
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Santander"
 msgstr "Santander"
 
-#: kstars_i18n.cpp:2195
+#: data/Cities.dat:2295
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Santiago"
 msgstr "Santiago"
 
-#: kstars_i18n.cpp:2196
+#: data/Cities.dat:2296
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Santo Domingo"
 msgstr "Santo Domingo"
 
-#: kstars_i18n.cpp:2197
+#: data/Cities.dat:2296
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Dominican Republic"
+msgstr "Gweriniaeth Dominica"
+
+#: data/Cities.dat:2297
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sapporo"
 msgstr "Sapporo"
 
-#: kstars_i18n.cpp:2198
+#: data/Cities.dat:2298
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sarajevo"
 msgstr "Sarajevo"
 
-#: kstars_i18n.cpp:2199
+#: data/Cities.dat:2298
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Bosnia and Herzegovina"
+msgstr "Bosnia ac Herzegovina"
+
+#: data/Cities.dat:2299
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Saransk"
 msgstr "Sarasota"
 
-#: kstars_i18n.cpp:2200
+#: data/Cities.dat:2300
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sarasota"
 msgstr "Sarasota"
 
-#: kstars_i18n.cpp:2201
+#: data/Cities.dat:2301
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Saratov"
 msgstr "Taranto"
 
-#: kstars_i18n.cpp:2202
+#: data/Cities.dat:2302
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sargent"
 msgstr "Sargent"
 
-#: kstars_i18n.cpp:2203
+#: data/Cities.dat:2303
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Saskatoon"
 msgstr "Saskatoon"
 
-#: kstars_i18n.cpp:2204
+#: data/Cities.dat:2304
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sassari"
 msgstr "Sassari"
 
-#: kstars_i18n.cpp:2205
+#: data/Cities.dat:2305
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Satif"
 msgstr "Haifa"
 
-#: kstars_i18n.cpp:2206
+#: data/Cities.dat:2306
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Saue"
 msgstr "Saue"
 
-#: kstars_i18n.cpp:2207
+#: data/Cities.dat:2307
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sault St. Marie"
 msgstr "Sault St. Marie"
 
-#: kstars_i18n.cpp:2208
+#: data/Cities.dat:2308
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Savannah"
 msgstr "Savannah"
 
-#: kstars_i18n.cpp:2209
+#: data/Cities.dat:2309
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Savona"
 msgstr "Savona"
 
-#: kstars_i18n.cpp:2210
+#: data/Cities.dat:2310
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Scarborough"
 msgstr "Scarborough"
 
-#: kstars_i18n.cpp:2211
+#: data/Cities.dat:2311
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Schauinsland"
 msgstr "Schauinsland"
 
-#: kstars_i18n.cpp:2212
+#: data/Cities.dat:2312
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Schaumburg"
 msgstr "Schaumburg"
 
-#: kstars_i18n.cpp:2213
+#: data/Cities.dat:2313
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Schenectady"
 msgstr "Schenectady"
 
-#: kstars_i18n.cpp:2214
+#: data/Cities.dat:2314
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Schuyler"
 msgstr "Schuyler"
 
-#: kstars_i18n.cpp:2215
+#: data/Cities.dat:2315
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Schwerin"
 msgstr "Schwerin"
 
-#: kstars_i18n.cpp:2216
+#: data/Cities.dat:2316
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Scottsdale"
 msgstr "Scottsdale"
 
-#: kstars_i18n.cpp:2217
+#: data/Cities.dat:2317
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Scranton"
 msgstr "Scranton"
 
-#: kstars_i18n.cpp:2218
+#: data/Cities.dat:2318
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Seabrook"
 msgstr "Seabrook"
 
-#: kstars_i18n.cpp:2219
+#: data/Cities.dat:2319
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Seaford"
 msgstr "Seaford"
 
-#: kstars_i18n.cpp:2220
+#: data/Cities.dat:2320
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Seal Beach"
 msgstr "Seal Beach"
 
-#: kstars_i18n.cpp:2221
+#: data/Cities.dat:2321
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Seattle"
 msgstr "Seattle"
 
-#: kstars_i18n.cpp:2222
+#: data/Cities.dat:2322
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sebastian"
 msgstr "Sebastian"
 
-#: kstars_i18n.cpp:2223
+#: data/Cities.dat:2323
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Segou"
 msgstr "Seoul"
 
-#: kstars_i18n.cpp:2224
+#: data/Cities.dat:2324
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Segovia"
 msgstr "Segovia"
 
-#: kstars_i18n.cpp:2225
+#: data/Cities.dat:2325
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Selma"
 msgstr "Selma"
 
-#: kstars_i18n.cpp:2226
+#: data/Cities.dat:2326
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Selter"
 msgstr "Selter"
 
-#: kstars_i18n.cpp:2227
+#: data/Cities.dat:2327
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Seogwipo"
 msgstr "Seogwipo"
 
-#: kstars_i18n.cpp:2228
+#: data/Cities.dat:2328
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Seongsanpo"
 msgstr "Seongsanpo"
 
-#: kstars_i18n.cpp:2229
+#: data/Cities.dat:2329
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Seosan"
 msgstr "Seosan"
 
-#: kstars_i18n.cpp:2230
+#: data/Cities.dat:2330
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Seoul"
 msgstr "Seoul"
 
-#: kstars_i18n.cpp:2231
+#: data/Cities.dat:2331
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: kstars_i18n.cpp:2232
+#: data/Cities.dat:2332
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sevilla"
 msgstr "Sevilla"
 
-#: kstars_i18n.cpp:2233
+#: data/Cities.dat:2333
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Seward"
 msgstr "Seward"
 
-#: kstars_i18n.cpp:2234
+#: data/Cities.dat:2334
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Seymour"
 msgstr "Seymour"
 
-#: kstars_i18n.cpp:2235
+#: data/Cities.dat:2335
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sfax"
 msgstr "Sofia"
 
-#: kstars_i18n.cpp:2236
+#: data/Cities.dat:2336
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Shanghai"
 msgstr "Shanghai"
 
-#: kstars_i18n.cpp:2237
+#: data/Cities.dat:2337
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Shannon"
 msgstr "Shannon"
 
-#: kstars_i18n.cpp:2238
+#: data/Cities.dat:2338
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Shawnee"
 msgstr "Shawnee"
 
-#: kstars_i18n.cpp:2239
+#: data/Cities.dat:2339
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sheboygan"
 msgstr "Sheboygan"
 
-#: kstars_i18n.cpp:2240
+#: data/Cities.dat:2340
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sheffield"
 msgstr "Sheffield"
 
-#: kstars_i18n.cpp:2241
+#: data/Cities.dat:2341
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Shelby"
 msgstr "Shelby"
 
-#: kstars_i18n.cpp:2242
+#: data/Cities.dat:2342
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Shelbyville"
 msgstr "Shelbyville"
 
-#: kstars_i18n.cpp:2243
+#: data/Cities.dat:2343
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sheldon"
 msgstr "Sheldon"
 
-#: kstars_i18n.cpp:2244
+#: data/Cities.dat:2344
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Shell Beach"
 msgstr "Traeth Shell"
 
-#: kstars_i18n.cpp:2245
+#: data/Cities.dat:2345
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Shemya"
 msgstr "Shemya"
 
-#: kstars_i18n.cpp:2246
+#: data/Cities.dat:2346
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sherbrooke"
 msgstr "Sherbrooke"
 
-#: kstars_i18n.cpp:2247
+#: data/Cities.dat:2347
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sheridan"
 msgstr "Sheridan"
 
-#: kstars_i18n.cpp:2248
+#: data/Cities.dat:2348
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Shiraz"
 msgstr "Shiraz"
 
-#: kstars_i18n.cpp:2249
+#: data/Cities.dat:2349
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Shoshone"
 msgstr "Shoshone"
 
-#: kstars_i18n.cpp:2250
+#: data/Cities.dat:2350
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Shreveport"
 msgstr "Shreveport"
 
-#: kstars_i18n.cpp:2251
+#: data/Cities.dat:2351
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Shungnak"
 msgstr "Shungnak"
 
-#: kstars_i18n.cpp:2252
+#: data/Cities.dat:2352
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sibu"
 msgstr "Sibu"
 
-#: kstars_i18n.cpp:2253
+#: data/Cities.dat:2353
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Siding Spring"
 msgstr "Siding Spring"
 
-#: kstars_i18n.cpp:2254
+#: data/Cities.dat:2354
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Siegen"
 msgstr "Siegen"
 
-#: kstars_i18n.cpp:2255
+#: data/Cities.dat:2355
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Siena"
 msgstr "Siena"
 
-#: kstars_i18n.cpp:2256
+#: data/Cities.dat:2356
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sigonella"
 msgstr "Sigonella"
 
-#: kstars_i18n.cpp:2257
+#: data/Cities.dat:2357
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Silkeborg"
 msgstr "Silkeborg"
 
-#: kstars_i18n.cpp:2258
+#: data/Cities.dat:2358
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sillamäe"
 msgstr "Sillamäe"
 
-#: kstars_i18n.cpp:2259
+#: data/Cities.dat:2359
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Silver Spring"
 msgstr "Silver Spring"
 
-#: kstars_i18n.cpp:2260
+#: data/Cities.dat:2360
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Simi Valley"
 msgstr "Simi Valley"
 
-#: kstars_i18n.cpp:2261
+#: data/Cities.dat:2361
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Simunye"
 msgstr "Sibu"
 
-#: kstars_i18n.cpp:2262
+#: data/Cities.dat:2362
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sindi"
 msgstr "Sindi"
 
-#: kstars_i18n.cpp:2263
+#: data/Cities.dat:2363
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Singapore"
 msgstr "Singapore"
 
-#: kstars_i18n.cpp:2264
+#: data/Cities.dat:2363 data/Cities.dat:2513
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Singapore"
+msgstr "Singapore"
+
+#: data/Cities.dat:2364
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sinuiju"
 msgstr "Sinuiju"
 
-#: kstars_i18n.cpp:2265
+#: data/Cities.dat:2365
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sioux City"
 msgstr "Dinas Sioux"
 
-#: kstars_i18n.cpp:2266
+#: data/Cities.dat:2366
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: kstars_i18n.cpp:2267
+#: data/Cities.dat:2367
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sioux Lookout"
 msgstr "Sioux Lookout"
 
-#: kstars_i18n.cpp:2268
+#: data/Cities.dat:2368
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sioux Narrows"
 msgstr "Sioux Narrows"
 
-#: kstars_i18n.cpp:2269
+#: data/Cities.dat:2369
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Siracusa"
 msgstr "Siracusa"
 
-#: kstars_i18n.cpp:2270
+#: data/Cities.dat:2370
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sitka"
 msgstr "Sitka"
 
-#: kstars_i18n.cpp:2271
+#: data/Cities.dat:2371
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sittwe"
 msgstr "Sittwe"
 
-#: kstars_i18n.cpp:2272
+#: data/Cities.dat:2372
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Skagen"
 msgstr "Skagen"
 
-#: kstars_i18n.cpp:2273
+#: data/Cities.dat:2373
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Skalnate Pleso"
 msgstr "Skalnate Pleso"
 
-#: kstars_i18n.cpp:2274
+#: data/Cities.dat:2374
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Skibotn"
 msgstr "Skibotn"
 
-#: kstars_i18n.cpp:2275
+#: data/Cities.dat:2375
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Skive"
 msgstr "Skive"
 
-#: kstars_i18n.cpp:2276
+#: data/Cities.dat:2376
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Skokie"
 msgstr "Skokie"
 
-#: kstars_i18n.cpp:2277
+#: data/Cities.dat:2377
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Skopje"
 msgstr "Skokie"
 
-#: kstars_i18n.cpp:2278
+#: data/Cities.dat:2377
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Macedonia"
+msgstr "Macedonia"
+
+#: data/Cities.dat:2378
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Slagelse"
 msgstr "Slagelse"
 
-#: kstars_i18n.cpp:2279
+#: data/Cities.dat:2379
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Slidell"
 msgstr "Slidell"
 
-#: kstars_i18n.cpp:2280
+#: data/Cities.dat:2380
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Smolensk"
 msgstr "Solingen"
 
-#: kstars_i18n.cpp:2281
+#: data/Cities.dat:2381
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Smyrna"
 msgstr "Smyrna"
 
-#: kstars_i18n.cpp:2282
+#: data/Cities.dat:2382
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sochi"
 msgstr "Sokcho"
 
-#: kstars_i18n.cpp:2283
+#: data/Cities.dat:2383
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Soda Springs"
 msgstr "Soda Springs"
 
-#: kstars_i18n.cpp:2284
+#: data/Cities.dat:2384
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Soeborg"
 msgstr "Soeborg"
 
-#: kstars_i18n.cpp:2285
+#: data/Cities.dat:2385
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Soenderborg"
 msgstr "Soenderborg"
 
-#: kstars_i18n.cpp:2286
+#: data/Cities.dat:2386
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sofia"
 msgstr "Sofia"
 
-#: kstars_i18n.cpp:2287
+#: data/Cities.dat:2386
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Bulgaria"
+msgstr "Bwlgaria"
+
+#: data/Cities.dat:2387
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sokcho"
 msgstr "Sokcho"
 
-#: kstars_i18n.cpp:2288
+#: data/Cities.dat:2388
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Solingen"
 msgstr "Solingen"
 
-#: kstars_i18n.cpp:2289
+#: data/Cities.dat:2389 data/Cities.dat:2390
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Somerset"
 msgstr "Somerset"
 
-#: kstars_i18n.cpp:2290
+#: data/Cities.dat:2391 data/Cities.dat:2392
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Somerville"
 msgstr "Somerville"
 
-#: kstars_i18n.cpp:2291
+#: data/Cities.dat:2393
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sondrestrom"
 msgstr "Sondrestrom"
 
-#: kstars_i18n.cpp:2292
+#: data/Cities.dat:2394
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sonnenberg"
 msgstr "Sonnenberg"
 
-#: kstars_i18n.cpp:2293
+#: data/Cities.dat:2395
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sonoma"
 msgstr "Sonoma"
 
-#: kstars_i18n.cpp:2294
+#: data/Cities.dat:2396
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Soria"
 msgstr "Soria"
 
-#: kstars_i18n.cpp:2295
+#: data/Cities.dat:2397
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sousse"
 msgstr "Saue"
 
-#: kstars_i18n.cpp:2296
+#: data/Cities.dat:2398
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "South Bend"
 msgstr "South Bend"
 
-#: kstars_i18n.cpp:2297
+#: data/Cities.dat:2399
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "South Gate"
 msgstr "South Gate"
 
-#: kstars_i18n.cpp:2298
+#: data/Cities.dat:2400
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "South Kauai VORTAC"
 msgstr "South Kauai VORTAC"
 
-#: kstars_i18n.cpp:2299
+#: data/Cities.dat:2401 data/Cities.dat:2402
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Southampton"
 msgstr "Southampton"
 
-#: kstars_i18n.cpp:2300
+#: data/Cities.dat:2403
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Southfield"
 msgstr "Southfield"
 
-#: kstars_i18n.cpp:2301
+#: data/Cities.dat:2404
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Southington"
 msgstr "Southington"
 
-#: kstars_i18n.cpp:2302
+#: data/Cities.dat:2405
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Soweto"
 msgstr "Modesto"
 
-#: kstars_i18n.cpp:2303
+#: data/Cities.dat:2406
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Soyo"
 msgstr "Tokyo"
 
-#: kstars_i18n.cpp:2304
+#: data/Cities.dat:2407
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sparks"
 msgstr "Sparks"
 
-#: kstars_i18n.cpp:2305
+#: data/Cities.dat:2408
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Spartanburg"
 msgstr "Spartanburg"
 
-#: kstars_i18n.cpp:2306
+#: data/Cities.dat:2409
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Spenard"
 msgstr "Spenard"
 
-#: kstars_i18n.cpp:2307
+#: data/Cities.dat:2410
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Spencer"
 msgstr "Spencer"
 
-#: kstars_i18n.cpp:2308
+#: data/Cities.dat:2411
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Spokane"
 msgstr "Spokane"
 
-#: kstars_i18n.cpp:2309
+#: data/Cities.dat:2412
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Springdale"
 msgstr "Springdale"
 
-#: kstars_i18n.cpp:2310
+#: 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"
 msgstr "Springfield"
 
-#: kstars_i18n.cpp:2311
+#: data/Cities.dat:2419
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "St-Hubert"
 msgstr "St-Hubert"
 
-#: kstars_i18n.cpp:2312
+#: data/Cities.dat:2420
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "St. Albans"
 msgstr "St. Albans"
 
-#: kstars_i18n.cpp:2313
+#: data/Cities.dat:2421
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "St. Catharines"
 msgstr "St. Catharines"
 
-#: kstars_i18n.cpp:2314
+#: data/Cities.dat:2422
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "St. Charles"
 msgstr "St. Charles"
 
-#: kstars_i18n.cpp:2315
+#: data/Cities.dat:2423
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "St. Clair Shores"
 msgstr "St. Clair Shores"
 
-#: kstars_i18n.cpp:2316
+#: data/Cities.dat:2424
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "St. Cloud"
 msgstr "St. Cloud"
 
-#: kstars_i18n.cpp:2317
+#: data/Cities.dat:2425
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "St. Croix"
 msgstr "St. Croix"
 
-#: kstars_i18n.cpp:2318
+#: data/Cities.dat:2425 data/Cities.dat:2440
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Virgin Islands"
+msgstr "Ynysoedd yr Wyryf"
+
+#: data/Cities.dat:2426
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "St. George"
 msgstr "St. George"
 
-#: kstars_i18n.cpp:2319
+#: data/Cities.dat:2427
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "St. John"
 msgstr "St. John"
 
-#: kstars_i18n.cpp:2320
+#: data/Cities.dat:2428 data/Cities.dat:2429
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "St. John's"
 msgstr "St. John's"
 
-#: kstars_i18n.cpp:2321
+#: data/Cities.dat:2428
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Antigua and Barbuda"
+msgstr "Antigua a Barbuda"
+
+#: data/Cities.dat:2430
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "St. Joseph"
 msgstr "St. Joseph"
 
-#: kstars_i18n.cpp:2322
+#: data/Cities.dat:2431 data/Cities.dat:2432
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "St. Louis"
 msgstr "St. Louis"
 
-#: kstars_i18n.cpp:2323
+#: data/Cities.dat:2433
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "St. María Tonantzintla"
 msgstr "St. María Tonantzintla"
 
-#: kstars_i18n.cpp:2324
+#: data/Cities.dat:2434
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "St. Michales"
 msgstr "St. Michales"
 
-#: kstars_i18n.cpp:2325
+#: data/Cities.dat:2435
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "St. Nazaire"
 msgstr "St. Nazaire"
 
-#: kstars_i18n.cpp:2326
+#: data/Cities.dat:2435
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Loire-atlantique"
+msgstr "Zealand"
+
+#: data/Cities.dat:2436
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "St. Paul"
 msgstr "St. Paul"
 
-#: kstars_i18n.cpp:2327
+#: data/Cities.dat:2437
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "St. Peter Port"
 msgstr "St. Peter Port"
 
-#: kstars_i18n.cpp:2328
+#: data/Cities.dat:2437
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Guernsey"
+msgstr "Guernsey"
+
+#: data/Cities.dat:2438 data/Cities.dat:2439
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "St. Petersburg"
 msgstr "St. Petersburg"
 
-#: kstars_i18n.cpp:2329
+#: data/Cities.dat:2440
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "St. Thomas"
 msgstr "St. Thomas"
 
-#: kstars_i18n.cpp:2330
+#: data/Cities.dat:2441
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Stamford"
 msgstr "Stamford"
 
-#: kstars_i18n.cpp:2331
+#: data/Cities.dat:2442
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Stanley"
 msgstr "Stanley"
 
-#: kstars_i18n.cpp:2332
+#: data/Cities.dat:2442
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Falkland Islands"
+msgstr "Ynysoedd Falkland"
+
+#: data/Cities.dat:2443
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Stara Lesna"
 msgstr "Stara Lesna"
 
-#: kstars_i18n.cpp:2333
+#: data/Cities.dat:2444
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Staten Island"
 msgstr "Ynys Staten"
 
-#: kstars_i18n.cpp:2334
+#: data/Cities.dat:2445
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Statesville"
 msgstr "Statesville"
 
-#: kstars_i18n.cpp:2335
+#: data/Cities.dat:2446
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Stavanger"
 msgstr "Stavanger"
 
-#: kstars_i18n.cpp:2336
+#: data/Cities.dat:2447
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Stavropol'"
 msgstr "Seabrook"
 
-#: kstars_i18n.cpp:2337
+#: data/Cities.dat:2448
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: kstars_i18n.cpp:2338
+#: data/Cities.dat:2449 data/Cities.dat:2450
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Sterling Heights"
-msgstr "Sterling Heights"
+"Sterling"
+msgstr "Sterling"
 
-#: kstars_i18n.cpp:2339
+#: data/Cities.dat:2451
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Sterling"
-msgstr "Sterling"
+"Sterling Heights"
+msgstr "Sterling Heights"
 
-#: kstars_i18n.cpp:2340
+#: data/Cities.dat:2452
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Steubenville"
 msgstr "Steubenville"
 
-#: kstars_i18n.cpp:2341
+#: data/Cities.dat:2453
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Stockert"
 msgstr "Stockert"
 
-#: kstars_i18n.cpp:2342
+#: data/Cities.dat:2454 data/Cities.dat:2455
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Stockholm"
 msgstr "Stockholm"
 
-#: kstars_i18n.cpp:2343
+#: data/Cities.dat:2456
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Stockton"
 msgstr "Stockton"
 
-#: kstars_i18n.cpp:2344
+#: data/Cities.dat:2457
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Stony Brook"
 msgstr "Stony Brook"
 
-#: kstars_i18n.cpp:2345
+#: data/Cities.dat:2458
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Strasbourg"
 msgstr "Strasbourg"
 
-#: kstars_i18n.cpp:2346
+#: data/Cities.dat:2458
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Bas-Rhin"
+msgstr "Maine"
+
+#: data/Cities.dat:2459
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Stratford"
 msgstr "Stratford"
 
-#: kstars_i18n.cpp:2347
+#: data/Cities.dat:2460
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Struer"
 msgstr "Struer"
 
-#: kstars_i18n.cpp:2348
+#: data/Cities.dat:2461
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sturtevant"
 msgstr "Sturtevant"
 
-#: kstars_i18n.cpp:2349
+#: data/Cities.dat:2462
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Stuttgart"
 msgstr "Stuttgart"
 
-#: kstars_i18n.cpp:2350
+#: data/Cities.dat:2463
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sudbury"
 msgstr "Sudbury"
 
-#: kstars_i18n.cpp:2351
+#: data/Cities.dat:2464
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Suez"
 msgstr "Saue"
 
-#: kstars_i18n.cpp:2352
+#: data/Cities.dat:2465
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Suffolk"
 msgstr "Suffolk"
 
-#: kstars_i18n.cpp:2353
+#: data/Cities.dat:2466
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sugadaira"
 msgstr "Sugadaira"
 
-#: kstars_i18n.cpp:2354
+#: data/Cities.dat:2467
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sumter"
 msgstr "Sumter"
 
-#: kstars_i18n.cpp:2355
+#: data/Cities.dat:2468
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sun Valley"
 msgstr "Sun Valley"
 
-#: kstars_i18n.cpp:2356
+#: data/Cities.dat:2469
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Suncheon"
 msgstr "Suncheon"
 
-#: kstars_i18n.cpp:2357
+#: data/Cities.dat:2470
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sunnyvale"
 msgstr "Sunnyvale"
 
-#: kstars_i18n.cpp:2358
+#: data/Cities.dat:2471
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sunrise"
 msgstr "Sunrise"
 
-#: kstars_i18n.cpp:2359
+#: data/Cities.dat:2472
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Superior"
 msgstr "Superior"
 
-#: kstars_i18n.cpp:2360
+#: data/Cities.dat:2473
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sutherland"
 msgstr "Sutherland"
 
-#: kstars_i18n.cpp:2361
+#: data/Cities.dat:2474
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Suure-Jaani"
 msgstr "Suure-Jaani"
 
-#: kstars_i18n.cpp:2362
+#: data/Cities.dat:2475
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Suwon"
 msgstr "Suwon"
 
-#: kstars_i18n.cpp:2363
+#: data/Cities.dat:2476
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Svendborg"
 msgstr "Svendborg"
 
-#: kstars_i18n.cpp:2364
+#: data/Cities.dat:2477
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Swannanoa"
 msgstr "Swannanoa"
 
-#: kstars_i18n.cpp:2365
+#: data/Cities.dat:2478
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Swift Current"
 msgstr "Swift Current"
 
-#: kstars_i18n.cpp:2366
+#: data/Cities.dat:2479 data/Cities.dat:2480
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Sydney"
 msgstr "Sydney"
 
-#: kstars_i18n.cpp:2367
+#: data/Cities.dat:2481
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Syktyvkar"
 msgstr "Sitka"
 
-#: kstars_i18n.cpp:2368
+#: data/Cities.dat:2482
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Syracuse"
 msgstr "Syracuse"
 
-#: kstars_i18n.cpp:2369
+#: data/Cities.dat:2483
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "São Paulo"
 msgstr "São Paulo"
 
-#: kstars_i18n.cpp:2370
+#: data/Cities.dat:2484
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tabriz"
 msgstr "Tabriz"
 
-#: kstars_i18n.cpp:2371
+#: data/Cities.dat:2485
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tacoma"
 msgstr "Tacoma"
 
-#: kstars_i18n.cpp:2372
+#: data/Cities.dat:2486
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Taebaek"
 msgstr "Taebaek"
 
-#: kstars_i18n.cpp:2373
+#: data/Cities.dat:2487
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tahiti"
 msgstr "Tahiti"
 
-#: kstars_i18n.cpp:2374
+#: data/Cities.dat:2488
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tai Tam"
 msgstr "Tai Tam"
 
-#: kstars_i18n.cpp:2375
+#: data/Cities.dat:2488
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Hong Kong"
+msgstr "Hong Kong"
+
+#: data/Cities.dat:2489
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Taipei"
 msgstr "Taipei"
 
-#: kstars_i18n.cpp:2376
+#: data/Cities.dat:2489
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Taiwan"
+msgstr "Taiwan"
+
+#: data/Cities.dat:2490
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Takoradi"
 msgstr "Terni"
 
-#: kstars_i18n.cpp:2377
+#: data/Cities.dat:2491
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Talara"
 msgstr "Talara"
 
-#: kstars_i18n.cpp:2378
+#: data/Cities.dat:2492
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tallahassee"
 msgstr "Tallahassee"
 
-#: kstars_i18n.cpp:2379
+#: data/Cities.dat:2493
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tallinn"
 msgstr "Tallinn"
 
-#: kstars_i18n.cpp:2380
+#: data/Cities.dat:2494
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tamanrasset"
 msgstr "Talara"
 
-#: kstars_i18n.cpp:2381
+#: data/Cities.dat:2495
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tambov"
 msgstr "Hao"
 
-#: kstars_i18n.cpp:2382
+#: data/Cities.dat:2496
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tampa"
 msgstr "Tampa"
 
-#: kstars_i18n.cpp:2383
+#: data/Cities.dat:2497
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tampere"
 msgstr "Tampere"
 
-#: kstars_i18n.cpp:2384
+#: data/Cities.dat:2498
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tamsalu"
 msgstr "Tamsalu"
 
-#: kstars_i18n.cpp:2385
+#: data/Cities.dat:2499
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tangier"
 msgstr "Tangier"
 
-#: kstars_i18n.cpp:2386
+#: data/Cities.dat:2500
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Taora Island"
 msgstr "Taora Island"
 
-#: kstars_i18n.cpp:2387
+#: data/Cities.dat:2501
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tapa"
 msgstr "Tapa"
 
-#: kstars_i18n.cpp:2388
+#: data/Cities.dat:2502
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Taranto"
 msgstr "Taranto"
 
-#: kstars_i18n.cpp:2389
+#: data/Cities.dat:2503
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tarragona"
 msgstr "Tarragona"
 
-#: kstars_i18n.cpp:2390
+#: data/Cities.dat:2504
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tartu"
 msgstr "Tartu"
 
-#: kstars_i18n.cpp:2391
+#: data/Cities.dat:2505
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tashkent"
 msgstr "Tashkent"
 
-#: kstars_i18n.cpp:2392
+#: data/Cities.dat:2505
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Uzbekistan"
+msgstr "Uzbekistan"
+
+#: data/Cities.dat:2506
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tataouine"
 msgstr "Tartu"
 
-#: kstars_i18n.cpp:2393
+#: data/Cities.dat:2507
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Taylor"
 msgstr "Taylor"
 
-#: kstars_i18n.cpp:2394
+#: data/Cities.dat:2508
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: kstars_i18n.cpp:2395
+#: data/Cities.dat:2508
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Honduras"
+msgstr "Honduras"
+
+#: data/Cities.dat:2509
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tehran"
 msgstr "Tehran"
 
-#: kstars_i18n.cpp:2396
+#: data/Cities.dat:2510
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Teignmouth"
 msgstr "Teignmouth"
 
-#: kstars_i18n.cpp:2397
+#: data/Cities.dat:2511
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tel Aviv"
 msgstr "Tel Aviv"
 
-#: kstars_i18n.cpp:2398
+#: data/Cities.dat:2512
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tempe"
 msgstr "Tempe"
 
-#: kstars_i18n.cpp:2399
+#: data/Cities.dat:2513
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tengah"
 msgstr "Tengah"
 
-#: kstars_i18n.cpp:2400
+#: data/Cities.dat:2514
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tenino"
 msgstr "Tenino"
 
-#: kstars_i18n.cpp:2401
+#: data/Cities.dat:2515
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tern Island"
 msgstr "Ynys Tern"
 
-#: kstars_i18n.cpp:2402
+#: data/Cities.dat:2516
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Terni"
 msgstr "Terni"
 
-#: kstars_i18n.cpp:2403
+#: data/Cities.dat:2517
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Terrassa"
 msgstr "Terrassa"
 
-#: kstars_i18n.cpp:2404
+#: data/Cities.dat:2518
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Terre Haute"
 msgstr "Terre Haute"
 
-#: kstars_i18n.cpp:2405
+#: data/Cities.dat:2519
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Teruel"
 msgstr "Teruel"
 
-#: kstars_i18n.cpp:2406
+#: data/Cities.dat:2520 data/Cities.dat:2521
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Texarkana"
 msgstr "Texarkana"
 
-#: kstars_i18n.cpp:2407
+#: data/Cities.dat:2522
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Teyateayneng"
 msgstr "Meerane"
 
-#: kstars_i18n.cpp:2408
+#: data/Cities.dat:2523
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "The Pas"
 msgstr "The Pas"
 
-#: kstars_i18n.cpp:2409
+#: data/Cities.dat:2524
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Thessaloníki"
 msgstr "Thessaloníki"
 
-#: kstars_i18n.cpp:2410
+#: data/Cities.dat:2525
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Thibodaux"
 msgstr "Thibodaux"
 
-#: kstars_i18n.cpp:2411
+#: data/Cities.dat:2526
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Thies"
 msgstr "Trieste"
 
-#: kstars_i18n.cpp:2412
+#: data/Cities.dat:2527
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Thisted"
 msgstr "Thisted"
 
-#: kstars_i18n.cpp:2413
+#: data/Cities.dat:2528
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Thomasville"
 msgstr "Thomasville"
 
-#: kstars_i18n.cpp:2414
+#: data/Cities.dat:2529
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Thornton"
 msgstr "Thornton"
 
-#: kstars_i18n.cpp:2415
+#: data/Cities.dat:2530
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Thousand Oaks"
 msgstr "Thousand Oaks"
 
-#: kstars_i18n.cpp:2416
+#: data/Cities.dat:2531
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Thule"
 msgstr "Thule"
 
-#: kstars_i18n.cpp:2417
+#: data/Cities.dat:2532
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Thunder Bay"
 msgstr "Thunder Bay"
 
-#: kstars_i18n.cpp:2418
+#: data/Cities.dat:2533
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tifton"
 msgstr "Tifton"
 
-#: kstars_i18n.cpp:2419
+#: data/Cities.dat:2534
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tiko"
 msgstr "Tokyo"
 
-#: kstars_i18n.cpp:2420
+#: data/Cities.dat:2535
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tilburg"
 msgstr "Tilburg"
 
-#: kstars_i18n.cpp:2421
+#: data/Cities.dat:2536
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tillson"
 msgstr "Tillson"
 
-#: kstars_i18n.cpp:2422
+#: data/Cities.dat:2537
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Timmins"
 msgstr "Timmins"
 
-#: kstars_i18n.cpp:2423
+#: data/Cities.dat:2538
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tinak"
 msgstr "Tinak"
 
-#: kstars_i18n.cpp:2424
+#: data/Cities.dat:2539
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tindouf"
 msgstr "Tenino"
 
-#: kstars_i18n.cpp:2425
+#: data/Cities.dat:2540
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tinian Island"
 msgstr "Ynys Tinian"
 
-#: kstars_i18n.cpp:2426
+#: data/Cities.dat:2541
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tlemcen"
 msgstr "Tempe"
 
-#: kstars_i18n.cpp:2427
+#: data/Cities.dat:2542
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Toamasina"
 msgstr "Tamsalu"
 
-#: kstars_i18n.cpp:2428
+#: data/Cities.dat:2543
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tobruk"
 msgstr "York"
 
-#: kstars_i18n.cpp:2429
+#: data/Cities.dat:2544
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Toender"
 msgstr "Toender"
 
-#: kstars_i18n.cpp:2430
+#: data/Cities.dat:2545
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tokyo"
 msgstr "Tokyo"
 
-#: kstars_i18n.cpp:2431
+#: data/Cities.dat:2546 data/Cities.dat:2547
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Toledo"
 msgstr "Toledo"
 
-#: kstars_i18n.cpp:2432
+#: data/Cities.dat:2547
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Toledo"
+msgstr "Colorado"
+
+#: data/Cities.dat:2548
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Toliara"
 msgstr "Talara"
 
-#: kstars_i18n.cpp:2433
+#: data/Cities.dat:2549
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tombouctou"
 msgstr "Tombstone"
 
-#: kstars_i18n.cpp:2434
+#: data/Cities.dat:2550
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tombstone"
 msgstr "Tombstone"
 
-#: kstars_i18n.cpp:2435
+#: data/Cities.dat:2551
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tomsk"
 msgstr "Tokyo"
 
-#: kstars_i18n.cpp:2436
+#: data/Cities.dat:2552
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tongyeong"
 msgstr "Tongyeong"
 
-#: kstars_i18n.cpp:2437
+#: data/Cities.dat:2553
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Topeka"
 msgstr "Topeka"
 
-#: kstars_i18n.cpp:2438
+#: data/Cities.dat:2554
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Toronto"
 msgstr "Toronto"
 
-#: kstars_i18n.cpp:2439
+#: data/Cities.dat:2555
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Torrance"
 msgstr "Torrance"
 
-#: kstars_i18n.cpp:2440
+#: data/Cities.dat:2556
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Torrington"
 msgstr "Torrington"
 
-#: kstars_i18n.cpp:2441
+#: data/Cities.dat:2557
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Toulouse"
 msgstr "Toulouse"
 
-#: kstars_i18n.cpp:2442
+#: data/Cities.dat:2557
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Haute-Garonne"
+msgstr "Hawaii"
+
+#: data/Cities.dat:2558
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tours"
 msgstr "Tours"
 
-#: kstars_i18n.cpp:2443
+#: data/Cities.dat:2558
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Indre-et-Loire"
+msgstr "Madeira"
+
+#: data/Cities.dat:2559
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Townsville"
 msgstr "Townsville"
 
-#: kstars_i18n.cpp:2444
+#: data/Cities.dat:2560
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Toyokawa"
 msgstr "Toyokawa"
 
-#: kstars_i18n.cpp:2445
+#: data/Cities.dat:2561
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tozeur"
 msgstr "Tours"
 
-#: kstars_i18n.cpp:2446
+#: data/Cities.dat:2562
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Trapani"
 msgstr "Trapani"
 
-#: kstars_i18n.cpp:2447
+#: data/Cities.dat:2563
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Traverse City"
 msgstr "Dinas Traverse"
 
-#: kstars_i18n.cpp:2448
+#: data/Cities.dat:2564
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Trento"
 msgstr "Trento"
 
-#: kstars_i18n.cpp:2449
+#: data/Cities.dat:2565
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Trenton"
 msgstr "Trenton"
 
-#: kstars_i18n.cpp:2450
+#: data/Cities.dat:2566
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Treviso"
 msgstr "Treviso"
 
-#: kstars_i18n.cpp:2451
+#: data/Cities.dat:2567
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Trieste"
 msgstr "Trieste"
 
-#: kstars_i18n.cpp:2452
+#: data/Cities.dat:2568
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Trinidad"
 msgstr "Trinidad"
 
-#: kstars_i18n.cpp:2453
+#: data/Cities.dat:2569
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tripoli"
 msgstr "Tripoli"
 
-#: kstars_i18n.cpp:2454
+#: data/Cities.dat:2569
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Libya"
+msgstr "Libya"
+
+#: data/Cities.dat:2570
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Trois-Rivieres"
 msgstr "Trois-Rivieres"
 
-#: kstars_i18n.cpp:2455
+#: data/Cities.dat:2571
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Trondheim"
 msgstr "Trondheim"
 
-#: kstars_i18n.cpp:2456
+#: data/Cities.dat:2572 data/Cities.dat:2573 data/Cities.dat:2574
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Troy"
 msgstr "Troy"
 
-#: kstars_i18n.cpp:2457
+#: data/Cities.dat:2575
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Troyes"
 msgstr "Troy"
 
-#: kstars_i18n.cpp:2458
+#: data/Cities.dat:2575
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Aube"
+msgstr "Quebec"
+
+#: data/Cities.dat:2576
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Truk Atoll"
 msgstr "Truk Atoll"
 
-#: kstars_i18n.cpp:2459
+#: data/Cities.dat:2577
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: kstars_i18n.cpp:2460
+#: data/Cities.dat:2578
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tucker"
 msgstr "Tucker"
 
-#: kstars_i18n.cpp:2461
+#: data/Cities.dat:2579
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tucson"
 msgstr "Tucson"
 
-#: kstars_i18n.cpp:2462
+#: data/Cities.dat:2580
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tucumcari"
 msgstr "Tucumcari"
 
-#: kstars_i18n.cpp:2463
+#: data/Cities.dat:2581
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tula"
 msgstr "Tulsa"
 
-#: kstars_i18n.cpp:2464
+#: data/Cities.dat:2582
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tulsa"
 msgstr "Tulsa"
 
-#: kstars_i18n.cpp:2465
+#: data/Cities.dat:2583
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tunis"
 msgstr "Tunis"
 
-#: kstars_i18n.cpp:2466
+#: data/Cities.dat:2584
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tupelo"
 msgstr "Tupelo"
 
-#: kstars_i18n.cpp:2467
+#: data/Cities.dat:2585
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Turin"
 msgstr "Turin"
 
-#: kstars_i18n.cpp:2468
+#: data/Cities.dat:2586
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Turku"
 msgstr "Turku"
 
-#: kstars_i18n.cpp:2469
+#: data/Cities.dat:2587
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: kstars_i18n.cpp:2470
+#: data/Cities.dat:2588
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tver'"
 msgstr "Dover"
 
-#: kstars_i18n.cpp:2471
+#: data/Cities.dat:2589
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Twin Falls"
 msgstr "Twin Falls"
 
-#: kstars_i18n.cpp:2472
+#: data/Cities.dat:2590
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tyler"
 msgstr "Tyler"
 
-#: kstars_i18n.cpp:2473
+#: data/Cities.dat:2591
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tyumen'"
 msgstr "Tempe"
 
-#: kstars_i18n.cpp:2474
+#: data/Cities.dat:2592
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Tõrva"
 msgstr "Tõrva"
 
-#: kstars_i18n.cpp:2475
+#: data/Cities.dat:2593
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Türi"
 msgstr "Türi"
 
-#: kstars_i18n.cpp:2476
+#: data/Cities.dat:2594
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "US Naval Observatory"
 msgstr "Arsyllfa Morlu'r UD"
 
-#: kstars_i18n.cpp:2477
+#: data/Cities.dat:2594
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Washington, DC"
+msgstr "Washington, DC"
+
+#: data/Cities.dat:2595
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ubon"
 msgstr "Ubon"
 
-#: kstars_i18n.cpp:2478
+#: data/Cities.dat:2596
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Udine"
 msgstr "Udine"
 
-#: kstars_i18n.cpp:2479
+#: data/Cities.dat:2597
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Udon-Thani"
 msgstr "Udon-Thani"
 
-#: kstars_i18n.cpp:2480
+#: data/Cities.dat:2598
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Uelzen"
 msgstr "Uelzen"
 
-#: kstars_i18n.cpp:2481
+#: data/Cities.dat:2599
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ufa"
 msgstr "Sofia"
 
-#: kstars_i18n.cpp:2482
+#: data/Cities.dat:2600
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Uiseong"
 msgstr "Uiseong"
 
-#: kstars_i18n.cpp:2483
+#: data/Cities.dat:2601
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ujung Pandang"
 msgstr "Ujung Pandang"
 
-#: kstars_i18n.cpp:2484
+#: data/Cities.dat:2602
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ukkel"
 msgstr "Ukkel"
 
-#: kstars_i18n.cpp:2485
+#: data/Cities.dat:2603
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ulan-Ude"
 msgstr "Ulsan"
 
-#: kstars_i18n.cpp:2486
+#: data/Cities.dat:2604
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Uljin"
 msgstr "Uljin"
 
-#: kstars_i18n.cpp:2487
+#: data/Cities.dat:2605
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ulleungdo"
 msgstr "Ulleungdo"
 
-#: kstars_i18n.cpp:2488
+#: data/Cities.dat:2606
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ulm"
 msgstr "Ulm"
 
-#: kstars_i18n.cpp:2489
+#: data/Cities.dat:2607
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ulsan"
 msgstr "Ulsan"
 
-#: kstars_i18n.cpp:2490
+#: data/Cities.dat:2608
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Unalaska"
 msgstr "Unalaska"
 
-#: kstars_i18n.cpp:2491
+#: data/Cities.dat:2609
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Uni. de Barcelona"
 msgstr "Prifysgol Barcelona"
 
-#: kstars_i18n.cpp:2492
+#: data/Cities.dat:2610 data/Cities.dat:2611
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Union City"
 msgstr "Dinas Union"
 
-#: kstars_i18n.cpp:2493
+#: data/Cities.dat:2612
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "University City"
 msgstr "Dinas University"
 
-#: kstars_i18n.cpp:2494
-msgid ""
-"_: City name (optional, probably does not need a translation)\n"
-"Upolu Point"
-msgstr "Upolu Point"
-
-#: kstars_i18n.cpp:2495
+#: data/Cities.dat:2613
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Upolu"
 msgstr "Upolu"
 
-#: kstars_i18n.cpp:2496
+#: data/Cities.dat:2614
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Uppsala Sur"
-msgstr "Uppsala Sur"
+"Upolu Point"
+msgstr "Upolu Point"
 
-#: kstars_i18n.cpp:2497
+#: data/Cities.dat:2615
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Uppsala"
 msgstr "Uppsala"
 
-#: kstars_i18n.cpp:2498
+#: data/Cities.dat:2616
+msgid ""
+"_: City name (optional, probably does not need a translation)\n"
+"Uppsala Sur"
+msgstr "Uppsala Sur"
+
+#: data/Cities.dat:2617
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Urbana"
 msgstr "Urbana"
 
-#: kstars_i18n.cpp:2499
+#: data/Cities.dat:2618
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ust'-Ordynsky"
 msgstr "Gdansk"
 
-#: kstars_i18n.cpp:2500
+#: data/Cities.dat:2619
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Utica"
 msgstr "Utica"
 
-#: kstars_i18n.cpp:2501
+#: data/Cities.dat:2620
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Utirik"
 msgstr "Utirik"
 
-#: kstars_i18n.cpp:2502
+#: data/Cities.dat:2621
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Utrecht"
 msgstr "Utrecht"
 
-#: kstars_i18n.cpp:2503
+#: data/Cities.dat:2622
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vacaville"
 msgstr "Vacaville"
 
-#: kstars_i18n.cpp:2504
+#: data/Cities.dat:2623
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vainu Bappu"
 msgstr "Vainu Bappu"
 
-#: kstars_i18n.cpp:2505
+#: data/Cities.dat:2624
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Val-d'or"
 msgstr "Val-d'or"
 
-#: kstars_i18n.cpp:2506
+#: data/Cities.dat:2625
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Valdez"
 msgstr "Valdez"
 
-#: kstars_i18n.cpp:2507
+#: data/Cities.dat:2626
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Valdosta"
 msgstr "Valdosta"
 
-#: kstars_i18n.cpp:2508
+#: data/Cities.dat:2627
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vale"
 msgstr "Vale"
 
-#: kstars_i18n.cpp:2509
+#: data/Cities.dat:2628
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Valentine"
 msgstr "Valentine"
 
-#: kstars_i18n.cpp:2510
+#: data/Cities.dat:2629
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Valga"
 msgstr "Valga"
 
-#: kstars_i18n.cpp:2511
+#: data/Cities.dat:2630
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Valhalla"
 msgstr "Valhalla"
 
-#: kstars_i18n.cpp:2512
+#: data/Cities.dat:2631
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Valladolid"
 msgstr "Valladolid"
 
-#: kstars_i18n.cpp:2513
+#: data/Cities.dat:2632
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vallejo"
 msgstr "Vallejo"
 
-#: kstars_i18n.cpp:2514
+#: data/Cities.dat:2633
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Valletta"
 msgstr "Valletta"
 
-#: kstars_i18n.cpp:2515
+#: data/Cities.dat:2633
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Malta"
+msgstr "Malta"
+
+#: data/Cities.dat:2634
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Valparaiso"
 msgstr "Valparaíso"
 
-#: kstars_i18n.cpp:2516
+#: data/Cities.dat:2635
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Valverde"
 msgstr "Valverde"
 
-#: kstars_i18n.cpp:2517
+#: data/Cities.dat:2636
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Valéncia"
 msgstr "Valéncia"
 
-#: kstars_i18n.cpp:2518
+#: data/Cities.dat:2637
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Van Buren"
 msgstr "Van Buren"
 
-#: kstars_i18n.cpp:2519
+#: data/Cities.dat:2638
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Van Nuys"
 msgstr "Van Nuys"
 
-#: kstars_i18n.cpp:2520
+#: data/Cities.dat:2639 data/Cities.dat:2640
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vancouver"
 msgstr "Vancouver"
 
-#: kstars_i18n.cpp:2521
+#: data/Cities.dat:2641
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vandans"
 msgstr "Vandans"
 
-#: kstars_i18n.cpp:2522
+#: data/Cities.dat:2642
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vantaa"
 msgstr "Vantaa"
 
-#: kstars_i18n.cpp:2523
+#: data/Cities.dat:2643
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Varde"
 msgstr "Varde"
 
-#: kstars_i18n.cpp:2524
+#: data/Cities.dat:2644
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Varsovia"
 msgstr "Varsovia"
 
-#: kstars_i18n.cpp:2525
+#: data/Cities.dat:2645
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vaticano"
 msgstr "Vaticano"
 
-#: kstars_i18n.cpp:2526
+#: data/Cities.dat:2645
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Vatican"
+msgstr "Vatican"
+
+#: data/Cities.dat:2646
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vaughn"
 msgstr "Vaughn"
 
-#: kstars_i18n.cpp:2527
+#: data/Cities.dat:2647
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vejle"
 msgstr "Vejle"
 
-#: kstars_i18n.cpp:2528
+#: data/Cities.dat:2648 data/Cities.dat:2649
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Venice"
 msgstr "Venice"
 
-#: kstars_i18n.cpp:2529
+#: data/Cities.dat:2650
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ventura"
 msgstr "Ventura"
 
-#: kstars_i18n.cpp:2530
+#: data/Cities.dat:2651
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vermillion"
 msgstr "Vermillion"
 
-#: kstars_i18n.cpp:2531
+#: data/Cities.dat:2652
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vernal"
 msgstr "Vernal"
 
-#: kstars_i18n.cpp:2532
+#: data/Cities.dat:2653
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Verona"
 msgstr "Verona"
 
-#: kstars_i18n.cpp:2533
+#: data/Cities.dat:2654
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Very Large Array"
 msgstr "Very Large Array"
 
-#: kstars_i18n.cpp:2534
+#: data/Cities.dat:2655
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Viborg"
 msgstr "Viborg"
 
-#: kstars_i18n.cpp:2535
+#: data/Cities.dat:2656
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vicenza"
 msgstr "Vicenza"
 
-#: kstars_i18n.cpp:2536
+#: data/Cities.dat:2657
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vicksburg"
 msgstr "Vicksburg"
 
-#: kstars_i18n.cpp:2537
+#: data/Cities.dat:2658 data/Cities.dat:2659 data/Cities.dat:2660
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Victoria"
 msgstr "Victoria"
 
-#: kstars_i18n.cpp:2538
+#: data/Cities.dat:2658
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Seychelles"
+msgstr "Seychelles"
+
+#: data/Cities.dat:2661
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vienna"
 msgstr "Vienna"
 
-#: kstars_i18n.cpp:2539
+#: data/Cities.dat:2662
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vigo"
 msgstr "Vigo"
 
-#: kstars_i18n.cpp:2540
+#: data/Cities.dat:2663
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Viljandi"
 msgstr "Viljandi"
 
-#: kstars_i18n.cpp:2541
+#: data/Cities.dat:2664
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vilnius"
 msgstr "Vilnius"
 
-#: kstars_i18n.cpp:2542
+#: data/Cities.dat:2664
+msgid ""
+"_: Country name (optional, but should be translated)\n"
+"Lithuania"
+msgstr "Lithuania"
+
+#: data/Cities.dat:2665
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vineland"
 msgstr "Vineland"
 
-#: kstars_i18n.cpp:2543
+#: data/Cities.dat:2666
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Virginia Beach"
 msgstr "Traeth Virginia"
 
-#: kstars_i18n.cpp:2544
+#: data/Cities.dat:2667
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Visalia"
 msgstr "Visalia"
 
-#: kstars_i18n.cpp:2545
+#: data/Cities.dat:2668
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vitoria-Gasteiz"
 msgstr "Vitoria-Gasteiz"
 
-#: kstars_i18n.cpp:2546
+#: data/Cities.dat:2669
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vladikavkaz"
 msgstr "Vladivostok"
 
-#: kstars_i18n.cpp:2547
+#: data/Cities.dat:2670
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vladimir"
 msgstr "Viljandi"
 
-#: kstars_i18n.cpp:2548
+#: data/Cities.dat:2671
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vladivostok"
 msgstr "Vladivostok"
 
-#: kstars_i18n.cpp:2549
+#: data/Cities.dat:2672
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Volgograd"
 msgstr "Bologna"
 
-#: kstars_i18n.cpp:2550
+#: data/Cities.dat:2673
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vologda"
 msgstr "Bologna"
 
-#: kstars_i18n.cpp:2551
+#: data/Cities.dat:2674
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vols"
 msgstr "Vols"
 
-#: kstars_i18n.cpp:2552
+#: data/Cities.dat:2675
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Vordingborg"
 msgstr "Vordingborg"
 
-#: kstars_i18n.cpp:2553
+#: data/Cities.dat:2676
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Võhma"
 msgstr "Võhma"
 
-#: kstars_i18n.cpp:2554
+#: data/Cities.dat:2677
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Võru"
 msgstr "Võru"
 
-#: kstars_i18n.cpp:2555
+#: data/Cities.dat:2678
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wabash"
 msgstr "Wabash"
 
-#: kstars_i18n.cpp:2556
+#: data/Cities.dat:2679
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Waco"
 msgstr "Waco"
 
-#: kstars_i18n.cpp:2557
+#: data/Cities.dat:2680
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wad Medani"
 msgstr "La Mesa"
 
-#: kstars_i18n.cpp:2558
+#: data/Cities.dat:2681
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wadi-Halfa"
 msgstr "Waialua"
 
-#: kstars_i18n.cpp:2559
+#: data/Cities.dat:2682
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wafra"
 msgstr "Wafra"
 
-#: kstars_i18n.cpp:2560
+#: data/Cities.dat:2683
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wahiawa"
 msgstr "Wahiawa"
 
-#: kstars_i18n.cpp:2561
+#: data/Cities.dat:2684
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Waialua"
 msgstr "Waialua"
 
-#: kstars_i18n.cpp:2562
+#: data/Cities.dat:2685
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Waikola"
 msgstr "Waikola"
 
-#: kstars_i18n.cpp:2563
+#: data/Cities.dat:2686
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wailuku"
 msgstr "Wailuku"
 
-#: kstars_i18n.cpp:2564
+#: data/Cities.dat:2687
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Waimea"
 msgstr "Waimea"
 
-#: kstars_i18n.cpp:2565
+#: data/Cities.dat:2688
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Waipahu"
 msgstr "Waipahu"
 
-#: kstars_i18n.cpp:2566
+#: data/Cities.dat:2689
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wake Island"
 msgstr "Ynys Wake"
 
-#: kstars_i18n.cpp:2567
+#: data/Cities.dat:2690
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wakefield"
 msgstr "Wakefield"
 
-#: kstars_i18n.cpp:2568
+#: data/Cities.dat:2691
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Waldoboro"
 msgstr "Waldoboro"
 
-#: kstars_i18n.cpp:2569
+#: data/Cities.dat:2692
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Walker"
 msgstr "Walker"
 
-#: kstars_i18n.cpp:2570
+#: data/Cities.dat:2693
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Walla Walla"
 msgstr "Walla Walla"
 
-#: kstars_i18n.cpp:2571
+#: data/Cities.dat:2694
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wallace"
 msgstr "Wallace"
 
-#: kstars_i18n.cpp:2572
+#: data/Cities.dat:2695
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wallowa"
 msgstr "Wallowa"
 
-#: kstars_i18n.cpp:2573
+#: data/Cities.dat:2696
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Walnut Creek"
 msgstr "Walnut Creek"
 
-#: kstars_i18n.cpp:2574
+#: data/Cities.dat:2697
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Waltham"
 msgstr "Waltham"
 
-#: kstars_i18n.cpp:2575
+#: data/Cities.dat:2698
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Walvis Bay"
 msgstr "Sallisaw"
 
-#: kstars_i18n.cpp:2576
+#: data/Cities.dat:2699
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wando"
 msgstr "Wando"
 
-#: kstars_i18n.cpp:2577
+#: data/Cities.dat:2700
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Warner Robins"
 msgstr "Warner Robins"
 
-#: kstars_i18n.cpp:2578
+#: data/Cities.dat:2701 data/Cities.dat:2702 data/Cities.dat:2703
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Warren"
 msgstr "Warren"
 
-#: kstars_i18n.cpp:2579
+#: data/Cities.dat:2704
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Warsaw"
 msgstr "Warsaw"
 
-#: kstars_i18n.cpp:2580
+#: data/Cities.dat:2705
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Warwick"
 msgstr "Warwick"
 
-#: kstars_i18n.cpp:2581
+#: data/Cities.dat:2706
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wasco"
 msgstr "Wasco"
 
-#: kstars_i18n.cpp:2582
+#: data/Cities.dat:2707
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Waseca"
 msgstr "Waseca"
 
-#: kstars_i18n.cpp:2583
+#: data/Cities.dat:2708 data/Cities.dat:2709
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Washington"
 msgstr "Washington"
 
-#: kstars_i18n.cpp:2584
+#: data/Cities.dat:2708
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"DC"
+msgstr "DC"
+
+#: data/Cities.dat:2710
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Waterbury"
 msgstr "Waterbury"
 
-#: kstars_i18n.cpp:2585
+#: data/Cities.dat:2711 data/Cities.dat:2712
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Waterloo"
 msgstr "Waterloo"
 
-#: kstars_i18n.cpp:2586
+#: data/Cities.dat:2713 data/Cities.dat:2714
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Watertown"
 msgstr "Watertown"
 
-#: kstars_i18n.cpp:2587
+#: data/Cities.dat:2715
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Waterville"
 msgstr "Waterville"
 
-#: kstars_i18n.cpp:2588
+#: data/Cities.dat:2716
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Waukegan"
 msgstr "Waukegan"
 
-#: kstars_i18n.cpp:2589
+#: data/Cities.dat:2717
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Waukesha"
 msgstr "Waukesha"
 
-#: kstars_i18n.cpp:2590
+#: data/Cities.dat:2718
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wausau"
 msgstr "Wausau"
 
-#: kstars_i18n.cpp:2591
+#: data/Cities.dat:2719
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wauwatosa"
 msgstr "Wauwatosa"
 
-#: kstars_i18n.cpp:2592
+#: data/Cities.dat:2720
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Waycross"
 msgstr "Waycross"
 
-#: kstars_i18n.cpp:2593
+#: data/Cities.dat:2721
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wayne"
 msgstr "Wayne"
 
-#: kstars_i18n.cpp:2594
+#: data/Cities.dat:2722
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Waynesboro"
 msgstr "Waynesboro"
 
-#: kstars_i18n.cpp:2595
+#: data/Cities.dat:2723
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Waynesburg"
 msgstr "Waynesburg"
 
-#: kstars_i18n.cpp:2596
+#: data/Cities.dat:2724
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Weirs"
 msgstr "Weirs"
 
-#: kstars_i18n.cpp:2597
+#: data/Cities.dat:2725
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Weirton"
 msgstr "Weirton"
 
-#: kstars_i18n.cpp:2598
+#: data/Cities.dat:2726
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wellington"
 msgstr "Wellington"
 
-#: kstars_i18n.cpp:2599
+#: data/Cities.dat:2727
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wells"
 msgstr "Wells"
 
-#: kstars_i18n.cpp:2600
+#: data/Cities.dat:2728
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wendover"
 msgstr "Wendover"
 
-#: kstars_i18n.cpp:2601
+#: data/Cities.dat:2729
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "West Allis"
 msgstr "West Allis"
 
-#: kstars_i18n.cpp:2602
+#: data/Cities.dat:2730
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "West Covina"
 msgstr "West Covina"
 
-#: kstars_i18n.cpp:2603
+#: data/Cities.dat:2731
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "West Haven"
 msgstr "West Haven"
 
-#: kstars_i18n.cpp:2604
+#: data/Cities.dat:2732
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "West Hills"
 msgstr "West Hills"
 
-#: kstars_i18n.cpp:2605
+#: data/Cities.dat:2733
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "West Memphis"
 msgstr "West Memphis"
 
-#: kstars_i18n.cpp:2606
+#: data/Cities.dat:2734
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "West Palm Beach"
 msgstr "Gorllewin Palm Beach"
 
-#: kstars_i18n.cpp:2607
+#: data/Cities.dat:2735
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Westbrook"
 msgstr "Westbrook"
 
-#: kstars_i18n.cpp:2608
+#: data/Cities.dat:2736
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Westerbork"
 msgstr "Westerbork"
 
-#: kstars_i18n.cpp:2609
+#: data/Cities.dat:2737
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Westerly"
 msgstr "Westerly"
 
-#: kstars_i18n.cpp:2610
+#: data/Cities.dat:2738
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Westland"
 msgstr "Westland"
 
-#: kstars_i18n.cpp:2611
+#: data/Cities.dat:2739 data/Cities.dat:2740 data/Cities.dat:2741
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Westminster"
 msgstr "Westminster"
 
-#: kstars_i18n.cpp:2612
+#: data/Cities.dat:2742
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Weymouth"
 msgstr "Weymouth"
 
-#: kstars_i18n.cpp:2613
+#: data/Cities.dat:2743
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wheaton"
 msgstr "Wheaton"
 
-#: kstars_i18n.cpp:2614
+#: data/Cities.dat:2744
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wheeling"
 msgstr "Wheeling"
 
-#: kstars_i18n.cpp:2615
+#: data/Cities.dat:2745
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Whenuapai"
 msgstr "Whenuapai"
 
-#: kstars_i18n.cpp:2616
+#: data/Cities.dat:2746
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Whidbey Island"
 msgstr "Ynys Whidbey"
 
-#: kstars_i18n.cpp:2617
+#: data/Cities.dat:2747
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "White Plains"
 msgstr "White Plains"
 
-#: kstars_i18n.cpp:2618
+#: data/Cities.dat:2748
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Whitehorse"
 msgstr "Whitehorse"
 
-#: kstars_i18n.cpp:2619
+#: data/Cities.dat:2748
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Yukon"
+msgstr "Yukon"
+
+#: data/Cities.dat:2749
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Whittier"
 msgstr "Whittier"
 
-#: kstars_i18n.cpp:2620
+#: data/Cities.dat:2750
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Wichita Falls"
-msgstr "Wichita Falls"
+"Wichita"
+msgstr "Wichita"
 
-#: kstars_i18n.cpp:2621
+#: data/Cities.dat:2751
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
-"Wichita"
-msgstr "Wichita"
+"Wichita Falls"
+msgstr "Wichita Falls"
 
-#: kstars_i18n.cpp:2622
+#: data/Cities.dat:2752
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wickenburg"
 msgstr "Wickenburg"
 
-#: kstars_i18n.cpp:2623
+#: data/Cities.dat:2753
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wiesbaden"
 msgstr "Wiesbaden"
 
-#: kstars_i18n.cpp:2624
+#: data/Cities.dat:2754
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wilcox Solar Obs."
 msgstr "Ars. Heulol Wilcox"
 
-#: kstars_i18n.cpp:2625
+#: data/Cities.dat:2755
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wilder"
 msgstr "Wilder"
 
-#: kstars_i18n.cpp:2626
+#: data/Cities.dat:2756
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wilkes-Barre"
 msgstr "Wilkes-Barre"
 
-#: kstars_i18n.cpp:2627
+#: data/Cities.dat:2757
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Willcox"
 msgstr "Willcox"
 
-#: kstars_i18n.cpp:2628
+#: data/Cities.dat:2758
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Willemstad"
 msgstr "Willemstad"
 
-#: kstars_i18n.cpp:2629
+#: data/Cities.dat:2759
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Williston"
 msgstr "Williston"
 
-#: kstars_i18n.cpp:2630
+#: data/Cities.dat:2760 data/Cities.dat:2761
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wilmington"
 msgstr "Wilmington"
 
-#: kstars_i18n.cpp:2631
+#: 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"
 msgstr "Winchester"
 
-#: kstars_i18n.cpp:2632
+#: data/Cities.dat:2766
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Windam"
 msgstr "Windam"
 
-#: kstars_i18n.cpp:2633
+#: data/Cities.dat:2767 data/Cities.dat:2768
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Windhoek"
 msgstr "Windhoek"
 
-#: kstars_i18n.cpp:2634
+#: data/Cities.dat:2768
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Khomas Hochland"
+msgstr "Khomas Hochland"
+
+#: data/Cities.dat:2769
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Windsor"
 msgstr "Windsor"
 
-#: kstars_i18n.cpp:2635
+#: data/Cities.dat:2770
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Winnemucca"
 msgstr "Winnemucca"
 
-#: kstars_i18n.cpp:2636
+#: data/Cities.dat:2771
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Winner"
 msgstr "Winner"
 
-#: kstars_i18n.cpp:2637
+#: data/Cities.dat:2772
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Winnett"
 msgstr "Winnett"
 
-#: kstars_i18n.cpp:2638
+#: data/Cities.dat:2773
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Winnfield"
 msgstr "Winnfield"
 
-#: kstars_i18n.cpp:2639
+#: data/Cities.dat:2774
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Winnipeg"
 msgstr "Winnipeg"
 
-#: kstars_i18n.cpp:2640
+#: data/Cities.dat:2775 data/Cities.dat:2776
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Winona"
 msgstr "Winona"
 
-#: kstars_i18n.cpp:2641
+#: data/Cities.dat:2777
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Winooski"
 msgstr "Winooski"
 
-#: kstars_i18n.cpp:2642
+#: data/Cities.dat:2778
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Winsted"
 msgstr "Winsted"
 
-#: kstars_i18n.cpp:2643
+#: data/Cities.dat:2779
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: kstars_i18n.cpp:2644
+#: data/Cities.dat:2780
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Witten"
 msgstr "Witten"
 
-#: kstars_i18n.cpp:2645
+#: data/Cities.dat:2781
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wolfsburg"
 msgstr "Wolfsburg"
 
-#: kstars_i18n.cpp:2646
+#: data/Cities.dat:2782
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wolphaartsdijk"
 msgstr "Wolphaartsdijk"
 
-#: kstars_i18n.cpp:2647
+#: data/Cities.dat:2783
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wonju"
 msgstr "Wonju"
 
-#: kstars_i18n.cpp:2648
+#: data/Cities.dat:2784
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wonsan"
 msgstr "Wonsan"
 
-#: kstars_i18n.cpp:2649
+#: data/Cities.dat:2785
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Woodland Hills"
 msgstr "Woodland Hills"
 
-#: kstars_i18n.cpp:2650
+#: data/Cities.dat:2786
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Woodsville"
 msgstr "Woodsville"
 
-#: kstars_i18n.cpp:2651
+#: data/Cities.dat:2787
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Woodward"
 msgstr "Woodward"
 
-#: kstars_i18n.cpp:2652
+#: data/Cities.dat:2788 data/Cities.dat:2789
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Woonsocket"
 msgstr "Woonsocket"
 
-#: kstars_i18n.cpp:2653
+#: data/Cities.dat:2790
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Worcester"
 msgstr "Worcester"
 
-#: kstars_i18n.cpp:2654
+#: data/Cities.dat:2791
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wotje"
 msgstr "Wotje"
 
-#: kstars_i18n.cpp:2655
+#: data/Cities.dat:2792
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wuppertal"
 msgstr "Wuppertal"
 
-#: kstars_i18n.cpp:2656
+#: data/Cities.dat:2793
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wurzburg"
 msgstr "Wurzburg"
 
-#: kstars_i18n.cpp:2657
+#: data/Cities.dat:2794
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wynnewood"
 msgstr "Wynnewood"
 
-#: kstars_i18n.cpp:2658
+#: data/Cities.dat:2795
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wyoming"
 msgstr "Wyoming"
 
-#: kstars_i18n.cpp:2659
+#: data/Cities.dat:2796
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Wytheville"
 msgstr "Wytheville"
 
-#: kstars_i18n.cpp:2660
+#: data/Cities.dat:2797
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yakima"
 msgstr "Yakima"
 
-#: kstars_i18n.cpp:2661
+#: data/Cities.dat:2798
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yakutat"
 msgstr "Yakutat"
 
-#: kstars_i18n.cpp:2662
+#: data/Cities.dat:2799
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yakutsk"
 msgstr "Yakutat"
 
-#: kstars_i18n.cpp:2663
+#: data/Cities.dat:2800
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yale Obs."
 msgstr "Ars. Yale"
 
-#: kstars_i18n.cpp:2664
+#: data/Cities.dat:2801
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yalta"
 msgstr "Yalta"
 
-#: kstars_i18n.cpp:2665
+#: data/Cities.dat:2802
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yamoussoukro"
 msgstr "Mamoudzou"
 
-#: kstars_i18n.cpp:2666
+#: data/Cities.dat:2803
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yangpyeong"
 msgstr "Yangpyeong"
 
-#: kstars_i18n.cpp:2667
+#: data/Cities.dat:2804
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yankton"
 msgstr "Yankton"
 
-#: kstars_i18n.cpp:2668
+#: data/Cities.dat:2805
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yaounde"
 msgstr "Gander"
 
-#: kstars_i18n.cpp:2669
+#: data/Cities.dat:2806
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yap Island"
 msgstr "Ynys Yap"
 
-#: kstars_i18n.cpp:2670
+#: data/Cities.dat:2807
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yardley"
 msgstr "Yardley"
 
-#: kstars_i18n.cpp:2671
+#: data/Cities.dat:2808
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yebes"
 msgstr "Yebes"
 
-#: kstars_i18n.cpp:2672
+#: data/Cities.dat:2809
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yekepa"
 msgstr "Yebes"
 
-#: kstars_i18n.cpp:2673
+#: data/Cities.dat:2810
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yellowknife"
 msgstr "Yellowknife"
 
-#: kstars_i18n.cpp:2674
+#: data/Cities.dat:2811
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yeongcheon"
 msgstr "Yeongcheon"
 
-#: kstars_i18n.cpp:2675
+#: data/Cities.dat:2812
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yeongdeok"
 msgstr "Yeongdeok"
 
-#: kstars_i18n.cpp:2676
+#: data/Cities.dat:2813
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yeongju"
 msgstr "Yeongju"
 
-#: kstars_i18n.cpp:2677
+#: data/Cities.dat:2814
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yeongwol"
 msgstr "Yeongwol"
 
-#: kstars_i18n.cpp:2678
+#: data/Cities.dat:2815
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yeosu"
 msgstr "Yeosu"
 
-#: kstars_i18n.cpp:2679
+#: data/Cities.dat:2816
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yerkes Obs."
 msgstr "Ars. Yerkes"
 
-#: kstars_i18n.cpp:2680
+#: data/Cities.dat:2817
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yonkers"
 msgstr "Yonkers"
 
-#: kstars_i18n.cpp:2681
+#: data/Cities.dat:2818 data/Cities.dat:2819
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "York"
 msgstr "York"
 
-#: kstars_i18n.cpp:2682
+#: data/Cities.dat:2820
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yorktown Heights"
 msgstr "Yorktown Heights"
 
-#: kstars_i18n.cpp:2683
+#: data/Cities.dat:2821
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yoshkar Ola"
 msgstr "Kohala"
 
-#: kstars_i18n.cpp:2684
+#: data/Cities.dat:2822
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Youngstown"
 msgstr "Youngstown"
 
-#: kstars_i18n.cpp:2685
+#: data/Cities.dat:2823
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yuba City"
 msgstr "Dinas Yuba"
 
-#: kstars_i18n.cpp:2686
+#: data/Cities.dat:2824 data/Cities.dat:2825
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yuma"
 msgstr "Yuma"
 
-#: kstars_i18n.cpp:2687
+#: data/Cities.dat:2826
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yupojin"
 msgstr "Yupojin"
 
-#: kstars_i18n.cpp:2688
+#: data/Cities.dat:2826
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Hambuk"
+msgstr "Hambuk"
+
+#: data/Cities.dat:2827
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Yuzhno-Sakhalinsk"
 msgstr "Salinas"
 
-#: kstars_i18n.cpp:2689
+#: data/Cities.dat:2828
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Zamora"
 msgstr "Zamora"
 
-#: kstars_i18n.cpp:2690
+#: data/Cities.dat:2829
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Zanesville"
 msgstr "Zanesville"
 
-#: kstars_i18n.cpp:2691
+#: data/Cities.dat:2830
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Zanzibar"
 msgstr "Hannibal"
 
-#: kstars_i18n.cpp:2692
+#: data/Cities.dat:2831
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Zaragoza"
 msgstr "Zaragoza"
 
-#: kstars_i18n.cpp:2693
+#: data/Cities.dat:2832
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Zarzis"
 msgstr "Paris"
 
-#: kstars_i18n.cpp:2694
+#: data/Cities.dat:2833
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Zduny"
 msgstr "Muncy"
 
-#: kstars_i18n.cpp:2695
+#: data/Cities.dat:2833
+#, fuzzy
+msgid ""
+"_: Region/state name (optional, rarely needs a translation)\n"
+"Wielkopolska"
+msgstr "Alaska"
+
+#: data/Cities.dat:2834
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Zelenchukskaya"
 msgstr "Zelenchukskaya"
 
-#: kstars_i18n.cpp:2696
+#: data/Cities.dat:2835
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ziguinchor"
 msgstr "Suncheon"
 
-#: kstars_i18n.cpp:2697
+#: data/Cities.dat:2836
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Zimmerwald"
 msgstr "Zimmerwald"
 
-#: kstars_i18n.cpp:2698
+#: data/Cities.dat:2837
 #, fuzzy
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Zomba"
 msgstr "Bombay"
 
-#: kstars_i18n.cpp:2699
+#: data/Cities.dat:2838
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Zorneding"
 msgstr "Zorneding"
 
-#: kstars_i18n.cpp:2700
+#: data/Cities.dat:2839
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Zwickau"
 msgstr "Zwickau"
 
-#: kstars_i18n.cpp:2701
+#: data/Cities.dat:2840
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Zürich"
 msgstr "Zürich"
 
-#: kstars_i18n.cpp:2702
+#: data/Cities.dat:2841
 msgid ""
 "_: City name (optional, probably does not need a translation)\n"
 "Ávila"
 msgstr "Ávila"
 
-#: kstars_i18n.cpp:2704
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"ACT"
-msgstr "ACT"
-
-#: kstars_i18n.cpp:2705
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Alabama"
-msgstr "Alabama"
-
-#: kstars_i18n.cpp:2706
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Alaska"
-msgstr "Alaska"
-
-#: kstars_i18n.cpp:2707
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Alberta"
-msgstr "Alberta"
-
-#: kstars_i18n.cpp:2708
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Alpes Maritimes"
-msgstr "Alberta"
-
-#: kstars_i18n.cpp:2709
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Alpes de Haute Provence"
-msgstr "Falster"
-
-#: kstars_i18n.cpp:2710
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Alpes maritimes"
-msgstr "Alberta"
-
-#: kstars_i18n.cpp:2711
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Alpes-Maritimes"
-msgstr "Alberta"
-
-#: kstars_i18n.cpp:2712
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Andhra Pradesh"
-msgstr "Arkansas"
-
-#: kstars_i18n.cpp:2713
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Arizona"
-msgstr "Arizona"
-
-#: kstars_i18n.cpp:2714
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Arkansas"
-msgstr "Arkansas"
-
-#: kstars_i18n.cpp:2715
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Aube"
-msgstr "Quebec"
-
-#: kstars_i18n.cpp:2716
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Azores"
-msgstr "Azores"
-
-#: kstars_i18n.cpp:2717
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Bas-Rhin"
-msgstr "Maine"
-
-#: kstars_i18n.cpp:2718
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Bornholm"
-msgstr "Bornholm"
-
-#: kstars_i18n.cpp:2719
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Bouches-du-rhône"
-msgstr "Guernsey"
-
-#: kstars_i18n.cpp:2720
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Brabant"
-msgstr "Alabama"
-
-#: kstars_i18n.cpp:2721
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"British Columbia"
-msgstr "British Columbia"
-
-#: kstars_i18n.cpp:2722
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"California"
-msgstr "California"
-
-#: kstars_i18n.cpp:2723
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Calvados"
-msgstr "Colorado"
-
-#: kstars_i18n.cpp:2724
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Canary Islands"
-msgstr "Ynysoedd Canary"
-
-#: kstars_i18n.cpp:2725
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Central Region"
-msgstr "Oregon"
-
-#: kstars_i18n.cpp:2726
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Charente-Maritime"
-msgstr "Tenerife"
-
-#: kstars_i18n.cpp:2727
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Cher"
-msgstr "DC"
-
-#: kstars_i18n.cpp:2728
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Christmas Island"
-msgstr "Ynys y Nadolig"
-
-#: kstars_i18n.cpp:2729
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Chungbuk"
-msgstr "Chungbuk"
-
-#: kstars_i18n.cpp:2730
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Chungnam"
-msgstr "Chungnam"
-
-#: kstars_i18n.cpp:2731
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Colorado"
-msgstr "Colorado"
-
-#: kstars_i18n.cpp:2732
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Connecticut"
-msgstr "Connecticut"
-
-#: kstars_i18n.cpp:2733
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Corse du Sud"
-msgstr "Colorado"
-
-#: kstars_i18n.cpp:2734
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Côte d'or"
-msgstr "Efrog Newydd"
-
-#: kstars_i18n.cpp:2735
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"DC"
-msgstr "DC"
-
-#: kstars_i18n.cpp:2736
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Delaware"
-msgstr "Delaware"
-
-#: kstars_i18n.cpp:2737
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Falster"
-msgstr "Falster"
-
-#: kstars_i18n.cpp:2738
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Far East"
-msgstr "Falster"
-
-#: kstars_i18n.cpp:2739
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Finistère"
-msgstr "Falster"
-
-#: kstars_i18n.cpp:2740
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Flandre occidentale"
-msgstr "Florida"
-
-#: kstars_i18n.cpp:2741
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Florida"
-msgstr "Florida"
-
-#: kstars_i18n.cpp:2742
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Fyn"
-msgstr "Fyn"
-
-#: kstars_i18n.cpp:2743
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Gangwon"
-msgstr "Gangwon"
-
-#: kstars_i18n.cpp:2744
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Georgia"
-msgstr "Georgia"
-
-#: kstars_i18n.cpp:2745
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Gironde"
-msgstr "Maine"
-
-#: kstars_i18n.cpp:2746
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Gran Canaria"
-msgstr "Gran Canaria"
-
-#: kstars_i18n.cpp:2747
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Guadalcanal"
-msgstr "Guadalcanal"
-
-#: kstars_i18n.cpp:2748
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Guernsey"
-msgstr "Guernsey"
-
-#: kstars_i18n.cpp:2749
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Gyengnam"
-msgstr "Gyengnam"
-
-#: kstars_i18n.cpp:2750
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Gyeongbuk"
-msgstr "Gyeongbuk"
-
-#: kstars_i18n.cpp:2751
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Gyeonggi"
-msgstr "Gyeonggi"
-
-#: kstars_i18n.cpp:2752
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Gyeongnam"
-msgstr "Gyeongnam"
-
-#: kstars_i18n.cpp:2753
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Hambuk"
-msgstr "Hambuk"
-
-#: kstars_i18n.cpp:2754
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Haute-Corse"
-msgstr "Guernsey"
-
-#: kstars_i18n.cpp:2755
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Haute-Garonne"
-msgstr "Hawaii"
-
-#: kstars_i18n.cpp:2756
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Haute-Savoie"
-msgstr "Hawaii"
-
-#: kstars_i18n.cpp:2757
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Hautes Alpes"
-msgstr "Cymru"
-
-#: kstars_i18n.cpp:2758
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Hautes-Pyrénées"
-msgstr "Guernsey"
-
-#: kstars_i18n.cpp:2759
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Hauts-de-Seine"
-msgstr "Maine"
-
-#: kstars_i18n.cpp:2760
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Hawaii"
-msgstr "Hawaii"
-
-#: kstars_i18n.cpp:2761
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Herault"
-msgstr "Hambuk"
-
-#: kstars_i18n.cpp:2762
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Idaho"
-msgstr "Idaho"
-
-#: kstars_i18n.cpp:2763
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Ille-et-vilaine"
-msgstr "Maine"
-
-#: kstars_i18n.cpp:2764
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Illinois"
-msgstr "Illinois"
-
-#: kstars_i18n.cpp:2765
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Incheon"
-msgstr "Incheon"
-
-#: kstars_i18n.cpp:2766
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Indiana"
-msgstr "Indiana"
-
-#: kstars_i18n.cpp:2767
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Indre-et-Loire"
-msgstr "Madeira"
-
-#: kstars_i18n.cpp:2768
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Iowa"
-msgstr "Iowa"
-
-#: kstars_i18n.cpp:2769
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Isère"
-msgstr "Azores"
-
-#: kstars_i18n.cpp:2770
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Jeju"
-msgstr "Jeju"
-
-#: kstars_i18n.cpp:2771
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Jeonbuk"
-msgstr "Jeonbuk"
-
-#: kstars_i18n.cpp:2772
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Jeonnam"
-msgstr "Jeonnam"
-
-#: kstars_i18n.cpp:2773
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Jylland"
-msgstr "Jylland"
-
-#: kstars_i18n.cpp:2774
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Kansas"
-msgstr "Kansas"
-
-#: kstars_i18n.cpp:2775
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Kentucky"
-msgstr "Kentucky"
-
-#: kstars_i18n.cpp:2776
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Khomas Hochland"
-msgstr "Khomas Hochland"
-
-#: kstars_i18n.cpp:2777
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Lecco"
-msgstr "Lecco"
-
-#: kstars_i18n.cpp:2778
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Loire atlantique"
-msgstr "Zealand"
-
-#: kstars_i18n.cpp:2779
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Loire"
-msgstr "Azores"
-
-#: kstars_i18n.cpp:2780
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Loire-atlantique"
-msgstr "Zealand"
-
-#: kstars_i18n.cpp:2781
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Loiret"
-msgstr "Tibet"
-
-#: kstars_i18n.cpp:2782
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Lolland"
-msgstr "Lolland"
-
-#: kstars_i18n.cpp:2783
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Louisiana"
-msgstr "Louisiana"
-
-#: kstars_i18n.cpp:2784
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Madeira"
-msgstr "Madeira"
-
-#: kstars_i18n.cpp:2785
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Maine"
-msgstr "Maine"
-
-#: kstars_i18n.cpp:2786
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Manche"
-msgstr "Maine"
-
-#: kstars_i18n.cpp:2787
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Manitoba"
-msgstr "Manitoba"
-
-#: kstars_i18n.cpp:2788
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Marne"
-msgstr "Maine"
-
-#: kstars_i18n.cpp:2789
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Maryland"
-msgstr "Maryland"
-
-#: kstars_i18n.cpp:2790
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Massachusetts"
-msgstr "Massachusetts"
-
-#: kstars_i18n.cpp:2791
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Mayotte"
-msgstr "Mayotte"
-
-#: kstars_i18n.cpp:2792
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Michigan"
-msgstr "Michigan"
-
-#: kstars_i18n.cpp:2793
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Minnesota"
-msgstr "Minnesota"
-
-#: kstars_i18n.cpp:2794
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Mississippi"
-msgstr "Mississippi"
-
-#: kstars_i18n.cpp:2795
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Missouri"
-msgstr "Missouri"
-
-#: kstars_i18n.cpp:2796
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Montana"
-msgstr "Montana"
-
-#: kstars_i18n.cpp:2797
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Moselle"
-msgstr "Lolland"
-
-#: kstars_i18n.cpp:2798
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Nebraska"
-msgstr "Nebraska"
-
-#: kstars_i18n.cpp:2799
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Nevada"
-msgstr "Nevada"
-
-#: kstars_i18n.cpp:2800
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"New Brunswick"
-msgstr "Brunswick Newydd"
-
-#: kstars_i18n.cpp:2801
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"New Caledonia"
-msgstr "Caledonia Newydd"
-
-#: kstars_i18n.cpp:2802
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"New Hampshire"
-msgstr "Hampshire Newydd"
-
-#: kstars_i18n.cpp:2803
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"New Jersey"
-msgstr "Jersey Newydd"
-
-#: kstars_i18n.cpp:2804
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"New Mexico"
-msgstr "Mexico Newydd"
-
-#: kstars_i18n.cpp:2805
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"New South Wales"
-msgstr "De Cymru Newydd"
-
-#: kstars_i18n.cpp:2806
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"New York"
-msgstr "Efrog Newydd"
-
-#: kstars_i18n.cpp:2807
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Newfoundland"
-msgstr "Newfoundland"
-
-#: kstars_i18n.cpp:2808
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Nord"
-msgstr "Florida"
-
-#: kstars_i18n.cpp:2809
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"North Carolina"
-msgstr "Gogledd Carolina"
-
-#: kstars_i18n.cpp:2810
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"North Dakota"
-msgstr "Gogledd Dakota"
-
-#: kstars_i18n.cpp:2811
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"North-West Region"
-msgstr "Northwest Territories"
-
-#: kstars_i18n.cpp:2812
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Northern Ireland"
-msgstr "Gogledd Iwerddon"
-
-#: kstars_i18n.cpp:2813
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Northern Territory"
-msgstr "Northern Territory"
-
-#: kstars_i18n.cpp:2814
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Northwest Territories"
-msgstr "Northwest Territories"
-
-#: kstars_i18n.cpp:2815
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Nova Scotia"
-msgstr "Nova Scotia"
-
-#: kstars_i18n.cpp:2816
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Nunavut"
-msgstr "Nunavut"
-
-#: kstars_i18n.cpp:2817
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Ohio"
-msgstr "Ohio"
-
-#: kstars_i18n.cpp:2818
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Oklahoma"
-msgstr "Oklahoma"
-
-#: kstars_i18n.cpp:2819
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Ontario"
-msgstr "Ontario"
-
-#: kstars_i18n.cpp:2820
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Oregon"
-msgstr "Oregon"
-
-#: kstars_i18n.cpp:2821
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Paris"
-msgstr "Ontario"
-
-#: kstars_i18n.cpp:2822
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Pas-de-Calais"
-msgstr "Kansas"
-
-#: kstars_i18n.cpp:2823
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Pennsylvania"
-msgstr "Pennsylvania"
-
-#: kstars_i18n.cpp:2824
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Prince Edward Island"
-msgstr "Ynys Tywysog Edward"
-
-#: kstars_i18n.cpp:2825
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Puerto Rico"
-msgstr "Puerto Rico"
-
-#: kstars_i18n.cpp:2826
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Puy-de-Dôme"
-msgstr "Quebec"
-
-#: kstars_i18n.cpp:2827
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Pyrénées Orientales"
-msgstr "Cymru"
-
-#: kstars_i18n.cpp:2828
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Pyrénées atlantiques"
-msgstr "Zealand"
-
-#: kstars_i18n.cpp:2829
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Pyungbuk"
-msgstr "Pyungbuk"
-
-#: kstars_i18n.cpp:2830
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Quebec"
-msgstr "Quebec"
-
-#: kstars_i18n.cpp:2831
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Queensland"
-msgstr "Queensland"
-
-#: kstars_i18n.cpp:2832
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Rhode Island"
-msgstr "Ynys Rhode"
-
-#: kstars_i18n.cpp:2833
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Rhône"
-msgstr "Maine"
-
-#: kstars_i18n.cpp:2834
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Saskatchewan"
-msgstr "Saskatchewan"
-
-#: kstars_i18n.cpp:2835
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Scotland"
-msgstr "Yr Alban"
-
-#: kstars_i18n.cpp:2836
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Seine maritime"
-msgstr "Tenerife"
-
-#: kstars_i18n.cpp:2837
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Seine-maritime"
-msgstr "Tenerife"
-
-#: kstars_i18n.cpp:2838
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Siberia"
-msgstr "Georgia"
-
-#: kstars_i18n.cpp:2839
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Somme"
-msgstr "Azores"
-
-#: kstars_i18n.cpp:2840
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"South Australia"
-msgstr "De Australia"
-
-#: kstars_i18n.cpp:2841
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"South Carolina"
-msgstr "De Carolina"
-
-#: kstars_i18n.cpp:2842
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"South Dakota"
-msgstr "De Dakota"
-
-#: kstars_i18n.cpp:2843
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"South Region"
-msgstr "De Carolina"
-
-#: kstars_i18n.cpp:2844
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"St-Pierre and Miquelon"
-msgstr "Yr Alban"
-
-#: kstars_i18n.cpp:2845
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Tenerife"
-msgstr "Tenerife"
-
-#: kstars_i18n.cpp:2846
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Tennessee"
-msgstr "Tennessee"
-
-#: kstars_i18n.cpp:2847
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Texas"
-msgstr "Texas"
-
-#: kstars_i18n.cpp:2848
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Tibet"
-msgstr "Tibet"
-
-#: kstars_i18n.cpp:2849
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Toledo"
-msgstr "Colorado"
-
-#: kstars_i18n.cpp:2850
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Ural"
-msgstr "Utah"
-
-#: kstars_i18n.cpp:2851
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Utah"
-msgstr "Utah"
-
-#: kstars_i18n.cpp:2852
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Vaucluse"
-msgstr "Falster"
-
-#: kstars_i18n.cpp:2853
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Vermont"
-msgstr "Vermont"
-
-#: kstars_i18n.cpp:2854
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Victoria"
-msgstr "Victoria"
-
-#: kstars_i18n.cpp:2855
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Virginia"
-msgstr "Virginia"
-
-#: kstars_i18n.cpp:2856
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Volga Region"
-msgstr "Oregon"
-
-#: kstars_i18n.cpp:2857
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Wales"
-msgstr "Cymru"
-
-#: kstars_i18n.cpp:2858
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Washington"
-msgstr "Washington"
-
-#: kstars_i18n.cpp:2859
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Washington, DC"
-msgstr "Washington, DC"
-
-#: kstars_i18n.cpp:2860
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"West Virginia"
-msgstr "Gorllewin Virginia"
-
-#: kstars_i18n.cpp:2861
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Western Australia"
-msgstr "Gorllewin Australia"
-
-#: kstars_i18n.cpp:2862
-#, fuzzy
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Wielkopolska"
-msgstr "Alaska"
-
-#: kstars_i18n.cpp:2863
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Wisconsin"
-msgstr "Wisconsin"
-
-#: kstars_i18n.cpp:2864
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Wyoming"
-msgstr "Wyoming"
-
-#: kstars_i18n.cpp:2865
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Yukon"
-msgstr "Yukon"
-
-#: kstars_i18n.cpp:2866
-msgid ""
-"_: Region/state name (optional, rarely needs a translation)\n"
-"Zealand"
-msgstr "Zealand"
-
-#: kstars_i18n.cpp:2867
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Afghanistan"
-msgstr "Afghanistan"
-
-#: kstars_i18n.cpp:2868
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Algeria"
-msgstr "Algeria"
-
-#: kstars_i18n.cpp:2869
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Angola"
-msgstr "Angola"
-
-#: kstars_i18n.cpp:2870
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Antarctica"
-msgstr "Antarctica"
-
-#: kstars_i18n.cpp:2871
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Antigua and Barbuda"
-msgstr "Antigua a Barbuda"
-
-#: kstars_i18n.cpp:2872
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Argentina"
-msgstr "Yr Ariandir"
-
-#: kstars_i18n.cpp:2873
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Armenia"
-msgstr "Armenia"
-
-#: kstars_i18n.cpp:2874
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Ascension Island"
-msgstr "Ynys Ascension"
-
-#: kstars_i18n.cpp:2875
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Australia"
-msgstr "Australia"
-
-#: kstars_i18n.cpp:2876
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Austria"
-msgstr "Austria"
-
-#: kstars_i18n.cpp:2877
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Bahamas"
-msgstr "Bahamas"
-
-#: kstars_i18n.cpp:2878
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Bahrain"
-msgstr "Bahrain"
-
-#: kstars_i18n.cpp:2879
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Bangladesh"
-msgstr "Bangladesh"
-
-#: kstars_i18n.cpp:2880
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Barbados"
-msgstr "Barbados"
-
-#: kstars_i18n.cpp:2881
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Belgium"
-msgstr "Gwlad Belg"
-
-#: kstars_i18n.cpp:2882
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Belize"
-msgstr "Belize"
-
-#: kstars_i18n.cpp:2883
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Bermuda"
-msgstr "Bermiwda"
-
-#: kstars_i18n.cpp:2884
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Bolivia"
-msgstr "Bolivia"
-
-#: kstars_i18n.cpp:2885
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Bosnia and Herzegovina"
-msgstr "Bosnia ac Herzegovina"
-
-#: kstars_i18n.cpp:2886
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Botswana"
-msgstr "Botswana"
-
-#: kstars_i18n.cpp:2887
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Brazil"
-msgstr "Brasil"
-
-#: kstars_i18n.cpp:2888
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Brunei"
-msgstr "Brunei"
-
-#: kstars_i18n.cpp:2889
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Bulgaria"
-msgstr "Bwlgaria"
-
-#: kstars_i18n.cpp:2890
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Burkina Faso"
-msgstr "Bwrcina Ffaso"
-
-#: kstars_i18n.cpp:2891
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Burundi"
-msgstr "Bwrwndi"
-
-#: kstars_i18n.cpp:2892
-#, fuzzy
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Bénin"
-msgstr "Brunei"
-
-#: kstars_i18n.cpp:2893
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Cameroon"
-msgstr "Camerwn"
-
-#: kstars_i18n.cpp:2894
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Canada"
-msgstr "Canada"
-
-#: kstars_i18n.cpp:2895
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Cape Verde"
-msgstr "Cape Verde"
-
-#: kstars_i18n.cpp:2896
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Cayman Islands"
-msgstr "Ynysoedd Cayman"
-
-#: kstars_i18n.cpp:2897
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Central African Republic"
-msgstr "Gweriniaeth Canolig Affrica"
-
-#: kstars_i18n.cpp:2898
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Chad"
-msgstr "Chad"
-
-#: kstars_i18n.cpp:2899
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Chile"
-msgstr "Chile"
-
-#: kstars_i18n.cpp:2900
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"China"
-msgstr "Tseina"
-
-#: kstars_i18n.cpp:2901
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Colombia"
-msgstr "Colombia"
-
-#: kstars_i18n.cpp:2902
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Congo (Democratic Republic)"
-msgstr "Congo (Gweriniaeth Democrataidd)"
-
-#: kstars_i18n.cpp:2903
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Congo"
-msgstr "Congo"
-
-#: kstars_i18n.cpp:2904
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Costa Rica"
-msgstr "Costa Rica"
-
-#: kstars_i18n.cpp:2905
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Croatia"
-msgstr "Croatia"
-
-#: kstars_i18n.cpp:2906
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Cuba"
-msgstr "Cuba"
-
-#: kstars_i18n.cpp:2907
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Cyprus"
-msgstr "Cyprus"
-
-#: kstars_i18n.cpp:2908
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Czech Republic"
-msgstr "Gweriniaeth Tsiec"
-
-#: kstars_i18n.cpp:2909
-#, fuzzy
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Dem rep of Congo"
-msgstr "Yemen"
-
-#: kstars_i18n.cpp:2910
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Denmark"
-msgstr "Denmarc"
-
-#: kstars_i18n.cpp:2911
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Djibouti"
-msgstr "Djibouti"
-
-#: kstars_i18n.cpp:2912
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Dominican Republic"
-msgstr "Gweriniaeth Dominica"
-
-#: kstars_i18n.cpp:2913
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Ecuador"
-msgstr "Ecuador"
-
-#: kstars_i18n.cpp:2914
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Egypt"
-msgstr "Yr Aifft"
-
-#: kstars_i18n.cpp:2915
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"El Salvador"
-msgstr "El Salvador"
-
-#: kstars_i18n.cpp:2916
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Equatorial Guinea"
-msgstr "Gini'r Cyhydedd"
-
-#: kstars_i18n.cpp:2917
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Eritrea"
-msgstr "Eritrea"
-
-#: kstars_i18n.cpp:2918
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Estonia"
-msgstr "Estonia"
-
-#: kstars_i18n.cpp:2919
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Ethiopia"
-msgstr "Ethiopia"
-
-#: kstars_i18n.cpp:2920
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Falkland Islands"
-msgstr "Ynysoedd Falkland"
-
-#: kstars_i18n.cpp:2921
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Fiji"
-msgstr "Fiji"
-
-#: kstars_i18n.cpp:2922
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Finland"
-msgstr "Ffindir"
-
-#: kstars_i18n.cpp:2923
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"France"
-msgstr "Ffrainc"
-
-#: kstars_i18n.cpp:2924
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"French Guiana"
-msgstr "Guiana Ffrengig"
-
-#: kstars_i18n.cpp:2925
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"French Polynesia"
-msgstr "Polynesia Ffrengig"
-
-#: kstars_i18n.cpp:2926
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Gabon"
-msgstr "Gabon"
-
-#: kstars_i18n.cpp:2927
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Gambia"
-msgstr "Gambia"
-
-#: kstars_i18n.cpp:2928
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Germany"
-msgstr "Yr Almaen"
-
-#: kstars_i18n.cpp:2929
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Ghana"
-msgstr "Ghana"
-
-#: kstars_i18n.cpp:2930
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Greece"
-msgstr "Groeg"
-
-#: kstars_i18n.cpp:2931
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Greenland"
-msgstr "Ynys Las"
-
-#: kstars_i18n.cpp:2932
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Guam"
-msgstr "Guam"
-
-#: kstars_i18n.cpp:2933
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Guatemala"
-msgstr "Guatemala"
-
-#: kstars_i18n.cpp:2934
-#, fuzzy
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Guinea Bissau"
-msgstr "Tunisia"
-
-#: kstars_i18n.cpp:2935
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Guinea"
-msgstr "Gini"
-
-#: kstars_i18n.cpp:2936
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Guyana"
-msgstr "Guyana"
-
-#: kstars_i18n.cpp:2937
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Haiti"
-msgstr "Haiti"
-
-#: kstars_i18n.cpp:2938
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Honduras"
-msgstr "Honduras"
-
-#: kstars_i18n.cpp:2939
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Hong Kong"
-msgstr "Hong Kong"
-
-#: kstars_i18n.cpp:2940
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Hungary"
-msgstr "Hwngari"
-
-#: kstars_i18n.cpp:2941
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Iceland"
-msgstr "Gwlad yr Iâ"
-
-#: kstars_i18n.cpp:2942
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"India"
-msgstr "India"
-
-#: kstars_i18n.cpp:2943
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Indonesia"
-msgstr "Indonesia"
-
-#: kstars_i18n.cpp:2944
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Iran"
-msgstr "Iran"
-
-#: kstars_i18n.cpp:2945
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Iraq"
-msgstr "Iraq"
-
-#: kstars_i18n.cpp:2946
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Ireland"
-msgstr "Iwerddon"
-
-#: kstars_i18n.cpp:2947
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Isle of Man"
-msgstr "Ynys Mannin"
-
-#: kstars_i18n.cpp:2948
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Israel"
-msgstr "Israel"
-
-#: kstars_i18n.cpp:2949
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Italy"
-msgstr "Yr Eidal"
-
-#: kstars_i18n.cpp:2950
-#, fuzzy
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Ivory coast"
-msgstr "Iran"
-
-#: kstars_i18n.cpp:2951
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Jamaica"
-msgstr "Jamaica"
-
-#: kstars_i18n.cpp:2952
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Japan"
-msgstr "Siapan"
-
-#: kstars_i18n.cpp:2953
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Jordan"
-msgstr "Jordan"
-
-#: kstars_i18n.cpp:2954
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Kazakhstan"
-msgstr "Kazakhstan"
-
-#: kstars_i18n.cpp:2955
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Kenya"
-msgstr "Kenya"
-
-#: kstars_i18n.cpp:2956
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Kiribati"
-msgstr "Ciribati"
-
-#: kstars_i18n.cpp:2957
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Korea"
-msgstr "Corea"
-
-#: kstars_i18n.cpp:2958
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Kuwait"
-msgstr "Kuwait"
-
-#: kstars_i18n.cpp:2959
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Latvia"
-msgstr "Latvia"
-
-#: kstars_i18n.cpp:2960
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Lebanon"
-msgstr "Lebanon"
-
-#: kstars_i18n.cpp:2961
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Lesotho"
-msgstr "Lesotho"
-
-#: kstars_i18n.cpp:2962
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Liberia"
-msgstr "Liberia"
-
-#: kstars_i18n.cpp:2963
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Libya"
-msgstr "Libya"
-
-#: kstars_i18n.cpp:2964
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Lithuania"
-msgstr "Lithuania"
-
-#: kstars_i18n.cpp:2965
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Luxembourg"
-msgstr "Luxembourg"
-
-#: kstars_i18n.cpp:2966
-#, fuzzy
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Lybia"
-msgstr "Liberia"
-
-#: kstars_i18n.cpp:2967
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Macedonia"
-msgstr "Macedonia"
-
-#: kstars_i18n.cpp:2968
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Madagascar"
-msgstr "Madagascar"
-
-#: kstars_i18n.cpp:2969
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Malawi"
-msgstr "Malawi"
-
-#: kstars_i18n.cpp:2970
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Malaysia"
-msgstr "Malaysia"
-
-#: kstars_i18n.cpp:2971
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Maldives"
-msgstr "Maldifau"
-
-#: kstars_i18n.cpp:2972
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Mali"
-msgstr "Mali"
-
-#: kstars_i18n.cpp:2973
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Malta"
-msgstr "Malta"
-
-#: kstars_i18n.cpp:2974
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Marshall Islands"
-msgstr "Ynysoedd Marshall"
-
-#: kstars_i18n.cpp:2975
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Mauritania"
-msgstr "Mawritania"
-
-#: kstars_i18n.cpp:2976
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Mauritius"
-msgstr "Mauritius"
-
-#: kstars_i18n.cpp:2977
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Mexico"
-msgstr "Mecsico"
-
-#: kstars_i18n.cpp:2978
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Micronesia"
-msgstr "Micronesia"
-
-#: kstars_i18n.cpp:2979
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Monaco"
-msgstr "Monaco"
-
-#: kstars_i18n.cpp:2980
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Morocco"
-msgstr "Morocco"
-
-#: kstars_i18n.cpp:2981
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Mozambique"
-msgstr "Mosambîc"
-
-#: kstars_i18n.cpp:2982
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Myanmar"
-msgstr "Myanmar"
-
-#: kstars_i18n.cpp:2983
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Namibia"
-msgstr "Namibia"
-
-#: kstars_i18n.cpp:2984
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Nepal"
-msgstr "Nepal"
-
-#: kstars_i18n.cpp:2985
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Netherlands"
-msgstr "Iseldiroedd"
-
-#: kstars_i18n.cpp:2986
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"New Zealand"
-msgstr "Seland Newydd"
-
-#: kstars_i18n.cpp:2987
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Nicaragua"
-msgstr "Nicaragua"
-
-#: kstars_i18n.cpp:2988
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Niger"
-msgstr "Niger"
-
-#: kstars_i18n.cpp:2989
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Nigeria"
-msgstr "Nigeria"
-
-#: kstars_i18n.cpp:2990
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Norway"
-msgstr "Norwy"
-
-#: kstars_i18n.cpp:2991
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Pakistan"
-msgstr "Pakistan"
-
-#: kstars_i18n.cpp:2992
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Palau"
-msgstr "Palau"
-
-#: kstars_i18n.cpp:2993
+#: 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 ""
-"_: Country name (optional, but should be translated)\n"
-"Panama"
-msgstr "Panama"
-
-#: kstars_i18n.cpp:2994
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Papua New Guinea"
-msgstr "Papwa Gini Newydd "
-
-#: kstars_i18n.cpp:2995
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Paraguay"
-msgstr "Paraguay"
-
-#: kstars_i18n.cpp:2996
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Peru"
-msgstr "Peru"
-
-#: kstars_i18n.cpp:2997
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Philippines"
-msgstr "Philippines"
-
-#: kstars_i18n.cpp:2998
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Pitcairn Islands"
-msgstr "Ynysoedd Pitcairn"
-
-#: kstars_i18n.cpp:2999
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Poland"
-msgstr "Gwlad Pwyl"
-
-#: kstars_i18n.cpp:3000
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Portugal"
-msgstr "Portiwgal"
-
-#: kstars_i18n.cpp:3001
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Qatar"
-msgstr "Qatar"
-
-#: kstars_i18n.cpp:3002
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Romania"
-msgstr "Romania"
-
-#: kstars_i18n.cpp:3003
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Russia"
-msgstr "Rwsia"
-
-#: kstars_i18n.cpp:3004
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Rwanda"
-msgstr "Rwanda"
-
-#: kstars_i18n.cpp:3005
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Samoa"
-msgstr "Samoa"
-
-#: kstars_i18n.cpp:3006
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Saudi Arabia"
-msgstr "Saudi Arabia"
-
-#: kstars_i18n.cpp:3007
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Senegal"
-msgstr "Senegal"
-
-#: kstars_i18n.cpp:3008
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Seychelles"
-msgstr "Seychelles"
-
-#: kstars_i18n.cpp:3009
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Sierra Leone"
-msgstr "Sierra Leone"
-
-#: kstars_i18n.cpp:3010
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Singapore"
-msgstr "Singapore"
-
-#: kstars_i18n.cpp:3011
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Slovakia"
-msgstr "Slovakia"
-
-#: kstars_i18n.cpp:3012
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Slovenia"
-msgstr "Slovenia"
-
-#: kstars_i18n.cpp:3013
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Solomon Islands"
-msgstr "Ynysoedd Solomon"
-
-#: kstars_i18n.cpp:3014
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Somalia"
-msgstr "Somalia"
-
-#: kstars_i18n.cpp:3015
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"South Africa"
-msgstr "De Affrica"
-
-#: kstars_i18n.cpp:3016
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"South Korea"
-msgstr "De Corea"
-
-#: kstars_i18n.cpp:3017
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Spain"
-msgstr "Sbaen"
-
-#: kstars_i18n.cpp:3018
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Sri Lanka"
-msgstr "Sri Lanka"
-
-#: kstars_i18n.cpp:3019
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"St. Lucia"
-msgstr "St. Lucia"
-
-#: kstars_i18n.cpp:3020
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Sudan"
-msgstr "Sudan"
-
-#: kstars_i18n.cpp:3021
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Swaziland"
-msgstr "Gwlad y Swasi"
-
-#: kstars_i18n.cpp:3022
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Sweden"
-msgstr "Sweden"
+"_: Image/info menu item (should be translated)\n"
+"Show HST Image"
+msgstr "Dangos Delwedd HST"
 
-#: kstars_i18n.cpp:3023
+#: data/image_url.dat:29
 msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Switzerland"
-msgstr "Swistir"
+"_: Image/info menu item (should be translated)\n"
+"Show HST Image (2002)"
+msgstr "Dangos Delwedd HST (2002)"
 
-#: kstars_i18n.cpp:3024
+#: data/image_url.dat:30 data/image_url.dat:139 data/image_url.dat:147
 msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Syria"
-msgstr "Syria"
+"_: Image/info menu item (should be translated)\n"
+"Show HST Image (2003)"
+msgstr "Dangos Delwedd HST (2003)"
 
-#: kstars_i18n.cpp:3025
+#: data/image_url.dat:32
 msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Taiwan"
-msgstr "Taiwan"
+"_: Image/info menu item (should be translated)\n"
+"Show HST Image (Detail)"
+msgstr "Dangos Delwedd HST (Manylion)"
 
-#: kstars_i18n.cpp:3026
+#: data/image_url.dat:35
 msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Tanzania"
-msgstr "Tanzania"
+"_: Image/info menu item (should be translated)\n"
+"Show HST Image (stars in M 31)"
+msgstr "Dangos Delwedd HST (sêr yn M31)"
 
-#: kstars_i18n.cpp:3027
+#: data/image_url.dat:40
 #, fuzzy
 msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Tanzanie"
-msgstr "Tanzania"
-
-#: kstars_i18n.cpp:3028
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Thailand"
-msgstr "Thailand"
-
-#: kstars_i18n.cpp:3029
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Togo"
-msgstr "Togo"
-
-#: kstars_i18n.cpp:3030
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Trinidad and Tobago"
-msgstr "Trinidad a Tobago"
-
-#: kstars_i18n.cpp:3031
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Tunisia"
-msgstr "Tunisia"
-
-#: kstars_i18n.cpp:3032
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Turkey"
-msgstr "Twrci"
-
-#: kstars_i18n.cpp:3033
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Turks and Caicos Islands"
-msgstr "Ynysoedd Turks a Caicos"
-
-#: kstars_i18n.cpp:3034
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"US Territory"
-msgstr "Tiriogaeth UD"
-
-#: kstars_i18n.cpp:3035
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"USA"
-msgstr "Yr Unol Daleithiau America"
-
-#: kstars_i18n.cpp:3036
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Uganda"
-msgstr "Uganda"
-
-#: kstars_i18n.cpp:3037
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Ukraine"
-msgstr "Wcrain"
-
-#: kstars_i18n.cpp:3038
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"United Arab Emirates"
-msgstr "Emiraethau Arabaidd Unedig"
-
-#: kstars_i18n.cpp:3039
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"United Kingdom"
-msgstr "Y Deyrnas Unedig"
-
-#: kstars_i18n.cpp:3040
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Uruguay"
-msgstr "Uruguay"
-
-#: kstars_i18n.cpp:3041
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Uzbekistan"
-msgstr "Uzbekistan"
-
-#: kstars_i18n.cpp:3042
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Vanuatu"
-msgstr "Vanuatu"
-
-#: kstars_i18n.cpp:3043
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Vatican"
-msgstr "Vatican"
-
-#: kstars_i18n.cpp:3044
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Venezuela"
-msgstr "Venezuela"
-
-#: kstars_i18n.cpp:3045
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Virgin Islands"
-msgstr "Ynysoedd yr Wyryf"
+"_: Image/info menu item (should be translated)\n"
+"Show HST Image (1999)"
+msgstr "Dangos Delwedd HST (1995)"
 
-#: kstars_i18n.cpp:3046
+#: data/image_url.dat:41 data/image_url.dat:115 data/image_url.dat:130
 #, fuzzy
 msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Western sahara"
-msgstr "Iseldiroedd"
-
-#: kstars_i18n.cpp:3047
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Yemen"
-msgstr "Yemen"
-
-#: kstars_i18n.cpp:3048
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Yugoslavia"
-msgstr "Iwgoslafia"
-
-#: kstars_i18n.cpp:3049
-msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Zambia"
-msgstr "Zambia"
+"_: Image/info menu item (should be translated)\n"
+"Show HST Image (2004)"
+msgstr "Dangos Delwedd HST (2001)"
 
-#: kstars_i18n.cpp:3050
-#, fuzzy
+#: data/image_url.dat:47 data/image_url.dat:114 data/image_url.dat:137
 msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Zambie"
-msgstr "Zambia"
+"_: Image/info menu item (should be translated)\n"
+"Show HST Image (1995)"
+msgstr "Dangos Delwedd HST (1995)"
 
-#: kstars_i18n.cpp:3051
+#: data/image_url.dat:48
 msgid ""
-"_: Country name (optional, but should be translated)\n"
-"Zimbabwe"
-msgstr "Simbabwe"
+"_: Image/info menu item (should be translated)\n"
+"Show HST Image (1998)"
+msgstr "Dangos Delwedd HST (1998)"
 
-#: kstars_i18n.cpp:3053
+#: data/image_url.dat:76
 #, fuzzy
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"  05 March 2005"
-msgstr "Lleuad"
+"Show HST Image (SN 2004dj)"
+msgstr "Dangos Delwedd HST (2001)"
 
-#: kstars_i18n.cpp:3054 kstars_i18n.cpp:3100
-#, fuzzy
+#: data/image_url.dat:120
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"  Object_Name"
-msgstr "Tudalen JPL NASA"
+"Show HST Image (Hubble V)"
+msgstr "Dangos Delwedd HST (Hubble V)"
 
-#: kstars_i18n.cpp:3055
-#, fuzzy
+#: data/image_url.dat:121
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-" image_url.dat"
-msgstr "Dangos Delwedd VLT"
+"Show HST Image (Hubble X)"
+msgstr "Dangos Delwedd HST (Hubble X)"
 
-#: kstars_i18n.cpp:3056
+#: data/image_url.dat:129
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Comet Impact Scars (HST)"
-msgstr "Creithiau Ardrawiad Comed (HST)"
+"Show HST Image (detail)"
+msgstr "Dangos Delwedd HST (manylion)"
 
-#: kstars_i18n.cpp:3057
+#: data/image_url.dat:138 data/image_url.dat:146
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Galilean Satellites (HST)"
-msgstr "Lloerenni Galileaidd (HST)"
+"Show HST Image (2001)"
+msgstr "Dangos Delwedd HST (2001)"
 
-#: kstars_i18n.cpp:3058
+#: data/image_url.dat:140
 msgid ""
 "_: Image/info menu item (should be translated)\n"
 "Global Dust Storm (HST)"
 msgstr "Storm Llwch Byd-eang (HST)"
 
-#: kstars_i18n.cpp:3059
+#: data/image_url.dat:141
 msgid ""
 "_: Image/info menu item (should be translated)\n"
 "Jupiter and Io (HST)"
 msgstr "Iau ac Io (HST)"
 
-#: kstars_i18n.cpp:3060
-#, fuzzy
-msgid ""
-"_: Image/info menu item (should be translated)\n"
-"Show APOD Image (Radar)"
-msgstr "Dangos Delwedd NOAO"
-
-#: kstars_i18n.cpp:3061
-#, fuzzy
+#: data/image_url.dat:142
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show APOD Image (Venera lander)"
-msgstr "Dangos Delwedd HST (manylion)"
+"Galilean Satellites (HST)"
+msgstr "Lloerenni Galileaidd (HST)"
 
-#: kstars_i18n.cpp:3062
+#: data/image_url.dat:143
 #, fuzzy
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show APOD Image"
-msgstr "Dangos Delwedd NOAO"
-
-#: kstars_i18n.cpp:3063
-msgid ""
-"_: Image/info menu item (should be translated)\n"
-"Show Collage of Saturn and moons"
-msgstr "Dangos Gludwaith o Sadwrn a'i leuadau"
-
-#: kstars_i18n.cpp:3064
-msgid ""
-"_: Image/info menu item (should be translated)\n"
-"Show HST (Rings and Moons)"
-msgstr "Dangos HST (Modrwyau a Lleuadau)"
+"Triple Eclipse (HST)"
+msgstr "Delwedd Diffyg Cyfan"
 
-#: kstars_i18n.cpp:3065
+#: data/image_url.dat:144
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show HST Image (1995)"
-msgstr "Dangos Delwedd HST (1995)"
+"Comet Impact Scars (HST)"
+msgstr "Creithiau Ardrawiad Comed (HST)"
 
-#: kstars_i18n.cpp:3066
+#: data/image_url.dat:145
 #, fuzzy
 msgid ""
 "_: Image/info menu item (should be translated)\n"
 "Show HST Image (1996)"
 msgstr "Dangos Delwedd HST (1995)"
 
-#: kstars_i18n.cpp:3067
-msgid ""
-"_: Image/info menu item (should be translated)\n"
-"Show HST Image (1998)"
-msgstr "Dangos Delwedd HST (1998)"
-
-#: kstars_i18n.cpp:3068
+#: data/image_url.dat:148
 #, fuzzy
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show HST Image (1999)"
-msgstr "Dangos Delwedd HST (1995)"
+"Show HST Image (Aurora)"
+msgstr "Dangos Delwedd HST"
 
-#: kstars_i18n.cpp:3069
+#: data/image_url.dat:150
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show HST Image (2001)"
-msgstr "Dangos Delwedd HST (2001)"
+"Show HST (Rings and Moons)"
+msgstr "Dangos HST (Modrwyau a Lleuadau)"
 
-#: kstars_i18n.cpp:3070
+#: 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 HST Image (2002)"
-msgstr "Dangos Delwedd HST (2002)"
+"Show SEDS Image"
+msgstr "Dangos Delwedd SEDS"
 
-#: kstars_i18n.cpp:3071
+#: 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 HST Image (2003)"
-msgstr "Dangos Delwedd HST (2003)"
+"Show KPNO AOP Image"
+msgstr "Dangos Delwedd KPNO AOP"
 
-#: kstars_i18n.cpp:3072
-#, fuzzy
+#: 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 HST Image (2004)"
-msgstr "Dangos Delwedd HST (2001)"
+"Show NOAO Image"
+msgstr "Dangos Delwedd NOAO"
 
-#: kstars_i18n.cpp:3073
+#: data/image_url.dat:565
 #, fuzzy
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show HST Image (Aurora)"
-msgstr "Dangos Delwedd HST"
+"Show NOAO Image (Halpha)"
+msgstr "Dangos Delwedd NOAO"
 
-#: kstars_i18n.cpp:3074
+#: data/image_url.dat:566
+#, fuzzy
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show HST Image (Detail)"
-msgstr "Dangos Delwedd HST (Manylion)"
+"Show NOAO Image (Optical)"
+msgstr "Dangos Delwedd NOAO"
 
-#: kstars_i18n.cpp:3075
+#: data/image_url.dat:692
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show HST Image (Hubble V)"
-msgstr "Dangos Delwedd HST (Hubble V)"
+"Show Sun Image"
+msgstr "Dangos Delwedd Haul"
 
-#: kstars_i18n.cpp:3076
+#: data/image_url.dat:693
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show HST Image (Hubble X)"
-msgstr "Dangos Delwedd HST (Hubble X)"
+"Total Eclipse Image"
+msgstr "Delwedd Diffyg Cyfan"
 
-#: kstars_i18n.cpp:3077
-#, fuzzy
+#: data/image_url.dat:694
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show HST Image (SN 2004dj)"
-msgstr "Dangos Delwedd HST (2001)"
+"Show NASA Mosaic"
+msgstr "Dangos Mosaig NASA"
 
-#: kstars_i18n.cpp:3078
+#: data/image_url.dat:695
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show HST Image (detail)"
-msgstr "Dangos Delwedd HST (manylion)"
+"Show Magellan Surface Image"
+msgstr "Dangos Delwedd Arwyneb Magellan"
 
-#: kstars_i18n.cpp:3079
+#: 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"
-"Show HST Image (stars in M 31)"
-msgstr "Dangos Delwedd HST (sêr yn M31)"
+"Show VLT Image"
+msgstr "Dangos Delwedd VLT"
 
-#: kstars_i18n.cpp:3080
+#: data/image_url.dat:697
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show HST Image"
-msgstr "Dangos Delwedd HST"
+"Show MGS Image"
+msgstr "Dangos Delwedd MGS"
 
-#: kstars_i18n.cpp:3081
+#: data/image_url.dat:698
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show HST/VLT Image"
-msgstr "Dangos Delwedd HST/VLT"
+"Show Viking Lander Image"
+msgstr "Dangos Delwedd Glannydd Viking"
 
-#: kstars_i18n.cpp:3082
+#: data/image_url.dat:699
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show KPNO AOP Image"
-msgstr "Dangos Delwedd KPNO AOP"
+"Show Pathfinder Lander Image"
+msgstr "Dangos Delwedd Glannydd Pathfinder"
 
-#: kstars_i18n.cpp:3083
+#: data/image_url.dat:700
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show MGS Image"
-msgstr "Dangos Delwedd MGS"
+"Show Voyager 1 Image"
+msgstr "Dangos Delwedd Voyager 1"
 
-#: kstars_i18n.cpp:3084
+#: data/image_url.dat:701
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show Magellan Surface Image"
-msgstr "Dangos Delwedd Arwyneb Magellan"
+"Show Collage of Saturn and moons"
+msgstr "Dangos Gludwaith o Sadwrn a'i leuadau"
 
-#: kstars_i18n.cpp:3085
+#: data/image_url.dat:723
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show NASA Mosaic"
-msgstr "Dangos Mosaig NASA"
+"Show HST/VLT Image"
+msgstr "Dangos Delwedd HST/VLT"
 
-#: kstars_i18n.cpp:3086
+#: data/image_url.dat:731 data/image_url.dat:732
 #, fuzzy
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show NOAO Image (Halpha)"
+"Show APOD Image"
 msgstr "Dangos Delwedd NOAO"
 
-#: kstars_i18n.cpp:3087
+#: data/image_url.dat:733
 #, fuzzy
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show NOAO Image (Optical)"
-msgstr "Dangos Delwedd NOAO"
-
-#: kstars_i18n.cpp:3088
-msgid ""
-"_: Image/info menu item (should be translated)\n"
-"Show NOAO Image"
+"Show APOD Image (Radar)"
 msgstr "Dangos Delwedd NOAO"
 
-#: kstars_i18n.cpp:3089
-msgid ""
-"_: Image/info menu item (should be translated)\n"
-"Show Pathfinder Lander Image"
-msgstr "Dangos Delwedd Glannydd Pathfinder"
-
-#: kstars_i18n.cpp:3090
+#: data/image_url.dat:734
+#, fuzzy
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show SEDS Image"
-msgstr "Dangos Delwedd SEDS"
+"Show APOD Image (Venera lander)"
+msgstr "Dangos Delwedd HST (manylion)"
 
-#: kstars_i18n.cpp:3091
+#: 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
 #, fuzzy
 msgid ""
 "_: Image/info menu item (should be translated)\n"
 "Show Spitzer Image"
 msgstr "Dangos Delwedd HST"
 
-#: kstars_i18n.cpp:3092
-msgid ""
-"_: Image/info menu item (should be translated)\n"
-"Show Sun Image"
-msgstr "Dangos Delwedd Haul"
-
-#: kstars_i18n.cpp:3093
-msgid ""
-"_: Image/info menu item (should be translated)\n"
-"Show VLT Image"
-msgstr "Dangos Delwedd VLT"
-
-#: kstars_i18n.cpp:3094
+#: 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
+#, fuzzy
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Show Viking Lander Image"
-msgstr "Dangos Delwedd Glannydd Viking"
+"Wikipedia Page"
+msgstr "Tudalen JPL NASA"
 
-#: kstars_i18n.cpp:3095
+#: 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"
-"Show Voyager 1 Image"
-msgstr "Dangos Delwedd Voyager 1"
+"SEDS Information Page"
+msgstr "Tudalen Wybodaeth SEDS"
 
-#: kstars_i18n.cpp:3096
+#: data/info_url.dat:146
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Total Eclipse Image"
-msgstr "Delwedd Diffyg Cyfan"
+"HST Press Release (2002)"
+msgstr "Datganiad i'r Wasg HST(2002)"
 
-#: kstars_i18n.cpp:3097
-#, fuzzy
+#: 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"
-"Triple Eclipse (HST)"
-msgstr "Delwedd Diffyg Cyfan"
+"NASA JPL Page"
+msgstr "Tudalen JPL NASA"
 
-#: kstars_i18n.cpp:3099
-#, fuzzy
+#: data/info_url.dat:167
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"  09 March 2004"
-msgstr "Lleuad"
+"Daily Solar Images"
+msgstr "Delweddau Heulol Dyddiol"
 
-#: kstars_i18n.cpp:3101
-#, fuzzy
+#: data/info_url.dat:168
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-" Gaspra is missing from asteroids.dat!"
-msgstr "Lleuad"
+"Fred Espanek's Eclipse page"
+msgstr "Tudalen Ddiffygion Fred Espanek"
 
-#: kstars_i18n.cpp:3102
-#, fuzzy
+#: data/info_url.dat:172
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-" info_url.dat"
-msgstr "Lleuad"
+"The Apollo Program"
+msgstr "Rhaglen Apollo"
 
-#: kstars_i18n.cpp:3103
+#: data/info_url.dat:176
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Comet Shoemaker-Levy 9"
-msgstr "Comed Shoemaker-Levy 9"
+"The Mariner 10 Mission"
+msgstr "Cenhadaeth Mariner 10"
 
-#: kstars_i18n.cpp:3104
+#: data/info_url.dat:180
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Daily Solar Images"
-msgstr "Delweddau Heulol Dyddiol"
+"The Magellan Mission"
+msgstr "Cenhadaeth Magellan"
 
-#: kstars_i18n.cpp:3105
+#: data/info_url.dat:183
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Fred Espanek's Eclipse page"
-msgstr "Tudalen Ddiffygion Fred Espanek"
+"NASA Mars Missions"
+msgstr "Cenadaethau NASA i Fawrth"
 
-#: kstars_i18n.cpp:3106
+#: data/info_url.dat:185
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"HST Press Release (2002)"
-msgstr "Datganiad i'r Wasg HST(2002)"
+"Welcome to Mars!"
+msgstr "Croeso i Fawrth!"
 
-#: kstars_i18n.cpp:3107
+#: data/info_url.dat:186
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"Moon"
-msgstr "Lleuad"
+"The Whole Mars Catalog"
+msgstr "Y Catalog Mawrth Cyfan"
 
-#: kstars_i18n.cpp:3108
+#: data/info_url.dat:187
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"NASA JPL Page"
-msgstr "Tudalen JPL NASA"
+"The Mars Society"
+msgstr "Cymdeithas Mawrth"
 
-#: kstars_i18n.cpp:3109
+#: data/info_url.dat:192
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"NASA Mars Missions"
-msgstr "Cenadaethau NASA i Fawrth"
+"The Galileo Mission"
+msgstr "Cenhadaeth Galileo"
 
-#: kstars_i18n.cpp:3110
+#: 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"
-"SEDS Information Page"
-msgstr "Tudalen Wybodaeth SEDS"
+"The Voyager Missions"
+msgstr "Cenadaethau Voyager"
 
-#: kstars_i18n.cpp:3112
+#: data/info_url.dat:194
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"The Apollo Program"
-msgstr "Rhaglen Apollo"
+"Comet Shoemaker-Levy 9"
+msgstr "Comed Shoemaker-Levy 9"
 
-#: kstars_i18n.cpp:3113
+#: data/info_url.dat:198
 msgid ""
 "_: Image/info menu item (should be translated)\n"
 "The Cassini Mission"
 msgstr "Cenhadaeth Cassini"
 
-#: kstars_i18n.cpp:3114
+#: data/info_url.dat:243
 msgid ""
 "_: Image/info menu item (should be translated)\n"
-"The Galileo Mission"
-msgstr "Cenhadaeth Galileo"
+"About the Moon Images"
+msgstr "Ynglyn â Delweddau'r Lleuad"
 
-#: kstars_i18n.cpp:3115
+#: data/hip001.dat:13
 msgid ""
-"_: Image/info menu item (should be translated)\n"
-"The Magellan Mission"
-msgstr "Cenhadaeth Magellan"
+"_: star name\n"
+"Sirius"
+msgstr "Sirius"
 
-#: kstars_i18n.cpp:3116
+#: data/hip001.dat:14
 msgid ""
-"_: Image/info menu item (should be translated)\n"
-"The Mariner 10 Mission"
-msgstr "Cenhadaeth Mariner 10"
+"_: star name\n"
+"Canopus"
+msgstr "Canopus"
 
-#: kstars_i18n.cpp:3117
+#: data/hip001.dat:15
 msgid ""
-"_: Image/info menu item (should be translated)\n"
-"The Mars Society"
-msgstr "Cymdeithas Mawrth"
+"_: star name\n"
+"Arcturus"
+msgstr "Arcturus"
 
-#: kstars_i18n.cpp:3118
+#: data/hip001.dat:16
 msgid ""
-"_: Image/info menu item (should be translated)\n"
-"The Voyager Missions"
-msgstr "Cenadaethau Voyager"
+"_: star name\n"
+"Rigel Kentaurus"
+msgstr "Rigel Kentaurus"
 
-#: kstars_i18n.cpp:3119
+#: data/hip001.dat:17
 msgid ""
-"_: Image/info menu item (should be translated)\n"
-"The Whole Mars Catalog"
-msgstr "Y Catalog Mawrth Cyfan"
+"_: star name\n"
+"Vega"
+msgstr "Vega"
 
-#: kstars_i18n.cpp:3120
+#: data/hip001.dat:18
 msgid ""
-"_: Image/info menu item (should be translated)\n"
-"Welcome to Mars!"
-msgstr "Croeso i Fawrth!"
+"_: star name\n"
+"Capella"
+msgstr "Capella"
 
-#: kstars_i18n.cpp:3121
-#, fuzzy
+#: data/hip001.dat:19
 msgid ""
-"_: Image/info menu item (should be translated)\n"
-"Wikipedia Page"
-msgstr "Tudalen JPL NASA"
+"_: star name\n"
+"Rigel"
+msgstr "Rigel"
 
-#: kstars_i18n.cpp:3122
+#: data/hip001.dat:20
 msgid ""
 "_: star name\n"
-"Acamar"
-msgstr "Acamar"
+"Procyon"
+msgstr "Procyon"
 
-#: kstars_i18n.cpp:3123
+#: data/hip001.dat:21
 msgid ""
 "_: star name\n"
 "Achernar"
 msgstr "Achernar"
 
-#: kstars_i18n.cpp:3124
+#: data/hip001.dat:22
 msgid ""
 "_: star name\n"
-"Acrux"
-msgstr "Acrux"
+"Betelgeuse"
+msgstr "Betelgeuse"
 
-#: kstars_i18n.cpp:3125
+#: data/hip001.dat:23
 msgid ""
 "_: star name\n"
-"Acubens"
-msgstr "Acubens"
+"Hadar"
+msgstr "Hadar"
 
-#: kstars_i18n.cpp:3126
+#: data/hip001.dat:24
 msgid ""
 "_: star name\n"
-"Adhafera"
-msgstr "Adhafera"
+"Altair"
+msgstr "Altair"
 
-#: kstars_i18n.cpp:3127
+#: data/hip001.dat:25
 msgid ""
 "_: star name\n"
-"Adhara"
-msgstr "Adhara"
+"Acrux"
+msgstr "Acrux"
 
-#: kstars_i18n.cpp:3128
+#: data/hip001.dat:26
 msgid ""
 "_: star name\n"
-"Ain"
-msgstr "Ain"
+"Aldebaran"
+msgstr "Aldebaran"
 
-#: kstars_i18n.cpp:3129
+#: data/hip001.dat:27
 msgid ""
 "_: star name\n"
-"Al Dhanab"
-msgstr "Al Dhanab"
+"Spica"
+msgstr "Spica"
 
-#: kstars_i18n.cpp:3130
+#: data/hip001.dat:28
 msgid ""
 "_: star name\n"
-"Al Gieba"
-msgstr "Al Gieba"
+"Antares"
+msgstr "Antares"
 
-#: kstars_i18n.cpp:3131
+#: data/hip001.dat:29
 msgid ""
 "_: star name\n"
-"Al Giedi"
-msgstr "Al Giedi"
+"Pollux"
+msgstr "Pollux"
 
-#: kstars_i18n.cpp:3132
+#: data/hip001.dat:30
 msgid ""
 "_: star name\n"
-"Al Na'ir"
-msgstr "Al Na'ir"
+"Fomalhaut"
+msgstr "Fomalhaut"
 
-#: kstars_i18n.cpp:3133
+#: data/hip001.dat:31
 msgid ""
 "_: star name\n"
-"Al Nair"
-msgstr "Al Nair"
+"Mimosa"
+msgstr "Mimosa"
 
-#: kstars_i18n.cpp:3134
+#: data/hip001.dat:32
 msgid ""
 "_: star name\n"
-"Al Nasl"
-msgstr "Al Nasl"
+"Deneb"
+msgstr "Deneb"
 
-#: kstars_i18n.cpp:3135
+#: data/hip001.dat:34
 msgid ""
 "_: star name\n"
-"Al Niyat"
-msgstr "Al Niyat"
+"Regulus"
+msgstr "Regulus"
 
-#: kstars_i18n.cpp:3136
+#: data/hip001.dat:35
 msgid ""
 "_: star name\n"
-"Al Thalimain"
-msgstr "Al Thalimain"
+"Adhara"
+msgstr "Adhara"
 
-#: kstars_i18n.cpp:3137
+#: data/hip001.dat:36
 msgid ""
 "_: star name\n"
-"Albali"
-msgstr "Albali"
+"Castor"
+msgstr "Castor"
 
-#: kstars_i18n.cpp:3138
+#: data/hip001.dat:37
 msgid ""
 "_: star name\n"
-"Albireo"
-msgstr "Albireo"
+"Gacrux"
+msgstr "Gacrux"
 
-#: kstars_i18n.cpp:3139
+#: data/hip001.dat:38
 msgid ""
 "_: star name\n"
-"Alcyone"
-msgstr "Alcyone"
+"Shaula"
+msgstr "Shaula"
 
-#: kstars_i18n.cpp:3140
+#: data/hip001.dat:39
 msgid ""
 "_: star name\n"
-"Aldebaran"
-msgstr "Aldebaran"
+"Bellatrix"
+msgstr "Bellatrix"
 
-#: kstars_i18n.cpp:3141
+#: data/hip001.dat:40
 msgid ""
 "_: star name\n"
-"Alderamin"
-msgstr "Alderamin"
+"Alnath"
+msgstr "Alnath"
 
-#: kstars_i18n.cpp:3142
+#: data/hip001.dat:41
 msgid ""
 "_: star name\n"
-"Algenib"
-msgstr "Algenib"
+"Miaplacidus"
+msgstr "Miaplacidus"
 
-#: kstars_i18n.cpp:3143
+#: data/hip001.dat:42
 msgid ""
 "_: star name\n"
-"Algol"
-msgstr "Algol"
+"Alnilam"
+msgstr "Alnilam"
 
-#: kstars_i18n.cpp:3144
+#: data/hip001.dat:43
 msgid ""
 "_: star name\n"
-"Algorab"
-msgstr "Algorab"
+"Al Na'ir"
+msgstr "Al Na'ir"
 
-#: kstars_i18n.cpp:3145
+#: data/hip001.dat:44
+#, fuzzy
 msgid ""
 "_: star name\n"
-"Alhena"
-msgstr "Alhena"
+"Alnitak"
+msgstr "Alnilam"
 
-#: kstars_i18n.cpp:3146
+#: data/hip001.dat:45
 msgid ""
 "_: star name\n"
-"Alioth"
-msgstr "Alioth"
+"Regor"
+msgstr "Regor"
 
-#: kstars_i18n.cpp:3147
+#: data/hip001.dat:46
 msgid ""
 "_: star name\n"
-"Alkaid"
-msgstr "Alkaid"
+"Alioth"
+msgstr "Alioth"
 
-#: kstars_i18n.cpp:3148
+#: data/hip001.dat:47
 msgid ""
 "_: star name\n"
-"Alkalurops"
-msgstr "Alkalurops"
+"Mirfak"
+msgstr "Mirfak"
 
-#: kstars_i18n.cpp:3149
+#: data/hip001.dat:48
 msgid ""
 "_: star name\n"
-"Alkes"
-msgstr "Alkes"
+"Kaus Australis"
+msgstr "Kaus Australis"
 
-#: kstars_i18n.cpp:3150
+#: data/hip001.dat:49
 msgid ""
 "_: star name\n"
-"Almach"
-msgstr "Almach"
+"Dubhe"
+msgstr "Dubhe"
 
-#: kstars_i18n.cpp:3151
+#: data/hip001.dat:50
 msgid ""
 "_: star name\n"
-"Alnath"
-msgstr "Alnath"
+"Wezen"
+msgstr "Wezen"
 
-#: kstars_i18n.cpp:3152
+#: data/hip001.dat:51
 msgid ""
 "_: star name\n"
-"Alnilam"
-msgstr "Alnilam"
+"Alkaid"
+msgstr "Alkaid"
 
-#: kstars_i18n.cpp:3153
-#, fuzzy
+#: data/hip001.dat:52
 msgid ""
 "_: star name\n"
-"Alnitak"
-msgstr "Alnilam"
+"Sargas"
+msgstr "Sargas"
 
-#: kstars_i18n.cpp:3154
+#: data/hip001.dat:53
 msgid ""
 "_: star name\n"
-"Alphard"
-msgstr "Alphard"
+"Avior"
+msgstr "Avior"
 
-#: kstars_i18n.cpp:3155
+#: data/hip001.dat:54
 msgid ""
 "_: star name\n"
-"Alphecca"
-msgstr "Alphecca"
+"Menkalinan"
+msgstr "Menkalinan"
 
-#: kstars_i18n.cpp:3156
+#: data/hip001.dat:56
 msgid ""
 "_: star name\n"
-"Alpheratz"
-msgstr "Alpheratz"
+"Alhena"
+msgstr "Alhena"
 
-#: kstars_i18n.cpp:3157
+#: data/hip001.dat:58
 msgid ""
 "_: star name\n"
-"Alphirk"
-msgstr "Alphirk"
+"Peacock"
+msgstr "Peacock"
 
-#: kstars_i18n.cpp:3158
+#: data/hip001.dat:59
 msgid ""
 "_: star name\n"
-"Alshain"
-msgstr "Alshain"
+"Polaris"
+msgstr "Polaris"
 
-#: kstars_i18n.cpp:3159
+#: data/hip001.dat:60
 msgid ""
 "_: star name\n"
-"Altair"
-msgstr "Altair"
+"Mirzam"
+msgstr "Mirzam"
 
-#: kstars_i18n.cpp:3160
+#: data/hip001.dat:61
 msgid ""
 "_: star name\n"
-"Altais"
-msgstr "Altais"
+"Alphard"
+msgstr "Alphard"
 
-#: kstars_i18n.cpp:3161
+#: data/hip001.dat:62
 msgid ""
 "_: star name\n"
-"Aludra"
-msgstr "Aludra"
+"Hamal"
+msgstr "Hamal"
 
-#: kstars_i18n.cpp:3162
+#: data/hip001.dat:63
 msgid ""
 "_: star name\n"
-"Alula Borealis"
-msgstr "Alula Borealis"
+"Al Gieba"
+msgstr "Al Gieba"
 
-#: kstars_i18n.cpp:3163
+#: data/hip001.dat:64
 msgid ""
 "_: star name\n"
-"Alya"
-msgstr "Alya"
+"Diphda"
+msgstr "Diphda"
 
-#: kstars_i18n.cpp:3164
+#: data/hip001.dat:65
 msgid ""
 "_: star name\n"
-"Ancha"
-msgstr "Ancha"
+"Nunki"
+msgstr "Nunki"
 
-#: kstars_i18n.cpp:3165
+#: data/hip001.dat:66
 msgid ""
 "_: star name\n"
-"Ankaa"
-msgstr "Ankaa"
+"Menkent"
+msgstr "Menkent"
 
-#: kstars_i18n.cpp:3166
+#: data/hip001.dat:67
 msgid ""
 "_: star name\n"
-"Antares"
-msgstr "Antares"
+"Alpheratz"
+msgstr "Alpheratz"
 
-#: kstars_i18n.cpp:3167
+#: data/hip001.dat:68
 msgid ""
 "_: star name\n"
-"Arcturus"
-msgstr "Arcturus"
+"Saiph"
+msgstr "Saiph"
 
-#: kstars_i18n.cpp:3168
+#: data/hip001.dat:69
 msgid ""
 "_: star name\n"
-"Arneb"
-msgstr "Arneb"
+"Mirach"
+msgstr "Mirach"
 
-#: kstars_i18n.cpp:3169
+#: data/hip001.dat:70
 msgid ""
 "_: star name\n"
-"Asellus Borealis"
-msgstr "Asellus Borealis"
+"Kocab"
+msgstr "Kocab"
 
-#: kstars_i18n.cpp:3170
+#: data/hip001.dat:72
 msgid ""
 "_: star name\n"
-"Asmidiske"
-msgstr "Asmidiske"
+"Rasalhague"
+msgstr "Rasalhague"
 
-#: kstars_i18n.cpp:3171
+#: data/hip001.dat:73
 msgid ""
 "_: star name\n"
-"Aspidiske"
-msgstr "Aspidiske"
+"Algol"
+msgstr "Algol"
 
-#: kstars_i18n.cpp:3172
+#: data/hip001.dat:74
 msgid ""
 "_: star name\n"
-"Atik"
-msgstr "Atik"
+"Almach"
+msgstr "Almach"
 
-#: kstars_i18n.cpp:3173
+#: data/hip001.dat:75
 msgid ""
 "_: star name\n"
-"Auva"
-msgstr "Auva"
+"Denebola"
+msgstr "Denebola"
 
-#: kstars_i18n.cpp:3174
+#: data/hip001.dat:76
 msgid ""
 "_: star name\n"
-"Avior"
-msgstr "Avior"
+"Tsih"
+msgstr "Tsih"
 
-#: kstars_i18n.cpp:3175
+#: data/hip001.dat:78
 msgid ""
 "_: star name\n"
-"Azha"
-msgstr "Azha"
+"Naos"
+msgstr "Naos"
 
-#: kstars_i18n.cpp:3176
+#: data/hip001.dat:79
 msgid ""
 "_: star name\n"
-"Baham"
-msgstr "Baham"
+"Aspidiske"
+msgstr "Aspidiske"
 
-#: kstars_i18n.cpp:3177
+#: data/hip001.dat:80
 msgid ""
 "_: star name\n"
-"Baten"
-msgstr "Baten"
+"Alphecca"
+msgstr "Alphecca"
 
-#: kstars_i18n.cpp:3178
+#: data/hip001.dat:81
 msgid ""
 "_: star name\n"
-"Beid"
-msgstr "Beid"
+"Mizar"
+msgstr "Mizar"
 
-#: kstars_i18n.cpp:3179
+#: data/hip001.dat:82
 msgid ""
 "_: star name\n"
-"Bellatrix"
-msgstr "Bellatrix"
+"Sadr"
+msgstr "Sadr"
 
-#: kstars_i18n.cpp:3180
+#: data/hip001.dat:83
 msgid ""
 "_: star name\n"
-"Betelgeuse"
-msgstr "Betelgeuse"
+"Suhail"
+msgstr "Suhail"
 
-#: kstars_i18n.cpp:3181
+#: data/hip001.dat:84
 msgid ""
 "_: star name\n"
-"Botein"
-msgstr "Botein"
+"Schedar"
+msgstr "Schedar"
 
-#: kstars_i18n.cpp:3182
+#: data/hip001.dat:85
 msgid ""
 "_: star name\n"
-"Canopus"
-msgstr "Canopus"
+"Eltanin"
+msgstr "Eltanin"
 
-#: kstars_i18n.cpp:3183
+#: data/hip001.dat:86
 msgid ""
 "_: star name\n"
-"Capella"
-msgstr "Capella"
+"Mintaka"
+msgstr "Mintaka"
 
-#: kstars_i18n.cpp:3184
+#: data/hip001.dat:87
 msgid ""
 "_: star name\n"
 "Caph"
 msgstr "Caph"
 
-#: kstars_i18n.cpp:3185
+#: data/hip001.dat:89
 msgid ""
 "_: star name\n"
-"Castor"
-msgstr "Castor"
+"Dschubba"
+msgstr "Dschubba"
 
-#: kstars_i18n.cpp:3186
+#: data/hip001.dat:91
 msgid ""
 "_: star name\n"
-"Chara"
-msgstr "Chara"
+"Men"
+msgstr "Men"
 
-#: kstars_i18n.cpp:3187
+#: data/hip001.dat:93
 msgid ""
 "_: star name\n"
-"Chertan"
-msgstr "Chertan"
+"Merak"
+msgstr "Merak"
 
-#: kstars_i18n.cpp:3188
+#: data/hip001.dat:94
 msgid ""
 "_: star name\n"
-"Chow"
-msgstr "Chow"
+"Pulcherrima"
+msgstr "Pulcherrima"
 
-#: kstars_i18n.cpp:3189
+#: data/hip001.dat:95
 msgid ""
 "_: star name\n"
-"Cor Caroli"
-msgstr "Cor Caroli"
+"Enif"
+msgstr "Enif"
 
-#: kstars_i18n.cpp:3190
+#: data/hip001.dat:97
 msgid ""
 "_: star name\n"
-"Cujam"
-msgstr "Cujam"
+"Ankaa"
+msgstr "Ankaa"
 
-#: kstars_i18n.cpp:3191
+#: data/hip001.dat:98
 msgid ""
 "_: star name\n"
-"Cursa"
-msgstr "Cursa"
+"Phecda"
+msgstr "Phecda"
 
-#: kstars_i18n.cpp:3192
+#: data/hip001.dat:100
 msgid ""
 "_: star name\n"
-"Dabih"
-msgstr "Dabih"
+"Scheat"
+msgstr "Scheat"
 
-#: kstars_i18n.cpp:3193
+#: data/hip001.dat:101
 msgid ""
 "_: star name\n"
-"Deneb"
-msgstr "Deneb"
+"Aludra"
+msgstr "Aludra"
 
-#: kstars_i18n.cpp:3194
+#: data/hip001.dat:102
 msgid ""
 "_: star name\n"
-"Deneb Algiedi"
-msgstr "Deneb Algiedi"
+"Alderamin"
+msgstr "Alderamin"
 
-#: kstars_i18n.cpp:3195
+#: data/hip001.dat:103 data/hip001.dat:105
 msgid ""
 "_: star name\n"
-"Denebola"
-msgstr "Denebola"
+"Markab"
+msgstr "Markab"
 
-#: kstars_i18n.cpp:3196
+#: data/hip001.dat:104 data/hip001.dat:113
 msgid ""
 "_: star name\n"
-"Diphda"
-msgstr "Diphda"
+"Gienah"
+msgstr "Gienah"
 
-#: kstars_i18n.cpp:3197
+#: data/hip001.dat:107
 msgid ""
 "_: star name\n"
-"Dschubba"
-msgstr "Dschubba"
+"Menkab"
+msgstr "Menkab"
 
-#: kstars_i18n.cpp:3198
+#: data/hip001.dat:109
 msgid ""
 "_: star name\n"
-"Dubhe"
-msgstr "Dubhe"
+"Zozma"
+msgstr "Zozma"
 
-#: kstars_i18n.cpp:3199
+#: data/hip001.dat:110
 msgid ""
 "_: star name\n"
-"Dulfim"
-msgstr "Dulfim"
+"Graffias"
+msgstr "Graffias"
 
-#: kstars_i18n.cpp:3200
+#: data/hip001.dat:111
 msgid ""
 "_: star name\n"
-"Dziban"
-msgstr "Dziban"
+"Arneb"
+msgstr "Arneb"
 
-#: kstars_i18n.cpp:3201
+#: data/hip001.dat:115
 msgid ""
 "_: star name\n"
-"Edasich"
-msgstr "Edasich"
+"Zuben el Chamali"
+msgstr "Zuben el Chamali"
 
-#: kstars_i18n.cpp:3202
+#: data/hip001.dat:116
 msgid ""
 "_: star name\n"
-"Eltanin"
-msgstr "Eltanin"
+"Unukalhai"
+msgstr "Unukalhai"
 
-#: kstars_i18n.cpp:3203
+#: data/hip001.dat:117
 msgid ""
 "_: star name\n"
-"Enif"
-msgstr "Enif"
+"Sheratan"
+msgstr "Sheratan"
 
-#: kstars_i18n.cpp:3204
+#: data/hip001.dat:118
 msgid ""
 "_: star name\n"
-"Er Rai"
-msgstr "Er Rai"
+"Phakt"
+msgstr "Phakt"
 
-#: kstars_i18n.cpp:3205
+#: data/hip001.dat:120
 msgid ""
 "_: star name\n"
-"Fomalhaut"
-msgstr "Fomalhaut"
+"Kraz"
+msgstr "Kraz"
 
-#: kstars_i18n.cpp:3206
+#: data/hip001.dat:121
 msgid ""
 "_: star name\n"
-"Furud"
-msgstr "Furud"
+"Ruchbah"
+msgstr "Ruchbah"
 
-#: kstars_i18n.cpp:3207
+#: data/hip001.dat:122
 msgid ""
 "_: star name\n"
-"Gacrux"
-msgstr "Gacrux"
+"Muphrid"
+msgstr "Muphrid"
 
-#: kstars_i18n.cpp:3208
+#: data/hip001.dat:126
 msgid ""
 "_: star name\n"
-"Gienah"
-msgstr "Gienah"
+"Kabdhilinan"
+msgstr "Kabdhilinan"
 
-#: kstars_i18n.cpp:3209
+#: data/hip001.dat:127
 msgid ""
 "_: star name\n"
-"Gomeisa"
-msgstr "Gomeisa"
+"Lesath"
+msgstr "Lesath"
 
-#: kstars_i18n.cpp:3210
+#: data/hip001.dat:129
 msgid ""
 "_: star name\n"
-"Graffias"
-msgstr "Graffias"
+"Kaus Media"
+msgstr "Kaus Media"
 
-#: kstars_i18n.cpp:3211
+#: data/hip001.dat:130
 msgid ""
 "_: star name\n"
-"Grumium"
-msgstr "Grumium"
+"Tarazed"
+msgstr "Tarazed"
 
-#: kstars_i18n.cpp:3212
+#: data/hip001.dat:132
 msgid ""
 "_: star name\n"
-"Hadar"
-msgstr "Hadar"
+"Yed Prior"
+msgstr "Yed Prior"
 
-#: kstars_i18n.cpp:3213
+#: data/hip001.dat:135
 msgid ""
 "_: star name\n"
-"Hamal"
-msgstr "Hamal"
+"Na'ir al Saif"
+msgstr "Na'ir al Saif"
 
-#: kstars_i18n.cpp:3214
+#: data/hip001.dat:137
 msgid ""
 "_: star name\n"
-"Heze"
-msgstr "Heze"
+"Zuben El Genubi"
+msgstr "Zuben El Genubi"
 
-#: kstars_i18n.cpp:3215
+#: data/hip001.dat:138
 msgid ""
 "_: star name\n"
-"Homan"
-msgstr "Homan"
+"Kelb al Rai"
+msgstr "Kelb al Rai"
 
-#: kstars_i18n.cpp:3216
+#: data/hip001.dat:139
 msgid ""
 "_: star name\n"
-"Kabdhilinan"
-msgstr "Kabdhilinan"
+"Cursa"
+msgstr "Cursa"
 
-#: kstars_i18n.cpp:3217
+#: data/hip001.dat:140
 msgid ""
 "_: star name\n"
-"Kaou Pih"
-msgstr "Kaou Pih"
+"Kornephoros"
+msgstr "Kornephoros"
 
-#: kstars_i18n.cpp:3218
+#: data/hip001.dat:141
 msgid ""
 "_: star name\n"
-"Kaus Australis"
-msgstr "Kaus Australis"
+"Ras Algethi"
+msgstr "Ras Algethi"
 
-#: kstars_i18n.cpp:3219
+#: data/hip001.dat:143
 msgid ""
 "_: star name\n"
-"Kaus Borealis"
-msgstr "Kaus Borealis"
+"Rastaban"
+msgstr "Rastaban"
 
-#: kstars_i18n.cpp:3220
+#: data/hip001.dat:145
 msgid ""
 "_: star name\n"
-"Kaus Media"
-msgstr "Kaus Media"
+"Nihal"
+msgstr "Nihal"
 
-#: kstars_i18n.cpp:3221
+#: data/hip001.dat:149
 msgid ""
 "_: star name\n"
-"Kelb al Rai"
-msgstr "Kelb al Rai"
+"Kaus Borealis"
+msgstr "Kaus Borealis"
 
-#: kstars_i18n.cpp:3222
+#: data/hip001.dat:150
 msgid ""
 "_: star name\n"
-"Kitalpha"
-msgstr "Kitalpha"
+"Algenib"
+msgstr "Algenib"
 
-#: kstars_i18n.cpp:3223
+#: data/hip001.dat:153
 msgid ""
 "_: star name\n"
-"Kocab"
-msgstr "Kocab"
+"Atik"
+msgstr "Atik"
 
-#: kstars_i18n.cpp:3224
+#: data/hip001.dat:154
 msgid ""
 "_: star name\n"
-"Kornephoros"
-msgstr "Kornephoros"
+"Tchou"
+msgstr "Tchou"
 
-#: kstars_i18n.cpp:3225
+#: data/hip001.dat:156
 msgid ""
 "_: star name\n"
-"Kraz"
-msgstr "Kraz"
+"Alcyone"
+msgstr "Alcyone"
 
-#: kstars_i18n.cpp:3226
+#: data/hip001.dat:157
 msgid ""
 "_: star name\n"
-"Lesath"
-msgstr "Lesath"
+"Vindemiatrix"
+msgstr "Vindemiatrix"
 
-#: kstars_i18n.cpp:3227
+#: data/hip001.dat:158
 msgid ""
 "_: star name\n"
-"Maaz"
-msgstr "Maaz"
+"Deneb Algiedi"
+msgstr "Deneb Algiedi"
 
-#: kstars_i18n.cpp:3228
+#: data/hip001.dat:162
 msgid ""
 "_: star name\n"
-"Marfik"
-msgstr "Marfik"
+"Tejat"
+msgstr "Tejat"
 
-#: kstars_i18n.cpp:3229
+#: data/hip001.dat:164
 msgid ""
 "_: star name\n"
-"Markab"
-msgstr "Markab"
+"Acamar"
+msgstr "Acamar"
 
-#: kstars_i18n.cpp:3230
+#: data/hip001.dat:166
 msgid ""
 "_: star name\n"
-"Marsik"
-msgstr "Marsik"
+"Gomeisa"
+msgstr "Gomeisa"
 
-#: kstars_i18n.cpp:3231
+#: data/hip001.dat:167
 msgid ""
 "_: star name\n"
-"Matar"
-msgstr "Matar"
+"Cor Caroli"
+msgstr "Cor Caroli"
 
-#: kstars_i18n.cpp:3232
+#: data/hip001.dat:170
 msgid ""
 "_: star name\n"
-"Mebsuta"
-msgstr "Mebsuta"
+"Al Niyat"
+msgstr "Al Niyat"
 
-#: kstars_i18n.cpp:3233
+#: data/hip001.dat:171
 msgid ""
 "_: star name\n"
-"Megrez"
-msgstr "Megrez"
+"Sadalsud"
+msgstr "Sadalsud"
 
-#: kstars_i18n.cpp:3234
+#: data/hip001.dat:174
 msgid ""
 "_: star name\n"
-"Mekbuda"
-msgstr "Mekbuda"
+"Matar"
+msgstr "Matar"
 
-#: kstars_i18n.cpp:3235
+#: data/hip001.dat:175
 msgid ""
 "_: star name\n"
-"Men"
-msgstr "Men"
+"Algorab"
+msgstr "Algorab"
 
-#: kstars_i18n.cpp:3236
+#: data/hip001.dat:177
 msgid ""
 "_: star name\n"
-"Menkab"
-msgstr "Menkab"
+"Sadalmelik"
+msgstr "Sadalmelik"
 
-#: kstars_i18n.cpp:3237
+#: data/hip001.dat:180
 msgid ""
 "_: star name\n"
-"Menkalinan"
-msgstr "Menkalinan"
+"Zaurak"
+msgstr "Zaurak"
 
-#: kstars_i18n.cpp:3238
+#: data/hip001.dat:181
 msgid ""
 "_: star name\n"
-"Menkent"
-msgstr "Menkent"
+"Al Nasl"
+msgstr "Al Nasl"
 
-#: kstars_i18n.cpp:3239
+#: data/hip001.dat:186
 msgid ""
 "_: star name\n"
-"Menkib"
-msgstr "Menkib"
+"Pherkab"
+msgstr "Pherkab"
 
-#: kstars_i18n.cpp:3240
+#: data/hip001.dat:188
 msgid ""
 "_: star name\n"
-"Merak"
-msgstr "Merak"
+"Al Dhanab"
+msgstr "Al Dhanab"
 
-#: kstars_i18n.cpp:3241
+#: data/hip001.dat:191
 msgid ""
 "_: star name\n"
-"Mesarthim"
-msgstr "Mesarthim"
+"Furud"
+msgstr "Furud"
 
-#: kstars_i18n.cpp:3242
+#: data/hip001.dat:193
 msgid ""
 "_: star name\n"
-"Miaplacidus"
-msgstr "Miaplacidus"
+"Minkar"
+msgstr "Minkar"
 
-#: kstars_i18n.cpp:3243
+#: data/hip001.dat:194
 msgid ""
 "_: star name\n"
-"Mimosa"
-msgstr "Mimosa"
+"Maaz"
+msgstr "Maaz"
 
-#: kstars_i18n.cpp:3244
+#: data/hip001.dat:196
 msgid ""
 "_: star name\n"
-"Minhar al Shuja"
-msgstr "Minhar al Shuja"
+"Seginus"
+msgstr "Seginus"
 
-#: kstars_i18n.cpp:3245
+#: data/hip001.dat:197
 msgid ""
 "_: star name\n"
-"Minkar"
-msgstr "Minkar"
+"Dabih"
+msgstr "Dabih"
 
-#: kstars_i18n.cpp:3246
+#: data/hip001.dat:198
 msgid ""
 "_: star name\n"
-"Mintaka"
-msgstr "Mintaka"
+"Albireo"
+msgstr "Albireo"
 
-#: kstars_i18n.cpp:3247
+#: data/hip001.dat:199
 msgid ""
 "_: star name\n"
-"Mira"
-msgstr "Mira"
+"Mebsuta"
+msgstr "Mebsuta"
 
-#: kstars_i18n.cpp:3248
+#: data/hip001.dat:200
 msgid ""
 "_: star name\n"
-"Mirach"
-msgstr "Mirach"
+"Tania Australis"
+msgstr "Tania Australis"
 
-#: kstars_i18n.cpp:3249
+#: data/hip001.dat:201
 msgid ""
 "_: star name\n"
-"Mirfak"
-msgstr "Mirfak"
+"Altais"
+msgstr "Altais"
 
-#: kstars_i18n.cpp:3250
+#: data/hip001.dat:206
 msgid ""
 "_: star name\n"
-"Mirzam"
-msgstr "Mirzam"
+"Al Nair"
+msgstr "Al Nair"
 
-#: kstars_i18n.cpp:3251
+#: data/hip001.dat:207
 msgid ""
 "_: star name\n"
-"Mizar"
-msgstr "Mizar"
+"Talitha Borealis"
+msgstr "Talitha Borealis"
 
-#: kstars_i18n.cpp:3252
+#: data/hip001.dat:208
 msgid ""
 "_: star name\n"
-"Mothallah"
-msgstr "Mothallah"
+"Sarin"
+msgstr "Sarin"
 
-#: kstars_i18n.cpp:3253
+#: data/hip001.dat:209
 msgid ""
 "_: star name\n"
-"Muliphein"
-msgstr "Muliphein"
+"Wazn"
+msgstr "Wazn"
 
-#: kstars_i18n.cpp:3254
+#: data/hip001.dat:217
 msgid ""
 "_: star name\n"
-"Muphrid"
-msgstr "Muphrid"
+"Kaou Pih"
+msgstr "Kaou Pih"
 
-#: kstars_i18n.cpp:3255
+#: data/hip001.dat:226
 msgid ""
 "_: star name\n"
-"Muscida"
-msgstr "Muscida"
+"Er Rai"
+msgstr "Er Rai"
 
-#: kstars_i18n.cpp:3256
+#: data/hip001.dat:228
 msgid ""
 "_: star name\n"
-"Na'ir al Saif"
-msgstr "Na'ir al Saif"
+"Yed Posterior"
+msgstr "Yed Posterior"
 
-#: kstars_i18n.cpp:3257
+#: data/hip001.dat:230
 msgid ""
 "_: star name\n"
-"Name"
-msgstr "Enw"
+"Alphirk"
+msgstr "Alphirk"
 
-#: kstars_i18n.cpp:3258
+#: data/hip001.dat:233
 msgid ""
 "_: star name\n"
-"Naos"
-msgstr "Naos"
+"Sulaphat"
+msgstr "Sulaphat"
 
-#: kstars_i18n.cpp:3259
+#: data/hip001.dat:239
 msgid ""
 "_: star name\n"
-"Nashira"
-msgstr "Nashira"
+"Skat"
+msgstr "Skat"
 
-#: kstars_i18n.cpp:3260
+#: data/hip001.dat:243
 msgid ""
 "_: star name\n"
-"Navi"
-msgstr "Navi"
+"Edasich"
+msgstr "Edasich"
 
-#: kstars_i18n.cpp:3261
+#: data/hip001.dat:249
 msgid ""
 "_: star name\n"
-"Nekkar"
-msgstr "Nekkar"
+"Megrez"
+msgstr "Megrez"
 
-#: kstars_i18n.cpp:3262
+#: data/hip001.dat:255
 msgid ""
 "_: star name\n"
-"Nihal"
-msgstr "Nihal"
+"Chertan"
+msgstr "Chertan"
 
-#: kstars_i18n.cpp:3263
+#: data/hip001.dat:256
 msgid ""
 "_: star name\n"
-"Nunki"
-msgstr "Nunki"
+"Asmidiske"
+msgstr "Asmidiske"
 
-#: kstars_i18n.cpp:3264
+#: data/hip001.dat:257
 msgid ""
 "_: star name\n"
-"Nusakan"
-msgstr "Nusakan"
+"Navi"
+msgstr "Navi"
 
-#: kstars_i18n.cpp:3265
+#: data/hip001.dat:260
 msgid ""
 "_: star name\n"
-"Peacock"
-msgstr "Peacock"
+"Muscida"
+msgstr "Muscida"
 
-#: kstars_i18n.cpp:3266
+#: data/hip001.dat:264
 msgid ""
 "_: star name\n"
-"Phakt"
-msgstr "Phakt"
+"Heze"
+msgstr "Heze"
 
-#: kstars_i18n.cpp:3267
+#: data/hip001.dat:267
 msgid ""
 "_: star name\n"
-"Phecda"
-msgstr "Phecda"
+"Auva"
+msgstr "Auva"
 
-#: kstars_i18n.cpp:3268
+#: data/hip001.dat:274
 msgid ""
 "_: star name\n"
-"Pherkab"
-msgstr "Pherkab"
+"Homan"
+msgstr "Homan"
 
-#: kstars_i18n.cpp:3269
+#: data/hip001.dat:276
 msgid ""
 "_: star name\n"
-"Polaris"
-msgstr "Polaris"
+"Mothallah"
+msgstr "Mothallah"
 
-#: kstars_i18n.cpp:3270
+#: data/hip001.dat:281
 msgid ""
 "_: star name\n"
-"Pollux"
-msgstr "Pollux"
+"Adhafera"
+msgstr "Adhafera"
 
-#: kstars_i18n.cpp:3271
+#: data/hip001.dat:282
 msgid ""
 "_: star name\n"
-"Praecipula"
-msgstr "Praecipula"
+"Al Thalimain"
+msgstr "Al Thalimain"
 
-#: kstars_i18n.cpp:3272
+#: data/hip001.dat:283
 msgid ""
 "_: star name\n"
-"Prijipati"
-msgstr "Prijipati"
+"Tania Borealis"
+msgstr "Tania Borealis"
 
-#: kstars_i18n.cpp:3273
+#: data/hip001.dat:293
 msgid ""
 "_: star name\n"
-"Primus Hyadum"
-msgstr "Primus Hyadum"
+"Nekkar"
+msgstr "Nekkar"
 
-#: kstars_i18n.cpp:3274
+#: data/hip001.dat:297
 msgid ""
 "_: star name\n"
-"Procyon"
-msgstr "Procyon"
+"Alula Borealis"
+msgstr "Alula Borealis"
 
-#: kstars_i18n.cpp:3275
+#: data/hip001.dat:299
 msgid ""
 "_: star name\n"
-"Pulcherrima"
-msgstr "Pulcherrima"
+"Wasat"
+msgstr "Wasat"
+
+#: data/hip001.dat:301
+msgid ""
+"_: star name\n"
+"Sadalbari"
+msgstr "Sadalbari"
 
-#: kstars_i18n.cpp:3276
+#: data/hip001.dat:303
 msgid ""
 "_: star name\n"
 "Rana"
 msgstr "Rana"
 
-#: kstars_i18n.cpp:3277
+#: data/hip001.dat:305
 msgid ""
 "_: star name\n"
-"Ras Algethi"
-msgstr "Ras Algethi"
+"Tseen Ke"
+msgstr "Tseen Ke"
 
-#: kstars_i18n.cpp:3278
+#: data/hip001.dat:306
 msgid ""
 "_: star name\n"
-"Rasalas"
-msgstr "Rasalas"
+"Sheliak"
+msgstr "Sheliak"
 
-#: kstars_i18n.cpp:3279
+#: data/hip001.dat:307
 msgid ""
 "_: star name\n"
-"Rasalhague"
-msgstr "Rasalhague"
+"Baham"
+msgstr "Baham"
 
-#: kstars_i18n.cpp:3280
+#: data/hip001.dat:309
 msgid ""
 "_: star name\n"
-"Rastaban"
-msgstr "Rastaban"
+"Ain"
+msgstr "Ain"
 
-#: kstars_i18n.cpp:3281
+#: data/hip001.dat:310
 msgid ""
 "_: star name\n"
-"Regor"
-msgstr "Regor"
+"Tarf"
+msgstr "Tarf"
 
-#: kstars_i18n.cpp:3282
+#: data/hip001.dat:321
 msgid ""
 "_: star name\n"
-"Regulus"
-msgstr "Regulus"
+"Schemali"
+msgstr "Schemali"
 
-#: kstars_i18n.cpp:3283
+#: data/hip001.dat:324
 msgid ""
 "_: star name\n"
-"Rigel"
-msgstr "Rigel"
+"Talitha Australis"
+msgstr "Talitha Australis"
 
-#: kstars_i18n.cpp:3284
+#: data/hip001.dat:328
 msgid ""
 "_: star name\n"
-"Rigel Kentaurus"
-msgstr "Rigel Kentaurus"
+"Al Giedi"
+msgstr "Al Giedi"
 
-#: kstars_i18n.cpp:3285
+#: data/hip001.dat:331
 msgid ""
 "_: star name\n"
-"Rotanev"
-msgstr "Rotanev"
+"Zawijah"
+msgstr "Zawijah"
 
-#: kstars_i18n.cpp:3286
+#: data/hip001.dat:346
 msgid ""
 "_: star name\n"
-"Ruchbah"
-msgstr "Ruchbah"
+"Atlas"
+msgstr "Atlas"
 
-#: kstars_i18n.cpp:3287
+#: data/hip001.dat:351
 msgid ""
 "_: star name\n"
-"Sadachbia"
-msgstr "Sadachbia"
+"Rotanev"
+msgstr "Rotanev"
 
-#: kstars_i18n.cpp:3288
+#: data/hip001.dat:352
 msgid ""
 "_: star name\n"
-"Sadalbari"
-msgstr "Sadalbari"
+"Primus Hyadum"
+msgstr "Primus Hyadum"
 
-#: kstars_i18n.cpp:3289
+#: data/hip001.dat:354
 msgid ""
 "_: star name\n"
-"Sadalmelik"
-msgstr "Sadalmelik"
+"Chow"
+msgstr "Chow"
 
-#: kstars_i18n.cpp:3290
+#: data/hip001.dat:357
 msgid ""
 "_: star name\n"
-"Sadalsud"
-msgstr "Sadalsud"
+"Nusakan"
+msgstr "Nusakan"
 
-#: kstars_i18n.cpp:3291
+#: data/hip001.dat:359
 msgid ""
 "_: star name\n"
-"Sadatoni"
-msgstr "Sadatoni"
+"Thuban"
+msgstr "Thuban"
 
-#: kstars_i18n.cpp:3292
+#: data/hip001.dat:367
 msgid ""
 "_: star name\n"
-"Sadr"
-msgstr "Sadr"
+"Nashira"
+msgstr "Nashira"
 
-#: kstars_i18n.cpp:3293
+#: data/hip001.dat:368
 msgid ""
 "_: star name\n"
-"Saiph"
-msgstr "Saiph"
+"Sadatoni"
+msgstr "Sadatoni"
 
-#: kstars_i18n.cpp:3294
+#: data/hip001.dat:371
 msgid ""
 "_: star name\n"
-"Sargas"
-msgstr "Sargas"
+"Marfik"
+msgstr "Marfik"
 
-#: kstars_i18n.cpp:3295
+#: data/hip001.dat:378
 msgid ""
 "_: star name\n"
-"Sarin"
-msgstr "Sarin"
+"Alshain"
+msgstr "Alshain"
 
-#: kstars_i18n.cpp:3296
+#: data/hip001.dat:381
 msgid ""
 "_: star name\n"
-"Scheat"
-msgstr "Scheat"
+"Electra"
+msgstr "Electra"
 
-#: kstars_i18n.cpp:3297
+#: data/hip001.dat:382
 msgid ""
 "_: star name\n"
-"Schedar"
-msgstr "Schedar"
+"Prijipati"
+msgstr "Prijipati"
 
-#: kstars_i18n.cpp:3298
+#: data/hip001.dat:386
 msgid ""
 "_: star name\n"
-"Schemali"
-msgstr "Schemali"
+"Grumium"
+msgstr "Grumium"
 
-#: kstars_i18n.cpp:3299
+#: data/hip001.dat:391
 msgid ""
 "_: star name\n"
-"Seginus"
-msgstr "Seginus"
+"Baten"
+msgstr "Baten"
 
-#: kstars_i18n.cpp:3300
+#: data/hip001.dat:404
 msgid ""
 "_: star name\n"
-"Shaula"
-msgstr "Shaula"
+"Svalocin"
+msgstr "Svalocin"
 
-#: kstars_i18n.cpp:3301
+#: data/hip001.dat:413
 msgid ""
 "_: star name\n"
-"Sheliak"
-msgstr "Sheliak"
+"Albali"
+msgstr "Albali"
 
-#: kstars_i18n.cpp:3302
+#: data/hip001.dat:418
 msgid ""
 "_: star name\n"
-"Sheratan"
-msgstr "Sheratan"
+"Praecipula"
+msgstr "Praecipula"
 
-#: kstars_i18n.cpp:3303
+#: data/hip001.dat:457
 msgid ""
 "_: star name\n"
-"Sirius"
-msgstr "Sirius"
+"Sadachbia"
+msgstr "Sadachbia"
 
-#: kstars_i18n.cpp:3304
+#: data/hip001.dat:462
 msgid ""
 "_: star name\n"
-"Skat"
-msgstr "Skat"
+"Maia"
+msgstr "Maia"
 
-#: kstars_i18n.cpp:3305
+#: data/hip001.dat:468
 msgid ""
 "_: star name\n"
-"Spica"
-msgstr "Spica"
+"Mesarthim"
+msgstr "Mesarthim"
 
-#: kstars_i18n.cpp:3306
+#: data/hip001.dat:471
 msgid ""
 "_: star name\n"
-"Suhail"
-msgstr "Suhail"
+"Rasalas"
+msgstr "Rasalas"
 
-#: kstars_i18n.cpp:3307
+#: data/hip001.dat:475
 msgid ""
 "_: star name\n"
-"Sulaphat"
-msgstr "Sulaphat"
+"Azha"
+msgstr "Azha"
 
-#: kstars_i18n.cpp:3308
+#: data/hip001.dat:486
 msgid ""
 "_: star name\n"
-"Svalocin"
-msgstr "Svalocin"
+"Zuben el Hakrabi"
+msgstr "Zuben el Hakrabi"
 
-#: kstars_i18n.cpp:3309
+#: data/hip001.dat:489
 msgid ""
 "_: star name\n"
-"Syrma"
-msgstr "Syrma"
+"Kitalpha"
+msgstr "Kitalpha"
 
-#: kstars_i18n.cpp:3310
+#: data/hip001.dat:502 data/hip002.dat:80
 msgid ""
 "_: star name\n"
-"Talitha Australis"
-msgstr "Talitha Australis"
+"Asellus Borealis"
+msgstr "Asellus Borealis"
 
-#: kstars_i18n.cpp:3311
+#: data/hip001.dat:522
 msgid ""
 "_: star name\n"
-"Talitha Borealis"
-msgstr "Talitha Borealis"
+"Menkib"
+msgstr "Menkib"
 
-#: kstars_i18n.cpp:3312
+#: data/hip001.dat:525
 msgid ""
 "_: star name\n"
-"Tania Australis"
-msgstr "Tania Australis"
+"Alcor"
+msgstr "Alcor"
 
-#: kstars_i18n.cpp:3313
+#: data/hip001.dat:534
 msgid ""
 "_: star name\n"
-"Tania Borealis"
-msgstr "Tania Borealis"
+"Mekbuda"
+msgstr "Mekbuda"
 
-#: kstars_i18n.cpp:3314
+#: data/hip001.dat:549
 msgid ""
 "_: star name\n"
-"Tarazed"
-msgstr "Tarazed"
+"Dulfim"
+msgstr "Dulfim"
 
-#: kstars_i18n.cpp:3315
+#: data/hip001.dat:552
 msgid ""
 "_: star name\n"
-"Tarf"
-msgstr "Tarf"
+"Beid"
+msgstr "Beid"
 
-#: kstars_i18n.cpp:3316
+#: data/hip001.dat:571
 msgid ""
 "_: star name\n"
-"Tchou"
-msgstr "Tchou"
+"Syrma"
+msgstr "Syrma"
 
-#: kstars_i18n.cpp:3317
+#: data/hip001.dat:582 data/hip001.dat:596
 msgid ""
 "_: star name\n"
-"Tejat"
-msgstr "Tejat"
+"Alkes"
+msgstr "Alkes"
 
-#: kstars_i18n.cpp:3318
+#: data/hip001.dat:592
 msgid ""
 "_: star name\n"
-"Thuban"
-msgstr "Thuban"
+"Muliphein"
+msgstr "Muliphein"
 
-#: kstars_i18n.cpp:3319
+#: data/hip001.dat:614
 msgid ""
 "_: star name\n"
-"Tseen Ke"
-msgstr "Tseen Ke"
+"Merope"
+msgstr "Merope"
 
-#: kstars_i18n.cpp:3320
+#: data/hip001.dat:631
 msgid ""
 "_: star name\n"
-"Tsih"
-msgstr "Tsih"
+"Ancha"
+msgstr "Ancha"
 
-#: kstars_i18n.cpp:3321
+#: data/hip001.dat:675
 msgid ""
 "_: star name\n"
-"Unukalhai"
-msgstr "Unukalhai"
+"Chara"
+msgstr "Chara"
 
-#: kstars_i18n.cpp:3322
+#: data/hip001.dat:695
 msgid ""
 "_: star name\n"
-"Vega"
-msgstr "Vega"
+"Acubens"
+msgstr "Acubens"
 
-#: kstars_i18n.cpp:3323
+#: data/hip001.dat:728
 msgid ""
 "_: star name\n"
-"Vindemiatrix"
-msgstr "Vindemiatrix"
+"Taygeta"
+msgstr "Taygeta"
 
-#: kstars_i18n.cpp:3324
+#: data/hip001.dat:740
 msgid ""
 "_: star name\n"
-"Wasat"
-msgstr "Wasat"
+"Alkalurops"
+msgstr "Alkalurops"
 
-#: kstars_i18n.cpp:3325
+#: data/hip001.dat:783
 msgid ""
 "_: star name\n"
-"Wazn"
-msgstr "Wazn"
+"Botein"
+msgstr "Botein"
 
-#: kstars_i18n.cpp:3326
+#: data/hip001.dat:874
 msgid ""
 "_: star name\n"
-"Wezen"
-msgstr "Wezen"
+"Minhar al Shuja"
+msgstr "Minhar al Shuja"
 
-#: kstars_i18n.cpp:3327
+#: data/hip001.dat:996
 msgid ""
 "_: star name\n"
-"Yed Posterior"
-msgstr "Yed Posterior"
+"Cujam"
+msgstr "Cujam"
 
-#: kstars_i18n.cpp:3328
+#: data/hip001.dat:998
 msgid ""
 "_: star name\n"
-"Yed Prior"
-msgstr "Yed Prior"
+"Dziban"
+msgstr "Dziban"
 
-#: kstars_i18n.cpp:3329
+#: data/hip002.dat:39
 msgid ""
 "_: star name\n"
-"Zaurak"
-msgstr "Zaurak"
+"Alya"
+msgstr "Alya"
 
-#: kstars_i18n.cpp:3330
+#: data/hip002.dat:615
 msgid ""
 "_: star name\n"
-"Zawijah"
-msgstr "Zawijah"
+"Marsik"
+msgstr "Marsik"
 
-#: kstars_i18n.cpp:3331
+#: data/hip002.dat:706
 msgid ""
 "_: star name\n"
-"Zozma"
-msgstr "Zozma"
+"Pleione"
+msgstr "Pleione"
 
-#: kstars_i18n.cpp:3332
+#: data/hip004.dat:838
 msgid ""
 "_: star name\n"
-"Zuben El Genubi"
-msgstr "Zuben El Genubi"
+"Asterope"
+msgstr "Asterope"
 
-#: kstars_i18n.cpp:3333
+#: data/hip009.dat:482
 msgid ""
 "_: star name\n"
-"Zuben el Chamali"
-msgstr "Zuben el Chamali"
+"Mira"
+msgstr "Mira"
 
-#: kstars_i18n.cpp:3334
+#: data/ngcic01.dat:10
 msgid ""
-"_: star name\n"
-"Zuben el Hakrabi"
-msgstr "Zuben el Hakrabi"
+"_: object name (optional)\n"
+"Pleiades"
+msgstr "Pleiades"
 
-#: kstars_i18n.cpp:3335
+#: data/ngcic01.dat:117
 msgid ""
 "_: object name (optional)\n"
 "47 Tucanae"
 msgstr "47 Tucanae"
 
-#: kstars_i18n.cpp:3336
+#: data/ngcic01.dat:236
 msgid ""
 "_: object name (optional)\n"
 "Andromeda Galaxy"
 msgstr "Galaeth Andromeda"
 
-#: kstars_i18n.cpp:3337
+#: data/ngcic01.dat:267
 msgid ""
 "_: object name (optional)\n"
-"Antennae Galaxies"
-msgstr "Galaethau Antennae"
+"Sculptor Galaxy"
+msgstr "Galaeth Cerfluniwr"
 
-#: kstars_i18n.cpp:3338
+#: data/ngcic01.dat:306
 msgid ""
 "_: object name (optional)\n"
-"Atoms for Peace Galaxy"
-msgstr "Galaeth Atomau ar gyfer Heddwch"
+"Small Magellanic Cloud"
+msgstr "Cwmwl Magelanaidd Bach"
 
-#: kstars_i18n.cpp:3339
+#: data/ngcic01.dat:420
 msgid ""
 "_: object name (optional)\n"
-"Barnard's Galaxy"
-msgstr "Galaeth Barnard"
+"Mirach's Ghost (Galaxy not found :)"
+msgstr "Ysbryd Mirach (ni chanfuwyd y Galaeth :)"
 
-#: kstars_i18n.cpp:3340
+#: data/ngcic01.dat:616
 msgid ""
 "_: object name (optional)\n"
-"Bear Claw Galaxy"
-msgstr "Galaeth Crafanc yr Arth"
+"Triangulum Galaxy"
+msgstr "Galaeth Triangulum"
 
-#: kstars_i18n.cpp:3341
+#: data/ngcic01.dat:669
 msgid ""
 "_: object name (optional)\n"
-"Black-Eye Galaxy"
-msgstr "Galaeth Llygad-Ddu"
+"Little Dumbell Nebula"
+msgstr "Nifwl Pwysau Codi Bach"
 
-#: kstars_i18n.cpp:3342
+#: data/ngcic01.dat:888
 msgid ""
 "_: object name (optional)\n"
-"Blinking Planetary"
-msgstr "Planedaidd Amrantol"
+"H Persei, Double Cluster"
+msgstr "H Persei, Clwstwr Dwbl"
 
-#: kstars_i18n.cpp:3343
+#: data/ngcic01.dat:903
 msgid ""
 "_: object name (optional)\n"
-"Blue Flash Nebula"
-msgstr "Nifwl Fflachiad Glas"
+"Chi Persei, Double Cluster"
+msgstr "Chi Persei, Clwstwr Dwbl"
 
-#: kstars_i18n.cpp:3344
+#: data/ngcic02.dat:82
 msgid ""
 "_: object name (optional)\n"
-"Blue Planetary"
-msgstr "Planedaidd Glas"
+"Cetus A"
+msgstr "Cetus A"
 
-#: kstars_i18n.cpp:3345
+#: data/ngcic02.dat:284
 msgid ""
 "_: object name (optional)\n"
-"Blue Snowball"
-msgstr "Pelen-eira Las"
+"Pipe Nebula"
+msgstr "Nifwl Pibell"
 
-#: kstars_i18n.cpp:3346
+#: data/ngcic02.dat:292
 msgid ""
 "_: object name (optional)\n"
-"Bode's Galaxy"
-msgstr "Galaeth Bode"
+"Perseus A"
+msgstr "Perseus A"
 
-#: kstars_i18n.cpp:3347
+#: data/ngcic02.dat:334
 msgid ""
 "_: object name (optional)\n"
-"Box Galaxies"
-msgstr "Galaethau Blwch"
+"Fornax A"
+msgstr "Fornax A"
 
-#: kstars_i18n.cpp:3348
+#: data/ngcic02.dat:456
 msgid ""
 "_: object name (optional)\n"
-"Box Nebula"
-msgstr "Nifwl Blwch"
+"Maia Nebula"
+msgstr "Nifwl Maia"
 
-#: kstars_i18n.cpp:3349
+#: data/ngcic02.dat:459
 msgid ""
 "_: object name (optional)\n"
-"Bubble Nebula"
-msgstr "Nifwl Swigen"
+"Merope Nebula"
+msgstr "Nifwl Merope"
 
-#: kstars_i18n.cpp:3350
+#: data/ngcic02.dat:523
 msgid ""
 "_: object name (optional)\n"
-"Bug Nebula"
-msgstr "Nifwl Pryf"
+"California Nebula"
+msgstr "Nifwl Califfornia"
 
-#: kstars_i18n.cpp:3351
+#: data/ngcic02.dat:581
 msgid ""
 "_: object name (optional)\n"
-"Butterfly Cluster"
-msgstr "Clwstwr Pilipala"
+"Struve's Lost Nebula"
+msgstr "Nifwl Coll Struve"
 
-#: kstars_i18n.cpp:3352
+#: data/ngcic02.dat:582
 msgid ""
 "_: object name (optional)\n"
-"Butterfly Nebula"
-msgstr "Nifwl Pilipala"
+"Hind's Variable Nebula"
+msgstr "Nifwl Newidol Hind"
 
-#: kstars_i18n.cpp:3353
+#: data/ngcic02.dat:622 data/ngcic02.dat:625
 msgid ""
 "_: object name (optional)\n"
-"California Nebula"
-msgstr "Nifwl Califfornia"
+"Carafe Group"
+msgstr "Grŵp Carafe"
 
-#: kstars_i18n.cpp:3354
+#: data/ngcic02.dat:981
 msgid ""
 "_: object name (optional)\n"
-"Carafe Group"
-msgstr "Grŵp Carafe"
+"Crab Nebula"
+msgstr "Nifwl y Cranc"
 
-#: kstars_i18n.cpp:3355
+#: data/ngcic03.dat:5
 msgid ""
 "_: object name (optional)\n"
-"Cat Eye Nebula"
-msgstr "Nifwl Llygad y Gath"
+"Orion Nebula"
+msgstr "Nifwl Orion"
 
-#: kstars_i18n.cpp:3356
+#: data/ngcic03.dat:19
 msgid ""
 "_: object name (optional)\n"
-"Centaurus A"
-msgstr "Centaurus A"
+"Epsilon Orionis Nebula"
+msgstr "Nifwl Epsilon Orionis"
 
-#: kstars_i18n.cpp:3357
+#: data/ngcic03.dat:99
 msgid ""
 "_: object name (optional)\n"
-"Cetus A"
-msgstr "Cetus A"
+"Tarantula Nebula, 30 Doradus"
+msgstr "Nifwl Tarantula, 30 Doradus"
 
-#: kstars_i18n.cpp:3358
+#: data/ngcic03.dat:267
 msgid ""
 "_: object name (optional)\n"
-"Chi Persei, Double Cluster"
-msgstr "Chi Persei, Clwstwr Dwbl"
+"Rosette Nebula"
+msgstr "Nifwl Rhosglwm"
 
-#: kstars_i18n.cpp:3359
+#: data/ngcic03.dat:291
 msgid ""
 "_: object name (optional)\n"
-"Christmas Tree Cluster"
-msgstr "Clwstwr Coeden Nadolig"
+"Hubble's Variable Nebula"
+msgstr "Nifwl Newidol Hubble"
 
-#: kstars_i18n.cpp:3360
+#: data/ngcic03.dat:294
 msgid ""
 "_: object name (optional)\n"
-"Cocoon Nebula"
-msgstr "Nifwl Cocŵn"
+"Christmas Tree Cluster"
+msgstr "Clwstwr Coeden Nadolig"
 
-#: kstars_i18n.cpp:3361
+#: data/ngcic03.dat:426
 msgid ""
 "_: object name (optional)\n"
-"Coddington Nebula"
-msgstr "Nifwl Coddington "
+"Eskimo Nebula"
+msgstr "Nifwl Eskimo"
 
-#: kstars_i18n.cpp:3362
+#: data/ngcic03.dat:455
 msgid ""
 "_: object name (optional)\n"
-"Copeland Septet"
-msgstr "Seithawd Copeland"
+"Intergalactic Wanderer"
+msgstr "Crwydryn Rhyngalaethog"
 
-#: kstars_i18n.cpp:3363
+#: data/ngcic03.dat:576
 msgid ""
 "_: object name (optional)\n"
-"Crab Nebula"
-msgstr "Nifwl y Cranc"
+"Bear Claw Galaxy"
+msgstr "Galaeth Crafanc yr Arth"
 
-#: kstars_i18n.cpp:3364
+#: data/ngcic03.dat:614
 msgid ""
 "_: object name (optional)\n"
-"Crescent Nebula"
-msgstr "Nifwl Cilgant"
+"Polarissima Australis"
+msgstr "Polarissima Australis"
 
-#: kstars_i18n.cpp:3365
+#: data/ngcic03.dat:675
 msgid ""
 "_: object name (optional)\n"
-"Delle Caustiche"
-msgstr "Delle Caustiche"
+"Praesepe, Beehive Cluster"
+msgstr "Praesepe, Clwster Cwch Gwenyn"
 
-#: kstars_i18n.cpp:3366
+#: data/ngcic03.dat:729
 msgid ""
 "_: object name (optional)\n"
-"Dumbbell Nebula"
-msgstr "Nifwl Pwysau Codi"
+"Helix Galaxy"
+msgstr "Galaeth yr Helics"
 
-#: kstars_i18n.cpp:3367
+#: data/ngcic03.dat:730
 msgid ""
 "_: object name (optional)\n"
-"Eagle Nebula"
-msgstr "Nifwl yr Eryr"
+"Spindle"
+msgstr "Gwerthyd"
 
-#: kstars_i18n.cpp:3368
+#: data/ngcic03.dat:782
 msgid ""
 "_: object name (optional)\n"
-"Eight-Burst Planetary"
-msgstr "Planedaidd Wyth-Ebychiad"
+"Herschel's Ray"
+msgstr "Pelydryn Herschel"
 
-#: kstars_i18n.cpp:3369
+#: data/ngcic03.dat:913
 msgid ""
 "_: object name (optional)\n"
-"Epsilon Orionis Nebula"
-msgstr "Nifwl Epsilon Orionis"
+"Helix"
+msgstr "Helics"
 
-#: kstars_i18n.cpp:3370
+#: data/ngcic04.dat:80
 msgid ""
 "_: object name (optional)\n"
-"Eskimo Nebula"
-msgstr "Nifwl Eskimo"
+"Bode's Galaxy"
+msgstr "Galaeth Bode"
 
-#: kstars_i18n.cpp:3371
+#: data/ngcic04.dat:83
 msgid ""
 "_: object name (optional)\n"
-"Eta Carina, Keyhole Nebula"
-msgstr "Eta Carina, Nifwl Twll Clo"
+"Ursa Major A"
+msgstr "Ursa Major A"
 
-#: kstars_i18n.cpp:3372
+#: data/ngcic04.dat:164
 msgid ""
 "_: object name (optional)\n"
-"Flaming Star Nebula"
-msgstr "Nifwl y Seren Fflam"
+"Spindle Galaxy"
+msgstr "Galaeth y Werthyd"
 
-#: kstars_i18n.cpp:3373
+#: data/ngcic04.dat:181
 msgid ""
 "_: object name (optional)\n"
-"Fornax A"
-msgstr "Fornax A"
+"Eight-Burst Planetary"
+msgstr "Planedaidd Wyth-Ebychiad"
 
-#: kstars_i18n.cpp:3374
+#: data/ngcic04.dat:223
 msgid ""
 "_: object name (optional)\n"
-"Gamma Cas Nebula"
-msgstr "Nifwl Gamma Cas"
+"Polarissima Borealis"
+msgstr "Polarissima Borealis"
 
-#: kstars_i18n.cpp:3375
+#: data/ngcic04.dat:294
 msgid ""
 "_: object name (optional)\n"
-"Gamma Cyg Nebula"
-msgstr "Nifwl Gamma Cyg"
+"Ghost of Jupiter"
+msgstr "Ysbryd Iau"
 
-#: kstars_i18n.cpp:3376
+#: data/ngcic04.dat:362
 msgid ""
 "_: object name (optional)\n"
 "Gem Cluster"
 msgstr "Clwstwr y Gem"
 
-#: kstars_i18n.cpp:3377
+#: data/ngcic04.dat:447
 msgid ""
 "_: object name (optional)\n"
-"Ghost of Jupiter"
-msgstr "Ysbryd Iau"
+"Eta Carina, Keyhole Nebula"
+msgstr "Eta Carina, Nifwl Twll Clo"
 
-#: kstars_i18n.cpp:3378
+#: data/ngcic04.dat:667
 msgid ""
 "_: object name (optional)\n"
-"Grus Quartet"
-msgstr "Pedwarawd Grus"
+"Owl Nebula"
+msgstr "Nifwl Tylluan"
 
-#: kstars_i18n.cpp:3379
+#: 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"
-"H Persei, Double Cluster"
-msgstr "H Persei, Clwstwr Dwbl"
+"Copeland Septet"
+msgstr "Seithawd Copeland"
 
-#: kstars_i18n.cpp:3380
+#: data/ngcic05.dat:6
 msgid ""
 "_: object name (optional)\n"
-"Helix"
-msgstr "Helics"
+"Blue Planetary"
+msgstr "Planedaidd Glas"
 
-#: kstars_i18n.cpp:3381
+#: data/ngcic05.dat:16
 msgid ""
 "_: object name (optional)\n"
-"Helix Galaxy"
-msgstr "Galaeth yr Helics"
+"Miniature Spiral"
+msgstr "Troellyn Bach"
 
-#: kstars_i18n.cpp:3382
+#: data/ngcic05.dat:127 data/ngcic05.dat:128
 msgid ""
 "_: object name (optional)\n"
-"Helix Nebula"
-msgstr "Nifwl yr Helics"
+"Antennae Galaxies"
+msgstr "Galaethau Antennae"
 
-#: kstars_i18n.cpp:3383
+#: data/ngcic05.dat:261 data/ngcic05.dat:265 data/ngcic05.dat:266
+#: data/ngcic05.dat:267
 msgid ""
 "_: object name (optional)\n"
-"Hercules Cluster"
-msgstr "Clwstwr Heracles"
+"Box Galaxies"
+msgstr "Galaethau Blwch"
 
-#: kstars_i18n.cpp:3384
+#: 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"
-"Herschel's Ray"
-msgstr "Pelydryn Herschel"
+"Markarian Chain"
+msgstr "Cadwyn Markarian"
 
-#: kstars_i18n.cpp:3385
+#: data/ngcic05.dat:585
 msgid ""
 "_: object name (optional)\n"
-"Hind's Variable Nebula"
-msgstr "Nifwl Newidol Hind"
+"Virgo A"
+msgstr "Virgo A"
 
-#: kstars_i18n.cpp:3386
+#: data/ngcic05.dat:669 data/ngcic05.dat:670
 msgid ""
 "_: object name (optional)\n"
-"Horsehead Nebula"
-msgstr "Nifwl Pen Ceffyl"
+"Siamese Twins"
+msgstr "Gefeilliaid Siamaidd"
 
-#: kstars_i18n.cpp:3387
+#: data/ngcic05.dat:696
 msgid ""
 "_: object name (optional)\n"
-"Hubble's Variable Nebula"
-msgstr "Nifwl Newidol Hubble"
+"Sombrero Galaxy"
+msgstr "Galaeth Sombrero"
 
-#: kstars_i18n.cpp:3388
+#: data/ngcic05.dat:787
 msgid ""
 "_: object name (optional)\n"
-"Intergalactic Wanderer"
-msgstr "Crwydryn Rhyngalaethog"
+"The Mice"
+msgstr "Y Llygod Bach"
 
-#: kstars_i18n.cpp:3389
+#: data/ngcic05.dat:872
 msgid ""
 "_: object name (optional)\n"
 "Jewel Box"
 msgstr "Blwch Gemau"
 
-#: kstars_i18n.cpp:3390
-msgid ""
-"_: object name (optional)\n"
-"Keenan's System"
-msgstr "Cysawd Keenan"
-
-#: kstars_i18n.cpp:3391
+#: data/ngcic05.dat:893
 msgid ""
 "_: object name (optional)\n"
 "Kidney Bean Galaxy"
 msgstr "Galaeth Ffeuen Ffrengig"
 
-#: kstars_i18n.cpp:3392
+#: data/ngcic05.dat:946
 msgid ""
 "_: object name (optional)\n"
-"Lagoon Nebula"
-msgstr "Nifwl Lagwn"
-
-#: kstars_i18n.cpp:3393
-msgid ""
-"_: object name (optional)\n"
-"Little Dumbell Nebula"
-msgstr "Nifwl Pwysau Codi Bach"
+"Black-Eye Galaxy"
+msgstr "Galaeth Llygad-Ddu"
 
-#: kstars_i18n.cpp:3394
+#: data/ngcic06.dat:186
 msgid ""
 "_: object name (optional)\n"
-"Little Gem"
-msgstr "Gem Bach"
+"Sunflower Galaxy"
+msgstr "Galaeth Blodyn Haul"
 
-#: kstars_i18n.cpp:3395
+#: data/ngcic06.dat:262
 msgid ""
 "_: object name (optional)\n"
-"Longname"
-msgstr "Hirenw"
+"Centaurus A"
+msgstr "Centaurus A"
 
-#: kstars_i18n.cpp:3396
+#: data/ngcic06.dat:273
 msgid ""
 "_: object name (optional)\n"
-"Maia Nebula"
-msgstr "Nifwl Maia"
+"Omega Centauri"
+msgstr "Omega Centauri"
 
-#: kstars_i18n.cpp:3397
+#: data/ngcic06.dat:329
 msgid ""
 "_: object name (optional)\n"
-"Markarian Chain"
-msgstr "Cadwyn Markarian"
+"Whirlpool Galaxy"
+msgstr "Galaeth Chwyrndrobwll"
 
-#: kstars_i18n.cpp:3398
+#: data/ngcic06.dat:352 data/ngcic06.dat:354
 msgid ""
 "_: object name (optional)\n"
-"Merope Nebula"
-msgstr "Nifwl Merope"
+"Keenan's System"
+msgstr "Cysawd Keenan"
 
-#: kstars_i18n.cpp:3399
+#: data/ngcic06.dat:596
 msgid ""
 "_: object name (optional)\n"
-"Miniature Spiral"
-msgstr "Troellyn Bach"
+"Pinwheel Galaxy"
+msgstr "Galaeth Olwyn Pin"
 
-#: kstars_i18n.cpp:3400
+#: data/ngcic07.dat:171
 msgid ""
 "_: object name (optional)\n"
-"Mirach's Ghost (Galaxy not found :)"
-msgstr "Ysbryd Mirach (ni chanfuwyd y Galaeth :)"
+"Seyfert Galaxies"
+msgstr "Galaethau Seyfert"
 
-#: kstars_i18n.cpp:3401
+#: data/ngcic07.dat:357
 msgid ""
 "_: object name (optional)\n"
-"North American Nebula"
-msgstr "Nifwl Gogledd America"
+"Hercules Cluster"
+msgstr "Clwstwr Heracles"
 
-#: kstars_i18n.cpp:3402
+#: data/ngcic07.dat:456
 msgid ""
 "_: object name (optional)\n"
-"Omega Centauri"
-msgstr "Omega Centauri"
+"Bug Nebula"
+msgstr "Nifwl Pryf"
 
-#: kstars_i18n.cpp:3403
+#: data/ngcic07.dat:463
 msgid ""
 "_: object name (optional)\n"
-"Omicron Velorum Cluster"
-msgstr "Clwster Omicron Velorum"
+"Box Nebula"
+msgstr "Nifwl Blwch"
 
-#: kstars_i18n.cpp:3404
+#: data/ngcic07.dat:560
 msgid ""
 "_: object name (optional)\n"
-"Orion Nebula"
-msgstr "Nifwl Orion"
+"Butterfly Cluster"
+msgstr "Clwstwr Pilipala"
 
-#: kstars_i18n.cpp:3405
+#: data/ngcic07.dat:631
 msgid ""
 "_: object name (optional)\n"
-"Owl Nebula"
-msgstr "Nifwl Tylluan"
+"Ptolemy's Cluster"
+msgstr "Clwstwr Ptolemy"
 
-#: kstars_i18n.cpp:3406
+#: data/ngcic07.dat:670
 msgid ""
 "_: object name (optional)\n"
-"Papillon Galaxy"
-msgstr "Galaeth Papillon"
+"Trifid Nebula"
+msgstr "Nifwl Triffid"
 
-#: kstars_i18n.cpp:3407
+#: data/ngcic07.dat:679
 msgid ""
 "_: object name (optional)\n"
-"Pelican Nebula"
-msgstr "Nifwl Pelican"
+"Lagoon Nebula"
+msgstr "Nifwl Lagwn"
 
-#: kstars_i18n.cpp:3408
+#: data/ngcic07.dat:699
 msgid ""
 "_: object name (optional)\n"
-"Perseus A"
-msgstr "Perseus A"
+"Cat Eye Nebula"
+msgstr "Nifwl Llygad y Gath"
 
-#: kstars_i18n.cpp:3409
+#: data/ngcic07.dat:759
 msgid ""
 "_: object name (optional)\n"
-"Pinwheel Galaxy"
-msgstr "Galaeth Olwyn Pin"
+"Delle Caustiche"
+msgstr "Delle Caustiche"
 
-#: kstars_i18n.cpp:3410
+#: data/ngcic07.dat:767
 msgid ""
 "_: object name (optional)\n"
-"Pipe Nebula"
-msgstr "Nifwl Pibell"
+"Eagle Nebula"
+msgstr "Nifwl yr Eryr"
 
-#: kstars_i18n.cpp:3411
+#: data/ngcic07.dat:774
 msgid ""
 "_: object name (optional)\n"
-"Pleiades"
-msgstr "Pleiades"
+"Swan Nebula, Omega Nebula"
+msgstr "Nifwl yr Alarch, Nifwl Omega"
 
-#: kstars_i18n.cpp:3412
+#: data/ngcic07.dat:863
 msgid ""
 "_: object name (optional)\n"
-"Polarissima Australis"
-msgstr "Polarissima Australis"
+"Wild Duck Cluster"
+msgstr "Clwstwr Hwyaden Wyllt"
 
-#: kstars_i18n.cpp:3413
+#: data/ngcic07.dat:878
 msgid ""
 "_: object name (optional)\n"
-"Polarissima Borealis"
-msgstr "Polarissima Borealis"
+"Ring Nebula"
+msgstr "Nifwl Modrwy"
 
-#: kstars_i18n.cpp:3414
+#: data/ngcic07.dat:978
 msgid ""
 "_: object name (optional)\n"
-"Praesepe, Beehive Cluster"
-msgstr "Praesepe, Clwster Cwch Gwenyn"
+"Little Gem"
+msgstr "Gem Bach"
 
-#: kstars_i18n.cpp:3415
+#: data/ngcic07.dat:982
 msgid ""
 "_: object name (optional)\n"
-"Ptolemy's Cluster"
-msgstr "Clwstwr Ptolemy"
+"Barnard's Galaxy"
+msgstr "Galaeth Barnard"
 
-#: kstars_i18n.cpp:3416
+#: data/ngcic07.dat:986
 msgid ""
 "_: object name (optional)\n"
-"Rho Ophiucus Nebula"
-msgstr "Nifwl Rho Ophiucus"
+"Blinking Planetary"
+msgstr "Planedaidd Amrantol"
 
-#: kstars_i18n.cpp:3417
+#: data/ngcic08.dat:18
 msgid ""
 "_: object name (optional)\n"
-"Ring Nebula"
-msgstr "Nifwl Modrwy"
+"Dumbbell Nebula"
+msgstr "Nifwl Pwysau Codi"
 
-#: kstars_i18n.cpp:3418
+#: data/ngcic08.dat:60
 msgid ""
 "_: object name (optional)\n"
-"Rosette Nebula"
-msgstr "Nifwl Rhosglwm"
+"Crescent Nebula"
+msgstr "Nifwl Cilgant"
 
-#: kstars_i18n.cpp:3419
+#: data/ngcic08.dat:79
 msgid ""
 "_: object name (optional)\n"
-"Running Chicken Nebula"
-msgstr "Nifwl Iâr Redegol"
+"Blue Flash Nebula"
+msgstr "Nifwl Fflachiad Glas"
 
-#: kstars_i18n.cpp:3420
+#: data/ngcic08.dat:136 data/ngcic08.dat:168 data/ngcic08.dat:171
 msgid ""
 "_: object name (optional)\n"
-"Saturn Nebula"
-msgstr "Nifwl Sadwrn"
+"Veil Nebula"
+msgstr "Nifwl y Llen"
 
-#: kstars_i18n.cpp:3421
+#: data/ngcic08.dat:176
 msgid ""
 "_: object name (optional)\n"
-"Sculptor Galaxy"
-msgstr "Galaeth Cerfluniwr"
+"North American Nebula"
+msgstr "Nifwl Gogledd America"
 
-#: kstars_i18n.cpp:3422
+#: data/ngcic08.dat:185
 msgid ""
 "_: object name (optional)\n"
-"Seyfert Galaxies"
-msgstr "Galaethau Seyfert"
+"Saturn Nebula"
+msgstr "Nifwl Sadwrn"
 
-#: kstars_i18n.cpp:3423
+#: data/ngcic08.dat:437
 msgid ""
 "_: object name (optional)\n"
-"Siamese Twins"
-msgstr "Gefeilliaid Siamaidd"
+"Atoms for Peace Galaxy"
+msgstr "Galaeth Atomau ar gyfer Heddwch"
 
-#: kstars_i18n.cpp:3424
+#: data/ngcic08.dat:479
 msgid ""
 "_: object name (optional)\n"
-"Small Magellanic Cloud"
-msgstr "Cwmwl Magelanaidd Bach"
+"Helix Nebula"
+msgstr "Nifwl yr Helics"
 
-#: kstars_i18n.cpp:3425
+#: data/ngcic08.dat:503 data/ngcic08.dat:504 data/ngcic08.dat:506
+#: data/ngcic08.dat:507
 msgid ""
 "_: object name (optional)\n"
-"Sombrero Galaxy"
-msgstr "Galaeth Sombrero"
+"Stephan's Quintet"
+msgstr "Pumawd Stephan"
 
-#: kstars_i18n.cpp:3426
+#: data/ngcic08.dat:743 data/ngcic08.dat:775 data/ngcic08.dat:783
+#: data/ngcic08.dat:792
 msgid ""
 "_: object name (optional)\n"
-"Southern Integral Galaxy"
-msgstr "Galaeth Integrol y De"
+"Grus Quartet"
+msgstr "Pedwarawd Grus"
 
-#: kstars_i18n.cpp:3427
+#: data/ngcic08.dat:828
 msgid ""
 "_: object name (optional)\n"
-"Southern Pleiades"
-msgstr "Pleiades y De"
+"Bubble Nebula"
+msgstr "Nifwl Swigen"
 
-#: kstars_i18n.cpp:3428
+#: data/ngcic08.dat:856
 msgid ""
 "_: object name (optional)\n"
-"Spindle"
-msgstr "Gwerthyd"
+"Blue Snowball"
+msgstr "Pelen-eira Las"
 
-#: kstars_i18n.cpp:3429
+#: data/ngcic09.dat:92 data/ngcic09.dat:96
 msgid ""
 "_: object name (optional)\n"
-"Spindle Galaxy"
-msgstr "Galaeth y Werthyd"
+"Gamma Cas Nebula"
+msgstr "Nifwl Gamma Cas"
 
-#: kstars_i18n.cpp:3430
+#: data/ngcic09.dat:439
 msgid ""
 "_: object name (optional)\n"
-"Star Queen Nebula"
-msgstr "Nifwl Brenhines y Sêr"
+"Flaming Star Nebula"
+msgstr "Nifwl y Seren Fflam"
 
-#: kstars_i18n.cpp:3431
+#: data/ngcic09.dat:468
 msgid ""
 "_: object name (optional)\n"
-"Stephan's Quintet"
-msgstr "Pumawd Stephan"
+"Horsehead Nebula"
+msgstr "Nifwl Pen Ceffyl"
 
-#: kstars_i18n.cpp:3432
+#: data/ngcic09.dat:742
 msgid ""
 "_: object name (optional)\n"
-"Struve's Lost Nebula"
-msgstr "Nifwl Coll Struve"
+"Papillon Galaxy"
+msgstr "Galaeth Papillon"
 
-#: kstars_i18n.cpp:3433
+#: data/ngcic10.dat:354
 msgid ""
 "_: object name (optional)\n"
-"Sunflower Galaxy"
-msgstr "Galaeth Blodyn Haul"
+"Gamma Cyg Nebula"
+msgstr "Nifwl Gamma Cyg"
 
-#: kstars_i18n.cpp:3434
+#: data/ngcic11.dat:155
 msgid ""
 "_: object name (optional)\n"
-"Swan Nebula, Omega Nebula"
-msgstr "Nifwl yr Alarch, Nifwl Omega"
+"Witch Head Nebula"
+msgstr "Nifwl Pen y Wrach"
 
-#: kstars_i18n.cpp:3435
+#: data/ngcic11.dat:258
 msgid ""
 "_: object name (optional)\n"
-"Tarantula Nebula, 30 Doradus"
-msgstr "Nifwl Tarantula, 30 Doradus"
+"Butterfly Nebula"
+msgstr "Nifwl Pilipala"
 
-#: kstars_i18n.cpp:3436
+#: data/ngcic11.dat:429
 msgid ""
 "_: object name (optional)\n"
-"The Mice"
-msgstr "Y Llygod Bach"
+"Omicron Velorum Cluster"
+msgstr "Clwster Omicron Velorum"
 
-#: kstars_i18n.cpp:3437
+#: data/ngcic11.dat:612
 msgid ""
 "_: object name (optional)\n"
-"Triangulum Galaxy"
-msgstr "Galaeth Triangulum"
+"Coddington Nebula"
+msgstr "Nifwl Coddington "
 
-#: kstars_i18n.cpp:3438
+#: data/ngcic11.dat:640
 msgid ""
 "_: object name (optional)\n"
-"Trifid Nebula"
-msgstr "Nifwl Triffid"
+"Southern Pleiades"
+msgstr "Pleiades y De"
 
-#: kstars_i18n.cpp:3439
+#: data/ngcic11.dat:982 data/ngcic11.dat:986
 msgid ""
 "_: object name (optional)\n"
-"Ursa Major A"
-msgstr "Ursa Major A"
+"Running Chicken Nebula"
+msgstr "Nifwl Iâr Redegol"
 
-#: kstars_i18n.cpp:3440
+#: data/ngcic12.dat:520 data/ngcic12.dat:523
 msgid ""
 "_: object name (optional)\n"
-"Veil Nebula"
-msgstr "Nifwl y Llen"
+"Zwicky's Triplet"
+msgstr "Triawd Zwicky"
 
-#: kstars_i18n.cpp:3441
+#: data/ngcic13.dat:636
 msgid ""
 "_: object name (optional)\n"
-"Virgo A"
-msgstr "Virgo A"
+"White-Eyed Pea"
+msgstr ""
 
-#: kstars_i18n.cpp:3442
+#: data/ngcic13.dat:647
 msgid ""
 "_: object name (optional)\n"
-"Whirlpool Galaxy"
-msgstr "Galaeth Chwyrndrobwll"
+"Rho Ophiucus Nebula"
+msgstr "Nifwl Rho Ophiucus"
 
-#: kstars_i18n.cpp:3443
+#: data/ngcic13.dat:747
 msgid ""
 "_: object name (optional)\n"
-"White-Eyed Pea"
-msgstr ""
+"Star Queen Nebula"
+msgstr "Nifwl Brenhines y Sêr"
 
-#: kstars_i18n.cpp:3444
+#: data/ngcic14.dat:115
 msgid ""
 "_: object name (optional)\n"
-"Wild Duck Cluster"
-msgstr "Clwstwr Hwyaden Wyllt"
+"Pelican Nebula"
+msgstr "Nifwl Pelican"
 
-#: kstars_i18n.cpp:3445
+#: data/ngcic14.dat:193
 msgid ""
 "_: object name (optional)\n"
-"Witch Head Nebula"
-msgstr "Nifwl Pen y Wrach"
+"Cocoon Nebula"
+msgstr "Nifwl Cocŵn"
 
-#: kstars_i18n.cpp:3446
+#: data/ngcic14.dat:220
 msgid ""
 "_: object name (optional)\n"
-"Zwicky's Triplet"
-msgstr "Triawd Zwicky"
+"Southern Integral Galaxy"
+msgstr "Galaeth Integrol y De"
 
-#: kstars_i18n.cpp:3447
+#: data/advinterface.dat:1
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Simbad"
 msgstr "Simbad"
 
-#: kstars_i18n.cpp:3448
+#: data/advinterface.dat:4
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Aladin"
 msgstr "Aladin"
 
-#: kstars_i18n.cpp:3449
+#: data/advinterface.dat:9
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Skyview"
 msgstr "Skyview"
 
-#: kstars_i18n.cpp:3450
+#: data/advinterface.dat:11
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Gamma-ray"
 msgstr "Pelydryn Gamma"
 
-#: kstars_i18n.cpp:3451
+#: data/advinterface.dat:17
 msgid ""
 "_: Advanced URLs: description or category\n"
 "X-ray"
 msgstr "Pelydryn X"
 
-#: kstars_i18n.cpp:3452
+#: data/advinterface.dat:30
 msgid ""
 "_: Advanced URLs: description or category\n"
 "EUV"
 msgstr "EUV"
 
-#: kstars_i18n.cpp:3453
+#: data/advinterface.dat:38
 msgid ""
 "_: Advanced URLs: description or category\n"
 "UV"
 msgstr "UV"
 
-#: kstars_i18n.cpp:3454
+#: data/advinterface.dat:44
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Optical"
 msgstr "Optegol"
 
-#: kstars_i18n.cpp:3455
+#: data/advinterface.dat:50
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Infrared"
 msgstr "Isgoch"
 
-#: kstars_i18n.cpp:3456
+#: data/advinterface.dat:62
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Radio"
 msgstr "Radio"
 
-#: kstars_i18n.cpp:3457
+#: data/advinterface.dat:76
 msgid ""
 "_: Advanced URLs: description or category\n"
 "High Energy Astrophysical Archive (HEASARC)"
 msgstr ""
 "Archif Astroffisegol Ynni Uchel (HEASARC - High Energy Astrophysical Archive)"
 
-#: kstars_i18n.cpp:3458
+#: data/advinterface.dat:77
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Recent X-Ray Missions"
 msgstr ""
 
-#: kstars_i18n.cpp:3459
+#: data/advinterface.dat:85
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Past X-ray Mission"
 msgstr ""
 
-#: kstars_i18n.cpp:3460
+#: data/advinterface.dat:97
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Gamma-Ray Missions"
 msgstr ""
 
-#: kstars_i18n.cpp:3461
+#: data/advinterface.dat:105
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Other Missions"
 msgstr ""
 
-#: kstars_i18n.cpp:3462
+#: data/advinterface.dat:114
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Popular Catalog Choices"
 msgstr ""
 
-#: kstars_i18n.cpp:3463
+#: data/advinterface.dat:125
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Multiwavelength Catalogs"
 msgstr ""
 
-#: kstars_i18n.cpp:3464
+#: data/advinterface.dat:135
 msgid ""
 "_: Advanced URLs: description or category\n"
 "NASA Extragalactic Database (NED)"
 msgstr ""
 
-#: kstars_i18n.cpp:3465
+#: data/advinterface.dat:139
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Positions"
 msgstr ""
 
-#: kstars_i18n.cpp:3466
+#: data/advinterface.dat:149
 msgid ""
 "_: Advanced URLs: description or category\n"
 "NASA Astrophysics Data System (ADS)"
 msgstr ""
 
-#: kstars_i18n.cpp:3467
+#: data/advinterface.dat:150
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Astronomy and Astrophysics"
 msgstr ""
 
-#: kstars_i18n.cpp:3468
+#: data/advinterface.dat:155
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Instrumentation"
 msgstr ""
 
-#: kstars_i18n.cpp:3469
+#: data/advinterface.dat:160
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Physics and Geophysics"
 msgstr ""
 
-#: kstars_i18n.cpp:3470
+#: data/advinterface.dat:165
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Astrophysics preprints"
 msgstr ""
 
-#: kstars_i18n.cpp:3471
+#: data/advinterface.dat:171
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Multimission Archive at Space Telescope (MAST)"
 msgstr ""
 
-#: kstars_i18n.cpp:3472
+#: data/advinterface.dat:172
 msgid ""
 "_: Advanced URLs: description or category\n"
 "HST"
 msgstr ""
 
-#: kstars_i18n.cpp:3473
+#: data/advinterface.dat:176
 msgid ""
 "_: Advanced URLs: description or category\n"
 "ASTRO"
 msgstr ""
 
-#: kstars_i18n.cpp:3474
+#: data/advinterface.dat:181
 msgid ""
 "_: Advanced URLs: description or category\n"
 "ORFEUS"
 msgstr ""
 
-#: kstars_i18n.cpp:3475
+#: data/advinterface.dat:185
 msgid ""
 "_: Advanced URLs: description or category\n"
 "COPERNICUS"
 msgstr ""
 
-#: kstars_i18n.cpp:3476
+#: data/advinterface.dat:191
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Images"
 msgstr "Delweddau"
 
-#: kstars_i18n.cpp:3477
+#: data/advinterface.dat:200
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Spectra"
 msgstr ""
 
-#: kstars_i18n.cpp:3478
+#: data/advinterface.dat:208
 msgid ""
 "_: Advanced URLs: description or category\n"
 "Other"
 msgstr "Arall"
 
-#: kstarsactions.cpp:368
-msgid "Catalogs"
-msgstr ""
-
-#: kstarsactions.cpp:370
-msgid "Guides"
-msgstr ""
+#: addcatdialogui.ui:16
+#, fuzzy, no-c-format
+msgid "AddCatDialog"
+msgstr "Ychwanegu Catalog"
 
-#: kstarsactions.cpp:371
-msgid "Colors"
-msgstr "Lliwiau"
+#: addcatdialogui.ui:27
+#, fuzzy, no-c-format
+msgid "Import File"
+msgstr "Ychwanegu Catalog ..."
 
-#: kstarsactions.cpp:409
-msgid "KStars::slotFind() - Not enough memory for dialog"
-msgstr ""
+#: addcatdialogui.ui:38
+#, fuzzy, no-c-format
+msgid "Enter import data filename"
+msgstr "Dangos enw"
 
-#: kstarsactions.cpp:473
+#: addcatdialogui.ui:41
+#, no-c-format
 msgid ""
-"Warning:  You are about to execute a remote shell script on your machine. "
+"To import an existing data file, enter its filename here.  You will then "
+"describe the contents of the file below.  You can leave the filename blank "
+"to construct a catalog file with a valid header, but no data."
 msgstr ""
 
-#: kstarsactions.cpp:474
-msgid ""
-"If you absolutely trust the source of this script, press Continue to execute "
-"the script; "
+#: addcatdialogui.ui:57
+#, no-c-format
+msgid "Contents of the imported data file"
 msgstr ""
 
-#: kstarsactions.cpp:475
-msgid "to save the file without executing it, press Save; "
+#: addcatdialogui.ui:60
+#, no-c-format
+msgid ""
+"When you select a data file in the above line, its contents are displayed "
+"here."
 msgstr ""
 
-#: kstarsactions.cpp:476
-msgid "to cancel the download, press Cancel. "
-msgstr ""
+#: addcatdialogui.ui:70
+#, fuzzy, no-c-format
+msgid "Describe Data Fields"
+msgstr "Manylion"
 
-#: kstarsactions.cpp:478
-msgid "Really Execute Remote Script?"
-msgstr ""
+#: addcatdialogui.ui:94
+#, fuzzy, no-c-format
+msgid "<b>Catalog fields:</b>"
+msgstr "<b>Dyddiad</b>"
 
-#: kstarsactions.cpp:488
-msgid "Save location is invalid. Try another location?"
+#: addcatdialogui.ui:102
+#, no-c-format
+msgid "Data fields present in the import file"
 msgstr ""
 
-#: kstarsactions.cpp:489
-msgid "Invalid Save Location"
+#: addcatdialogui.ui:105
+#, no-c-format
+msgid ""
+"Build a list of data fields for your import data file (in the correct order "
+"from left to right), by dragging items from the \"Available fields\" list."
 msgstr ""
 
-#: kstarsactions.cpp:489 tools/observinglist.cpp:583
-msgid "Try Another"
+#: addcatdialogui.ui:128
+#, no-c-format
+msgid "<b>Available fields:</b>"
 msgstr ""
 
-#: kstarsactions.cpp:489 tools/observinglist.cpp:583
-#: tools/observinglist.cpp:632
-msgid "Do Not Try"
+#: addcatdialogui.ui:136
+#, no-c-format
+msgid "The list of available data fields"
 msgstr ""
 
-#: kstarsactions.cpp:509
-msgid "Could not download the file."
+#: addcatdialogui.ui:139
+#, no-c-format
+msgid ""
+"Drag items from this box to the \"Catalog fields\" box to describe the "
+"contents of your imported data file."
 msgstr ""
 
-#: kstarsactions.cpp:509 tools/scriptbuilder.cpp:757
-msgid "Download Error"
+#: addcatdialogui.ui:167
+#, no-c-format
+msgid "The coordinate epoch for the catalog"
 msgstr ""
 
-#: kstarsactions.cpp:531 kstarsdata.cpp:2348 tools/observinglist.cpp:531
-#, c-format
-msgid "Could not open file %1"
-msgstr "Methwyd agor y ffeil %1"
-
-#: kstarsactions.cpp:556
-msgid ""
-"The selected script contains unrecognized elements,indicating that it was not "
-"created using the KStars script builder. This script may not function properly, "
-"and it may even contain malicious code. Would you like to execute it anyway?"
+#: addcatdialogui.ui:175
+#, no-c-format
+msgid "Catalog name prefix:"
 msgstr ""
 
-#: kstarsactions.cpp:560
-msgid "Script Validation Failed"
+#: addcatdialogui.ui:191
+#, no-c-format
+msgid "Symbol color:"
 msgstr ""
 
-#: kstarsactions.cpp:560
-msgid "Run Nevertheless"
+#: addcatdialogui.ui:216
+#, no-c-format
+msgid "Coordinate epoch:"
 msgstr ""
 
-#: kstarsactions.cpp:581
-msgid ""
-"You can save printer ink by using the \"Star Chart\" color scheme, which uses a "
-"white background. Would you like to temporarily switch to the Star Chart color "
-"scheme for printing?"
+#: addcatdialogui.ui:252
+#, no-c-format
+msgid "Preview &Output"
 msgstr ""
 
-#: kstarsactions.cpp:586
-msgid "Switch to Star Chart Colors?"
+#: addcatdialogui.ui:272
+#, no-c-format
+msgid "Enter the filename for the output catalog file"
 msgstr ""
 
-#: kstarsactions.cpp:587
-#, fuzzy
-msgid "Switch Color Scheme"
-msgstr "Gwaredu Cynllun Lliw"
-
-#: kstarsactions.cpp:587
-msgid "Do Not Switch"
-msgstr ""
+#: addcatdialogui.ui:280
+#, fuzzy, no-c-format
+msgid "Catalog name:"
+msgstr "Constellation names:"
 
-#: kstarsactions.cpp:643 kstarsinit.cpp:96
-msgid "Engage &Tracking"
-msgstr ""
+#: addcatdialogui.ui:288
+#, fuzzy, no-c-format
+msgid "Save catalog as:"
+msgstr "Constellation names:"
 
-#: kstarsactions.cpp:765
-msgid ""
-"_: The user should enter an angle for the field-of-view of the display\n"
-"Enter Desired Field-of-View Angle"
+#: addcatdialogui.ui:296
+#, no-c-format
+msgid "Enter a name for the catalog"
 msgstr ""
 
-#: kstarsactions.cpp:765
-msgid "Enter a field-of-view angle in degrees: "
+#: addlinkdialogui.ui:24
+#, no-c-format
+msgid "Resource Type"
 msgstr ""
 
-#: kstarsactions.cpp:853
-msgid "Could not open fov.dat for writing."
-msgstr ""
+#: addlinkdialogui.ui:35
+#, no-c-format
+msgid "Image"
+msgstr "Delwedd"
 
-#: kstarsactions.cpp:883 kstarsinit.cpp:338
-#, c-format
-msgid "Could not open file: %1"
-msgstr "Methwyd agor y ffeil : %1"
+#: addlinkdialogui.ui:43
+#, fuzzy, no-c-format
+msgid "Information"
+msgstr "Hyd:"
 
-#: kstarsactions.cpp:887 kstarsinit.cpp:342
-msgid "Edit FOV Symbols..."
-msgstr ""
+#: addlinkdialogui.ui:66
+#, no-c-format
+msgid "Description:"
+msgstr "Disgrifiad:"
 
-#: kstarsdata.cpp:129
-msgid "multiple star"
+#: addlinkdialogui.ui:128
+#, no-c-format
+msgid "Check URL"
 msgstr ""
 
-#: kstarsdata.cpp:130
-msgid "planet"
+#: ccdpreviewui.ui:16
+#, no-c-format
+msgid "CCD Preview"
 msgstr ""
 
-#: kstarsdata.cpp:131
-msgid "open cluster"
-msgstr ""
+#: ccdpreviewui.ui:50 streamformui.ui:50
+#, no-c-format
+msgid "Play/Pause"
+msgstr "Chwarae/Seibio"
 
-#: kstarsdata.cpp:132
-msgid "globular cluster"
+#: ccdpreviewui.ui:76 streamformui.ui:76
+#, no-c-format
+msgid "Capture Image"
 msgstr ""
 
-#: kstarsdata.cpp:133
-msgid "gaseous nebula"
+#: ccdpreviewui.ui:87 streamformui.ui:87
+#, no-c-format
+msgid "Image Format"
 msgstr ""
 
-#: kstarsdata.cpp:134
-msgid "planetary nebula"
-msgstr ""
+#: ccdpreviewui.ui:163 contrastbrightnessgui.ui:74
+#, no-c-format
+msgid "Brightness:"
+msgstr "Disgleirdeb:"
 
-#: kstarsdata.cpp:135
-msgid "supernova remnant"
-msgstr ""
+#: ccdpreviewui.ui:179 contrastbrightnessgui.ui:44
+#, no-c-format
+msgid "Contrast:"
+msgstr "Cyferbyniant :"
 
-#: kstarsdata.cpp:136
-msgid "galaxy"
-msgstr "galaeth"
+#: ccdpreviewui.ui:195
+#, no-c-format
+msgid "Gamma:"
+msgstr "Gama :"
 
-#: kstarsdata.cpp:137
-msgid "comet"
+#: ccdpreviewui.ui:211 telescopepropui.ui:148
+#, no-c-format
+msgid "Focal length:"
 msgstr ""
 
-#: kstarsdata.cpp:138
-msgid "asteroid"
+#: ccdpreviewui.ui:230
+#, no-c-format
+msgid "FWHM:"
 msgstr ""
 
-#: kstarsdata.cpp:139
-msgid "constellation"
-msgstr "cyfseriad"
+#: ccdpreviewui.ui:233 ccdpreviewui.ui:370 ccdpreviewui.ui:399
+#, no-c-format
+msgid "Full Width at Half Maximum"
+msgstr ""
 
-#: kstarsdata.cpp:436
-msgid "No star named %1 found."
+#: ccdpreviewui.ui:339
+#, no-c-format
+msgid "Enter the telescope focal length in mm"
 msgstr ""
 
-#: kstarsdata.cpp:519 kstarsdata.cpp:535
-msgid "Unable to parse boundary segment."
+#: ccdpreviewui.ui:364
+#, no-c-format
+msgid "--"
 msgstr ""
 
-#: kstarsdata.cpp:545
-#, fuzzy
-msgid "Bad Constellation Boundary data."
-msgstr "Constellation names"
+#: 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 "mM"
 
-#: kstarsdata.cpp:587 kstarsdata.cpp:1842
-msgid "Loading Star Data (%1%)"
+#: ccdpreviewui.ui:415
+#, no-c-format
+msgid "arcsecs"
 msgstr ""
 
-#: kstarsdata.cpp:791 kstarsdata.cpp:1853
-msgid "Loading NGC/IC Data (%1%)"
+#: contrastbrightnessgui.ui:16
+#, no-c-format
+msgid "Contrast/Brightness"
 msgstr ""
 
-#: kstarsdata.cpp:887
-msgid "Unnamed Object"
+#: details_data.ui:16
+#, no-c-format
+msgid "Details - General Data"
 msgstr ""
 
-#: kstarsdata.cpp:1011
-msgid "No localized URL file; using default English file."
+#: details_data.ui:46
+#, no-c-format
+msgid "<p align=\"center\">Primary Name, Other Names</p>"
 msgstr ""
 
-#: kstarsdata.cpp:1026
-msgid ""
-"Failed to copy default URL file to locale folder, modifying default object "
-"links is not possible"
-msgstr ""
+#: details_data.ui:142
+#, no-c-format
+msgid "in"
+msgstr "in"
 
-#: kstarsdata.cpp:1145
-#, c-format
-msgid "Error adding catalog: %1"
-msgstr ""
+#: details_data.ui:168
+#, no-c-format
+msgid "Constellation"
+msgstr "Cyfseriad"
 
-#: kstarsdata.cpp:1223
-msgid "Line %1 does not contain %2 fields.  Skipping it."
+#: details_data.ui:222
+#, no-c-format
+msgid "Click to change image"
 msgstr ""
 
-#: kstarsdata.cpp:1230
+#: details_data.ui:225
+#, no-c-format
 msgid ""
-"Some lines in the custom catalog could not be parsed; see error messages below."
-msgstr ""
-
-#: kstarsdata.cpp:1231
-msgid "To reject the file, press Cancel. "
+"A small thumbnail image of the object is shown here.  You can modify the "
+"image by clicking on it."
 msgstr ""
 
-#: kstarsdata.cpp:1232
-msgid "To accept the file (ignoring unparsed lines), press Accept."
+#: details_data.ui:293
+#, no-c-format
+msgid "0.00 arcmin"
 msgstr ""
 
-#: kstarsdata.cpp:1234
-msgid "Some Lines in File Were Invalid"
+#: details_data.ui:317
+#, no-c-format
+msgid "0.00 mag"
 msgstr ""
 
-#: kstarsdata.cpp:1234
-msgid "Accept"
-msgstr "Derbyn"
-
-#: kstarsdata.cpp:1240
-msgid ""
-"No lines could be parsed from the specified file, see error messages below."
+#: details_data.ui:346
+#, no-c-format
+msgid "Magnitude:"
 msgstr ""
 
-#: kstarsdata.cpp:1242
-msgid "No Valid Data Found in File"
-msgstr ""
+#: details_data.ui:378 tools/modcalcangdistdlg.ui:271
+#, no-c-format
+msgid "Distance:"
+msgstr "Pellder:"
 
-#: kstarsdata.cpp:1249 kstarsdata.cpp:1252
-#, fuzzy, c-format
-msgid "Could not open custom data file: %1"
-msgstr "Methwyd agor y ffeil : %1"
+#: details_data.ui:405
+#, fuzzy, no-c-format
+msgid "0.00 pc"
+msgstr "0.0"
 
-#: kstarsdata.cpp:1250
-msgid "Error opening file"
-msgstr "Gwall tra'n agor y ffeil"
+#: details_data.ui:434
+#, no-c-format
+msgid "Size:"
+msgstr "Maint:"
 
-#: kstarsdata.cpp:1282
-msgid "Line %1, field %2: Unable to parse RA value: %3"
+#: details_data.ui:504
+#, no-c-format
+msgid "Add to Observing List"
 msgstr ""
 
-#: kstarsdata.cpp:1291
-msgid "Line %1, field %2: Unable to parse Dec value: %3"
+#: details_data.ui:512
+#, no-c-format
+msgid "Center in Map"
 msgstr ""
 
-#: kstarsdata.cpp:1303
-msgid "Line %1, field %2: Invalid object type: %3"
+#: details_data.ui:520
+#, no-c-format
+msgid "Center in Telescope"
 msgstr ""
 
-#: kstarsdata.cpp:1305
-msgid "Must be one of 0, 1, 3, 4, 5, 6, 7, 8."
+#: details_database.ui:16
+#, no-c-format
+msgid "Details - Online Databases"
 msgstr ""
 
-#: kstarsdata.cpp:1310
-msgid "Line %1, field %2: Unable to parse Object type: %3"
+#: details_database.ui:25
+#, no-c-format
+msgid "Choose Online Database"
 msgstr ""
 
-#: kstarsdata.cpp:1321
-msgid "Line %1, field %2: Unable to parse Magnitude: %3"
+#: details_links.ui:16
+#, no-c-format
+msgid "Details - Resource Links"
 msgstr ""
 
-#: kstarsdata.cpp:1332
-msgid "Line %1, field %2: Unable to parse Major Axis: %3"
+#: details_links.ui:43
+#, no-c-format
+msgid "<p align=\"center\">Information Links</p>"
 msgstr ""
 
-#: kstarsdata.cpp:1343
-msgid "Line %1, field %2: Unable to parse Minor Axis: %3"
+#: details_links.ui:97
+#, no-c-format
+msgid "<p align=\"center\">Image Links</p>"
 msgstr ""
 
-#: kstarsdata.cpp:1354
-msgid "Line %1, field %2: Unable to parse Position Angle: %3"
+#: details_links.ui:129
+#, no-c-format
+msgid "View Resource"
 msgstr ""
 
-#: kstarsdata.cpp:1402 kstarsdata.cpp:1411 kstarsdata.cpp:1420
-#: kstarsdata.cpp:1430 kstarsdata.cpp:1436 kstarsdata.cpp:1468
-#: kstarsdata.cpp:1473 kstarsdata.cpp:1484 kstarsdata.cpp:1490
-#: kstarsdata.cpp:1496 kstarsdata.cpp:1501 kstarsdata.cpp:1506
-#: kstarsdata.cpp:1511
-msgid "Parsing header: "
+#: details_links.ui:145
+#, no-c-format
+msgid "Edit Link..."
 msgstr ""
 
-#: kstarsdata.cpp:1403
-msgid "Extra Name field in header: %1.  Will be ignored"
-msgstr ""
+#: details_links.ui:153
+#, no-c-format
+msgid "Remove Link"
+msgstr "Gwaredu Cyswllt"
 
-#: kstarsdata.cpp:1412
-msgid "Extra Prefix field in header: %1.  Will be ignored"
+#: details_log.ui:16
+#, no-c-format
+msgid "Details - User Log"
 msgstr ""
 
-#: kstarsdata.cpp:1421
-msgid "Extra Color field in header: %1.  Will be ignored"
+#: details_log.ui:35
+#, no-c-format
+msgid "<p align=\"center\">User Log</p>"
 msgstr ""
 
-#: kstarsdata.cpp:1431
-msgid "Could not convert Epoch to float: %1.  Using 2000. instead"
+#: details_position.ui:16
+#, no-c-format
+msgid "Details - Position Data"
 msgstr ""
 
-#: kstarsdata.cpp:1437
-msgid "Extra Epoch field in header: %1.  Will be ignored"
+#: details_position.ui:43
+#, no-c-format
+msgid "<p align=\"center\">Coordinates</p>"
 msgstr ""
 
-#: kstarsdata.cpp:1469
-msgid "Duplicate data field descriptor \"%1\" will be ignored"
-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:831 details_position.ui:856
+#, no-c-format
+msgid "00:00:00"
+msgstr "00:00:00"
 
-#: kstarsdata.cpp:1474
-msgid "Invalid data field descriptor \"%1\" will be ignored"
+#: details_position.ui:155
+#, no-c-format
+msgid "Dec (2000.0):"
 msgstr ""
 
-#: kstarsdata.cpp:1485
-msgid "No valid column descriptors found.  Exiting"
+#: details_position.ui:179
+#, no-c-format
+msgid "RA (2000.0):"
 msgstr ""
 
-#: kstarsdata.cpp:1491
-msgid "No data lines found after header.  Exiting."
-msgstr ""
+#: details_position.ui:280 tools/modcalcazeldlg.ui:409
+#: tools/modcalcazeldlg.ui:706 tools/modcalcplanetsdlg.ui:448
+#, no-c-format
+msgid "Altitude:"
+msgstr "Uchder :"
 
-#: kstarsdata.cpp:1497
-msgid "No Catalog Name specified; setting to \"Custom\""
-msgstr ""
+#: details_position.ui:304 tools/modcalcazeldlg.ui:401
+#: tools/modcalcazeldlg.ui:605 tools/modcalcplanetsdlg.ui:429
+#, no-c-format
+msgid "Azimuth:"
+msgstr "Asimwth:"
 
-#: kstarsdata.cpp:1502
-msgid "No Catalog Prefix specified; setting to \"CC\""
+#: details_position.ui:365
+#, no-c-format
+msgid "Hour angle:"
 msgstr ""
 
-#: kstarsdata.cpp:1507
-msgid "No Catalog Color specified; setting to Red"
+#: details_position.ui:441
+#, no-c-format
+msgid "Airmass:"
 msgstr ""
 
-#: kstarsdata.cpp:1512
-msgid "No Catalog Epoch specified; assuming 2000."
-msgstr ""
+#: details_position.ui:469
+#, no-c-format
+msgid "1.00"
+msgstr "1.00"
 
-#: kstarsdata.cpp:1543
-msgid "Cities.dat: Ran out of fields.  Line was:"
+#: details_position.ui:518
+#, no-c-format
+msgid "<p align=\"center\">Rise/Set/Transit</p>"
 msgstr ""
 
-#: kstarsdata.cpp:1561 kstarsdata.cpp:1567 kstarsdata.cpp:1573
-#: kstarsdata.cpp:1586 kstarsdata.cpp:1592 kstarsdata.cpp:1598
-msgid ""
-"\n"
-"Cities.dat: Bad integer.  Line was:\n"
+#: details_position.ui:584 details_position.ui:609 details_position.ui:706
+#, no-c-format
+msgid "00:00"
 msgstr ""
 
-#: kstarsdata.cpp:1580
-msgid ""
-"\n"
-"Cities.dat: Invalid latitude sign.  Line was:\n"
-msgstr ""
+#: details_position.ui:630
+#, fuzzy, no-c-format
+msgid "Set time:"
+msgstr "Amser"
 
-#: kstarsdata.cpp:1605
-msgid ""
-"\n"
-"Cities.dat: Invalid longitude sign.  Line was:\n"
-msgstr ""
+#: details_position.ui:654
+#, fuzzy, no-c-format
+msgid "Transit time:"
+msgstr "Enw'r ffeil:"
 
-#: kstarsdata.cpp:1623
-msgid ""
-"\n"
-"Cities.dat: Bad time zone.  Line was:\n"
-msgstr ""
+#: details_position.ui:678
+#, fuzzy, no-c-format
+msgid "Rise time:"
+msgstr "Enw'r ffeil:"
 
-#: kstarsdata.cpp:1774
-msgid ""
-"The file %1 could not be found. KStars cannot run properly without this file. "
-"To continue loading, place the file in one of the following locations, then "
-"press Retry:\n"
-"\n"
-msgstr ""
+#: details_position.ui:779
+#, fuzzy, no-c-format
+msgid "Azimuth at set:"
+msgstr "Asimwth:"
 
-#: kstarsdata.cpp:1780
-msgid "Otherwise, press Cancel to shutdown."
+#: details_position.ui:803
+#, no-c-format
+msgid "Altitude at transit:"
 msgstr ""
 
-#: kstarsdata.cpp:1781
-#, c-format
-msgid "Critical File Not Found: %1"
-msgstr ""
+#: details_position.ui:877
+#, fuzzy, no-c-format
+msgid "Azimuth at rise:"
+msgstr "Asimwth:"
 
-#: kstarsdata.cpp:1783
-msgid ""
-"The file %1 could not be found. KStars can still run without this file. "
-"However, to avoid seeing this message in the future, you can place the file in "
-"one of the following locations, then press Retry:\n"
-"\n"
-msgstr ""
+#: devmanager.ui:16
+#, no-c-format
+msgid "Device Manager"
+msgstr "Rheolwr Dyfeisiau"
 
-#: kstarsdata.cpp:1789
-msgid "Otherwise, press Cancel to continue loading without this file."
+#: devmanager.ui:34
+#, no-c-format
+msgid "Local/Server"
 msgstr ""
 
-#: kstarsdata.cpp:1790
-#, c-format
-msgid "Non-Critical File Not Found: %1"
-msgstr ""
+#: devmanager.ui:43
+#, no-c-format
+msgid "Device"
+msgstr "Dyfais"
 
-#: kstarsdata.cpp:1793
-msgid "Retry"
-msgstr "Ail-geisio..."
+#: devmanager.ui:54 devmanager.ui:244
+#, no-c-format
+msgid "Status"
+msgstr "Cyflwr"
 
-#: kstarsdata.cpp:1816
-msgid "Reading Time Zone Rules"
-msgstr ""
+#: devmanager.ui:65 devmanager.ui:152 tools/argstartindi.ui:72
+#, no-c-format
+msgid "Mode"
+msgstr "Modd"
 
-#: kstarsdata.cpp:1832
-msgid "Loading City Data"
-msgstr ""
+#: devmanager.ui:76
+#, no-c-format
+msgid "Version"
+msgstr "Fersiwn"
 
-#: kstarsdata.cpp:1857
-#, fuzzy
-msgid "Loading Custom catalogs"
-msgstr "Ychwanegu Catalog"
+#: devmanager.ui:87 devmanager.ui:266
+#, no-c-format
+msgid "Port"
+msgstr "Porth"
 
-#: kstarsdata.cpp:1865
-msgid "Loading Constellations"
+#: devmanager.ui:119
+#, no-c-format
+msgid "Server Log"
 msgstr ""
 
-#: kstarsdata.cpp:1872
-msgid "Loading Constellation Names"
-msgstr ""
+#: devmanager.ui:163 tools/argstartindi.ui:83
+#, no-c-format
+msgid "Local"
+msgstr "Lleol"
 
-#: kstarsdata.cpp:1879
-#, fuzzy
-msgid "Loading Constellation Boundaries"
-msgstr "Defnyddio enwau cyfseriadau Lladin"
+#: devmanager.ui:174 tools/argstartindi.ui:94
+#, no-c-format
+msgid "Server"
+msgstr "Gweinydd"
 
-#: kstarsdata.cpp:1886
-msgid "Loading Milky Way"
-msgstr ""
+#: devmanager.ui:195
+#, fuzzy, no-c-format
+msgid "R&un Service"
+msgstr "Stopio Gwasanaeth"
 
-#: kstarsdata.cpp:1893
-msgid "Creating Planets"
-msgstr ""
+#: devmanager.ui:235
+#, no-c-format
+msgid "Client"
+msgstr "Dibynnydd:"
 
-#: kstarsdata.cpp:1902
-msgid "Creating Asteroids and Comets"
-msgstr ""
+#: devmanager.ui:255 tools/observinglistui.ui:391
+#, no-c-format
+msgid "Name"
+msgstr "Enw"
 
-#: kstarsdata.cpp:1912
-msgid "Creating Moon"
+#: devmanager.ui:292
+#, no-c-format
+msgid "Hosts"
 msgstr ""
 
-#: kstarsdata.cpp:1920
-msgid "Loading Image URLs"
-msgstr ""
+#: devmanager.ui:303 imagereductionui.ui:110 imagereductionui.ui:288
+#: imagereductionui.ui:456
+#, no-c-format
+msgid "Add..."
+msgstr "Ychwanegu..."
 
-#: kstarsdata.cpp:1934
-msgid "Loading Information URLs"
+#: devmanager.ui:311
+#, no-c-format
+msgid "Modify"
 msgstr ""
 
-#: kstarsdata.cpp:2447
-msgid "Could not set time: %1 / %2 / %3 ; %4:%5:%6"
-msgstr ""
+#: devmanager.ui:329 tools/argswitchindi.ui:72
+#, no-c-format
+msgid "Connection"
+msgstr "Cysylltiad"
 
-#: kstarsdata.cpp:2562
-msgid "Could not set location named %1, %2, %3"
-msgstr ""
+#: devmanager.ui:411 fitsheaderdialog.ui:97 histdialog.ui:269
+#: imgsequencedlgui.ui:214 telescopepropui.ui:87
+#, fuzzy, no-c-format
+msgid "&Close"
+msgstr "&Cau'r Ffenestr"
 
-#: kstarsdcop.cpp:117
-msgid "Error [DCOP waitForKey()]: Invalid key requested."
-msgstr ""
+#: fitsheaderdialog.ui:28
+#, no-c-format
+msgid "Card"
+msgstr "Cerdyn"
 
-#: kstarsdcop.cpp:177 kstarsdcop.cpp:180
-msgid "Error [DCOP setGeoLocation]: city "
-msgstr ""
+#: fitsheaderdialog.ui:39
+#, no-c-format
+msgid "Value"
+msgstr "Gwerth"
 
-#: kstarsdcop.cpp:178 kstarsdcop.cpp:181
-msgid " not found in database."
-msgstr ""
+#: fitsheaderdialog.ui:50
+#, no-c-format
+msgid "Comment"
+msgstr "Sylwad"
 
-#: kstarsdcop.cpp:349 opscolors.cpp:47 tools/scriptbuilder.cpp:699
-msgid ""
-"_: use default color scheme\n"
-"Default Colors"
+#: fitsviewer.rc:4 kstarsui.rc:5
+#, no-c-format
+msgid "&File"
 msgstr ""
 
-#: kstarsdcop.cpp:350 opscolors.cpp:48 tools/scriptbuilder.cpp:700
-msgid ""
-"_: use 'star chart' color scheme\n"
-"Star Chart"
-msgstr ""
+#: fitsviewer.rc:12
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Golygu..."
 
-#: kstarsdcop.cpp:351 opscolors.cpp:49 tools/scriptbuilder.cpp:701
-msgid ""
-"_: use 'night vision' color scheme\n"
-"Night Vision"
+#: fitsviewer.rc:19 kstarsui.rc:40
+#, no-c-format
+msgid "&View"
 msgstr ""
 
-#: kstarsdcop.cpp:368
-msgid "Unable to load color scheme named %1. Also tried %2."
-msgstr ""
+#: fitsviewer.rc:25 kstarsui.rc:116
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Dangos y Prif Bar Offer"
 
-#: kstarsdcop.cpp:421 main.cpp:82
-msgid "Could not parse image format of %1; assuming PNG."
+#: fitsviewer.rc:36
+#, no-c-format
+msgid "Process ToolBar"
 msgstr ""
 
-#: kstarsdcop.cpp:450
-msgid "Error: Unable to save image: %1 "
-msgstr "Fazi : Methu cadw'r ddelwedd : %1 "
-
-#: kstarsdcop.cpp:451
-#, c-format
-msgid "Image saved to file: %1"
+#: focusdialogdlg.ui:28
+#, no-c-format
+msgid "RA/Dec"
 msgstr ""
 
-#: kstarsdcop.cpp:470
-msgid "Print Sky"
+#: focusdialogdlg.ui:39
+#, no-c-format
+msgid "New RA:"
 msgstr ""
 
-#: kstarsinit.cpp:53
-msgid "&Close Window"
-msgstr "&Cau'r Ffenestr"
-
-#: kstarsinit.cpp:55
-msgid "&Download Data..."
+#: focusdialogdlg.ui:50
+#, no-c-format
+msgid "Enter new Right Ascension"
 msgstr ""
 
-#: kstarsinit.cpp:57
-msgid "Open FITS..."
+#: focusdialogdlg.ui:61
+#, no-c-format
+msgid "Enter new Declination"
 msgstr ""
 
-#: kstarsinit.cpp:58
-msgid "&Save Sky Image..."
+#: focusdialogdlg.ui:69
+#, no-c-format
+msgid "New dec:"
 msgstr ""
 
-#: kstarsinit.cpp:60
-msgid "&Run Script..."
+#: 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 ""
 
-#: kstarsinit.cpp:66
-msgid "Set Time to &Now"
+#: focusdialogdlg.ui:85
+#, no-c-format
+msgid "2000.0"
 msgstr ""
 
-#: kstarsinit.cpp:68
-msgid ""
-"_: set Clock to New Time\n"
-"&Set Time..."
+#: focusdialogdlg.ui:88
+#, no-c-format
+msgid "Epoch for the RA/Dec coordinates"
 msgstr ""
 
-#: kstarsinit.cpp:70
-msgid "Stop &Clock"
+#: focusdialogdlg.ui:98
+#, no-c-format
+msgid "Az/Alt"
 msgstr ""
 
-#: kstarsinit.cpp:71
-msgid "Start &Clock"
+#: focusdialogdlg.ui:109
+#, no-c-format
+msgid "New azimuth:"
 msgstr ""
 
-#: kstarsinit.cpp:73
-msgid "Start Clock"
+#: focusdialogdlg.ui:117
+#, no-c-format
+msgid "New altitude:"
 msgstr ""
 
-#: kstarsinit.cpp:74
-msgid "Stop Clock"
+#: focusdialogdlg.ui:128
+#, no-c-format
+msgid "Enter new Azimuth"
 msgstr ""
 
-#: kstarsinit.cpp:81
-msgid "&Zenith"
+#: focusdialogdlg.ui:173
+#, no-c-format
+msgid "Enter new Altitude"
 msgstr ""
 
-#: kstarsinit.cpp:83
-msgid "&North"
-msgstr "&Gogledd"
-
-#: kstarsinit.cpp:85
-msgid "&East"
-msgstr "&Dwyrain"
-
-#: kstarsinit.cpp:87
-msgid "&South"
-msgstr "&De"
-
-#: kstarsinit.cpp:89
-msgid "&West"
-msgstr "&Gorllewin"
-
-#: kstarsinit.cpp:93
-msgid "&Find Object..."
+#: fovdialogui.ui:16
+#, no-c-format
+msgid "Edit FOV Symbols"
 msgstr ""
 
-#: kstarsinit.cpp:94
-msgid "Find object"
+#: fovdialogui.ui:36
+#, no-c-format
+msgid ""
+"The list of defined field-of-view (FOV) symbols.  You can add a symbol to "
+"the list using the \"New\" button, remove a symbol using the \"Remove\" "
+"button, and modify a symbol using the \"Edit\" button.  A schematic of the "
+"highlighted symbol is drawn at right."
 msgstr ""
 
-#: kstarsinit.cpp:99
-msgid "Set Focus &Manually..."
-msgstr ""
+#: fovdialogui.ui:52
+#, no-c-format
+msgid "New..."
+msgstr "Newydd ..."
 
-#: kstarsinit.cpp:107
-msgid "&Zoom to Angular Size..."
+#: fovdialogui.ui:55
+#, no-c-format
+msgid "Add a new FOV symbol"
 msgstr ""
 
-#: kstarsinit.cpp:109
-msgid "Horizontal &Coordinates"
+#: fovdialogui.ui:58
+#, no-c-format
+msgid ""
+"Add a new field-of-view (FOV) symbol to the list.  You can define the size, "
+"shape, and color of the new symbol."
 msgstr ""
 
-#: kstarsinit.cpp:109
-msgid "Equatorial &Coordinates"
-msgstr ""
+#: fovdialogui.ui:83
+#, no-c-format
+msgid "Edit..."
+msgstr "Golygu..."
 
-#: kstarsinit.cpp:122
-msgid ""
-"_: Show the information boxes\n"
-"Show &Info Boxes"
+#: fovdialogui.ui:86
+#, no-c-format
+msgid "Modify the highlighted FOV symbol"
 msgstr ""
 
-#: kstarsinit.cpp:128
+#: fovdialogui.ui:89
+#, no-c-format
 msgid ""
-"_: Show time-related info box\n"
-"Show &Time Box"
+"Press this button to modify the highlighted FOV symbol.  You can change its "
+"size, shape and color."
 msgstr ""
 
-#: kstarsinit.cpp:133
-msgid ""
-"_: Show focus-related info box\n"
-"Show &Focus Box"
+#: fovdialogui.ui:100
+#, no-c-format
+msgid "Remove highlighted FOV symbol"
 msgstr ""
 
-#: kstarsinit.cpp:138
-msgid ""
-"_: Show location-related info box\n"
-"Show &Location Box"
+#: fovdialogui.ui:103
+#, no-c-format
+msgid "Press this button to remove the highlighted FOV symbol from the list."
 msgstr ""
 
-#: kstarsinit.cpp:144
-msgid "Show Main Toolbar"
-msgstr "Dangos y Prif Bar Offer"
+#: histdialog.ui:115
+#, no-c-format
+msgid "Max."
+msgstr "Uchaf."
 
-#: kstarsinit.cpp:148
-msgid "Show View Toolbar"
-msgstr "Dangos Bar Offer Golwg"
+#: histdialog.ui:172
+#, no-c-format
+msgid "Intensity:"
+msgstr "Dwyster:"
 
-#: kstarsinit.cpp:153
-msgid "Show Statusbar"
-msgstr "Dangos bar cyflwr"
+#: histdialog.ui:196
+#, no-c-format
+msgid "Frequency:"
+msgstr "Amlder :"
 
-#: kstarsinit.cpp:157
-msgid "Show Az/Alt Field"
-msgstr ""
+#: histdialog.ui:204
+#, no-c-format
+msgid "Min."
+msgstr "Isaf."
 
-#: kstarsinit.cpp:161
-msgid "Show RA/Dec Field"
+#: histdialog.ui:255
+#, no-c-format
+msgid "&Apply"
 msgstr ""
 
-#: kstarsinit.cpp:166
-msgid "C&olor Schemes"
+#: histdialog.ui:282
+#, no-c-format
+msgid "FITS Scale"
 msgstr ""
 
-#: kstarsinit.cpp:167
-msgid "&Default"
-msgstr "&Rhagosod"
-
-#: kstarsinit.cpp:168
-msgid "&Star Chart"
-msgstr ""
+#: histdialog.ui:293
+#, no-c-format
+msgid "Auto"
+msgstr "Ymysgogol"
 
-#: kstarsinit.cpp:169
-msgid "&Night Vision"
-msgstr ""
+#: histdialog.ui:304
+#, no-c-format
+msgid "Linear"
+msgstr "Llinynnol"
 
-#: kstarsinit.cpp:170
-msgid "&Moonless Night"
+#: histdialog.ui:312
+#, no-c-format
+msgid "Logarithmic"
 msgstr ""
 
-#: kstarsinit.cpp:190
-msgid "&FOV Symbols"
+#: histdialog.ui:320
+#, no-c-format
+msgid "Square root"
 msgstr ""
 
-#: kstarsinit.cpp:193
-msgid ""
-"_: Location on Earth\n"
-"&Geographic..."
-msgstr ""
+#: imagereductionui.ui:52 imagereductionui.ui:230 imagereductionui.ui:398
+#, no-c-format
+msgid "File Name"
+msgstr "Enw Ffeil"
 
-#: kstarsinit.cpp:199
-msgid "Startup Wizard..."
+#: imagereductionui.ui:144 imagereductionui.ui:322 imagereductionui.ui:490
+#, no-c-format
+msgid "Combination"
 msgstr ""
 
-#: kstarsinit.cpp:203
-msgid "Calculator..."
-msgstr "Cyfrifiannell ..."
+#: imagereductionui.ui:155 imagereductionui.ui:333 imagereductionui.ui:501
+#, no-c-format
+msgid "Average"
+msgstr "Cyfartaledd"
 
-#: kstarsinit.cpp:206
-msgid "Observing List..."
+#: imagereductionui.ui:166 imagereductionui.ui:344 imagereductionui.ui:512
+#, no-c-format
+msgid "Median"
 msgstr ""
 
-#: kstarsinit.cpp:211
-msgid "AAVSO Light Curves..."
+#: imagereductionui.ui:221
+#, no-c-format
+msgid "Flat Field Frames"
 msgstr ""
 
-#: kstarsinit.cpp:214
-msgid "Altitude vs. Time..."
+#: imagereductionui.ui:389
+#, no-c-format
+msgid "Flat Field Dark Frames"
 msgstr ""
 
-#: kstarsinit.cpp:216
-msgid "What's up Tonight..."
-msgstr ""
+#: imagereductionui.ui:566 indiconf.ui:168 indihostconf.ui:144
+#: tools/optionstreeview.ui:93 tools/scriptnamedialog.ui:106
+#, fuzzy, no-c-format
+msgid "&OK"
+msgstr "I&awn"
 
-#: kstarsinit.cpp:221
-msgid "Script Builder..."
+#: imagereductionui.ui:583 indiconf.ui:182 indihostconf.ui:158
+#: tools/optionstreeview.ui:104 tools/scriptnamedialog.ui:120
+#, no-c-format
+msgid "&Cancel"
 msgstr ""
 
-#: kstarsinit.cpp:223
-msgid "Solar System..."
+#: imgsequencedlgui.ui:16
+#, no-c-format
+msgid "Capture Image Sequence"
 msgstr ""
 
-#: kstarsinit.cpp:225
-msgid "Jupiter's Moons..."
-msgstr ""
+#: imgsequencedlgui.ui:33
+#, no-c-format
+msgid "Progress"
+msgstr "Cynnydd"
 
-#: kstarsinit.cpp:229
-msgid "Telescope Wizard..."
-msgstr ""
+#: imgsequencedlgui.ui:60
+#, no-c-format
+msgid "Progress:"
+msgstr "Cynnydd :"
 
-#: kstarsinit.cpp:230
-msgid "Telescope Properties..."
-msgstr ""
+#: imgsequencedlgui.ui:85
+#, no-c-format
+msgid "of"
+msgstr "o"
 
-#: kstarsinit.cpp:231
-msgid "Device Manager..."
-msgstr "Rheolwr Dyfeisiau"
+#: imgsequencedlgui.ui:110
+#, no-c-format
+msgid "completed"
+msgstr "gorffenwyd"
 
-#: kstarsinit.cpp:233
-msgid "Capture Image Sequence..."
-msgstr ""
+#: imgsequencedlgui.ui:183
+#, fuzzy, no-c-format
+msgid "&Start"
+msgstr "Dechrau"
 
-#: kstarsinit.cpp:236
-msgid "INDI Control Panel..."
-msgstr ""
+#: imgsequencedlgui.ui:200
+#, no-c-format
+msgid "S&top"
+msgstr "S&topio"
 
-#: kstarsinit.cpp:239
-msgid "Configure INDI..."
+#: imgsequencedlgui.ui:235
+#, no-c-format
+msgid "Camera/CCD"
 msgstr ""
 
-#: kstarsinit.cpp:244
-msgid "Tip of the Day"
-msgstr "Awgrymiad y Dydd"
+#: 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
+#, no-c-format
+msgid "Device:"
+msgstr "Dyfais:"
 
-#: kstarsinit.cpp:248
-msgid "&Handbook"
-msgstr ""
+#: imgsequencedlgui.ui:276
+#, no-c-format
+msgid "Prefix:"
+msgstr "Rhagddodiad:"
 
-#: kstarsinit.cpp:256
-msgid "Toggle Stars"
+#: imgsequencedlgui.ui:279
+#, no-c-format
+msgid "Prefix to append to the beginning of file names"
 msgstr ""
 
-#: kstarsinit.cpp:260
-msgid "Toggle Deep Sky Objects"
-msgstr ""
+#: imgsequencedlgui.ui:290
+#, no-c-format
+msgid "Exposure:"
+msgstr "Dadleniad:"
 
-#: kstarsinit.cpp:264
-msgid "Toggle Solar System"
+#: imgsequencedlgui.ui:293
+#, no-c-format
+msgid "Set the exposure time in seconds for individual images, if applicable"
 msgstr ""
 
-#: kstarsinit.cpp:268
-msgid "Toggle Constellation Lines"
-msgstr ""
+#: imgsequencedlgui.ui:304
+#, no-c-format
+msgid "Count:"
+msgstr "Cyfrif:"
 
-#: kstarsinit.cpp:272
-msgid "Toggle Constellation Names"
+#: imgsequencedlgui.ui:307 imgsequencedlgui.ui:435
+#, no-c-format
+msgid "Number of images to capture"
 msgstr ""
 
-#: kstarsinit.cpp:276
-#, fuzzy
-msgid "Toggle Constellation Boundaries"
-msgstr "Constellation names"
+#: imgsequencedlgui.ui:318
+#, no-c-format
+msgid "Delay:"
+msgstr "Oedi:"
 
-#: kstarsinit.cpp:280
-msgid "Toggle Milky Way"
+#: imgsequencedlgui.ui:321
+#, no-c-format
+msgid "Delay in seconds between consecutive images"
 msgstr ""
 
-#: kstarsinit.cpp:284
-msgid "Toggle Coordinate Grid"
-msgstr ""
+#: imgsequencedlgui.ui:347
+#, no-c-format
+msgid "image"
+msgstr "delwedd"
 
-#: kstarsinit.cpp:288
-msgid "Toggle Ground"
+#: imgsequencedlgui.ui:383
+#, no-c-format
+msgid "Add ISO 8601 time stamp"
 msgstr ""
 
-#: kstarsinit.cpp:309
-msgid "Could not open fov.dat."
+#: imgsequencedlgui.ui:389
+#, no-c-format
+msgid "Add time stamp to the file name"
 msgstr ""
 
-#: kstarsinit.cpp:312
-msgid ""
-"_: Do not use a field-of-view indicator\n"
-"No FOV"
-msgstr ""
+#: imgsequencedlgui.ui:399 tools/obslistwizardui.ui:49
+#, no-c-format
+msgid "Filter"
+msgstr "Hidlo"
 
-#: kstarsinit.cpp:313
-msgid ""
-"_: use field-of-view for binoculars\n"
-"7x35 Binoculars"
+#: imgsequencedlgui.ui:432 tools/argsetfilternumindi.ui:51
+#, no-c-format
+msgid "Filter:"
+msgstr "Hidl:"
+
+#: indiconf.ui:16
+#, no-c-format
+msgid "Configure INDI"
 msgstr ""
 
-#: kstarsinit.cpp:314
-msgid ""
-"_: use 1-degree field-of-view indicator\n"
-"One Degree"
+#: indiconf.ui:41
+#, no-c-format
+msgid "Default FITS directory:"
 msgstr ""
 
-#: kstarsinit.cpp:315
-msgid ""
-"_: use HST field-of-view indicator\n"
-"HST WFPC2"
+#: indiconf.ui:92
+#, no-c-format
+msgid "&Automatic display of FITS upon capture"
 msgstr ""
 
-#: kstarsinit.cpp:316
-msgid ""
-"_: use Radiotelescope HPBW\n"
-"30m at 1.3cm"
+#: indiconf.ui:103
+#, no-c-format
+msgid "Telescope port:"
 msgstr ""
 
-#: kstarsinit.cpp:346
-msgid " Welcome to KStars "
+#: indiconf.ui:106
+#, no-c-format
+msgid "Default INDI telescope port"
 msgstr ""
 
-#: kstarsinit.cpp:407
-msgid "Initial Position is Below Horizon"
+#: indiconf.ui:119
+#, no-c-format
+msgid "Video port:"
 msgstr ""
 
-#: kstarsinit.cpp:408
-msgid ""
-"The initial position is below the horizon.\n"
-"Would you like to reset to the default position?"
+#: indiconf.ui:122
+#, no-c-format
+msgid "Default INDI video port"
 msgstr ""
 
-#: kstarsinit.cpp:410
-#, fuzzy
-msgid "Reset Position"
-msgstr "Lleoliad"
+#: indiconf.ui:195
+#, no-c-format
+msgid "Display"
+msgstr "Dangos"
 
-#: kstarsinit.cpp:410
-msgid "Do Not Reset"
+#: indiconf.ui:206
+#, no-c-format
+msgid "&Device target crosshair"
 msgstr ""
 
-#: kstarsinit.cpp:527 kstarsinit.cpp:543 skymap.cpp:175 skymap.cpp:489
-#: skymapevents.cpp:396 skymapevents.cpp:508 skymapevents.cpp:593
-msgid "nothing"
-msgstr "dim"
+#: indiconf.ui:212
+#, no-c-format
+msgid "Display the telescope position on the sky map"
+msgstr ""
 
-#: kstarssplash.cpp:29
-msgid "Loading KStars..."
+#: indiconf.ui:220
+#, no-c-format
+msgid "INDI messages in status &bar"
 msgstr ""
 
-#: kstarssplash.cpp:63
-msgid "Welcome to KStars. Please stand by while loading..."
+#: indiconf.ui:226
+#, no-c-format
+msgid "Display INDI status messages in the status bar"
 msgstr ""
 
-#: locationdialog.cpp:40
-msgid "Set Geographic Location"
+#: indiconf.ui:253
+#, no-c-format
+msgid "Automatic Device Updates"
 msgstr ""
 
-#: locationdialog.cpp:47
-msgid "Choose City"
+#: indiconf.ui:264 tools/argsetlocaltime.ui:54
+#, no-c-format
+msgid "Time"
+msgstr "Amser"
+
+#: indiconf.ui:270
+#, no-c-format
+msgid "Update telescope clock upon connection"
 msgstr ""
 
-#: locationdialog.cpp:48
-msgid "Choose/Modify Coordinates"
+#: indiconf.ui:278
+#, no-c-format
+msgid "&Geographic location"
 msgstr ""
 
-#: locationdialog.cpp:70
-msgid "City filter:"
+#: indiconf.ui:284
+#, no-c-format
+msgid "Update telescope geographical location upon connection"
 msgstr ""
 
-#: locationdialog.cpp:72
-msgid "Province filter:"
+#: indiconf.ui:294
+#, no-c-format
+msgid "Filter Wheel"
 msgstr ""
 
-#: locationdialog.cpp:74
-msgid "Country filter:"
+#: indiconf.ui:297
+#, no-c-format
+msgid "Assign color values for your filter wheel slots"
 msgstr ""
 
-#. i18n: file kswizardui.ui line 278
-#: locationdialog.cpp:90 rc.cpp:779 rc.cpp:2168
+#: indiconf.ui:316
 #, no-c-format
-msgid "City:"
-msgstr "Dinas:"
+msgid "Slot:"
+msgstr "Agen :"
 
-#: locationdialog.cpp:91
-msgid "State/Province:"
-msgstr "Talaith :"
+#: indiconf.ui:324
+#, no-c-format
+msgid "Alias:"
+msgstr "Ffugenw :"
 
-#. i18n: file kswizardui.ui line 262
-#: locationdialog.cpp:92 rc.cpp:773 rc.cpp:2171
+#: indihostconf.ui:43 tools/altvstimeui.ui:171
 #, no-c-format
-msgid "Country:"
-msgstr "Gwlad:"
+msgid "Name:"
+msgstr "Enw:"
 
-#. i18n: file kswizardui.ui line 351
-#: locationdialog.cpp:93 rc.cpp:794 rc.cpp:2542 rc.cpp:2611 rc.cpp:2653
-#: rc.cpp:2728 rc.cpp:2911 rc.cpp:3022 rc.cpp:3037 rc.cpp:3178 rc.cpp:3241
-#: rc.cpp:3427 rc.cpp:3454 rc.cpp:3526 rc.cpp:3601
+#: indihostconf.ui:51
 #, no-c-format
-msgid "Longitude:"
-msgstr "Hydred:"
+msgid "Host:"
+msgstr "Gwesteiwr:"
 
-#. i18n: file kswizardui.ui line 359
-#: locationdialog.cpp:94 rc.cpp:797 rc.cpp:2545 rc.cpp:2608 rc.cpp:2650
-#: rc.cpp:2725 rc.cpp:2908 rc.cpp:3019 rc.cpp:3040 rc.cpp:3181 rc.cpp:3238
-#: rc.cpp:3523 rc.cpp:3604
+#: indihostconf.ui:59 tools/argsetportindi.ui:40
 #, no-c-format
-msgid "Latitude:"
-msgstr "Lledred:"
+msgid "Port:"
+msgstr "Porth:"
 
-#: locationdialog.cpp:95
-msgid ""
-"_: timezone offset from universal time\n"
-"UT offset:"
+#: kstars.kcfg:10
+#, no-c-format
+msgid "Position of the time InfoBox."
 msgstr ""
 
-#: locationdialog.cpp:96
-msgid ""
-"_: daylight savings time rule\n"
-"DST rule:"
-msgstr ""
+#: kstars.kcfg:11
+#, fuzzy, no-c-format
+msgid "The screen coordinates of the Time InfoBox."
+msgstr "Toggle display of star name labels"
 
-#. i18n: file tools/altvstimeui.ui line 238
-#: locationdialog.cpp:120 rc.cpp:1978
+#: kstars.kcfg:15
 #, no-c-format
-msgid "Clear Fields"
+msgid "Position of the focus InfoBox."
 msgstr ""
 
-#: locationdialog.cpp:121
-msgid "Explain DST Rules"
-msgstr ""
+#: kstars.kcfg:16
+#, fuzzy, no-c-format
+msgid "The screen coordinates of the Focus InfoBox."
+msgstr "Toggle display of star name labels"
 
-#: locationdialog.cpp:240 locationdialog.cpp:281 locationdialog.cpp:435
-#, c-format
-msgid ""
-"_n: One city matches search criteria\n"
-"%n cities match search criteria"
-msgstr ""
+#: kstars.kcfg:20
+#, fuzzy, no-c-format
+msgid "Position of the geographic InfoBox."
+msgstr "Toggle display of star name labels"
 
-#: locationdialog.cpp:335
-msgid "This City already exists in the database."
+#: kstars.kcfg:21
+#, no-c-format
+msgid "The screen coordinates of the Geographic Location InfoBox."
 msgstr ""
 
-#: locationdialog.cpp:336
-msgid "Error: Duplicate Entry"
-msgstr "Fazi : Cofnod Dyblyg"
-
-#: locationdialog.cpp:346
-msgid "All fields (except province) must be filled to add this location."
+#: kstars.kcfg:25
+#, no-c-format
+msgid "Is the time InfoBox in the \"shaded\" state?"
 msgstr ""
 
-#: locationdialog.cpp:347
-msgid "Fields are Empty"
+#: kstars.kcfg:26
+#, no-c-format
+msgid "If true, the Time InfoBox will show only its top line of data."
 msgstr ""
 
-#: locationdialog.cpp:352
-msgid "Could not parse coordinates."
+#: kstars.kcfg:30
+#, no-c-format
+msgid "Is the focus InfoBox in the \"shaded\" state?"
 msgstr ""
 
-#: locationdialog.cpp:353
-msgid "Bad Coordinates"
+#: kstars.kcfg:31
+#, no-c-format
+msgid "If true, the Focus InfoBox will show only its top line of data."
 msgstr ""
 
-#: locationdialog.cpp:357
-msgid "Really override original data for this city?"
+#: kstars.kcfg:35
+#, no-c-format
+msgid "Is the geographic InfoBox in the \"shaded\" state?"
 msgstr ""
 
-#: locationdialog.cpp:358
-msgid "Override Existing Data?"
+#: kstars.kcfg:36
+#, no-c-format
+msgid ""
+"If true, the Geographic Location InfoBox will show only its top line of data."
 msgstr ""
 
-#: locationdialog.cpp:358
-#, fuzzy
-msgid "Override Data"
-msgstr "&Trosysgrifo"
+#: kstars.kcfg:40
+#, fuzzy, no-c-format
+msgid "Meta-option to toggle display of all InfoBoxes"
+msgstr "Toggle display of star name labels"
 
-#: locationdialog.cpp:358
-msgid "Do Not Override"
-msgstr ""
+#: kstars.kcfg:41
+#, fuzzy, no-c-format
+msgid "Toggles display of all three InfoBoxes."
+msgstr "Toggle display of star name labels"
 
-#: locationdialog.cpp:374
-msgid ""
-"Local cities database could not be opened.\n"
-"Location will not be recorded."
-msgstr ""
+#: kstars.kcfg:45
+#, fuzzy, no-c-format
+msgid "Display the time InfoBox?"
+msgstr "Toggle display of star name labels"
 
-#: locationdialog.cpp:477
-msgid " Start Date (Start Time)  /  Revert Date (Revert Time)"
-msgstr ""
+#: kstars.kcfg:46
+#, fuzzy, no-c-format
+msgid "Toggles display of the Time InfoBox."
+msgstr "Toggle display of star name labels"
 
-#: locationdialog.cpp:479
-msgid "--: No DST correction"
-msgstr ""
+#: kstars.kcfg:50
+#, fuzzy, no-c-format
+msgid "Display the focus InfoBox?"
+msgstr "Toggle display of star name labels"
 
-#: locationdialog.cpp:480
-msgid "AU: last Sun in Oct. (02:00) / last Sun in Mar. (02:00)"
-msgstr ""
+#: kstars.kcfg:51
+#, fuzzy, no-c-format
+msgid "Toggles display of the Focus InfoBox."
+msgstr "Toggle display of star name labels"
 
-#: locationdialog.cpp:481
-msgid "BZ:  2nd Sun in Oct. (00:00) /  3rd Sun in Feb. (00:00)"
-msgstr ""
+#: kstars.kcfg:55
+#, fuzzy, no-c-format
+msgid "Display the geographic InfoBox?"
+msgstr "Toggle display of star name labels"
 
-#: locationdialog.cpp:482
-msgid "CH:  2nd Sun in Apr. (00:00) /  2nd Sun in Sep. (00:00)"
-msgstr ""
+#: kstars.kcfg:56
+#, fuzzy, no-c-format
+msgid "Toggles display of the Geographic Location InfoBox."
+msgstr "Toggle display of star name labels"
 
-#: locationdialog.cpp:483
-msgid "CL:  2nd Sun in Oct. (04:00) /  2nd Sun in Mar. (04:00)"
+#: kstars.kcfg:60 kstars.kcfg:66
+#, no-c-format
+msgid "Time InfoBox anchor flag"
 msgstr ""
 
-#: locationdialog.cpp:484
-msgid "CZ:  1st Sun in Oct. (02:45) /  3rd Sun in Mar. (02:45)"
+#: kstars.kcfg:61
+#, no-c-format
+msgid ""
+"Is the Time InfoBox anchored to a window edge?  0 = not anchored; 1 = "
+"anchored to right edge; 2 = anchored to bottom edge; 3 = anchored to bottom "
+"and right edges."
 msgstr ""
 
-#: locationdialog.cpp:485
-msgid "EE: Last Sun in Mar. (00:00) / Last Sun in Oct. (02:00)"
+#: kstars.kcfg:67
+#, no-c-format
+msgid ""
+"Is the Focus InfoBox anchored to a window edge?  0 = not anchored; 1 = "
+"anchored to right edge; 2 = anchored to bottom edge; 3 = anchored to bottom "
+"and right edges."
 msgstr ""
 
-#: locationdialog.cpp:486
-msgid "EG: Last Fri in Apr. (00:00) / Last Thu in Sep. (00:00)"
+#: kstars.kcfg:72
+#, no-c-format
+msgid "Geographic InfoBox anchor flag"
 msgstr ""
 
-#: locationdialog.cpp:487
-msgid "EU: Last Sun in Mar. (01:00) / Last Sun in Oct. (01:00)"
+#: kstars.kcfg:73
+#, no-c-format
+msgid ""
+"Is the Geographic Location InfoBox anchored to a window edge?  0 = not "
+"anchored; 1 = anchored to right edge; 2 = anchored to bottom edge; 3 = "
+"anchored to bottom and right edges."
 msgstr ""
 
-#: locationdialog.cpp:488
-msgid "FK:  1st Sun in Sep. (02:00) /  3rd Sun in Apr. (02:00)"
+#: kstars.kcfg:78
+#, no-c-format
+msgid "Display the statusbar?"
 msgstr ""
 
-#: locationdialog.cpp:489
-msgid "HK:  2nd Sun in May  (03:30) /  3rd Sun in Oct. (03:30)"
-msgstr ""
+#: kstars.kcfg:79
+#, fuzzy, no-c-format
+msgid "Toggle display of the status bar."
+msgstr "Toggle display of star name labels"
 
-#: locationdialog.cpp:490
-msgid "IQ: Apr 1 (03:00) / Oct. 1 (00:00)"
+#: kstars.kcfg:83
+#, no-c-format
+msgid "Display Alt/Az coordinates in the statusbar?"
 msgstr ""
 
-#: locationdialog.cpp:491
-msgid "IR: Mar 21 (00:00) / Sep. 22 (00:00)"
+#: kstars.kcfg:84
+#, no-c-format
+msgid ""
+"Toggle display of the Horizontal coordinates of the mouse cursor in the "
+"status bar."
 msgstr ""
 
-#: locationdialog.cpp:492
-msgid "JD: Last Thu in Mar. (00:00) / Last Thu in Sep. (00:00)"
+#: kstars.kcfg:88
+#, no-c-format
+msgid "Display RA/Dec coordinates in the statusbar?"
 msgstr ""
 
-#: locationdialog.cpp:493
-msgid "LB: Last Sun in Mar. (00:00) / Last Sun in Oct. (00:00)"
+#: kstars.kcfg:89
+#, no-c-format
+msgid ""
+"Toggle display of the Equatorial coordinates of the mouse cursor in the "
+"status bar."
 msgstr ""
 
-#: locationdialog.cpp:494
-msgid "MX:  1st Sun in May  (02:00) / Last Sun in Sep. (02:00)"
-msgstr ""
+#: kstars.kcfg:93
+#, fuzzy, no-c-format
+msgid "Display main toolbar?"
+msgstr "Toggle display of star name labels"
 
-#: locationdialog.cpp:495
-msgid "NB:  1st Sun in Sep. (02:00) /  1st Sun in Apr. (02:00)"
-msgstr ""
+#: kstars.kcfg:94
+#, fuzzy, no-c-format
+msgid "Toggle display of the main toolbar."
+msgstr "Toggle display of star name labels"
 
-#: locationdialog.cpp:496
-msgid "NZ:  1st Sun in Oct. (02:00) /  3rd Sun in Mar. (02:00)"
-msgstr ""
+#: kstars.kcfg:98
+#, fuzzy, no-c-format
+msgid "Display view toolbar?"
+msgstr "Toggle display of star name labels"
 
-#: locationdialog.cpp:497
-msgid "PY:  1st Sun in Oct. (00:00) /  1st Sun in Mar. (00:00)"
-msgstr ""
+#: kstars.kcfg:99
+#, fuzzy, no-c-format
+msgid "Toggle display of the \"view\" toolbar."
+msgstr "Toggle display of star name labels"
 
-#: locationdialog.cpp:498
-msgid "RU: Last Sun in Mar. (02:00) / Last Sun in Oct. (02:00)"
+#: kstars.kcfg:103
+#, no-c-format
+msgid "Width of main window, in pixels"
 msgstr ""
 
-#: locationdialog.cpp:499
-msgid "SK:  2nd Sun in May  (00:00) /  2nd Sun in Oct. (00:00)"
+#: kstars.kcfg:107
+#, no-c-format
+msgid "Height of main window, in pixels"
 msgstr ""
 
-#: locationdialog.cpp:500
-msgid "SY: Apr. 1 (00:00) / Oct. 1 (00:00)"
+#: kstars.kcfg:111
+#, no-c-format
+msgid "Run Startup Wizard when KStars launches?"
 msgstr ""
 
-#: locationdialog.cpp:501
-msgid "TG:  1st Sun in Nov. (02:00) / Last Sun in Jan. (02:00)"
+#: kstars.kcfg:118
+#, no-c-format
+msgid "Filenames of defined custom object catalogs."
 msgstr ""
 
-#: locationdialog.cpp:502
-msgid "TS:  1st Sun in Oct. (02:00) / Last Sun in Mar. (02:00)"
+#: kstars.kcfg:119
+#, no-c-format
+msgid "List of the filenames of custom objects catalogs."
 msgstr ""
 
-#: locationdialog.cpp:503
-msgid "US:  1st Sun in Apr. (02:00) / Last Sun in Oct. (02:00)"
+#: kstars.kcfg:122
+#, no-c-format
+msgid "List of toggles for displaying custom object catalogs."
 msgstr ""
 
-#: locationdialog.cpp:504
-msgid "ZN: Apr. 1 (01:00) / Oct. 1 (00:00)"
+#: kstars.kcfg:123
+#, no-c-format
+msgid ""
+"List of integers toggling display of each custom object catalog (any nonzero "
+"value indicates the objects in that catalog will be displayed)."
 msgstr ""
 
-#: locationdialog.cpp:506
-msgid "Daylight Saving Time Rules"
+#: kstars.kcfg:129
+#, no-c-format
+msgid "Automatically set telescope's geographic location?"
 msgstr ""
 
-#: main.cpp:35
-msgid "Desktop Planetarium"
-msgstr "Planetariwm Penbwrdd"
-
-#: main.cpp:37
+#: kstars.kcfg:130
+#, no-c-format
 msgid ""
-"Some images in KStars are for non-commercial use only.  See README.images."
+"If true, INDI will automatically synch the telescope's geographic location "
+"to the current KStars location."
 msgstr ""
 
-#: main.cpp:42
-msgid "Dump sky image to file"
-msgstr ""
-
-#: main.cpp:43
-msgid "Script to execute"
+#: kstars.kcfg:134
+#, no-c-format
+msgid "Automatically set telescope's time and date?"
 msgstr ""
 
-#: main.cpp:44
-msgid "Width of sky image"
+#: kstars.kcfg:135
+#, no-c-format
+msgid ""
+"If true, INDI will automatically synch the telescope's clock to the current "
+"KStars time."
 msgstr ""
 
-#: main.cpp:45
-msgid "Height of sky image"
-msgstr ""
+#: kstars.kcfg:139
+#, fuzzy, no-c-format
+msgid "Draw crosshairs at telescope position in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#: main.cpp:46
-msgid "Filename for sky image"
+#: kstars.kcfg:140
+#, no-c-format
+msgid ""
+"Toggle display of crosshairs centered at telescope's pointed position in the "
+"KStars sky map."
 msgstr ""
 
-#: main.cpp:47
-msgid "Date and time"
-msgstr "Dyddiad ac amser"
-
-#: main.cpp:48
-msgid "Start with clock paused"
+#: kstars.kcfg:144
+#, no-c-format
+msgid "Display INDI messages in the statusbar?"
 msgstr ""
 
-#: main.cpp:54
-msgid "KStars"
-msgstr "KSer"
+#: kstars.kcfg:145
+#, fuzzy, no-c-format
+msgid "Toggle display of INDI messages in the KStars statusbar."
+msgstr "Toggle display of star name labels"
 
-#: main.cpp:56
-msgid "(c) 2001-2003, The KStars Team"
+#: kstars.kcfg:149
+#, no-c-format
+msgid "Display FITS automatically when an image is captured?"
 msgstr ""
 
-#: main.cpp:71
-msgid "Dumping sky image"
-msgstr ""
+#: kstars.kcfg:150
+#, fuzzy, no-c-format
+msgid "Toggle automatic display of FITS files upon capture."
+msgstr "Toggle display of star name labels"
 
-#: main.cpp:124
-msgid "Could not parse Date/Time string: "
-msgstr ""
+#: kstars.kcfg:154
+#, fuzzy, no-c-format
+msgid "INDI Telescope port"
+msgstr "Dewis Dim"
 
-#: main.cpp:125
-msgid "Valid date formats: "
+#: kstars.kcfg:155
+#, no-c-format
+msgid "The port to which the telescope is attached (e.g., /dev/ttyS0)"
 msgstr ""
 
-#: main.cpp:129
-msgid "Using CPU date/time instead."
+#: kstars.kcfg:159
+#, no-c-format
+msgid "INDI Video port"
 msgstr ""
 
-#: main.cpp:154
-msgid "Script executed."
+#: kstars.kcfg:160
+#, no-c-format
+msgid "The port to which the video device is connected"
 msgstr ""
 
-#: main.cpp:156
-msgid "Could not execute script."
+#: kstars.kcfg:164
+#, no-c-format
+msgid "FITS Default directory"
 msgstr ""
 
-#: main.cpp:168
-msgid "Unable to save image: %1 "
-msgstr "Methu cadw'r ddelwedd : %1 "
-
-#: main.cpp:169
-#, c-format
-msgid "Saved to file: %1"
+#: kstars.kcfg:165
+#, no-c-format
+msgid "The default location of saved FITS files"
 msgstr ""
 
-#: main.cpp:182
-msgid "Specified date (%1) is invalid.  Will use current CPU date instead."
+#: kstars.kcfg:169
+#, no-c-format
+msgid "Aliases for filter wheel slots."
 msgstr ""
 
-#: opscatalog.cpp:38
-msgid "Index Catalog (IC)"
+#: kstars.kcfg:170
+#, no-c-format
+msgid "List of the aliases for filter wheel slots."
 msgstr ""
 
-#: opscatalog.cpp:41
-msgid "New General Catalog (NGC)"
+#: kstars.kcfg:176
+#, no-c-format
+msgid "City name of geographic location."
 msgstr ""
 
-#: opscatalog.cpp:44
-msgid "Messier Catalog (images)"
+#: kstars.kcfg:177
+#, no-c-format
+msgid "The City name of the current geographic location."
 msgstr ""
 
-#: opscatalog.cpp:47
-msgid "Messier Catalog (symbols)"
+#: kstars.kcfg:181
+#, no-c-format
+msgid "Province name of geographic location."
 msgstr ""
 
-#: opscolors.cpp:50 tools/scriptbuilder.cpp:702
+#: kstars.kcfg:182
+#, no-c-format
 msgid ""
-"_: use 'moonless night' color scheme\n"
-"Moonless Night"
+"The Province name of the current geographic location.  This is the name of "
+"the state for locations in the U. S."
 msgstr ""
 
-#: opscolors.cpp:74
-msgid ""
-"_: use realistic star colors\n"
-"Real Colors"
+#: kstars.kcfg:186
+#, no-c-format
+msgid "Country name of geographic location."
 msgstr ""
 
-#: opscolors.cpp:75
-msgid ""
-"_: show stars as red circles\n"
-"Solid Red"
-msgstr "Coch Solet"
+#: kstars.kcfg:187
+#, no-c-format
+msgid "The Country name of the current geographic location."
+msgstr ""
 
-#: opscolors.cpp:76
-msgid ""
-"_: show stars as black circles\n"
-"Solid Black"
+#: kstars.kcfg:191
+#, no-c-format
+msgid "Geographic Longitude, in degrees."
 msgstr ""
 
-#: opscolors.cpp:77
-msgid ""
-"_: show stars as white circles\n"
-"Solid White"
+#: kstars.kcfg:192
+#, no-c-format
+msgid "The longitude of the current geographic location, in decimal degrees."
 msgstr ""
 
-#: opscolors.cpp:126
-msgid ""
-"The specified color scheme file (%1) could not be found, or was corrupt."
+#: kstars.kcfg:196
+#, no-c-format
+msgid "Geographic Latitude, in degrees."
 msgstr ""
 
-#: opscolors.cpp:127
-msgid "Could Not Set Color Scheme"
+#: kstars.kcfg:197
+#, no-c-format
+msgid "The latitude of the current geographic location, in decimal degrees."
 msgstr ""
 
-#: opscolors.cpp:162
-msgid "New Color Scheme"
+#: kstars.kcfg:201
+#, no-c-format
+msgid "Elevation above sea level of geographic location, in meters."
 msgstr ""
 
-#: opscolors.cpp:163
-msgid "Enter a name for the new color scheme:"
+#: kstars.kcfg:205
+#, no-c-format
+msgid "Time Zone offset of geographic location, in hours."
 msgstr ""
 
-#: opscolors.cpp:187
+#: kstars.kcfg:209
+#, no-c-format
 msgid ""
-"Local color scheme index file could not be opened.\n"
-"Scheme cannot be removed."
+"Two-letter code for daylight savings time rule used by geographic location."
 msgstr ""
 
-#: opscolors.cpp:216
-#, c-format
-msgid "Could not delete the file: %1"
+#: kstars.kcfg:210
+#, 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)."
 msgstr ""
 
-#: opscolors.cpp:217
-msgid "Error Deleting File"
+#: kstars.kcfg:217
+#, no-c-format
+msgid "Use animated slewing effects when changing focus position?"
 msgstr ""
 
-#: opscolors.cpp:227
-msgid "Could not find an entry named %1 in colors.dat."
+#: kstars.kcfg:218
+#, no-c-format
+msgid ""
+"If true, focus changes will cause the sky to visibly spin to the new "
+"position.  Otherwise, the display will \"snap\" instantly to the new "
+"position."
 msgstr ""
 
-#: opscolors.cpp:228
-msgid "Scheme Not Found"
+#: kstars.kcfg:222
+#, no-c-format
+msgid "Name of selected FOV indicator"
 msgstr ""
 
-#. i18n: file tools/modcalcplanetsdlg.ui line 94
-#: planetcatalog.cpp:49 rc.cpp:3145 rc.cpp:3256 tools/modcalcplanets.cpp:101
-#: tools/modcalcplanets.cpp:377 tools/modcalcplanets.cpp:514
+#: kstars.kcfg:223
 #, no-c-format
-msgid "Earth"
+msgid ""
+"The name of the currently-selected field-of-view indicator.  The list of "
+"defined FOV indicator names is listed in the \"Settings|FOV Symbols\" menu."
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 200
-#: planetcatalog.cpp:61 rc.cpp:1639 rc.cpp:3139 rc.cpp:3250
-#: tools/modcalcplanets.cpp:106 tools/modcalcplanets.cpp:375
+#: kstars.kcfg:227
 #, no-c-format
-msgid "Mercury"
+msgid "Shape of selected FOV"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 144
-#: planetcatalog.cpp:66 rc.cpp:1603 rc.cpp:3142 rc.cpp:3253
-#: tools/modcalcplanets.cpp:112 tools/modcalcplanets.cpp:376
+#: kstars.kcfg:228
 #, no-c-format
-msgid "Venus"
+msgid ""
+"Integer indicating the selected FOV symbol shape.  Possible values are: "
+"0=Square; 1=Circle; 2=Crosshairs; 3=Bullseye."
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 74
-#: planetcatalog.cpp:71 rc.cpp:1558 rc.cpp:3148 rc.cpp:3259
-#: tools/modcalcplanets.cpp:121 tools/modcalcplanets.cpp:378
+#: kstars.kcfg:233
 #, no-c-format
-msgid "Mars"
+msgid "Angular size of selected FOV indicator, in arcmin"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 172
-#: planetcatalog.cpp:76 rc.cpp:1621 rc.cpp:3151 rc.cpp:3262
-#: tools/modcalcplanets.cpp:127 tools/modcalcplanets.cpp:379
+#: kstars.kcfg:234
 #, no-c-format
-msgid "Jupiter"
+msgid "The angular size for the FOV symbol, in arcminutes."
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 46
-#: planetcatalog.cpp:81 rc.cpp:1540 rc.cpp:3154 rc.cpp:3265
-#: tools/modcalcplanets.cpp:133 tools/modcalcplanets.cpp:380
+#: kstars.kcfg:238
 #, no-c-format
-msgid "Saturn"
+msgid "Fade planet trails to background color?"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 245
-#: planetcatalog.cpp:86 rc.cpp:1657 rc.cpp:3157 rc.cpp:3268
-#: tools/modcalcplanets.cpp:139 tools/modcalcplanets.cpp:381
+#: kstars.kcfg:239
 #, no-c-format
-msgid "Uranus"
+msgid ""
+"If true, trails attached to solar system bodies will fade into the "
+"background sky color."
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 214
-#: planetcatalog.cpp:91 rc.cpp:1648 rc.cpp:3160 rc.cpp:3271
-#: tools/modcalcplanets.cpp:145 tools/modcalcplanets.cpp:382
+#: kstars.kcfg:243
 #, no-c-format
-msgid "Neptune"
+msgid "Right Ascension of focus position"
 msgstr ""
 
-#. i18n: file addcatdialogui.ui line 16
-#: rc.cpp:3
-#, fuzzy, no-c-format
-msgid "AddCatDialog"
-msgstr "Ychwanegu Catalog"
-
-#. i18n: file addcatdialogui.ui line 27
-#: rc.cpp:6
-#, fuzzy, no-c-format
-msgid "Import File"
-msgstr "Ychwanegu Catalog ..."
-
-#. i18n: file addcatdialogui.ui line 38
-#: rc.cpp:9
-#, fuzzy, no-c-format
-msgid "Enter import data filename"
-msgstr "Dangos enw"
-
-#. i18n: file addcatdialogui.ui line 41
-#: rc.cpp:12
+#: kstars.kcfg:244
 #, no-c-format
 msgid ""
-"To import an existing data file, enter its filename here.  You will then "
-"describe the contents of the file below.  You can leave the filename blank to "
-"construct a catalog file with a valid header, but no data."
+"The right ascension of the initial focus position of the sky map, in decimal "
+"hours.  This value is volatile; it is reset whenever the program shuts down."
 msgstr ""
 
-#. i18n: file addcatdialogui.ui line 57
-#: rc.cpp:15
+#: kstars.kcfg:248
 #, no-c-format
-msgid "Contents of the imported data file"
+msgid "Declination of focus position"
 msgstr ""
 
-#. i18n: file addcatdialogui.ui line 60
-#: rc.cpp:18
+#: kstars.kcfg:249
 #, no-c-format
 msgid ""
-"When you select a data file in the above line, its contents are displayed here."
+"The declination of the initial focus position of the sky map, in decimal "
+"degrees.  This value is volatile; it is reset whenever the program shuts "
+"down."
 msgstr ""
 
-#. i18n: file addcatdialogui.ui line 70
-#: rc.cpp:21
-#, fuzzy, no-c-format
-msgid "Describe Data Fields"
-msgstr "Manylion"
-
-#. i18n: file addcatdialogui.ui line 94
-#: rc.cpp:24
-#, fuzzy, no-c-format
-msgid "<b>Catalog fields:</b>"
-msgstr "<b>Dyddiad</b>"
-
-#. i18n: file addcatdialogui.ui line 102
-#: rc.cpp:27
+#: kstars.kcfg:253
 #, no-c-format
-msgid "Data fields present in the import file"
+msgid "Name of focused object"
 msgstr ""
 
-#. i18n: file addcatdialogui.ui line 105
-#: rc.cpp:30
+#: kstars.kcfg:254
 #, no-c-format
 msgid ""
-"Build a list of data fields for your import data file (in the correct order "
-"from left to right), by dragging items from the \"Available fields\" list."
+"The name of the object that should be centered and tracked on startup.  If "
+"no object should be centered, set to \"nothing\".  This value is volatile; "
+"it is reset whenever the program shuts down."
 msgstr ""
 
-#. i18n: file addcatdialogui.ui line 128
-#: rc.cpp:33
+#: kstars.kcfg:258
 #, no-c-format
-msgid "<b>Available fields:</b>"
+msgid "Is tracking engaged?"
 msgstr ""
 
-#. i18n: file addcatdialogui.ui line 136
-#: rc.cpp:36
+#: kstars.kcfg:259
 #, no-c-format
-msgid "The list of available data fields"
+msgid ""
+"True if the skymap should track on its initial position on startup.  This "
+"value is volatile; it is reset whenever the program shuts down."
 msgstr ""
 
-#. i18n: file addcatdialogui.ui line 139
-#: rc.cpp:39
+#: kstars.kcfg:263
+#, fuzzy, no-c-format
+msgid "Hide objects while moving?"
+msgstr "Cuddio enwau cyfseriadau wrth symud?"
+
+#: kstars.kcfg:264
 #, no-c-format
 msgid ""
-"Drag items from this box to the \"Catalog fields\" box to describe the contents "
-"of your imported data file."
+"Toggle whether KStars should hide some objects while the display is moving, "
+"for smoother motion."
 msgstr ""
 
-#. i18n: file addcatdialogui.ui line 167
-#: rc.cpp:42
-#, no-c-format
-msgid "The coordinate epoch for the catalog"
-msgstr ""
+#: kstars.kcfg:268
+#, fuzzy, no-c-format
+msgid "Hide constellation boundaries while moving?"
+msgstr "Cuddio enwau cyfseriadau wrth symud?"
 
-#. i18n: file addcatdialogui.ui line 175
-#: rc.cpp:45
-#, no-c-format
-msgid "Catalog name prefix:"
-msgstr ""
+#: kstars.kcfg:269
+#, fuzzy, no-c-format
+msgid ""
+"Toggle whether constellation boundaries are hidden while the display is in "
+"motion."
+msgstr "Os brithir, llunir enwau cyfseriadau ar fap yr awyr."
 
-#. i18n: file addcatdialogui.ui line 191
-#: rc.cpp:48
+#: kstars.kcfg:273 opsadvancedui.ui:378
 #, no-c-format
-msgid "Symbol color:"
+msgid "Hide constellation lines while moving?"
 msgstr ""
 
-#. i18n: file addcatdialogui.ui line 216
-#: rc.cpp:51
-#, no-c-format
-msgid "Coordinate epoch:"
-msgstr ""
+#: kstars.kcfg:274
+#, fuzzy, no-c-format
+msgid ""
+"Toggle whether constellation lines are hidden while the display is in motion."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file addcatdialogui.ui line 252
-#: rc.cpp:54
+#: kstars.kcfg:278 opsadvancedui.ui:392
 #, no-c-format
-msgid "Preview &Output"
-msgstr ""
+msgid "Hide constellation names while moving?"
+msgstr "Cuddio enwau cyfseriadau wrth symud?"
 
-#. i18n: file addcatdialogui.ui line 272
-#: rc.cpp:57
+#: kstars.kcfg:279
+#, fuzzy, no-c-format
+msgid ""
+"Toggle whether constellation names are hidden while the display is in motion."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
+
+#: kstars.kcfg:283 opsadvancedui.ui:350
 #, no-c-format
-msgid "Enter the filename for the output catalog file"
+msgid "Hide coordinate grid while moving?"
 msgstr ""
 
-#. i18n: file addcatdialogui.ui line 280
-#: rc.cpp:60
+#: kstars.kcfg:284
 #, fuzzy, no-c-format
-msgid "Catalog name:"
-msgstr "Constellation names:"
+msgid ""
+"Toggle whether the coordinate grid is hidden while the display is in motion."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file addcatdialogui.ui line 288
-#: rc.cpp:63
+#: kstars.kcfg:288
 #, fuzzy, no-c-format
-msgid "Save catalog as:"
-msgstr "Constellation names:"
+msgid "Hide Milky Way contour while moving?"
+msgstr "Cuddio enwau cyfseriadau wrth symud?"
 
-#. i18n: file addcatdialogui.ui line 296
-#: rc.cpp:66
-#, no-c-format
-msgid "Enter a name for the catalog"
-msgstr ""
+#: kstars.kcfg:289
+#, fuzzy, no-c-format
+msgid ""
+"Toggle whether the Milky Way contour is hidden while the display is in "
+"motion."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file addlinkdialogui.ui line 24
-#: rc.cpp:69
+#: kstars.kcfg:293 opsadvancedui.ui:286
 #, no-c-format
-msgid "Resource Type"
+msgid "Hide IC objects while moving?"
 msgstr ""
 
-#. i18n: file addlinkdialogui.ui line 35
-#: rc.cpp:72
-#, no-c-format
-msgid "Image"
-msgstr "Delwedd"
+#: kstars.kcfg:294
+#, fuzzy, no-c-format
+msgid "Toggle whether IC objects are hidden while the display is in motion."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file addlinkdialogui.ui line 66
-#: rc.cpp:78
-#, no-c-format
-msgid "Description:"
-msgstr "Disgrifiad:"
+#: kstars.kcfg:298
+#, fuzzy, no-c-format
+msgid "Hide Messier objects while moving?"
+msgstr "Cuddio enwau cyfseriadau wrth symud?"
 
-#. i18n: file addlinkdialogui.ui line 128
-#: rc.cpp:84
-#, no-c-format
-msgid "Check URL"
-msgstr ""
+#: kstars.kcfg:299
+#, fuzzy, no-c-format
+msgid ""
+"Toggle whether Messier objects are hidden while the display is in motion."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file ccdpreviewui.ui line 16
-#: rc.cpp:87
+#: kstars.kcfg:303 opsadvancedui.ui:364
 #, no-c-format
-msgid "CCD Preview"
+msgid "Hide NGC objects while moving?"
 msgstr ""
 
-#. i18n: file ccdpreviewui.ui line 50
-#: rc.cpp:90 rc.cpp:1798
-#, no-c-format
-msgid "Play/Pause"
-msgstr "Chwarae/Seibio"
-
-#. i18n: file ccdpreviewui.ui line 76
-#: rc.cpp:93 rc.cpp:1801
-#, no-c-format
-msgid "Capture Image"
-msgstr ""
+#: kstars.kcfg:304
+#, fuzzy, no-c-format
+msgid "Toggle whether NGC objects are hidden while the display is in motion."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file ccdpreviewui.ui line 87
-#: rc.cpp:96 rc.cpp:1804
-#, no-c-format
-msgid "Image Format"
-msgstr ""
+#: kstars.kcfg:308
+#, fuzzy, no-c-format
+msgid "Hide extra objects while moving?"
+msgstr "Cuddio enwau cyfseriadau wrth symud?"
 
-#. i18n: file ccdpreviewui.ui line 163
-#: rc.cpp:99 rc.cpp:141
-#, no-c-format
-msgid "Brightness:"
-msgstr "Disgleirdeb:"
+#: kstars.kcfg:309
+#, fuzzy, no-c-format
+msgid "Toggle whether extra objects are hidden while the display is in motion."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file ccdpreviewui.ui line 179
-#: rc.cpp:102 rc.cpp:138
-#, no-c-format
-msgid "Contrast:"
-msgstr "Cyferbyniant :"
+#: kstars.kcfg:313
+#, fuzzy, no-c-format
+msgid "Hide solar system objects while moving?"
+msgstr "Cuddio enwau cyfseriadau wrth symud?"
 
-#. i18n: file ccdpreviewui.ui line 195
-#: rc.cpp:105
-#, no-c-format
-msgid "Gamma:"
-msgstr "Gama :"
+#: kstars.kcfg:314
+#, fuzzy, no-c-format
+msgid ""
+"Toggle whether solar system objects are hidden while the display is in "
+"motion."
+msgstr "Os brithir, llunir enwau cyfseriadau ar fap yr awyr."
 
-#. i18n: file ccdpreviewui.ui line 211
-#: rc.cpp:108 rc.cpp:1834
+#: kstars.kcfg:318 opsadvancedui.ui:217
 #, no-c-format
-msgid "Focal length:"
+msgid "Hide faint stars while moving?"
 msgstr ""
 
-#. i18n: file ccdpreviewui.ui line 230
-#: rc.cpp:111
-#, no-c-format
-msgid "FWHM:"
-msgstr ""
+#: kstars.kcfg:319
+#, fuzzy, no-c-format
+msgid "Toggle whether faint stars are hidden while the display is in motion."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file ccdpreviewui.ui line 233
-#: rc.cpp:114 rc.cpp:123 rc.cpp:129
-#, no-c-format
-msgid "Full Width at Half Maximum"
-msgstr ""
+#: kstars.kcfg:323
+#, fuzzy, no-c-format
+msgid "Draw asteroids in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file ccdpreviewui.ui line 339
-#: rc.cpp:117
-#, no-c-format
-msgid "Enter the telescope focal length in mm"
-msgstr ""
+#: kstars.kcfg:324
+#, fuzzy, no-c-format
+msgid "Toggle whether asteroids are drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file ccdpreviewui.ui line 364
-#: rc.cpp:120
-#, no-c-format
-msgid "--"
-msgstr ""
+#: kstars.kcfg:328
+#, fuzzy, no-c-format
+msgid "Label asteroid names in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file ccdpreviewui.ui line 396
-#: rc.cpp:126 rc.cpp:883 rc.cpp:894 rc.cpp:947 rc.cpp:958 rc.cpp:1840
-#: rc.cpp:1843
-#, no-c-format
-msgid "mm"
-msgstr "mM"
+#: kstars.kcfg:329
+#, fuzzy, no-c-format
+msgid "Toggle whether asteroid name labels are drawn in the sky map."
+msgstr "Os brithir, llunir enwau cyfseriadau ar fap yr awyr."
 
-#. i18n: file ccdpreviewui.ui line 415
-#: rc.cpp:132
-#, no-c-format
-msgid "arcsecs"
-msgstr ""
+#: kstars.kcfg:333
+#, fuzzy, no-c-format
+msgid "Draw comets in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file contrastbrightnessgui.ui line 16
-#: rc.cpp:135
-#, no-c-format
-msgid "Contrast/Brightness"
-msgstr ""
+#: kstars.kcfg:334
+#, fuzzy, no-c-format
+msgid "Toggle whether comets are drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file details_data.ui line 16
-#: rc.cpp:144
-#, no-c-format
-msgid "Details - General Data"
-msgstr ""
+#: kstars.kcfg:338
+#, fuzzy, no-c-format
+msgid "Label comet names in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file details_data.ui line 46
-#: rc.cpp:147
-#, no-c-format
-msgid "<p align=\"center\">Primary Name, Other Names</p>"
-msgstr ""
+#: kstars.kcfg:339
+#, fuzzy, no-c-format
+msgid "Toggle whether comet name labels are drawn in the sky map."
+msgstr "Os brithir, llunir enwau cyfseriadau ar fap yr awyr."
 
-#. i18n: file details_data.ui line 142
-#: rc.cpp:153
-#, no-c-format
-msgid "in"
-msgstr "in"
+#: kstars.kcfg:343
+#, fuzzy, no-c-format
+msgid "Draw constellation boundaries in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file details_data.ui line 168
-#: rc.cpp:156
-#, no-c-format
-msgid "Constellation"
-msgstr "Cyfseriad"
+#: kstars.kcfg:344
+#, fuzzy, no-c-format
+msgid "Toggle whether constellation boundaries are drawn in the sky map."
+msgstr "Os brithir, llunir enwau cyfseriadau ar fap yr awyr."
 
-#. i18n: file details_data.ui line 222
-#: rc.cpp:159
-#, no-c-format
-msgid "Click to change image"
-msgstr ""
+#: kstars.kcfg:348
+#, fuzzy, no-c-format
+msgid "Draw constellation lines in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file details_data.ui line 225
-#: rc.cpp:162
-#, no-c-format
-msgid ""
-"A small thumbnail image of the object is shown here.  You can modify the image "
-"by clicking on it."
-msgstr ""
+#: kstars.kcfg:349
+#, fuzzy, no-c-format
+msgid "Toggle whether constellation lines are drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file details_data.ui line 293
-#: rc.cpp:165
-#, no-c-format
-msgid "0.00 arcmin"
-msgstr ""
+#: kstars.kcfg:353
+#, fuzzy, no-c-format
+msgid "Draw constellation names in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file details_data.ui line 317
-#: rc.cpp:168
-#, no-c-format
-msgid "0.00 mag"
-msgstr ""
+#: kstars.kcfg:354
+#, fuzzy, no-c-format
+msgid "Toggle whether constellation name labels are drawn in the sky map."
+msgstr "Os brithir, llunir enwau cyfseriadau ar fap yr awyr."
 
-#. i18n: file details_data.ui line 346
-#: rc.cpp:171
-#, no-c-format
-msgid "Magnitude:"
-msgstr ""
+#: kstars.kcfg:358
+#, fuzzy, no-c-format
+msgid "Draw \"deep sky\" objects in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file details_data.ui line 378
-#: rc.cpp:174 rc.cpp:2389
-#, no-c-format
-msgid "Distance:"
-msgstr "Pellder:"
+#: kstars.kcfg:359
+#, fuzzy, no-c-format
+msgid "Toggle whether deep-sky objects are drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file details_data.ui line 405
-#: rc.cpp:177
+#: kstars.kcfg:363
 #, fuzzy, no-c-format
-msgid "0.00 pc"
-msgstr "0.0"
+msgid "Draw ecliptic line in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file details_data.ui line 434
-#: rc.cpp:180
-#, no-c-format
-msgid "Size:"
-msgstr "Maint:"
+#: kstars.kcfg:364
+#, fuzzy, no-c-format
+msgid "Toggle whether the ecliptic line is drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file details_data.ui line 504
-#: rc.cpp:183
-#, no-c-format
-msgid "Add to Observing List"
-msgstr ""
+#: kstars.kcfg:368
+#, fuzzy, no-c-format
+msgid "Draw equator line in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file details_data.ui line 512
-#: rc.cpp:186
-#, no-c-format
-msgid "Center in Map"
-msgstr ""
+#: kstars.kcfg:369
+#, fuzzy, no-c-format
+msgid "Toggle whether the equator line is drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file details_data.ui line 520
-#: rc.cpp:189
-#, no-c-format
-msgid "Center in Telescope"
-msgstr ""
+#: kstars.kcfg:373
+#, fuzzy, no-c-format
+msgid "Draw coordinate grid in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file details_database.ui line 16
-#: rc.cpp:192
-#, no-c-format
-msgid "Details - Online Databases"
-msgstr ""
+#: kstars.kcfg:374
+#, fuzzy, no-c-format
+msgid "Toggle whether the coordinate grid is drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file details_database.ui line 25
-#: rc.cpp:195
-#, no-c-format
-msgid "Choose Online Database"
-msgstr ""
+#: kstars.kcfg:378
+#, fuzzy, no-c-format
+msgid "Draw opaque ground in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file details_links.ui line 16
-#: rc.cpp:198
-#, no-c-format
-msgid "Details - Resource Links"
-msgstr ""
+#: kstars.kcfg:379
+#, fuzzy, no-c-format
+msgid "Toggle whether the region below the horizon is opaque."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file details_links.ui line 43
-#: rc.cpp:201
-#, no-c-format
-msgid "<p align=\"center\">Information Links</p>"
-msgstr ""
+#: kstars.kcfg:383
+#, fuzzy, no-c-format
+msgid "Draw horizon line in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file details_links.ui line 97
-#: rc.cpp:204
-#, no-c-format
-msgid "<p align=\"center\">Image Links</p>"
-msgstr ""
+#: kstars.kcfg:384
+#, fuzzy, no-c-format
+msgid "Toggle whether the horizon line is drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file details_links.ui line 129
-#: rc.cpp:207
-#, no-c-format
-msgid "View Resource"
-msgstr ""
+#: kstars.kcfg:388
+#, fuzzy, no-c-format
+msgid "Draw IC objects in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file details_links.ui line 145
-#: rc.cpp:213
-#, no-c-format
-msgid "Edit Link..."
-msgstr ""
+#: kstars.kcfg:389
+#, fuzzy, no-c-format
+msgid "Toggle whether IC objects are drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file details_links.ui line 153
-#: rc.cpp:216
-#, no-c-format
-msgid "Remove Link"
-msgstr "Gwaredu Cyswllt"
+#: kstars.kcfg:393
+#, fuzzy, no-c-format
+msgid "Draw NGC objects in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file details_log.ui line 16
-#: rc.cpp:219
-#, no-c-format
-msgid "Details - User Log"
-msgstr ""
+#: kstars.kcfg:394
+#, fuzzy, no-c-format
+msgid "Toggle whether NGC objects are drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file details_log.ui line 35
-#: rc.cpp:222
-#, no-c-format
-msgid "<p align=\"center\">User Log</p>"
-msgstr ""
+#: kstars.kcfg:398
+#, fuzzy, no-c-format
+msgid "Draw Messier objects in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file details_position.ui line 16
-#: rc.cpp:225
-#, no-c-format
-msgid "Details - Position Data"
-msgstr ""
+#: kstars.kcfg:399
+#, fuzzy, no-c-format
+msgid "Toggle whether Messier objects are drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file details_position.ui line 43
-#: rc.cpp:228
-#, no-c-format
-msgid "<p align=\"center\">Coordinates</p>"
-msgstr ""
+#: kstars.kcfg:403
+#, fuzzy, no-c-format
+msgid "Draw Messier object images in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file details_position.ui line 109
-#: rc.cpp:231 rc.cpp:234 rc.cpp:243 rc.cpp:246 rc.cpp:258 rc.cpp:288
-#: rc.cpp:297 rc.cpp:300
-#, no-c-format
-msgid "00:00:00"
-msgstr "00:00:00"
+#: kstars.kcfg:404
+#, fuzzy, no-c-format
+msgid "Toggle whether Messier objects are rendered as images in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file details_position.ui line 155
-#: rc.cpp:237
-#, no-c-format
-msgid "Dec (2000.0):"
-msgstr ""
+#: kstars.kcfg:408
+#, fuzzy, no-c-format
+msgid "Draw extra deep-sky objects in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file details_position.ui line 179
-#: rc.cpp:240
-#, no-c-format
-msgid "RA (2000.0):"
-msgstr ""
+#: kstars.kcfg:409
+#, fuzzy, no-c-format
+msgid "Toggle whether extra objects are drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file details_position.ui line 280
-#: rc.cpp:249 rc.cpp:2581 rc.cpp:2614 rc.cpp:3199
-#, no-c-format
-msgid "Altitude:"
-msgstr "Uchder :"
+#: kstars.kcfg:413
+#, fuzzy, no-c-format
+msgid "Draw Milky Way contour in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file details_position.ui line 304
-#: rc.cpp:252 rc.cpp:2578 rc.cpp:2605 rc.cpp:3196
-#, no-c-format
-msgid "Azimuth:"
-msgstr "Asimwth:"
+#: kstars.kcfg:414
+#, fuzzy, no-c-format
+msgid "Toggle whether the Milky Way contour is drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file details_position.ui line 365
-#: rc.cpp:255
+#: kstars.kcfg:418
 #, no-c-format
-msgid "Hour angle:"
+msgid "Fill Milky Way contour? (false means use outline only)"
 msgstr ""
 
-#. i18n: file details_position.ui line 441
-#: rc.cpp:261
+#: kstars.kcfg:419
 #, no-c-format
-msgid "Airmass:"
+msgid ""
+"Toggle whether the Milky Way contour is filled.  When this option is false, "
+"the Milky Way is shown as an outline."
 msgstr ""
 
-#. i18n: file details_position.ui line 469
-#: rc.cpp:264
-#, no-c-format
-msgid "1.00"
-msgstr "1.00"
+#: kstars.kcfg:423
+#, fuzzy, no-c-format
+msgid "Meta-option for all planets in the sky map."
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file details_position.ui line 518
-#: rc.cpp:267
+#: kstars.kcfg:424
 #, no-c-format
-msgid "<p align=\"center\">Rise/Set/Transit</p>"
+msgid ""
+"Meta-option to control whether all major planets (and the Sun and Moon) are "
+"drawn in the sky map."
 msgstr ""
 
-#. i18n: file details_position.ui line 584
-#: rc.cpp:270 rc.cpp:273 rc.cpp:285
-#, no-c-format
-msgid "00:00"
-msgstr ""
+#: kstars.kcfg:428
+#, fuzzy, no-c-format
+msgid "Draw planets as images in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file details_position.ui line 630
-#: rc.cpp:276
+#: kstars.kcfg:429
 #, fuzzy, no-c-format
-msgid "Set time:"
-msgstr "Amser"
+msgid ""
+"Toggle whether major planets (and the Sun and Moon) are rendered as images "
+"in the sky map."
+msgstr "Os brithir, llunir enwau cyfseriadau ar fap yr awyr."
 
-#. i18n: file details_position.ui line 654
-#: rc.cpp:279
+#: kstars.kcfg:433
 #, fuzzy, no-c-format
-msgid "Transit time:"
-msgstr "Enw'r ffeil:"
+msgid "Label planet names in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file details_position.ui line 678
-#: rc.cpp:282
+#: kstars.kcfg:434
 #, fuzzy, no-c-format
-msgid "Rise time:"
-msgstr "Enw'r ffeil:"
+msgid ""
+"Toggle whether major planets (and the Sun and Moon) are labeled in the sky "
+"map."
+msgstr "Os brithir, llunir enwau cyfseriadau ar fap yr awyr."
 
-#. i18n: file details_position.ui line 779
-#: rc.cpp:291
+#: kstars.kcfg:438
 #, fuzzy, no-c-format
-msgid "Azimuth at set:"
-msgstr "Asimwth:"
+msgid "Draw Sun in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file details_position.ui line 803
-#: rc.cpp:294
-#, no-c-format
-msgid "Altitude at transit:"
-msgstr ""
+#: kstars.kcfg:439
+#, fuzzy, no-c-format
+msgid "Toggle whether the Sun is drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file details_position.ui line 877
-#: rc.cpp:303
+#: kstars.kcfg:443
 #, fuzzy, no-c-format
-msgid "Azimuth at rise:"
-msgstr "Asimwth:"
+msgid "Draw Moon in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file devmanager.ui line 16
-#: rc.cpp:306
-#, no-c-format
-msgid "Device Manager"
-msgstr "Rheolwr Dyfeisiau"
+#: kstars.kcfg:444
+#, fuzzy, no-c-format
+msgid "Toggle whether the Moon is drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file devmanager.ui line 34
-#: rc.cpp:309
-#, no-c-format
-msgid "Local/Server"
-msgstr ""
+#: kstars.kcfg:448
+#, fuzzy, no-c-format
+msgid "Draw Mercury in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file devmanager.ui line 43
-#: rc.cpp:312
-#, no-c-format
-msgid "Device"
-msgstr "Dyfais"
+#: kstars.kcfg:449
+#, fuzzy, no-c-format
+msgid "Toggle whether Mercury is drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file devmanager.ui line 54
-#: rc.cpp:315 rc.cpp:348
-#, no-c-format
-msgid "Status"
-msgstr "Cyflwr"
+#: kstars.kcfg:453
+#, fuzzy, no-c-format
+msgid "Draw Venus in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file devmanager.ui line 65
-#: rc.cpp:318 rc.cpp:330 rc.cpp:2303
-#, no-c-format
-msgid "Mode"
-msgstr "Modd"
+#: kstars.kcfg:454
+#, fuzzy, no-c-format
+msgid "Toggle whether Venus is drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file devmanager.ui line 76
-#: rc.cpp:321
-#, no-c-format
-msgid "Version"
-msgstr "Fersiwn"
+#: kstars.kcfg:458
+#, fuzzy, no-c-format
+msgid "Draw Mars in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file devmanager.ui line 87
-#: rc.cpp:324 rc.cpp:354
-#, no-c-format
-msgid "Port"
-msgstr "Porth"
+#: kstars.kcfg:459
+#, fuzzy, no-c-format
+msgid "Toggle whether Mars is drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file devmanager.ui line 119
-#: rc.cpp:327
-#, no-c-format
-msgid "Server Log"
-msgstr ""
+#: kstars.kcfg:463
+#, fuzzy, no-c-format
+msgid "Draw Jupiter in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file devmanager.ui line 163
-#: rc.cpp:333 rc.cpp:2306
-#, no-c-format
-msgid "Local"
-msgstr "Lleol"
+#: kstars.kcfg:464
+#, fuzzy, no-c-format
+msgid "Toggle whether Jupiter is drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file devmanager.ui line 174
-#: rc.cpp:336 rc.cpp:2309
-#, no-c-format
-msgid "Server"
-msgstr "Gweinydd"
+#: kstars.kcfg:468
+#, fuzzy, no-c-format
+msgid "Draw Saturn in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file devmanager.ui line 195
-#: rc.cpp:339
+#: kstars.kcfg:469
 #, fuzzy, no-c-format
-msgid "R&un Service"
-msgstr "Stopio Gwasanaeth"
+msgid "Toggle whether Saturn is drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file devmanager.ui line 235
-#: rc.cpp:345
-#, no-c-format
-msgid "Client"
-msgstr "Dibynnydd:"
+#: kstars.kcfg:473
+#, fuzzy, no-c-format
+msgid "Draw Uranus in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file devmanager.ui line 255
-#: rc.cpp:351 rc.cpp:3744
-#, no-c-format
-msgid "Name"
-msgstr "Enw"
+#: kstars.kcfg:474
+#, fuzzy, no-c-format
+msgid "Toggle whether Uranus is drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file devmanager.ui line 292
-#: rc.cpp:357
-#, no-c-format
-msgid "Hosts"
-msgstr ""
+#: kstars.kcfg:478
+#, fuzzy, no-c-format
+msgid "Draw Neptune in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file devmanager.ui line 303
-#: rc.cpp:360 rc.cpp:513 rc.cpp:537 rc.cpp:561
-#, no-c-format
-msgid "Add..."
-msgstr "Ychwanegu..."
+#: kstars.kcfg:479
+#, fuzzy, no-c-format
+msgid "Toggle whether Neptune is drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file devmanager.ui line 329
-#: rc.cpp:369 rc.cpp:2315
-#, no-c-format
-msgid "Connection"
-msgstr "Cysylltiad"
+#: kstars.kcfg:483
+#, fuzzy, no-c-format
+msgid "Draw Pluto in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file fitsheaderdialog.ui line 28
-#: rc.cpp:384
-#, no-c-format
-msgid "Card"
-msgstr "Cerdyn"
+#: kstars.kcfg:484
+#, fuzzy, no-c-format
+msgid "Toggle whether Pluto is drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file fitsheaderdialog.ui line 39
-#: rc.cpp:387
-#, no-c-format
-msgid "Value"
-msgstr "Gwerth"
+#: kstars.kcfg:488
+#, fuzzy, no-c-format
+msgid "Draw stars in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file fitsheaderdialog.ui line 50
-#: rc.cpp:390
-#, no-c-format
-msgid "Comment"
-msgstr "Sylwad"
+#: kstars.kcfg:489
+#, fuzzy, no-c-format
+msgid "Toggle whether stars are drawn in the sky map."
+msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file focusdialogdlg.ui line 28
-#: rc.cpp:396
-#, no-c-format
-msgid "RA/Dec"
-msgstr ""
+#: kstars.kcfg:493
+#, fuzzy, no-c-format
+msgid "Label star magnitudes in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file focusdialogdlg.ui line 39
-#: rc.cpp:399
-#, no-c-format
-msgid "New RA:"
-msgstr ""
+#: kstars.kcfg:494
+#, fuzzy, no-c-format
+msgid ""
+"Toggle whether star magnitude (brightness) labels are shown in the sky map."
+msgstr "Os brithir, llunir enwau cyfseriadau ar fap yr awyr."
+
+#: kstars.kcfg:498
+#, fuzzy, no-c-format
+msgid "Label star names in the sky map?"
+msgstr "Llunio enwau'r cyfseriadau?"
+
+#: kstars.kcfg:499
+#, fuzzy, no-c-format
+msgid "Toggle whether star name labels are shown in the sky map."
+msgstr "Os brithir, llunir enwau cyfseriadau ar fap yr awyr."
 
-#. i18n: file focusdialogdlg.ui line 50
-#: rc.cpp:402
+#: kstars.kcfg:503
 #, no-c-format
-msgid "Enter new Right Ascension"
+msgid "Minimum timescale for forced-slewing mode"
 msgstr ""
 
-#. i18n: file focusdialogdlg.ui line 61
-#: rc.cpp:405
+#: kstars.kcfg:504
 #, no-c-format
-msgid "Enter new Declination"
+msgid "The timescale above which slewing mode is forced on at all times."
 msgstr ""
 
-#. i18n: file focusdialogdlg.ui line 69
-#: rc.cpp:408
+#: kstars.kcfg:508
 #, no-c-format
-msgid "New dec:"
+msgid "InfoBoxes Background fill mode"
 msgstr ""
 
-#. i18n: file focusdialogdlg.ui line 77
-#: rc.cpp:411 rc.cpp:1950 rc.cpp:2461 rc.cpp:2494 rc.cpp:2572 rc.cpp:2602
-#: rc.cpp:2719 rc.cpp:2752 rc.cpp:2899 rc.cpp:2935 rc.cpp:3541 rc.cpp:3589
+#: kstars.kcfg:509
 #, no-c-format
-msgid "Epoch:"
+msgid ""
+"The background fill mode for the on-screen information boxes: 0=\"no BG\"; 1="
+"\"semi-transparent BG\"; 2=\"opaque BG\""
 msgstr ""
 
-#. i18n: file focusdialogdlg.ui line 85
-#: rc.cpp:414
+#: kstars.kcfg:513
 #, no-c-format
-msgid "2000.0"
+msgid "Mode for rendering stars"
 msgstr ""
 
-#. i18n: file focusdialogdlg.ui line 88
-#: rc.cpp:417
+#: kstars.kcfg:514
 #, no-c-format
-msgid "Epoch for the RA/Dec coordinates"
+msgid ""
+"The method for rendering stars: 0=\"realistic colors\"; 1=\"solid red\"; 2="
+"\"solid black\"; 3=\"solid white\""
 msgstr ""
 
-#. i18n: file focusdialogdlg.ui line 98
-#: rc.cpp:420
+#: kstars.kcfg:519
 #, no-c-format
-msgid "Az/Alt"
+msgid "Saturation level of star colors"
 msgstr ""
 
-#. i18n: file focusdialogdlg.ui line 109
-#: rc.cpp:423
+#: kstars.kcfg:520
 #, no-c-format
-msgid "New azimuth:"
+msgid ""
+"The color saturation level of stars (only applicable when using \"realistic "
+"colors\" mode)."
 msgstr ""
 
-#. i18n: file focusdialogdlg.ui line 117
-#: rc.cpp:426
+#: kstars.kcfg:525
+#, fuzzy, no-c-format
+msgid "Use abbreviated constellation names?"
+msgstr "Defnyddio enwau cyfseriadau wedi'u lleoleiddio"
+
+#: kstars.kcfg:526
+#, fuzzy, no-c-format
+msgid "Use official IAU abbreviations for constellation names."
+msgstr "Defnyddio enwau cyfseriadau Lladin"
+
+#: kstars.kcfg:530
+#, fuzzy, no-c-format
+msgid "Use Latin constellation names?"
+msgstr "Defnyddio enwau cyfseriadau Lladin"
+
+#: kstars.kcfg:531
+#, fuzzy, no-c-format
+msgid "Use Latin constellation names."
+msgstr "Defnyddio enwau cyfseriadau Lladin"
+
+#: kstars.kcfg:535
+#, fuzzy, no-c-format
+msgid "Use localized constellation names?"
+msgstr "Defnyddio enwau cyfseriadau wedi'u lleoleiddio"
+
+#: kstars.kcfg:536
 #, no-c-format
-msgid "New altitude:"
+msgid ""
+"Use localized constellation names (if localized names are not available, "
+"default to Latin names)."
 msgstr ""
 
-#. i18n: file focusdialogdlg.ui line 128
-#: rc.cpp:429
+#: kstars.kcfg:540
 #, no-c-format
-msgid "Enter new Azimuth"
+msgid "Use horizontal coordinate system?"
 msgstr ""
 
-#. i18n: file focusdialogdlg.ui line 173
-#: rc.cpp:432
+#: kstars.kcfg:541
 #, no-c-format
-msgid "Enter new Altitude"
+msgid ""
+"Display the sky with horizontal coordinates (when false, equatorial "
+"coordinates will be used)."
 msgstr ""
 
-#. i18n: file fovdialogui.ui line 16
-#: rc.cpp:435
+#: kstars.kcfg:545
 #, no-c-format
-msgid "Edit FOV Symbols"
+msgid "Automatically label focused object?"
 msgstr ""
 
-#. i18n: file fovdialogui.ui line 36
-#: rc.cpp:438
+#: kstars.kcfg:546
 #, no-c-format
 msgid ""
-"The list of defined field-of-view (FOV) symbols.  You can add a symbol to the "
-"list using the \"New\" button, remove a symbol using the \"Remove\" button, and "
-"modify a symbol using the \"Edit\" button.  A schematic of the highlighted "
-"symbol is drawn at right."
+"Toggle whether a centered object automatically gets a name label attached."
 msgstr ""
 
-#. i18n: file fovdialogui.ui line 52
-#: rc.cpp:441
+#: kstars.kcfg:551
 #, no-c-format
-msgid "New..."
-msgstr "Newydd ..."
+msgid ""
+"Toggle whether a centered solar system object automatically gets a trail "
+"attached, as long as it remains centered."
+msgstr ""
 
-#. i18n: file fovdialogui.ui line 55
-#: rc.cpp:444
+#: kstars.kcfg:555
 #, no-c-format
-msgid "Add a new FOV symbol"
+msgid "Add temporary label on mouse hover?"
 msgstr ""
 
-#. i18n: file fovdialogui.ui line 58
-#: rc.cpp:447
+#: kstars.kcfg:556
 #, no-c-format
 msgid ""
-"Add a new field-of-view (FOV) symbol to the list.  You can define the size, "
-"shape, and color of the new symbol."
+"Toggle whether the object under the mouse cursor gets a transient name label."
 msgstr ""
 
-#. i18n: file fovdialogui.ui line 83
-#: rc.cpp:450
-#, no-c-format
-msgid "Edit..."
-msgstr "Golygu..."
-
-#. i18n: file fovdialogui.ui line 86
-#: rc.cpp:453
+#: kstars.kcfg:560
 #, no-c-format
-msgid "Modify the highlighted FOV symbol"
+msgid "Use symbols to label observing list objects"
 msgstr ""
 
-#. i18n: file fovdialogui.ui line 89
-#: rc.cpp:456
+#: kstars.kcfg:561
 #, no-c-format
 msgid ""
-"Press this button to modify the highlighted FOV symbol.  You can change its "
-"size, shape and color."
+"Objects in the observing list will be highlighted with a symbol in the map."
 msgstr ""
 
-#. i18n: file fovdialogui.ui line 100
-#: rc.cpp:462
+#: kstars.kcfg:565
 #, no-c-format
-msgid "Remove highlighted FOV symbol"
+msgid "Use text to label observing list objects"
 msgstr ""
 
-#. i18n: file fovdialogui.ui line 103
-#: rc.cpp:465
+#: kstars.kcfg:566
 #, no-c-format
-msgid "Press this button to remove the highlighted FOV symbol from the list."
+msgid ""
+"Objects in the observing list will be highlighted with a colored name label "
+"in the map."
 msgstr ""
 
-#. i18n: file histdialog.ui line 115
-#: rc.cpp:471
+#: kstars.kcfg:570
 #, no-c-format
-msgid "Max."
-msgstr "Uchaf."
-
-#. i18n: file histdialog.ui line 172
-#: rc.cpp:474
-#, no-c-format
-msgid "Intensity:"
-msgstr "Dwyster:"
+msgid "Correct positions for atmospheric refraction?"
+msgstr ""
 
-#. i18n: file histdialog.ui line 196
-#: rc.cpp:477
+#: kstars.kcfg:571
 #, no-c-format
-msgid "Frequency:"
-msgstr "Amlder :"
+msgid ""
+"Toggle whether object positions are corrected for the effects of atmospheric "
+"refraction (only applies when horizontal coordinates are used)."
+msgstr ""
 
-#. i18n: file histdialog.ui line 204
-#: rc.cpp:480
+#: kstars.kcfg:575
 #, no-c-format
-msgid "Min."
-msgstr "Isaf."
+msgid "Zoom Factor, in pixels per radian"
+msgstr ""
 
-#. i18n: file histdialog.ui line 282
-#: rc.cpp:489
+#: kstars.kcfg:576
 #, no-c-format
-msgid "FITS Scale"
+msgid "The zoom level, measured in pixels per radian."
 msgstr ""
 
-#. i18n: file histdialog.ui line 293
-#: rc.cpp:492
+#: kstars.kcfg:581
 #, no-c-format
-msgid "Auto"
-msgstr "Ymysgogol"
+msgid "Faint limit for asteroids"
+msgstr ""
 
-#. i18n: file histdialog.ui line 304
-#: rc.cpp:495
+#: kstars.kcfg:582
 #, no-c-format
-msgid "Linear"
-msgstr "Llinynnol"
+msgid "The faint magnitude limit for drawing asteroids."
+msgstr ""
 
-#. i18n: file histdialog.ui line 312
-#: rc.cpp:498
+#: kstars.kcfg:586
 #, no-c-format
-msgid "Logarithmic"
+msgid "Faint limit for asteroid names"
 msgstr ""
 
-#. i18n: file histdialog.ui line 320
-#: rc.cpp:501
+#: kstars.kcfg:587
 #, no-c-format
-msgid "Square root"
+msgid "The faint magnitude limit for drawing asteroid name labels."
 msgstr ""
 
-#. i18n: file imagereductionui.ui line 52
-#: rc.cpp:510 rc.cpp:534 rc.cpp:558
-#, no-c-format
-msgid "File Name"
-msgstr "Enw Ffeil"
+#: kstars.kcfg:591
+#, fuzzy, no-c-format
+msgid "Faint limit for deep-sky objects"
+msgstr "Toggle display of star name labels"
 
-#. i18n: file imagereductionui.ui line 132
-#: rc.cpp:519 rc.cpp:543 rc.cpp:567 rc.cpp:3717 tools/observinglist.cpp:708
+#: kstars.kcfg:592
 #, no-c-format
-msgid "Details"
-msgstr "Manylion"
+msgid ""
+"The faint magnitude limit for drawing deep-sky objects, when fully zoomed in."
+msgstr ""
 
-#. i18n: file imagereductionui.ui line 144
-#: rc.cpp:522 rc.cpp:546 rc.cpp:570
+#: kstars.kcfg:596
 #, no-c-format
-msgid "Combination"
+msgid "Faint limit for deep-sky objects when zoomed out"
 msgstr ""
 
-#. i18n: file imagereductionui.ui line 155
-#: rc.cpp:525 rc.cpp:549 rc.cpp:573
+#: kstars.kcfg:597
 #, no-c-format
-msgid "Average"
-msgstr "Cyfartaledd"
+msgid ""
+"The faint magnitude limit for drawing deep-sky objects, when fully zoomed "
+"out."
+msgstr ""
 
-#. i18n: file imagereductionui.ui line 166
-#: rc.cpp:528 rc.cpp:552 rc.cpp:576
+#: kstars.kcfg:601
 #, no-c-format
-msgid "Median"
+msgid "Faint limit for stars"
 msgstr ""
 
-#. i18n: file imagereductionui.ui line 221
-#: rc.cpp:531
+#: kstars.kcfg:602
 #, no-c-format
-msgid "Flat Field Frames"
+msgid "The faint magnitude limit for drawing stars, when fully zoomed in."
 msgstr ""
 
-#. i18n: file imagereductionui.ui line 389
-#: rc.cpp:555
+#: kstars.kcfg:606
 #, no-c-format
-msgid "Flat Field Dark Frames"
+msgid "Faint limit for stars when zoomed out"
 msgstr ""
 
-#. i18n: file imgsequencedlgui.ui line 16
-#: rc.cpp:585
+#: kstars.kcfg:607
 #, no-c-format
-msgid "Capture Image Sequence"
+msgid "The faint magnitude limit for drawing stars, when fully zoomed out."
 msgstr ""
 
-#. i18n: file imgsequencedlgui.ui line 33
-#: rc.cpp:588
-#, no-c-format
-msgid "Progress"
-msgstr "Cynnydd"
+#: kstars.kcfg:611
+#, fuzzy, no-c-format
+msgid "Faint limit for stars when slewing"
+msgstr "Cuddio enwau cyfseriadau wrth symud?"
 
-#. i18n: file imgsequencedlgui.ui line 60
-#: rc.cpp:591
+#: kstars.kcfg:612
 #, no-c-format
-msgid "Progress:"
-msgstr "Cynnydd :"
+msgid ""
+"The faint magnitude limit for drawing stars, when the map is in motion (only "
+"applicable if faint stars are set to be hidden while the map is in motion)."
+msgstr ""
 
-#. i18n: file imgsequencedlgui.ui line 85
-#: rc.cpp:594
+#: kstars.kcfg:616
 #, no-c-format
-msgid "of"
-msgstr "o"
+msgid "Faint limit for star name labels and/or magnitudes"
+msgstr ""
 
-#. i18n: file imgsequencedlgui.ui line 110
-#: rc.cpp:597
+#: kstars.kcfg:617
 #, no-c-format
-msgid "completed"
-msgstr "gorffenwyd"
+msgid "The faint magnitude limit for drawing star name and magnitude labels."
+msgstr ""
 
-#. i18n: file imgsequencedlgui.ui line 200
-#: rc.cpp:603
+#: kstars.kcfg:621
 #, no-c-format
-msgid "S&top"
-msgstr "S&topio"
+msgid "Maximum distance from Sun for labeling comets, in AU"
+msgstr ""
 
-#. i18n: file imgsequencedlgui.ui line 235
-#: rc.cpp:609
+#: kstars.kcfg:622
 #, no-c-format
-msgid "Camera/CCD"
+msgid "The maximum solar distance for drawing comets."
 msgstr ""
 
-#. i18n: file imgsequencedlgui.ui line 262
-#: rc.cpp:612 rc.cpp:651 rc.cpp:2092 rc.cpp:2120 rc.cpp:2135 rc.cpp:2141
-#: rc.cpp:2147 rc.cpp:2153 rc.cpp:2195 rc.cpp:2210 rc.cpp:2238 rc.cpp:2244
-#: rc.cpp:2253 rc.cpp:2279 rc.cpp:2285 rc.cpp:2288 rc.cpp:2294 rc.cpp:2300
-#: rc.cpp:2312
+#: kstars.kcfg:629
 #, no-c-format
-msgid "Device:"
-msgstr "Dyfais:"
+msgid "Use Dark colors for KStars windows?"
+msgstr ""
 
-#. i18n: file imgsequencedlgui.ui line 276
-#: rc.cpp:615
+#: kstars.kcfg:630
 #, no-c-format
-msgid "Prefix:"
-msgstr "Rhagddodiad:"
+msgid ""
+"If true, then the application window colors will be switched to a dark red "
+"theme, for better night vision."
+msgstr ""
 
-#. i18n: file imgsequencedlgui.ui line 279
-#: rc.cpp:618
+#: kstars.kcfg:634
 #, no-c-format
-msgid "Prefix to append to the beginning of file names"
+msgid "Color of angular distance ruler"
 msgstr ""
 
-#. i18n: file imgsequencedlgui.ui line 290
-#: rc.cpp:621
-#, no-c-format
-msgid "Exposure:"
-msgstr "Dadleniad:"
+#: kstars.kcfg:635
+#, fuzzy, no-c-format
+msgid "The color for the angular-distance measurement ruler."
+msgstr "Dangos llinellau cyfseriadau?"
 
-#. i18n: file imgsequencedlgui.ui line 293
-#: rc.cpp:624
+#: kstars.kcfg:639
 #, no-c-format
-msgid "Set the exposure time in seconds for individual images, if applicable"
+msgid "Background color of InfoBoxes"
 msgstr ""
 
-#. i18n: file imgsequencedlgui.ui line 304
-#: rc.cpp:627
-#, no-c-format
-msgid "Count:"
-msgstr "Cyfrif:"
+#: kstars.kcfg:640
+#, fuzzy, no-c-format
+msgid "The background color of the on-screen information boxes."
+msgstr "Defnyddio enwau cyfseriadau wedi'u lleoleiddio"
 
-#. i18n: file imgsequencedlgui.ui line 307
-#: rc.cpp:630 rc.cpp:657
+#: kstars.kcfg:644
 #, no-c-format
-msgid "Number of images to capture"
+msgid "Text color of InfoBoxes when grabbed with mouse"
 msgstr ""
 
-#. i18n: file imgsequencedlgui.ui line 318
-#: rc.cpp:633
-#, no-c-format
-msgid "Delay:"
-msgstr "Oedi:"
-
-#. i18n: file imgsequencedlgui.ui line 321
-#: rc.cpp:636
+#: kstars.kcfg:645
 #, no-c-format
-msgid "Delay in seconds between consecutive images"
+msgid ""
+"The text color for the on-screen information boxes, when activated by a "
+"mouse click."
 msgstr ""
 
-#. i18n: file imgsequencedlgui.ui line 347
-#: rc.cpp:639
-#, no-c-format
-msgid "image"
-msgstr "delwedd"
+#: kstars.kcfg:649
+#, fuzzy, no-c-format
+msgid "Text color of InfoBoxes"
+msgstr "Toggle display of star name labels"
 
-#. i18n: file imgsequencedlgui.ui line 383
-#: rc.cpp:642
-#, no-c-format
-msgid "Add ISO 8601 time stamp"
-msgstr ""
+#: kstars.kcfg:650
+#, fuzzy, no-c-format
+msgid "The normal text color of the on-screen information boxes."
+msgstr "Defnyddio enwau cyfseriadau wedi'u lleoleiddio"
 
-#. i18n: file imgsequencedlgui.ui line 389
-#: rc.cpp:645
-#, no-c-format
-msgid "Add time stamp to the file name"
-msgstr ""
+#: kstars.kcfg:654
+#, fuzzy, no-c-format
+msgid "Color of constellation boundaries"
+msgstr "Constellation names"
 
-#. i18n: file imgsequencedlgui.ui line 399
-#: rc.cpp:648 rc.cpp:3774
-#, no-c-format
-msgid "Filter"
-msgstr "Hidlo"
+#: kstars.kcfg:655
+#, fuzzy, no-c-format
+msgid "The color for the constellation boundary lines."
+msgstr "Dangos llinellau cyfseriadau?"
 
-#. i18n: file imgsequencedlgui.ui line 432
-#: rc.cpp:654 rc.cpp:2138
-#, no-c-format
-msgid "Filter:"
-msgstr "Hidl:"
+#: kstars.kcfg:659
+#, fuzzy, no-c-format
+msgid "Color of constellation lines"
+msgstr "Dangos llinellau cyfseriadau?"
 
-#. i18n: file indiconf.ui line 16
-#: rc.cpp:660
-#, no-c-format
-msgid "Configure INDI"
-msgstr ""
+#: kstars.kcfg:660
+#, fuzzy, no-c-format
+msgid "The color for the constellation figure lines."
+msgstr "Dangos llinellau cyfseriadau?"
 
-#. i18n: file indiconf.ui line 41
-#: rc.cpp:666
-#, no-c-format
-msgid "Default FITS directory:"
-msgstr ""
+#: kstars.kcfg:664
+#, fuzzy, no-c-format
+msgid "Color of constellation names"
+msgstr "Constellation names"
 
-#. i18n: file indiconf.ui line 92
-#: rc.cpp:669
-#, no-c-format
-msgid "&Automatic display of FITS upon capture"
-msgstr ""
+#: kstars.kcfg:665
+#, fuzzy, no-c-format
+msgid "The color for the constellation names."
+msgstr "Defnyddio enwau cyfseriadau wedi'u lleoleiddio"
 
-#. i18n: file indiconf.ui line 103
-#: rc.cpp:672
+#: kstars.kcfg:669
 #, no-c-format
-msgid "Telescope port:"
+msgid "Color of cardinal compass labels along horizon"
 msgstr ""
 
-#. i18n: file indiconf.ui line 106
-#: rc.cpp:675
-#, no-c-format
-msgid "Default INDI telescope port"
-msgstr ""
+#: kstars.kcfg:670
+#, fuzzy, no-c-format
+msgid "The color for the cardinal compass point labels."
+msgstr "Toggle display of star name labels"
 
-#. i18n: file indiconf.ui line 119
-#: rc.cpp:678
+#: kstars.kcfg:674
 #, no-c-format
-msgid "Video port:"
+msgid "Color of ecliptic line"
 msgstr ""
 
-#. i18n: file indiconf.ui line 122
-#: rc.cpp:681
+#: kstars.kcfg:675
+#, fuzzy, no-c-format
+msgid "The color for the ecliptic line."
+msgstr "Defnyddio enwau cyfseriadau wedi'u lleoleiddio"
+
+#: kstars.kcfg:679
 #, no-c-format
-msgid "Default INDI video port"
+msgid "Color of equator line"
 msgstr ""
 
-#. i18n: file indiconf.ui line 195
-#: rc.cpp:690
-#, no-c-format
-msgid "Display"
-msgstr "Dangos"
+#: kstars.kcfg:680
+#, fuzzy, no-c-format
+msgid "The color for the equator line."
+msgstr "Dangos llinellau cyfseriadau?"
 
-#. i18n: file indiconf.ui line 206
-#: rc.cpp:693
+#: kstars.kcfg:684
 #, no-c-format
-msgid "&Device target crosshair"
+msgid "Color of FOV indicator symbol"
 msgstr ""
 
-#. i18n: file indiconf.ui line 212
-#: rc.cpp:696
+#: kstars.kcfg:685
+#, fuzzy, no-c-format
+msgid "The color for the field-of-view indicator symbol."
+msgstr "Dangos llinellau cyfseriadau?"
+
+#: kstars.kcfg:689
+#, fuzzy, no-c-format
+msgid "Color of coordinate grid lines"
+msgstr "Toggle display of star name labels"
+
+#: kstars.kcfg:690
+#, fuzzy, no-c-format
+msgid "The color for the coordinate grid lines."
+msgstr "Dangos llinellau cyfseriadau?"
+
+#: kstars.kcfg:694
 #, no-c-format
-msgid "Display the telescope position on the sky map"
+msgid "Color of objects with extra links available"
 msgstr ""
 
-#. i18n: file indiconf.ui line 220
-#: rc.cpp:699
+#: kstars.kcfg:695
 #, no-c-format
-msgid "INDI messages in status &bar"
+msgid "The color for objects which have extra URL links available."
 msgstr ""
 
-#. i18n: file indiconf.ui line 226
-#: rc.cpp:702
+#: kstars.kcfg:699
+#, fuzzy, no-c-format
+msgid "Color of horizon line"
+msgstr "Toggle display of star name labels"
+
+#: kstars.kcfg:700
+#, fuzzy, no-c-format
+msgid "The color for the horizon line and opaque ground."
+msgstr "Defnyddio enwau cyfseriadau wedi'u lleoleiddio"
+
+#: kstars.kcfg:704
+#, fuzzy, no-c-format
+msgid "Color of Messier objects"
+msgstr "Toggle display of star name labels"
+
+#: kstars.kcfg:705
+#, fuzzy, no-c-format
+msgid "The color for Messier object symbols."
+msgstr "Toggle display of star name labels"
+
+#: kstars.kcfg:709
+#, fuzzy, no-c-format
+msgid "Color of NGC objects"
+msgstr "Toggle display of star name labels"
+
+#: kstars.kcfg:710
+#, fuzzy, no-c-format
+msgid "The color for NGC object symbols."
+msgstr "Toggle display of star name labels"
+
+#: kstars.kcfg:714
+#, fuzzy, no-c-format
+msgid "Color of IC objects"
+msgstr "Toggle display of star name labels"
+
+#: kstars.kcfg:715
+#, fuzzy, no-c-format
+msgid "The color for IC object symbols."
+msgstr "Toggle display of star name labels"
+
+#: kstars.kcfg:719
 #, no-c-format
-msgid "Display INDI status messages in the status bar"
+msgid "Color of Milky Way contour"
 msgstr ""
 
-#. i18n: file indiconf.ui line 253
-#: rc.cpp:705
+#: kstars.kcfg:720
+#, fuzzy, no-c-format
+msgid "The color for the Milky Way contour."
+msgstr "Defnyddio enwau cyfseriadau wedi'u lleoleiddio"
+
+#: kstars.kcfg:724
+#, fuzzy, no-c-format
+msgid "Color of star name labels"
+msgstr "Toggle display of star name labels"
+
+#: kstars.kcfg:725
+#, fuzzy, no-c-format
+msgid "The color for star name labels."
+msgstr "Toggle display of star name labels"
+
+#: kstars.kcfg:729
+#, fuzzy, no-c-format
+msgid "Color of planet name labels"
+msgstr "Toggle display of star name labels"
+
+#: kstars.kcfg:730
+#, fuzzy, no-c-format
+msgid "The color for solar system object labels."
+msgstr "Toggle display of star name labels"
+
+#: kstars.kcfg:734
 #, no-c-format
-msgid "Automatic Device Updates"
+msgid "Color of planet trails"
 msgstr ""
 
-#. i18n: file indiconf.ui line 264
-#: rc.cpp:708 rc.cpp:2204
-#, no-c-format
-msgid "Time"
-msgstr "Amser"
+#: kstars.kcfg:735
+#, fuzzy, no-c-format
+msgid "The color for solar system object trails."
+msgstr "Toggle display of star name labels"
+
+#: kstars.kcfg:739
+#, fuzzy, no-c-format
+msgid "Color of sky"
+msgstr "Lliwiau"
+
+#: kstars.kcfg:740
+#, fuzzy, no-c-format
+msgid "The color for the sky background."
+msgstr "Dangos llinellau cyfseriadau?"
 
-#. i18n: file indiconf.ui line 270
-#: rc.cpp:711
+#: kstars.kcfg:744
 #, no-c-format
-msgid "Update telescope clock upon connection"
+msgid "Color of telescope symbols"
 msgstr ""
 
-#. i18n: file indiconf.ui line 278
-#: rc.cpp:714
+#: kstars.kcfg:745
+#, fuzzy, no-c-format
+msgid "The color for telescope target symbols."
+msgstr "Toggle display of star name labels"
+
+#: kstars.kcfg:749
+#, fuzzy, no-c-format
+msgid "Color of user-added labels"
+msgstr "Toggle display of star name labels"
+
+#: kstars.kcfg:750
+#, fuzzy, no-c-format
+msgid "The color for user-added object labels."
+msgstr "Toggle display of star name labels"
+
+#: kstarsui.rc:20
 #, no-c-format
-msgid "&Geographic location"
-msgstr ""
+msgid "T&ime"
+msgstr "A&mser"
 
-#. i18n: file indiconf.ui line 284
-#: rc.cpp:717
+#: kstarsui.rc:27
 #, no-c-format
-msgid "Update telescope geographical location upon connection"
+msgid "&Pointing"
 msgstr ""
 
-#. i18n: file indiconf.ui line 294
-#: rc.cpp:720
+#: kstarsui.rc:51
 #, no-c-format
-msgid "Filter Wheel"
-msgstr ""
+msgid "&Devices"
+msgstr "&Dyfeisiau"
+
+#: kstarsui.rc:64
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "&Barrau Offer:"
 
-#. i18n: file indiconf.ui line 297
-#: rc.cpp:723
+#: kstarsui.rc:78
 #, no-c-format
-msgid "Assign color values for your filter wheel slots"
+msgid "&Settings"
 msgstr ""
 
-#. i18n: file indiconf.ui line 316
-#: rc.cpp:726
+#: kstarsui.rc:79
 #, no-c-format
-msgid "Slot:"
-msgstr "Agen :"
+msgid "&Info Boxes"
+msgstr ""
 
-#. i18n: file indiconf.ui line 324
-#: rc.cpp:729
+#: kstarsui.rc:86
 #, no-c-format
-msgid "Alias:"
-msgstr "Ffugenw :"
+msgid "&Toolbars"
+msgstr "&Barrau Offer:"
 
-#. i18n: file indihostconf.ui line 43
-#: rc.cpp:732 rc.cpp:1969
+#: kstarsui.rc:90
 #, no-c-format
-msgid "Name:"
-msgstr "Enw:"
+msgid "&Statusbar"
+msgstr ""
 
-#. i18n: file indihostconf.ui line 51
-#: rc.cpp:735
+#: kstarsui.rc:105 telescopewizard.ui:61
 #, no-c-format
-msgid "Host:"
-msgstr "Gwesteiwr:"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file indihostconf.ui line 59
-#: rc.cpp:738 rc.cpp:2213
+#: kstarsui.rc:131
 #, no-c-format
-msgid "Port:"
-msgstr "Porth:"
+msgid "View Toolbar"
+msgstr "Gweld Bar Offer"
 
-#. i18n: file kswizardui.ui line 20
-#: rc.cpp:747
+#: kswizardui.ui:20
 #, no-c-format
 msgid "Welcome to KStars"
 msgstr ""
 
-#. i18n: file kswizardui.ui line 61
-#: rc.cpp:750
+#: kswizardui.ui:61
 #, no-c-format
 msgid "<h3>Welcome to the KStars Setup Wizard</h3>"
 msgstr ""
 
-#. i18n: file kswizardui.ui line 96
-#: rc.cpp:753
+#: kswizardui.ui:94
 #, no-c-format
 msgid ""
-"<p>This Wizard will help you set up some basic options to help you get the most "
-"out of KStars.  You can press <b>Finish</b> at any time to save the settings "
-"you've made so far, and skip the remaining steps.</p>\n"
+"<p>This Wizard will help you set up some basic options to help you get the "
+"most out of KStars.  You can press <b>Finish</b> at any time to save the "
+"settings you've made so far, and skip the remaining steps.</p>\n"
 "\n"
 "<p>To get started, press the <b>Next</b> button.</p>"
 msgstr ""
 
-#. i18n: file kswizardui.ui line 130
-#: rc.cpp:758
+#: kswizardui.ui:130
 #, no-c-format
 msgid "Geographic Location"
 msgstr ""
 
-#. i18n: file kswizardui.ui line 171
-#: rc.cpp:761
+#: kswizardui.ui:171
 #, no-c-format
 msgid "<h3>Choose Your Home Location</h3>"
 msgstr ""
 
-#. i18n: file kswizardui.ui line 226
-#: rc.cpp:764
+#: kswizardui.ui:220
 #, no-c-format
 msgid ""
 "<p>Select a City near your\n"
@@ -25048,62 +30079,52 @@ msgid ""
 "<p>Once you have selected a City, press <b>Next</b>.</p>"
 msgstr ""
 
-#. i18n: file kswizardui.ui line 270
-#: rc.cpp:776
+#: kswizardui.ui:270
 #, no-c-format
 msgid "Filter the list by city name"
 msgstr ""
 
-#. i18n: file kswizardui.ui line 286
-#: rc.cpp:782 rc.cpp:2159
+#: kswizardui.ui:286 tools/argsetgeolocation.ui:48
 #, no-c-format
 msgid "Province:"
 msgstr ""
 
-#. i18n: file kswizardui.ui line 294
-#: rc.cpp:785
+#: kswizardui.ui:294
 #, no-c-format
 msgid "Filter the list by country name"
 msgstr ""
 
-#. i18n: file kswizardui.ui line 302
-#: rc.cpp:788
+#: kswizardui.ui:302
 #, no-c-format
 msgid "Filter the list by province name"
 msgstr ""
 
-#. i18n: file kswizardui.ui line 343
-#: rc.cpp:791
+#: kswizardui.ui:343
 #, no-c-format
 msgid "Displays the latitude of the selected city"
 msgstr ""
 
-#. i18n: file kswizardui.ui line 376
-#: rc.cpp:800
+#: kswizardui.ui:376
 #, no-c-format
 msgid "Displays the longitude of the selected city"
 msgstr ""
 
-#. i18n: file kswizardui.ui line 399
-#: rc.cpp:803
+#: kswizardui.ui:399
 #, no-c-format
 msgid "The list of cities which match the present search filters."
 msgstr ""
 
-#. i18n: file kswizardui.ui line 413
-#: rc.cpp:806
+#: kswizardui.ui:413
 #, no-c-format
 msgid "Setup Telescopes"
 msgstr ""
 
-#. i18n: file kswizardui.ui line 454
-#: rc.cpp:809
+#: kswizardui.ui:454
 #, no-c-format
 msgid "<h3>Setup Telescopes and Devices</h3>"
 msgstr ""
 
-#. i18n: file kswizardui.ui line 497
-#: rc.cpp:812
+#: kswizardui.ui:495
 #, no-c-format
 msgid ""
 "KStars can control most popular computerized telescope\n"
@@ -25111,8 +30132,7 @@ msgid ""
 "can also control telescopes remotely over the Internet."
 msgstr ""
 
-#. i18n: file kswizardui.ui line 525
-#: rc.cpp:817
+#: kswizardui.ui:522
 #, no-c-format
 msgid ""
 "To set up your devices, press the <b>Telescope Setup\n"
@@ -25121,40 +30141,34 @@ msgid ""
 "You can always set up devices later using the <b>Devices</b> menu."
 msgstr ""
 
-#. i18n: file kswizardui.ui line 575
-#: rc.cpp:823
+#: kswizardui.ui:575
 #, no-c-format
 msgid "Telescope Setup Wizard..."
 msgstr ""
 
-#. i18n: file kswizardui.ui line 578
-#: rc.cpp:826
+#: kswizardui.ui:578
 #, no-c-format
 msgid "Launch the Telescope Setup Wizard"
 msgstr ""
 
-#. i18n: file kswizardui.ui line 582
-#: rc.cpp:829
+#: kswizardui.ui:581
 #, no-c-format
 msgid ""
 "The Telescope Setup Wizard will help you configure telescopes\n"
 "and other astronomical devices such as CCD cameras and focusers."
 msgstr ""
 
-#. i18n: file kswizardui.ui line 634
-#: rc.cpp:833
+#: kswizardui.ui:634
 #, no-c-format
 msgid "Download Extras"
 msgstr ""
 
-#. i18n: file kswizardui.ui line 675
-#: rc.cpp:836
+#: kswizardui.ui:675
 #, no-c-format
 msgid "<h3>Download Extra Data Files</h3>"
 msgstr ""
 
-#. i18n: file kswizardui.ui line 722
-#: rc.cpp:839
+#: kswizardui.ui:716
 #, no-c-format
 msgid ""
 "<p>You may now download optional data files to enhance\n"
@@ -25166,64 +30180,54 @@ msgid ""
 "<b>Download data</b> from the <b>File</b> menu.</p>"
 msgstr ""
 
-#. i18n: file kswizardui.ui line 775
-#: rc.cpp:848
+#: kswizardui.ui:775
 #, no-c-format
 msgid "Download Extra Data"
 msgstr ""
 
-#. i18n: file newfovui.ui line 41
-#: rc.cpp:854
+#: newfovui.ui:41
 #, no-c-format
 msgid "<b>Name:</b>"
 msgstr "<b>Enw:</b>"
 
-#. i18n: file newfovui.ui line 49
-#: rc.cpp:857
+#: newfovui.ui:49
 #, no-c-format
 msgid "Name for FOV symbol"
 msgstr ""
 
-#. i18n: file newfovui.ui line 52
-#: rc.cpp:860
+#: newfovui.ui:52
 #, no-c-format
 msgid ""
-"The name of the field-of-view (FOV) symbol.  This name appears in the FOV menu "
-"and in the \"Edit FOV Symbols\" tool."
+"The name of the field-of-view (FOV) symbol.  This name appears in the FOV "
+"menu and in the \"Edit FOV Symbols\" tool."
 msgstr ""
 
-#. i18n: file newfovui.ui line 69
-#: rc.cpp:863
+#: newfovui.ui:69
 #, no-c-format
 msgid "Eyepiece"
 msgstr ""
 
-#. i18n: file newfovui.ui line 96
-#: rc.cpp:866 rc.cpp:933
+#: newfovui.ui:96 newfovui.ui:398
 #, no-c-format
 msgid "Telescope focal length:"
 msgstr ""
 
-#. i18n: file newfovui.ui line 104
-#: rc.cpp:869
+#: newfovui.ui:104
 #, no-c-format
 msgid "Eyepiece focal length:"
 msgstr ""
 
-#. i18n: file newfovui.ui line 112
-#: rc.cpp:872
+#: newfovui.ui:112
 #, no-c-format
 msgid "Eyepiece FOV:"
 msgstr ""
 
-#. i18n: file newfovui.ui line 138
-#: rc.cpp:875 rc.cpp:939 rc.cpp:970
+#: newfovui.ui:138 newfovui.ui:432 newfovui.ui:569
 #, no-c-format
 msgid "Telescope focal length, in millimeters"
 msgstr ""
 
-#. i18n: file newfovui.ui line 143
-#: rc.cpp:878
+#: newfovui.ui:141
 #, no-c-format
 msgid ""
 "Enter the telescope focal length, in millimeters.\n"
@@ -25232,14 +30236,12 @@ msgid ""
 "symbol which matches the field-of-view of a telescope eyepiece."
 msgstr ""
 
-#. i18n: file newfovui.ui line 174
-#: rc.cpp:886
+#: newfovui.ui:174
 #, no-c-format
 msgid "Eyepiece focal length, in millimeters"
 msgstr ""
 
-#. i18n: file newfovui.ui line 179
-#: rc.cpp:889
+#: newfovui.ui:177
 #, no-c-format
 msgid ""
 "Enter the eyepiece focal length, in millimeters.\n"
@@ -25248,14 +30250,12 @@ msgid ""
 "symbol which matches the field-of-view of a telescope eyepiece."
 msgstr ""
 
-#. i18n: file newfovui.ui line 210
-#: rc.cpp:897
+#: newfovui.ui:210
 #, no-c-format
 msgid "field-of-view of the eyepiece, in arcminutes"
 msgstr ""
 
-#. i18n: file newfovui.ui line 215
-#: rc.cpp:900
+#: newfovui.ui:213
 #, no-c-format
 msgid ""
 "Enter the eyepiece field-of-view angle, in arcminutes.\n"
@@ -25264,26 +30264,22 @@ msgid ""
 "symbol which matches the field-of-view of a telescope eyepiece."
 msgstr ""
 
-#. i18n: file newfovui.ui line 228
-#: rc.cpp:905
+#: newfovui.ui:228
 #, no-c-format
 msgid "arcmin"
 msgstr ""
 
-#. i18n: file newfovui.ui line 284
-#: rc.cpp:908 rc.cpp:922
+#: newfovui.ui:284 newfovui.ui:315
 #, no-c-format
 msgid "Compute FOV"
 msgstr ""
 
-#. i18n: file newfovui.ui line 287
-#: rc.cpp:911 rc.cpp:925
+#: newfovui.ui:287 newfovui.ui:318
 #, no-c-format
 msgid "Compute field-of-view from above data fields"
 msgstr ""
 
-#. i18n: file newfovui.ui line 292
-#: rc.cpp:914
+#: newfovui.ui:290
 #, no-c-format
 msgid ""
 "This button will compute the field-of-view (FOV) angle for a specific "
@@ -25295,32 +30291,28 @@ msgid ""
 "view\" edit box."
 msgstr ""
 
-#. i18n: file newfovui.ui line 304
-#: rc.cpp:919
+#: newfovui.ui:304
 #, no-c-format
 msgid "Camera"
 msgstr ""
 
-#. i18n: file newfovui.ui line 323
-#: rc.cpp:928
+#: 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 "
+"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."
 msgstr ""
 
-#. i18n: file newfovui.ui line 406
-#: rc.cpp:936
+#: newfovui.ui:406
 #, no-c-format
 msgid "Chip/Film size:"
 msgstr ""
 
-#. i18n: file newfovui.ui line 437
-#: rc.cpp:942 rc.cpp:973
+#: newfovui.ui:435 newfovui.ui:572
 #, no-c-format
 msgid ""
 "Enter the telescope focal length, in millimeters.\n"
@@ -25329,14 +30321,12 @@ msgid ""
 "symbol which matches the field-of-view of a camera mounted on a telescope."
 msgstr ""
 
-#. i18n: file newfovui.ui line 474
-#: rc.cpp:950 rc.cpp:981
+#: newfovui.ui:474 newfovui.ui:611
 #, no-c-format
 msgid "Size of chip or film, in millimeters"
 msgstr ""
 
-#. i18n: file newfovui.ui line 479
-#: rc.cpp:953 rc.cpp:984
+#: newfovui.ui:477 newfovui.ui:614
 #, no-c-format
 msgid ""
 "Enter the physical size of the CCD chip or film negative.\n"
@@ -25345,75 +30335,64 @@ msgid ""
 "symbol which matches the field-of-view of a camera mounted on a telescope."
 msgstr ""
 
-#. i18n: file newfovui.ui line 508
-#: rc.cpp:961
+#: newfovui.ui:508
 #, no-c-format
 msgid "Radiotelescope"
 msgstr ""
 
-#. i18n: file newfovui.ui line 535
-#: rc.cpp:964
+#: newfovui.ui:535
 #, no-c-format
 msgid "Radiotelescope diameter:"
 msgstr ""
 
-#. i18n: file newfovui.ui line 543
-#: rc.cpp:967
+#: newfovui.ui:543
 #, no-c-format
 msgid "Wavelength:"
 msgstr ""
 
-#. i18n: file newfovui.ui line 593
-#: rc.cpp:978
+#: newfovui.ui:593
 #, no-c-format
 msgid "m"
 msgstr "m"
 
-#. i18n: file newfovui.ui line 629
-#: rc.cpp:989
+#: newfovui.ui:629
 #, no-c-format
 msgid "cm"
 msgstr "cm"
 
-#. i18n: file newfovui.ui line 685
-#: rc.cpp:992
+#: newfovui.ui:685
 #, no-c-format
 msgid "Compute HPBW"
 msgstr ""
 
-#. i18n: file newfovui.ui line 691
-#: rc.cpp:995
+#: newfovui.ui:691
 #, no-c-format
 msgid "Compute radiotelescope HPBW from above data fields"
 msgstr ""
 
-#. i18n: file newfovui.ui line 696
-#: rc.cpp:998
+#: newfovui.ui:694
 #, no-c-format
 msgid ""
-"This button will compute the Half Power Beam Width (HPBW) angle for a specific "
-"radiotelescope and observing wavelength combination, assuming no multibeam "
-"receiver is available at the telescope.  You must first specify the diameter of "
-"the radiotelescope and the observing wavelength.\n"
+"This button will compute the Half Power Beam Width (HPBW) angle for a "
+"specific radiotelescope and observing wavelength combination, assuming no "
+"multibeam receiver is available at the telescope.  You must first specify "
+"the diameter of the radiotelescope and the observing wavelength.\n"
 "\n"
 "The computed HPBW angle (in arcminutes) will be displayed in the \"Field of "
 "view\" edit box."
 msgstr ""
 
-#. i18n: file newfovui.ui line 717
-#: rc.cpp:1003
+#: newfovui.ui:717
 #, no-c-format
 msgid "Field of view (arcmin):"
 msgstr ""
 
-#. i18n: file newfovui.ui line 725
-#: rc.cpp:1006
+#: newfovui.ui:725
 #, no-c-format
 msgid "Desired field-of-view size, in arcminutes"
 msgstr ""
 
-#. i18n: file newfovui.ui line 730
-#: rc.cpp:1009
+#: newfovui.ui:728
 #, no-c-format
 msgid ""
 "Enter the desired angular size for the field-of-view (FOV) symbol.\n"
@@ -25422,95 +30401,81 @@ msgid ""
 "Tabs to compute an angular size for specific eyepieces or cameras."
 msgstr ""
 
-#. i18n: file newfovui.ui line 791
-#: rc.cpp:1014
+#: newfovui.ui:791
 #, no-c-format
 msgid "Select color for the field-of-view symbol"
 msgstr ""
 
-#. i18n: file newfovui.ui line 794
-#: rc.cpp:1017
+#: newfovui.ui:794
 #, no-c-format
 msgid "Select a color for the field-of-view (FOV) symbol."
 msgstr ""
 
-#. i18n: file newfovui.ui line 802
-#: rc.cpp:1020
+#: newfovui.ui:802
 #, no-c-format
 msgid "Color:"
 msgstr "Lliw:"
 
-#. i18n: file newfovui.ui line 808
-#: rc.cpp:1023
+#: newfovui.ui:808
 #, no-c-format
 msgid "Square"
 msgstr "Sgwâr"
 
-#. i18n: file newfovui.ui line 813
-#: rc.cpp:1026
+#: newfovui.ui:813
 #, no-c-format
 msgid "Circle"
 msgstr "Cylch"
 
-#. i18n: file newfovui.ui line 818
-#: rc.cpp:1029
+#: newfovui.ui:818
 #, no-c-format
 msgid "Crosshairs"
 msgstr ""
 
-#. i18n: file newfovui.ui line 823
-#: rc.cpp:1032
+#: newfovui.ui:823
 #, no-c-format
 msgid "Bullseye"
 msgstr ""
 
-#. i18n: file newfovui.ui line 828
-#: rc.cpp:1035
+#: newfovui.ui:828
 #, fuzzy, no-c-format
 msgid "Semitransparent circle"
 msgstr "Tryloyw"
 
-#. i18n: file newfovui.ui line 835
-#: rc.cpp:1038
+#: newfovui.ui:835
 #, no-c-format
 msgid "Select a shape for the field-of-view symbol"
 msgstr ""
 
-#. i18n: file newfovui.ui line 840
-#: rc.cpp:1041
+#: newfovui.ui:838
 #, no-c-format
 msgid ""
-"Select a shape for the field-of-view (FOV) symbol.  The possible shapes are:\n"
+"Select a shape for the field-of-view (FOV) symbol.  The possible shapes "
+"are:\n"
 "\n"
 "Circle, Square, Crosshairs, Bullseye."
 msgstr ""
 
-#. i18n: file newfovui.ui line 848
-#: rc.cpp:1046
+#: newfovui.ui:848
 #, no-c-format
 msgid "Shape:"
 msgstr "Siâp :"
 
-#. i18n: file opsadvancedui.ui line 16
-#: rc.cpp:1049
+#: opsadvancedui.ui:16
 #, no-c-format
 msgid "OpsAdvanced"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 27
-#: rc.cpp:1052
+#: opsadvancedui.ui:27
 #, no-c-format
 msgid "Correct for atmospheric refraction"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 30
-#: rc.cpp:1055
+#: opsadvancedui.ui:30
 #, no-c-format
 msgid "Correct coordinates of objects for the effects of the atmosphere"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 33
-#: rc.cpp:1058
+#: opsadvancedui.ui:33
 #, no-c-format
 msgid ""
 "The atmosphere bends light passing through it, like a lens.  If this item is "
@@ -25519,20 +30484,17 @@ msgid ""
 "coordinate system."
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 41
-#: rc.cpp:1061
+#: opsadvancedui.ui:41
 #, no-c-format
 msgid "Use animated slewing"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 44
-#: rc.cpp:1064
+#: opsadvancedui.ui:44
 #, no-c-format
 msgid "Show slewing motion when focus changes?"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 47
-#: rc.cpp:1067
+#: opsadvancedui.ui:47
 #, no-c-format
 msgid ""
 "If checked, changing the focus position will result in a visible animated "
@@ -25540,499 +30502,398 @@ msgid ""
 "position instantaneously."
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 55
-#: rc.cpp:1070
+#: opsadvancedui.ui:55
 #, no-c-format
 msgid "Attach label to centered object"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 58
-#: rc.cpp:1073 rc.cpp:1082
+#: opsadvancedui.ui:58 opsadvancedui.ui:72
 #, no-c-format
 msgid "Show name label of centered object?"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 61
-#: rc.cpp:1076 rc.cpp:1085
+#: opsadvancedui.ui:61 opsadvancedui.ui:75
 #, no-c-format
 msgid ""
-"If checked, a name label will be temporarily attached to an object while it is "
-"centered in the display.  You can attach a more persistent label to any object "
-"using the right-click popup menu."
+"If checked, a name label will be temporarily attached to an object while it "
+"is centered in the display.  You can attach a more persistent label to any "
+"object using the right-click popup menu."
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 69
-#: rc.cpp:1079
+#: opsadvancedui.ui:69
 #, no-c-format
 msgid "Attach temporary label when hovering mouse"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 83
-#: rc.cpp:1088
+#: opsadvancedui.ui:83
 #, no-c-format
 msgid "Observing List Labels"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 94
-#: rc.cpp:1091
+#: opsadvancedui.ui:94
 #, no-c-format
 msgid "Symbol"
 msgstr "Symbol"
 
-#. i18n: file opsadvancedui.ui line 105
-#: rc.cpp:1094
+#: opsadvancedui.ui:105
 #, no-c-format
 msgid "Text"
 msgstr "Testun"
 
-#. i18n: file opsadvancedui.ui line 132
-#: rc.cpp:1097
+#: opsadvancedui.ui:132
 #, no-c-format
 msgid "Hide objects while moving"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 135
-#: rc.cpp:1100
+#: opsadvancedui.ui:135
 #, no-c-format
 msgid "Do not draw all objects while the map is moving?"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 138
-#: rc.cpp:1103
+#: opsadvancedui.ui:138
 #, no-c-format
 msgid ""
-"When the map is in motion, smooth animation is compromised if the program has "
-"too many objects to draw on the map; check this item to temporarily hide some "
-"of the objects while the display is in motion."
+"When the map is in motion, smooth animation is compromised if the program "
+"has too many objects to draw on the map; check this item to temporarily hide "
+"some of the objects while the display is in motion."
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 154
-#: rc.cpp:1106
+#: opsadvancedui.ui:154
 #, no-c-format
 msgid "Also hide if time step larger than:"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 165
-#: rc.cpp:1109
+#: opsadvancedui.ui:165
 #, no-c-format
 msgid "smallest timestep for which objects are always hidden"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 195
-#: rc.cpp:1112
+#: opsadvancedui.ui:195
 #, no-c-format
 msgid "Configure Hidden Objects"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 214
-#: rc.cpp:1115
+#: opsadvancedui.ui:214
 #, no-c-format
 msgid "Stars fainter than"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 217
-#: rc.cpp:1118
-#, no-c-format
-msgid "Hide faint stars while moving?"
-msgstr ""
-
-#. i18n: file opsadvancedui.ui line 220
-#: rc.cpp:1121
+#: opsadvancedui.ui:220
 #, no-c-format
 msgid ""
 "If checked, then fainter stars will be hidden when the map is in motion."
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 237
-#: rc.cpp:1124 rc.cpp:1127
+#: opsadvancedui.ui:237 opsadvancedui.ui:240
 #, no-c-format
 msgid "Stars fainter than this will not be drawn while the map is moving."
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 248
-#: rc.cpp:1130 rc.cpp:1231 rc.cpp:1237 rc.cpp:1260 rc.cpp:1328 rc.cpp:1334
-#: rc.cpp:1681 rc.cpp:1687 rc.cpp:3885
+#: 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 ""
 
-#. i18n: file opsadvancedui.ui line 283
-#: rc.cpp:1133
+#: opsadvancedui.ui:283
 #, no-c-format
 msgid "IC objects"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 286
-#: rc.cpp:1136
-#, no-c-format
-msgid "Hide IC objects while moving?"
-msgstr ""
-
-#. i18n: file opsadvancedui.ui line 289
-#: rc.cpp:1139
+#: opsadvancedui.ui:289
 #, no-c-format
 msgid ""
 "If checked, then objects in the IC catalog will be hidden when the map is in "
 "motion."
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 297
-#: rc.cpp:1142
+#: opsadvancedui.ui:297
 #, no-c-format
 msgid "Milky Way"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 300
-#: rc.cpp:1145
+#: opsadvancedui.ui:300
 #, no-c-format
 msgid "Hide the Milky Way contour while moving?"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 303
-#: rc.cpp:1148
+#: opsadvancedui.ui:303
 #, no-c-format
 msgid ""
 "If checked, then the Milky Way contour will be hidden when the map is in "
 "motion."
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 311
-#: rc.cpp:1151
+#: opsadvancedui.ui:311
 #, no-c-format
 msgid "Solar system"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 314
-#: rc.cpp:1154
+#: opsadvancedui.ui:314
 #, no-c-format
 msgid "Hide solar system bodies while moving?"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 317
-#: rc.cpp:1157
+#: opsadvancedui.ui:317
 #, no-c-format
 msgid ""
 "If checked, then all solar system bodies will be hidden when the map is in "
 "motion."
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 325
-#: rc.cpp:1160
+#: opsadvancedui.ui:325
 #, fuzzy, no-c-format
 msgid "Constellation boundaries"
 msgstr "Constellation names"
 
-#. i18n: file opsadvancedui.ui line 333
-#: rc.cpp:1163
+#: opsadvancedui.ui:333
 #, no-c-format
 msgid "Messier objects"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 336
-#: rc.cpp:1166
+#: opsadvancedui.ui:336
 #, no-c-format
 msgid "Hide Messier objects when moving?"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 339
-#: rc.cpp:1169
+#: opsadvancedui.ui:339
 #, no-c-format
 msgid ""
-"If checked, then objects in the Messier catalog will be hidden when the map is "
-"in motion."
+"If checked, then objects in the Messier catalog will be hidden when the map "
+"is in motion."
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 347
-#: rc.cpp:1172
+#: opsadvancedui.ui:347
 #, no-c-format
 msgid "Coordinate grid"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 350
-#: rc.cpp:1175
-#, no-c-format
-msgid "Hide coordinate grid while moving?"
-msgstr ""
-
-#. i18n: file opsadvancedui.ui line 353
-#: rc.cpp:1178
+#: opsadvancedui.ui:353
 #, no-c-format
 msgid ""
-"If checked, then the coordinate grid will be hidden when the map is in motion."
+"If checked, then the coordinate grid will be hidden when the map is in "
+"motion."
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 361
-#: rc.cpp:1181
+#: opsadvancedui.ui:361
 #, no-c-format
 msgid "NGC objects"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 364
-#: rc.cpp:1184
-#, no-c-format
-msgid "Hide NGC objects while moving?"
-msgstr ""
-
-#. i18n: file opsadvancedui.ui line 367
-#: rc.cpp:1187
+#: opsadvancedui.ui:367
 #, no-c-format
 msgid ""
-"If checked, then objects in the NGC catalog will be hidden when the map is in "
-"motion."
+"If checked, then objects in the NGC catalog will be hidden when the map is "
+"in motion."
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 375
-#: rc.cpp:1190
+#: opsadvancedui.ui:375
 #, no-c-format
 msgid "Constellation lines"
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 378
-#: rc.cpp:1193
-#, no-c-format
-msgid "Hide constellation lines while moving?"
-msgstr ""
-
-#. i18n: file opsadvancedui.ui line 381
-#: rc.cpp:1196
+#: opsadvancedui.ui:381
 #, no-c-format
 msgid ""
-"If checked, then constellation lines will be hidden when the map is in motion."
+"If checked, then constellation lines will be hidden when the map is in "
+"motion."
 msgstr ""
 
-#. i18n: file opsadvancedui.ui line 389
-#: rc.cpp:1199
+#: opsadvancedui.ui:389
 #, no-c-format
 msgid "Constellation names"
 msgstr "Constellation names"
 
-#. i18n: file opsadvancedui.ui line 392
-#: rc.cpp:1202
-#, no-c-format
-msgid "Hide constellation names while moving?"
-msgstr "Cuddio enwau cyfseriadau wrth symud?"
-
-#. i18n: file opsadvancedui.ui line 395
-#: rc.cpp:1205
+#: opsadvancedui.ui:395
 #, no-c-format
 msgid ""
-"If checked, then constellation names will be hidden when the map is in motion."
+"If checked, then constellation names will be hidden when the map is in "
+"motion."
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 16
-#: rc.cpp:1208
+#: opscatalogui.ui:16
 #, no-c-format
 msgid "OpsCatalog"
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 44
-#: rc.cpp:1214
+#: opscatalogui.ui:44
 #, no-c-format
 msgid "Hipparcos star catalog"
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 47
-#: rc.cpp:1217
+#: opscatalogui.ui:47
 #, no-c-format
 msgid "Draw stars?"
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 50
-#: rc.cpp:1220
+#: opscatalogui.ui:50
 #, no-c-format
 msgid ""
 "When selected, stars are drawn in the skymap.  Use the other options in this "
 "box to control how many stars are drawn."
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 69
-#: rc.cpp:1223 rc.cpp:1320
+#: opscatalogui.ui:69 opscatalogui.ui:456
 #, no-c-format
 msgid "The faint limit when zoomed in"
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 74
-#: rc.cpp:1226 rc.cpp:1323
+#: opscatalogui.ui:72 opscatalogui.ui:459
 #, no-c-format
 msgid ""
-"Set the faintest magnitude that will be drawn at the maximum zoom level.  The "
-"faint limit varies smoothly between these two values, as the zoom level "
+"Set the faintest magnitude that will be drawn at the maximum zoom level.  "
+"The faint limit varies smoothly between these two values, as the zoom level "
 "changes.\n"
 "\n"
 "Magnitude is a measure of brightness; the larger the number, the fainter the "
 "object.  Magnitude 6.0 is about as faint as the unaided human eye can see."
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 90
-#: rc.cpp:1234 rc.cpp:1331
+#: opscatalogui.ui:90 opscatalogui.ui:477
 #, no-c-format
 msgid "Faint limit zoomed out:"
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 109
-#: rc.cpp:1240 rc.cpp:1337
+#: opscatalogui.ui:109 opscatalogui.ui:499
 #, no-c-format
 msgid "The faint limit when zoomed out"
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 114
-#: rc.cpp:1243 rc.cpp:1340
+#: opscatalogui.ui:112 opscatalogui.ui:502
 #, no-c-format
 msgid ""
-"Set the faintest magnitude that will be drawn at the minimum zoom level.  The "
-"faint limit varies smoothly between these two values, as the zoom level "
+"Set the faintest magnitude that will be drawn at the minimum zoom level.  "
+"The faint limit varies smoothly between these two values, as the zoom level "
 "changes.\n"
 "\n"
 "Magnitude is a measure of brightness; the larger the number, the fainter the "
 "object.  Magnitude 6.0 is about as faint as the unaided human eye can see."
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 122
-#: rc.cpp:1248 rc.cpp:1345
+#: opscatalogui.ui:122 opscatalogui.ui:512
 #, no-c-format
 msgid "Faint limit zoomed in:"
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 191
-#: rc.cpp:1251
+#: opscatalogui.ui:191
 #, no-c-format
 msgid "For stars brighter than:"
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 202
-#: rc.cpp:1254
+#: opscatalogui.ui:202
 #, no-c-format
 msgid "Faint limit for name labels"
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 205
-#: rc.cpp:1257
+#: opscatalogui.ui:205
 #, no-c-format
 msgid ""
-"Sets the faintest <b>magnitude</b> for which name and magnitude labels may be "
-"attached to stars.  Magnitude is a measure of brightness; the larger the "
-"number, the fainter the object.  Magnitude 6.0 is about as faint as the unaided "
-"human eye can see."
+"Sets the faintest <b>magnitude</b> for which name and magnitude labels may "
+"be attached to stars.  Magnitude is a measure of brightness; the larger the "
+"number, the fainter the object.  Magnitude 6.0 is about as faint as the "
+"unaided human eye can see."
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 265
-#: rc.cpp:1263
+#: opscatalogui.ui:265
 #, no-c-format
 msgid "Show &name"
 msgstr "Dango&s enw"
 
-#. i18n: file opscatalogui.ui line 268
-#: rc.cpp:1266
+#: opscatalogui.ui:268
 #, no-c-format
 msgid "Attach name labels to bright stars?"
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 271
-#: rc.cpp:1269
+#: opscatalogui.ui:271
 #, no-c-format
 msgid "When checked, name labels are attached to the brighter stars."
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 306
-#: rc.cpp:1272
+#: opscatalogui.ui:306
 #, no-c-format
 msgid "Show ma&gnitude"
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 309
-#: rc.cpp:1275
+#: opscatalogui.ui:309
 #, no-c-format
 msgid "Attach magnitude labels to bright stars?"
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 312
-#: rc.cpp:1278
+#: opscatalogui.ui:312
 #, no-c-format
 msgid "When checked, magnitude labels are attached to the brighter stars."
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 324
-#: rc.cpp:1281
+#: opscatalogui.ui:324
 #, no-c-format
 msgid "Deep-Sky Objects"
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 341
-#: rc.cpp:1284
+#: opscatalogui.ui:341
 #, no-c-format
 msgid "Show Catalog"
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 357
-#: rc.cpp:1287
+#: opscatalogui.ui:357
 #, no-c-format
 msgid "List of other catalogs"
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 360
-#: rc.cpp:1290
+#: opscatalogui.ui:360
 #, no-c-format
 msgid ""
-"The list of catalogs available, other than the star catalog.  By default, the "
-"list includes the Messier, NGC and IC catalogs.  You can add your own object "
-"catalogs as well."
+"The list of catalogs available, other than the star catalog.  By default, "
+"the list includes the Messier, NGC and IC catalogs.  You can add your own "
+"object catalogs as well."
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 376
-#: rc.cpp:1293
+#: opscatalogui.ui:376
 #, fuzzy, no-c-format
 msgid "Import Catalog..."
 msgstr "Ychwanegu Catalog ..."
 
-#. i18n: file opscatalogui.ui line 379
-#: rc.cpp:1296
+#: opscatalogui.ui:379
 #, no-c-format
 msgid "Create a custom object catalog"
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 382
-#: rc.cpp:1299
+#: opscatalogui.ui:382
 #, no-c-format
 msgid ""
-"Press this button to create a custom object catalog.  Use this button instead "
-"of \"Load Catalog\", even if you already have a data file.  We will add a "
-"header to your data file to create the catalog."
+"Press this button to create a custom object catalog.  Use this button "
+"instead of \"Load Catalog\", even if you already have a data file.  We will "
+"add a header to your data file to create the catalog."
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 390
-#: rc.cpp:1302
+#: opscatalogui.ui:390
 #, fuzzy, no-c-format
 msgid "Load Catalog..."
 msgstr "Ychwanegu Catalog ..."
 
-#. i18n: file opscatalogui.ui line 393
-#: rc.cpp:1305
+#: opscatalogui.ui:393
 #, no-c-format
 msgid "Load an existing user catalog"
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 396
-#: rc.cpp:1308
+#: opscatalogui.ui:396
 #, no-c-format
 msgid ""
 "Load an existing custom catalog.  Only use this button if you have a catalog "
 "file that was created by KStars (or one that has the proper header)."
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 407
-#: rc.cpp:1311
+#: opscatalogui.ui:407
 #, no-c-format
 msgid "Remove Catalog"
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 410
-#: rc.cpp:1314
+#: opscatalogui.ui:410
 #, no-c-format
 msgid "Remove a custom catalog"
 msgstr ""
 
-#. i18n: file opscatalogui.ui line 413
-#: rc.cpp:1317
+#: opscatalogui.ui:413
 #, no-c-format
 msgid ""
 "Press this button to remove a custom object catalog that you had added "
@@ -26040,153 +30901,131 @@ msgid ""
 "button."
 msgstr ""
 
-#. i18n: file opscolorsui.ui line 16
-#: rc.cpp:1348
+#: opscolorsui.ui:16
 #, no-c-format
 msgid "OpsColors"
 msgstr ""
 
-#. i18n: file opscolorsui.ui line 27
-#: rc.cpp:1351
+#: opscolorsui.ui:27
 #, no-c-format
 msgid "Current Colors"
 msgstr ""
 
-#. i18n: file opscolorsui.ui line 38
-#: rc.cpp:1354
+#: opscolorsui.ui:38
 #, no-c-format
 msgid "Current color settings"
 msgstr ""
 
-#. i18n: file opscolorsui.ui line 41
-#: rc.cpp:1357
+#: opscolorsui.ui:41
 #, no-c-format
 msgid ""
 "The list of all customizable colors in the program.  Next to each item is a "
-"square showing the color it is currently set to.  Click on any item to change "
-"its color."
+"square showing the color it is currently set to.  Click on any item to "
+"change its color."
 msgstr ""
 
-#. i18n: file opscolorsui.ui line 57
-#: rc.cpp:1360
+#: opscolorsui.ui:57
 #, no-c-format
 msgid "InfoBox BG mode:"
 msgstr ""
 
-#. i18n: file opscolorsui.ui line 63
-#: rc.cpp:1363
+#: opscolorsui.ui:63
 #, no-c-format
 msgid "No Fill"
 msgstr ""
 
-#. i18n: file opscolorsui.ui line 68
-#: rc.cpp:1366
+#: opscolorsui.ui:68
 #, no-c-format
 msgid "Transparent"
 msgstr "Tryloyw"
 
-#. i18n: file opscolorsui.ui line 73
-#: rc.cpp:1369
+#: opscolorsui.ui:73
 #, no-c-format
 msgid "Opaque"
 msgstr "Afloyw"
 
-#. i18n: file opscolorsui.ui line 95
-#: rc.cpp:1372
+#: opscolorsui.ui:95
 #, no-c-format
 msgid "Star color mode:"
 msgstr ""
 
-#. i18n: file opscolorsui.ui line 106
-#: rc.cpp:1375
+#: opscolorsui.ui:106
 #, no-c-format
 msgid "Set the star color mode"
 msgstr ""
 
-#. i18n: file opscolorsui.ui line 109
-#: rc.cpp:1378
+#: opscolorsui.ui:109
 #, no-c-format
 msgid ""
 "There are four ways to draw stars on the map.  By default, stars are circles "
-"with a white core and a rim which is tinted to reflect the star's actual color. "
-" You may also choose to draw the stars as solid white, red, or black circles, "
-"to match the needs of your overall color scheme."
+"with a white core and a rim which is tinted to reflect the star's actual "
+"color.  You may also choose to draw the stars as solid white, red, or black "
+"circles, to match the needs of your overall color scheme."
 msgstr ""
 
-#. i18n: file opscolorsui.ui line 127
-#: rc.cpp:1381
+#: opscolorsui.ui:127
 #, no-c-format
 msgid "Star color intensity:"
 msgstr ""
 
-#. i18n: file opscolorsui.ui line 138
-#: rc.cpp:1384
+#: opscolorsui.ui:138
 #, no-c-format
 msgid "Set the intensity of star colors"
 msgstr ""
 
-#. i18n: file opscolorsui.ui line 141
-#: rc.cpp:1387
+#: opscolorsui.ui:141
 #, no-c-format
 msgid ""
-"When using the realistic-color star mode, this option will set the saturation "
-"level of the star's colors.  A higher value means more intense colors."
+"When using the realistic-color star mode, this option will set the "
+"saturation level of the star's colors.  A higher value means more intense "
+"colors."
 msgstr ""
 
-#. i18n: file opscolorsui.ui line 153
-#: rc.cpp:1390
+#: opscolorsui.ui:153
 #, no-c-format
 msgid "Preset Color Schemes"
 msgstr ""
 
-#. i18n: file opscolorsui.ui line 164
-#: rc.cpp:1393
+#: opscolorsui.ui:164
 #, no-c-format
 msgid "List of preset color schemes"
 msgstr ""
 
-#. i18n: file opscolorsui.ui line 167
-#: rc.cpp:1396
+#: opscolorsui.ui:167
 #, no-c-format
 msgid ""
-"List of all known color schemes.  Several are provided by default, and you may "
-"also define your own."
+"List of all known color schemes.  Several are provided by default, and you "
+"may also define your own."
 msgstr ""
 
-#. i18n: file opscolorsui.ui line 200
-#: rc.cpp:1399
+#: opscolorsui.ui:200
 #, no-c-format
 msgid "Remove Color Scheme"
 msgstr "Gwaredu Cynllun Lliw"
 
-#. i18n: file opscolorsui.ui line 203
-#: rc.cpp:1402
+#: opscolorsui.ui:203
 #, no-c-format
 msgid "Remove a preset color scheme"
 msgstr ""
 
-#. i18n: file opscolorsui.ui line 206
-#: rc.cpp:1405
+#: opscolorsui.ui:206
 #, no-c-format
 msgid ""
-"Press this button to remove the highlighted color scheme.  This will only work "
-"on your custom color schemes."
+"Press this button to remove the highlighted color scheme.  This will only "
+"work on your custom color schemes."
 msgstr ""
 
-#. i18n: file opscolorsui.ui line 265
-#: rc.cpp:1408
+#: opscolorsui.ui:265
 #, no-c-format
 msgid "Save Current Colors..."
 msgstr "Cadw Lliwiau Cyfredol..."
 
-#. i18n: file opscolorsui.ui line 268
-#: rc.cpp:1411
+#: opscolorsui.ui:268
 #, no-c-format
 msgid "Create a new preset color scheme using current settings"
 msgstr ""
 
-#. i18n: file opscolorsui.ui line 271
-#: rc.cpp:1414
+#: opscolorsui.ui:271
 #, no-c-format
 msgid ""
 "After changing the colors to a scheme that you like, press this button to "
@@ -26195,242 +31034,204 @@ msgid ""
 "main window."
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 16
-#: rc.cpp:1417
+#: opsguidesui.ui:16
 #, no-c-format
 msgid "OpsGuides"
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 27
-#: rc.cpp:1420
+#: opsguidesui.ui:27
 #, fuzzy, no-c-format
 msgid "&Constellation lines"
 msgstr "Constellation names"
 
-#. i18n: file opsguidesui.ui line 30
-#: rc.cpp:1423
+#: opsguidesui.ui:30
 #, no-c-format
 msgid "Show constellation lines?"
 msgstr "Dangos llinellau cyfseriadau?"
 
-#. i18n: file opsguidesui.ui line 33
-#: rc.cpp:1426
+#: opsguidesui.ui:33
 #, no-c-format
 msgid "If checked, constellation lines will be drawn on the sky map."
 msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
 
-#. i18n: file opsguidesui.ui line 41
-#: rc.cpp:1429
+#: opsguidesui.ui:41
 #, fuzzy, no-c-format
 msgid "Constellation &boundaries"
 msgstr "Constellation names"
 
-#. i18n: file opsguidesui.ui line 49
-#: rc.cpp:1432
+#: opsguidesui.ui:49
 #, no-c-format
 msgid "Constellation &names"
 msgstr "Constellation &names"
 
-#. i18n: file opsguidesui.ui line 52
-#: rc.cpp:1435
+#: opsguidesui.ui:52
 #, no-c-format
 msgid "Draw constellation names?"
 msgstr "Llunio enwau'r cyfseriadau?"
 
-#. i18n: file opsguidesui.ui line 55
-#: rc.cpp:1438
+#: opsguidesui.ui:55
 #, no-c-format
 msgid "If checked, constellation names will be drawn on the sky map."
 msgstr "Os brithir, llunir enwau cyfseriadau ar fap yr awyr."
 
-#. i18n: file opsguidesui.ui line 63
-#: rc.cpp:1441
+#: opsguidesui.ui:63
 #, no-c-format
 msgid "Constellation Name Options"
 msgstr "Dewisiadau Enw Cyfseriad"
 
-#. i18n: file opsguidesui.ui line 74
-#: rc.cpp:1444
+#: opsguidesui.ui:74
 #, no-c-format
 msgid "L&atin"
 msgstr "L&ladin"
 
-#. i18n: file opsguidesui.ui line 77
-#: rc.cpp:1447
+#: opsguidesui.ui:77
 #, no-c-format
 msgid "Use Latin constellation names"
 msgstr "Defnyddio enwau cyfseriadau Lladin"
 
-#. i18n: file opsguidesui.ui line 80
-#: rc.cpp:1450
+#: opsguidesui.ui:80
 #, no-c-format
 msgid "Select this to use Latin constellation names on the sky map"
 msgstr "Dewiswch hyn i ddefnyddio enwau cyfseriadau Lladin ar y map awyr"
 
-#. i18n: file opsguidesui.ui line 88
-#: rc.cpp:1453
+#: opsguidesui.ui:88
 #, no-c-format
 msgid "Localized"
 msgstr "Wedi'u Lleoleiddio"
 
-#. i18n: file opsguidesui.ui line 91
-#: rc.cpp:1456
+#: opsguidesui.ui:91
 #, no-c-format
 msgid "Use Localized constellation names"
 msgstr "Defnyddio enwau cyfseriadau wedi'u lleoleiddio"
 
-#. i18n: file opsguidesui.ui line 94
-#: rc.cpp:1459
+#: opsguidesui.ui:94
 #, no-c-format
 msgid ""
 "Select this to use constellation names from your locality (if available)"
 msgstr "Dewiswch hyn i ddefnyddio enwau cyfseriadau o'ch lleoliad (os ar gael)"
 
-#. i18n: file opsguidesui.ui line 102
-#: rc.cpp:1462
+#: opsguidesui.ui:102
 #, no-c-format
 msgid "Abbre&viated"
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 105
-#: rc.cpp:1465
+#: opsguidesui.ui:105
 #, no-c-format
 msgid "Use IAU abbreviations"
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 108
-#: rc.cpp:1468
+#: opsguidesui.ui:108
 #, no-c-format
 msgid ""
-"Select this to use abbreviations from the International Astronomical Union as "
-"constellation labels"
+"Select this to use abbreviations from the International Astronomical Union "
+"as constellation labels"
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 135
-#: rc.cpp:1471
+#: opsguidesui.ui:135
 #, no-c-format
 msgid "Mil&ky Way"
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 138
-#: rc.cpp:1474
+#: opsguidesui.ui:138
 #, no-c-format
 msgid "Draw the Milky Way contour?"
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 141
-#: rc.cpp:1477
+#: opsguidesui.ui:141
 #, no-c-format
 msgid ""
 "If checked, a contour representing the Milky Way will be drawn on the sky map"
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 149
-#: rc.cpp:1480
+#: opsguidesui.ui:149
 #, no-c-format
 msgid "Fill Milk&y Way"
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 152
-#: rc.cpp:1483
+#: opsguidesui.ui:152
 #, no-c-format
 msgid "Use filled Milky Way contour?"
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 155
-#: rc.cpp:1486
+#: opsguidesui.ui:155
 #, no-c-format
 msgid ""
 "If checked, the Milky Way contour will be shown filled.  Otherwise, only the "
 "outline will be drawn."
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 180
-#: rc.cpp:1489
+#: opsguidesui.ui:180
 #, no-c-format
 msgid "Coor&dinate grid"
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 183
-#: rc.cpp:1492
+#: opsguidesui.ui:183
 #, no-c-format
 msgid "Draw coordinate grid?"
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 186
-#: rc.cpp:1495
+#: opsguidesui.ui:186
 #, no-c-format
 msgid ""
-"If checked, a grid of lines will be drawn every 2 hours in Right Ascension and "
-"every 20 degrees in Declination."
+"If checked, a grid of lines will be drawn every 2 hours in Right Ascension "
+"and every 20 degrees in Declination."
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 194
-#: rc.cpp:1498
+#: opsguidesui.ui:194
 #, no-c-format
 msgid "Celestial e&quator"
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 197
-#: rc.cpp:1501
+#: opsguidesui.ui:197
 #, no-c-format
 msgid "Draw Celestial equator?"
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 200
-#: rc.cpp:1504
+#: opsguidesui.ui:200
 #, no-c-format
 msgid "If checked, the celestial equator will be drawn in the sky map."
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 211
-#: rc.cpp:1510
+#: opsguidesui.ui:211
 #, no-c-format
 msgid "Draw Ecliptic?"
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 214
-#: rc.cpp:1513
+#: opsguidesui.ui:214
 #, no-c-format
 msgid ""
-"If checked, the ecliptic will be drawn on the sky map.  The ecliptic is a great "
-"circle on the sky that the Sun appears to follow over the course of one year.  "
-"All other solar system bodies roughly follow the ecliptic as well."
+"If checked, the ecliptic will be drawn on the sky map.  The ecliptic is a "
+"great circle on the sky that the Sun appears to follow over the course of "
+"one year.  All other solar system bodies roughly follow the ecliptic as well."
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 222
-#: rc.cpp:1516
+#: opsguidesui.ui:222
 #, no-c-format
 msgid "Hori&zon (line)"
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 225
-#: rc.cpp:1519
+#: opsguidesui.ui:225
 #, no-c-format
 msgid "Draw horizon?"
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 228
-#: rc.cpp:1522
+#: opsguidesui.ui:228
 #, no-c-format
 msgid ""
 "If checked, a line representing the local horizon will be drawn on the map."
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 236
-#: rc.cpp:1525
+#: opsguidesui.ui:236
 #, fuzzy, no-c-format
 msgid "Opaque &ground"
 msgstr "Afloyw"
 
-#. i18n: file opsguidesui.ui line 239
-#: rc.cpp:1528
+#: opsguidesui.ui:239
 #, no-c-format
 msgid "Draw opaque ground?"
 msgstr ""
 
-#. i18n: file opsguidesui.ui line 242
-#: rc.cpp:1531
+#: opsguidesui.ui:242
 #, no-c-format
 msgid ""
 "If checked, the area below the horizon will be filled in, to simulate the "
@@ -26438,311 +31239,266 @@ msgid ""
 "Equatorial coordinate system."
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 16
-#: rc.cpp:1534
+#: opssolarsystemui.ui:16
 #, no-c-format
 msgid "OpsSolarSystem"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 27
-#: rc.cpp:1537
+#: opssolarsystemui.ui:27
 #, no-c-format
 msgid "Sun, Moon && Planets"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 49
-#: rc.cpp:1543
+#: opssolarsystemui.ui:49
 #, no-c-format
 msgid "Draw Saturn?"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 52
-#: rc.cpp:1546
+#: opssolarsystemui.ui:52
 #, no-c-format
 msgid "If checked, Saturn will be drawn on the map."
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 60
-#: rc.cpp:1549
+#: opssolarsystemui.ui:60
 #, no-c-format
 msgid "Use images"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 63
-#: rc.cpp:1552
+#: opssolarsystemui.ui:63
 #, no-c-format
 msgid "Draw major bodies as images?"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 66
-#: rc.cpp:1555
+#: opssolarsystemui.ui:66
 #, no-c-format
 msgid ""
 "If checked, then the planets, the Sun and the Moon will be shown as bitmap "
 "images on the map"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 77
-#: rc.cpp:1561
+#: opssolarsystemui.ui:77
 #, no-c-format
 msgid "Draw Mars?"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 80
-#: rc.cpp:1564
+#: opssolarsystemui.ui:80
 #, no-c-format
 msgid "If checked, Mars will be drawn on the map."
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 88
-#: rc.cpp:1567
+#: opssolarsystemui.ui:88
 #, no-c-format
 msgid "Use name labels"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 91
-#: rc.cpp:1570
+#: opssolarsystemui.ui:91
 #, no-c-format
 msgid "Attach Name labels to the major solar system bodies?"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 94
-#: rc.cpp:1573
+#: opssolarsystemui.ui:94
 #, no-c-format
 msgid ""
 "If checked, name labels will be attached to the planets, the Sun and the Moon"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 105
-#: rc.cpp:1579
+#: opssolarsystemui.ui:105
 #, no-c-format
 msgid "Draw Pluto?"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 108
-#: rc.cpp:1582
+#: opssolarsystemui.ui:108
 #, no-c-format
 msgid "If checked, Pluto will be drawn on the map."
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 119
-#: rc.cpp:1588
+#: opssolarsystemui.ui:116
+#, fuzzy, no-c-format
+msgid "Select All"
+msgstr "Dewis Dim"
+
+#: opssolarsystemui.ui:119
 #, no-c-format
 msgid "Select all major bodies"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 122
-#: rc.cpp:1591
+#: opssolarsystemui.ui:122
 #, no-c-format
 msgid ""
 "Press this to select all planets, the Sun and the Moon to be drawn in the map"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 130
-#: rc.cpp:1594
+#: opssolarsystemui.ui:130
 #, no-c-format
 msgid "Select None"
 msgstr "Dewis Dim"
 
-#. i18n: file opssolarsystemui.ui line 133
-#: rc.cpp:1597
+#: opssolarsystemui.ui:133
 #, no-c-format
 msgid "Unselect all major bodies"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 136
-#: rc.cpp:1600
+#: opssolarsystemui.ui:136
 #, no-c-format
 msgid ""
 "Press this button to unselect all planets, the Sun and the Moon so that they "
 "will not be drawn on the map"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 147
-#: rc.cpp:1606
+#: opssolarsystemui.ui:147
 #, no-c-format
 msgid "Draw Venus?"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 150
-#: rc.cpp:1609
+#: opssolarsystemui.ui:150
 #, no-c-format
 msgid "If checked, Venus will be drawn on the map."
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 158
-#: rc.cpp:1612
+#: opssolarsystemui.ui:158
 #, no-c-format
 msgid "The sun"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 161
-#: rc.cpp:1615
+#: opssolarsystemui.ui:161
 #, no-c-format
 msgid "Draw the Sun?"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 164
-#: rc.cpp:1618
+#: opssolarsystemui.ui:164
 #, no-c-format
 msgid "If checked, the Sun will be drawn on the map."
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 175
-#: rc.cpp:1624
+#: opssolarsystemui.ui:175
 #, no-c-format
 msgid "Draw Jupiter?"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 178
-#: rc.cpp:1627
+#: opssolarsystemui.ui:178
 #, no-c-format
 msgid "If checked, Jupiter will be drawn on the map."
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 186
-#: rc.cpp:1630
+#: opssolarsystemui.ui:186
 #, no-c-format
 msgid "The moon"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 189
-#: rc.cpp:1633
+#: opssolarsystemui.ui:189
 #, no-c-format
 msgid "Draw the Moon?"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 192
-#: rc.cpp:1636
+#: opssolarsystemui.ui:192
 #, no-c-format
 msgid "If checked, the Moon will be drawn on the map."
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 203
-#: rc.cpp:1642
+#: opssolarsystemui.ui:203
 #, no-c-format
 msgid "Draw Mercury?"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 206
-#: rc.cpp:1645
+#: opssolarsystemui.ui:206
 #, no-c-format
 msgid "If checked, Mercury will be drawn on the map."
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 217
-#: rc.cpp:1651
+#: opssolarsystemui.ui:217
 #, no-c-format
 msgid "Draw Neptune?"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 220
-#: rc.cpp:1654
+#: opssolarsystemui.ui:220
 #, no-c-format
 msgid "If checked, Neptune will be drawn on the map."
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 248
-#: rc.cpp:1660
+#: opssolarsystemui.ui:248
 #, no-c-format
 msgid "Draw Uranus?"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 251
-#: rc.cpp:1663
+#: opssolarsystemui.ui:251
 #, no-c-format
 msgid "If checked, Uranus will be drawn on the map."
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 280
-#: rc.cpp:1666
+#: opssolarsystemui.ui:280
 #, no-c-format
 msgid "Minor Planets"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 294
-#: rc.cpp:1672
+#: opssolarsystemui.ui:294
 #, no-c-format
 msgid "Draw comets?"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 297
-#: rc.cpp:1675
+#: opssolarsystemui.ui:297
 #, no-c-format
 msgid "If checked, comets will be drawn on the map"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 322
-#: rc.cpp:1678
+#: opssolarsystemui.ui:322
 #, no-c-format
 msgid "Show asteroids brighter than"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 338
-#: rc.cpp:1684
+#: opssolarsystemui.ui:338
 #, no-c-format
 msgid "AU"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 357
-#: rc.cpp:1693
+#: opssolarsystemui.ui:357
 #, no-c-format
 msgid "Draw asteroids?"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 360
-#: rc.cpp:1696
+#: opssolarsystemui.ui:360
 #, no-c-format
 msgid "If checked, asteroids will be drawn on the map"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 368
-#: rc.cpp:1699
+#: opssolarsystemui.ui:368
 #, no-c-format
 msgid "Show names of asteroids brighter than"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 371
-#: rc.cpp:1702
+#: opssolarsystemui.ui:371
 #, no-c-format
 msgid "Attach names to bright asteroids?"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 374
-#: rc.cpp:1705
+#: opssolarsystemui.ui:374
 #, no-c-format
 msgid "If checked, then name labels will be attached to bright asteroids"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 388
-#: rc.cpp:1708
+#: opssolarsystemui.ui:388
 #, no-c-format
 msgid "Maximum distance for comet names"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 391
-#: rc.cpp:1711
+#: opssolarsystemui.ui:391
 #, no-c-format
 msgid ""
 "Set the maximum distance from the Sun for a comet to have a name label, in "
-"Astronomical Units (AU).  1 AU is the distance between the Earth and the Sun, "
-"approximately 150 million km"
+"Astronomical Units (AU).  1 AU is the distance between the Earth and the "
+"Sun, approximately 150 million km"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 399
-#: rc.cpp:1714
+#: opssolarsystemui.ui:399
 #, no-c-format
 msgid "Show names of comets within"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 402
-#: rc.cpp:1717
+#: opssolarsystemui.ui:402
 #, no-c-format
 msgid "Show names of comets near the Sun"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 405
-#: rc.cpp:1720
+#: opssolarsystemui.ui:405
 #, no-c-format
 msgid ""
 "If checked, the comets near the Sun will have name labels attached.  Comets "
@@ -26750,241 +31506,202 @@ msgid ""
 "this case."
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 416
-#: rc.cpp:1723
+#: opssolarsystemui.ui:416
 #, no-c-format
 msgid "faint limit for asteroids"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 419
-#: rc.cpp:1726
+#: opssolarsystemui.ui:419
 #, no-c-format
 msgid "Set the faintest magnitude for drawing asteroids"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 430
-#: rc.cpp:1729
+#: opssolarsystemui.ui:430
 #, no-c-format
 msgid "Faint limit for asteroid name labels"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 433
-#: rc.cpp:1732
+#: opssolarsystemui.ui:433
 #, no-c-format
 msgid "Set the faint limit for drawing asteroid name labels"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 443
-#: rc.cpp:1735
+#: opssolarsystemui.ui:443
 #, no-c-format
 msgid "Orbital Trails"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 454
-#: rc.cpp:1738
+#: opssolarsystemui.ui:454
 #, no-c-format
 msgid "Always show trail when tracking a solar system body"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 457
-#: rc.cpp:1741
+#: opssolarsystemui.ui:457
 #, no-c-format
 msgid "Auto-trail tracked bodies"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 460
-#: rc.cpp:1744
+#: opssolarsystemui.ui:460
 #, no-c-format
 msgid ""
 "If checked then any solar system body will have a temporary trail attached "
 "while it is centered in the display."
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 476
-#: rc.cpp:1747
+#: opssolarsystemui.ui:476
 #, no-c-format
 msgid "Fade trails to background color"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 479
-#: rc.cpp:1750
+#: opssolarsystemui.ui:479
 #, no-c-format
 msgid "Fade trail color into the background?"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 482
-#: rc.cpp:1753
+#: opssolarsystemui.ui:482
 #, no-c-format
 msgid ""
-"If checked, the color of the planet trail will be blended into the background "
-"sky color."
+"If checked, the color of the planet trail will be blended into the "
+"background sky color."
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 507
-#: rc.cpp:1756
+#: opssolarsystemui.ui:507
 #, no-c-format
 msgid "Remove All Trails"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 510
-#: rc.cpp:1759
+#: opssolarsystemui.ui:510
 #, no-c-format
 msgid "Clear all orbit trails"
 msgstr ""
 
-#. i18n: file opssolarsystemui.ui line 513
-#: rc.cpp:1762
+#: opssolarsystemui.ui:513
 #, no-c-format
 msgid ""
-"Press this to clear all orbit trails that you may have attached to solar system "
-"bodies using the right-click popup menu."
+"Press this to clear all orbit trails that you may have attached to solar "
+"system bodies using the right-click popup menu."
 msgstr ""
 
-#. i18n: file statform.ui line 27
-#: rc.cpp:1768
+#: statform.ui:27
 #, no-c-format
 msgid "Std. dev:"
 msgstr ""
 
-#. i18n: file statform.ui line 43
-#: rc.cpp:1771
+#: statform.ui:43
 #, no-c-format
 msgid "Max:"
 msgstr "Uchaf :"
 
-#. i18n: file statform.ui line 59
-#: rc.cpp:1774 rc.cpp:1786
+#: statform.ui:59 statform.ui:115
 #, no-c-format
 msgid "@"
 msgstr "[1]"
 
-#. i18n: file statform.ui line 67
-#: rc.cpp:1777
+#: statform.ui:67
 #, no-c-format
 msgid "Bitpix:"
 msgstr ""
 
-#. i18n: file statform.ui line 83
-#: rc.cpp:1780 rc.cpp:3529 rc.cpp:3607
+#: statform.ui:83 tools/modcalcvlsrdlg.ui:203 tools/modcalcvlsrdlg.ui:793
 #, no-c-format
 msgid "Height:"
 msgstr "Taldra:"
 
-#. i18n: file statform.ui line 99
-#: rc.cpp:1783
+#: statform.ui:99
 #, no-c-format
 msgid "Mean:"
 msgstr ""
 
-#. i18n: file statform.ui line 123
-#: rc.cpp:1789
+#: statform.ui:123
 #, no-c-format
 msgid "Width:"
 msgstr "Lled:"
 
-#. i18n: file statform.ui line 155
-#: rc.cpp:1792
+#: statform.ui:155
 #, no-c-format
 msgid "Min:"
 msgstr "Isaf :"
 
-#. i18n: file streamformui.ui line 16
-#: rc.cpp:1795
+#: streamformui.ui:16
 #, no-c-format
 msgid "Video Stream"
 msgstr ""
 
-#. i18n: file telescopepropui.ui line 16
-#: rc.cpp:1807
+#: telescopepropui.ui:16
 #, no-c-format
 msgid "Telescope Properties"
 msgstr ""
 
-#. i18n: file telescopepropui.ui line 30
-#: rc.cpp:1810
+#: telescopepropui.ui:30
 #, no-c-format
 msgid "Telescopes:"
 msgstr ""
 
-#. i18n: file telescopepropui.ui line 46
-#: rc.cpp:1813
+#: telescopepropui.ui:46
 #, no-c-format
 msgid "&New"
 msgstr "&Newydd"
 
-#. i18n: file telescopepropui.ui line 54
-#: rc.cpp:1816
+#: telescopepropui.ui:54
 #, no-c-format
 msgid "S&ave"
 msgstr "C&adw"
 
-#. i18n: file telescopepropui.ui line 62
-#: rc.cpp:1819
+#: telescopepropui.ui:62
 #, no-c-format
 msgid "Remo&ve"
 msgstr "&Gwaredu"
 
-#. i18n: file telescopepropui.ui line 124
-#: rc.cpp:1825
+#: telescopepropui.ui:124
 #, no-c-format
 msgid "Driver:"
 msgstr "Gyrrydd:"
 
-#. i18n: file telescopepropui.ui line 132
-#: rc.cpp:1828
+#: telescopepropui.ui:132
 #, no-c-format
 msgid "Version:"
 msgstr "Fersiwn :"
 
-#. i18n: file telescopepropui.ui line 140
-#: rc.cpp:1831
+#: telescopepropui.ui:140
 #, no-c-format
 msgid "Label:"
 msgstr "Label:"
 
-#. i18n: file telescopepropui.ui line 156
-#: rc.cpp:1837
+#: telescopepropui.ui:156
 #, no-c-format
 msgid "Aperture:"
 msgstr ""
 
-#. i18n: file telescopewizard.ui line 36
-#: rc.cpp:1846
+#: telescopewizard.ui:36
 #, no-c-format
 msgid "Telescope Wizard"
 msgstr ""
 
-#. i18n: file telescopewizard.ui line 89
-#: rc.cpp:1852
+#: telescopewizard.ui:89
 #, no-c-format
 msgid "&Back"
 msgstr "&Yn ôl"
 
-#. i18n: file telescopewizard.ui line 97
-#: rc.cpp:1855
+#: telescopewizard.ui:97
 #, no-c-format
 msgid "&Next"
 msgstr "&Nesaf"
 
-#. i18n: file telescopewizard.ui line 142
-#: rc.cpp:1858
+#: telescopewizard.ui:136
 #, no-c-format
 msgid ""
 "Welcome to the <b>KStars Telescope Setup Wizard!</b>\n"
-"<br>"
-"<br>\n"
+"<br><br>\n"
 "This Wizard will help you to connect to your telescope and control it from "
 "KStars. You will be asked to verify some basic information.\n"
 "<br>\n"
-"<br>You can get extended information on telescope support in KStars by pressing "
-"the <tt>help</tt> button at any point during the Wizard.\n"
-"<br>"
-"<br>\n"
+"<br>You can get extended information on telescope support in KStars by "
+"pressing the <tt>help</tt> button at any point during the Wizard.\n"
+"<br><br>\n"
 "Please click next to continue."
 msgstr ""
 
-#. i18n: file telescopewizard.ui line 168
-#: rc.cpp:1867
+#: telescopewizard.ui:166
 #, no-c-format
 msgid ""
 "<h3>1. Telescope Model</h3>\n"
@@ -26993,577 +31710,488 @@ msgid ""
 "selecting a model."
 msgstr ""
 
-#. i18n: file telescopewizard.ui line 246
-#: rc.cpp:1872
+#: telescopewizard.ui:245
 #, no-c-format
 msgid ""
 "<b>Tip</b>\n"
-"<br>Some non-Meade telescopes support a subset of the LX200 command set. Select "
-"<tt>LX200 Generic</tt> to control such devices."
+"<br>Some non-Meade telescopes support a subset of the LX200 command set. "
+"Select <tt>LX200 Generic</tt> to control such devices."
 msgstr ""
 
-#. i18n: file telescopewizard.ui line 280
-#: rc.cpp:1876
+#: telescopewizard.ui:275
 #, no-c-format
 msgid ""
 "<h3>2. Align Your Telescope</h3>\n"
 "\n"
 "You need to align your telescope before you can control it properly from "
 "KStars. Please refer to your telescope manual for alignment instructions.\n"
-"<br>"
-"<br>\n"
-"After a successful alignment, connect your telescope's RS232 interface to your "
-"computer's serial or USB port.\n"
-"<br>"
-"<br>"
-"<br>Click next to continue."
+"<br><br>\n"
+"After a successful alignment, connect your telescope's RS232 interface to "
+"your computer's serial or USB port.\n"
+"<br><br><br>Click next to continue."
 msgstr ""
 
-#. i18n: file telescopewizard.ui line 307
-#: rc.cpp:1884
+#: telescopewizard.ui:304
 #, no-c-format
 msgid ""
 "<h3>3. Verify Local Settings</h3>\n"
 "\n"
-"Verify if the following time, date, and location settings are correct. If any "
-"of the settings are incorrect, you can correct them via the <tt>Set time</tt> "
-"and <tt>Set Location</tt> buttons.\n"
+"Verify if the following time, date, and location settings are correct. If "
+"any of the settings are incorrect, you can correct them via the <tt>Set "
+"time</tt> and <tt>Set Location</tt> buttons.\n"
 msgstr ""
 
-#. i18n: file telescopewizard.ui line 367
-#: rc.cpp:1890
+#: telescopewizard.ui:367
 #, no-c-format
 msgid "<b>Time</b>"
 msgstr "<b>Amser</b>"
 
-#. i18n: file telescopewizard.ui line 398
-#: rc.cpp:1893
+#: telescopewizard.ui:398
 #, no-c-format
 msgid "<b>Date</b>"
 msgstr "<b>Dyddiad</b>"
 
-#. i18n: file telescopewizard.ui line 431
-#: rc.cpp:1896
+#: telescopewizard.ui:431
 #, no-c-format
 msgid "<b>Location</b>"
 msgstr "<b>Lleoliad</b>"
 
-#. i18n: file telescopewizard.ui line 464
-#: rc.cpp:1899
+#: telescopewizard.ui:464
 #, no-c-format
 msgid "Set Time..."
 msgstr ""
 
-#. i18n: file telescopewizard.ui line 472
-#: rc.cpp:1902
+#: telescopewizard.ui:472
 #, no-c-format
 msgid "Set Location..."
 msgstr ""
 
-#. i18n: file telescopewizard.ui line 525
-#: rc.cpp:1905
+#: telescopewizard.ui:522
 #, no-c-format
 msgid ""
 "<h3>4. Determine Connection Port</h3>\n"
 "\n"
 "Enter the port number your telescope is connected to. If you only have one "
 "serial port in your computer, the port is usually <tt>/dev/ttyS0</tt>\n"
-"<br>"
-"<br>If you are unsure about the port number, you can leave the field empty and "
-"KStars will try to scan the ports for attached telescopes. Beware that the "
-"autoscan process might take a few minutes to complete. "
+"<br><br>If you are unsure about the port number, you can leave the field "
+"empty and KStars will try to scan the ports for attached telescopes. Beware "
+"that the autoscan process might take a few minutes to complete. "
 msgstr ""
 
-#. i18n: file telescopewizard.ui line 561
-#: rc.cpp:1911
+#: telescopewizard.ui:561
 #, no-c-format
 msgid "<b>Port:</b>"
 msgstr "<b>Porth:</b>"
 
-#. i18n: file thumbnaileditorui.ui line 16
-#: rc.cpp:1914
+#: thumbnaileditorui.ui:16
 #, no-c-format
 msgid "Thumbnail Editor"
 msgstr ""
 
-#. i18n: file thumbnaileditorui.ui line 49
-#: rc.cpp:1917
+#: thumbnaileditorui.ui:49
 #, no-c-format
 msgid "Crop region: [0,0  200 x 200]"
 msgstr ""
 
-#. i18n: file thumbnaileditorui.ui line 66
-#: rc.cpp:1920
+#: thumbnaileditorui.ui:66
 #, no-c-format
 msgid "(crop region will be scaled to 200x200)"
 msgstr ""
 
-#. i18n: file thumbnailpickerui.ui line 16
-#: rc.cpp:1923
+#: thumbnailpickerui.ui:16
 #, no-c-format
 msgid "Thumbnail Picker"
 msgstr ""
 
-#. i18n: file thumbnailpickerui.ui line 46
-#: rc.cpp:1926 thumbnailpicker.cpp:163
-#, no-c-format
-msgid "Search results:"
-msgstr ""
-
-#. i18n: file thumbnailpickerui.ui line 95
-#: rc.cpp:1929
+#: thumbnailpickerui.ui:95
 #, no-c-format
 msgid "Specify image location:"
 msgstr ""
 
-#. i18n: file thumbnailpickerui.ui line 103
-#: rc.cpp:1932
+#: thumbnailpickerui.ui:103
 #, no-c-format
 msgid "image/png image/jpeg image/gif image/tiff"
 msgstr ""
 
-#. i18n: file thumbnailpickerui.ui line 157
-#: rc.cpp:1935
+#: thumbnailpickerui.ui:157
 #, no-c-format
 msgid "Current thumbnail:"
 msgstr ""
 
-#. i18n: file thumbnailpickerui.ui line 250
-#: rc.cpp:1938
+#: thumbnailpickerui.ui:250
 #, fuzzy, no-c-format
 msgid "Edit Ima&ge..."
 msgstr "delwedd"
 
-#. i18n: file thumbnailpickerui.ui line 258
-#: rc.cpp:1941
+#: thumbnailpickerui.ui:258
 #, fuzzy, no-c-format
 msgid "Unset Image"
 msgstr "Delwedd"
 
-#. i18n: file tools/altvstimeui.ui line 16
-#: rc.cpp:1944 tools/altvstime.cpp:45
-#, no-c-format
-msgid "Altitude vs. Time"
-msgstr ""
-
-#. i18n: file tools/altvstimeui.ui line 39
-#: rc.cpp:1947
+#: tools/altvstimeui.ui:39
 #, no-c-format
 msgid "Sources"
 msgstr ""
 
-#. i18n: file tools/altvstimeui.ui line 93
-#: rc.cpp:1953 rc.cpp:2235 rc.cpp:2250 rc.cpp:3852
+#: tools/altvstimeui.ui:93 tools/argsetradec.ui:88
+#: tools/argsettargetcoordindi.ui:56 tools/obslistwizardui.ui:432
 #, no-c-format
 msgid "Dec:"
 msgstr "Rhag :"
 
-#. i18n: file tools/altvstimeui.ui line 109
-#: rc.cpp:1956 rc.cpp:2224 rc.cpp:2247 rc.cpp:3849
+#: tools/altvstimeui.ui:109 tools/argsetradec.ui:56
+#: tools/argsettargetcoordindi.ui:48 tools/obslistwizardui.ui:416
 #, no-c-format
 msgid "RA:"
 msgstr ""
 
-#. i18n: file tools/altvstimeui.ui line 123
-#: rc.cpp:1959
+#: tools/altvstimeui.ui:123
 #, no-c-format
 msgid "Name of plotted object"
 msgstr ""
 
-#. i18n: file tools/altvstimeui.ui line 130
-#: rc.cpp:1962
+#: tools/altvstimeui.ui:126
 #, no-c-format
 msgid ""
 "There are two ways to use this field:  \n"
 "\n"
 "1. Simply type the name of a known object and press the \"Plot\" button (or "
-"press Enter).  The object's Altitude vs. Time curve will be added to the plot, "
-"and its coordinates will be displayed below.\n"
+"press Enter).  The object's Altitude vs. Time curve will be added to the "
+"plot, and its coordinates will be displayed below.\n"
 "\n"
-"2. Type a name label for a custom object.  You will also need to specify the RA "
-"and Dec coordinates of the object, and then press the \"Plot\" button to add "
-"its curve to the plot."
+"2. Type a name label for a custom object.  You will also need to specify the "
+"RA and Dec coordinates of the object, and then press the \"Plot\" button to "
+"add its curve to the plot."
 msgstr ""
 
-#. i18n: file tools/altvstimeui.ui line 200
-#: rc.cpp:1972
+#: tools/altvstimeui.ui:200
 #, no-c-format
 msgid "Find Object..."
 msgstr ""
 
-#. i18n: file tools/altvstimeui.ui line 216
-#: rc.cpp:1975
+#: tools/altvstimeui.ui:216
 #, no-c-format
 msgid "Plot"
 msgstr ""
 
-#. i18n: file tools/altvstimeui.ui line 254
-#: rc.cpp:1981
+#: tools/altvstimeui.ui:254
 #, no-c-format
 msgid "Clear List"
 msgstr "Gwagu'r Rhestr"
 
-#. i18n: file tools/altvstimeui.ui line 280
-#: rc.cpp:1984 rc.cpp:3421
+#: tools/altvstimeui.ui:280 tools/modcalcsidtimedlg.ui:88
 #, no-c-format
 msgid "Date && Location"
 msgstr ""
 
-#. i18n: file tools/altvstimeui.ui line 299
-#: rc.cpp:1987 rc.cpp:2446 rc.cpp:2488 rc.cpp:2539 rc.cpp:2593 rc.cpp:2656
-#: rc.cpp:3115 rc.cpp:3175 rc.cpp:3235 rc.cpp:3424 rc.cpp:3472 rc.cpp:3514
-#: rc.cpp:3592
+#: 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/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
 #, no-c-format
 msgid "Date:"
 msgstr "Dyddiad:"
 
-#. i18n: file tools/altvstimeui.ui line 345
-#: rc.cpp:1990
+#: tools/altvstimeui.ui:345
 #, no-c-format
 msgid "Choose City..."
 msgstr ""
 
-#. i18n: file tools/altvstimeui.ui line 361
-#: rc.cpp:1993 rc.cpp:2758
+#: tools/altvstimeui.ui:361 tools/modcalceclipticcoordsdlg.ui:622
 #, no-c-format
 msgid "Long.:"
 msgstr ""
 
-#. i18n: file tools/altvstimeui.ui line 393
-#: rc.cpp:1996 rc.cpp:2764
+#: tools/altvstimeui.ui:393 tools/modcalceclipticcoordsdlg.ui:639
 #, fuzzy, no-c-format
 msgid "Lat.:"
 msgstr "Lladin"
 
-#. i18n: file tools/altvstimeui.ui line 461
-#: rc.cpp:1999
+#: tools/altvstimeui.ui:461
 #, no-c-format
 msgid "Update"
 msgstr "Diweddaru"
 
-#. i18n: file tools/argchangeviewoption.ui line 32
-#: rc.cpp:2002
+#: tools/argchangeviewoption.ui:32
 #, no-c-format
 msgid "List of adjustable options"
 msgstr ""
 
-#. i18n: file tools/argchangeviewoption.ui line 35
-#: rc.cpp:2005
+#: tools/argchangeviewoption.ui:35
 #, no-c-format
 msgid ""
 "Select an option from this list to set its value.  You may also select the "
 "option using an organized Tree List using the \"Browse Tree\" button."
 msgstr ""
 
-#. i18n: file tools/argchangeviewoption.ui line 60
-#: rc.cpp:2008
+#: tools/argchangeviewoption.ui:60
 #, no-c-format
 msgid "Value:"
 msgstr "Gwerth:"
 
-#. i18n: file tools/argchangeviewoption.ui line 68
-#: rc.cpp:2011
+#: tools/argchangeviewoption.ui:68
 #, no-c-format
 msgid "Browse Tree"
 msgstr ""
 
-#. i18n: file tools/argchangeviewoption.ui line 71
-#: rc.cpp:2014
+#: tools/argchangeviewoption.ui:71
 #, no-c-format
 msgid "Show Tree View of options"
 msgstr ""
 
-#. i18n: file tools/argchangeviewoption.ui line 74
-#: rc.cpp:2017
+#: tools/argchangeviewoption.ui:74
 #, no-c-format
 msgid ""
-"Press this button to select a View Option from a Tree list, in which they are "
-"grouped by subject.  Also shown are a short description of each option, and the "
-"data type of the option's value (string, integer, float or boolean)."
+"Press this button to select a View Option from a Tree list, in which they "
+"are grouped by subject.  Also shown are a short description of each option, "
+"and the data type of the option's value (string, integer, float or boolean)."
 msgstr ""
 
-#. i18n: file tools/argchangeviewoption.ui line 82
-#: rc.cpp:2020
+#: tools/argchangeviewoption.ui:82
 #, no-c-format
 msgid "value for selected option"
 msgstr ""
 
-#. i18n: file tools/argchangeviewoption.ui line 85
-#: rc.cpp:2023
+#: tools/argchangeviewoption.ui:85
 #, no-c-format
 msgid ""
-"Set the value for the selected view option here.  Make sure the value you enter "
-"matches the data type expected by the option.  For example, the \"UseAltAz\" "
-"option expects a boolean value, so you should enter \"true\", \"false\", \"1\", "
-"or \"0\".  If you are unsure what data type is expected, examine the Tree View "
-"of options using the \"Browse Tree\" button."
+"Set the value for the selected view option here.  Make sure the value you "
+"enter matches the data type expected by the option.  For example, the "
+"\"UseAltAz\" option expects a boolean value, so you should enter \"true\", "
+"\"false\", \"1\", or \"0\".  If you are unsure what data type is expected, "
+"examine the Tree View of options using the \"Browse Tree\" button."
 msgstr ""
 
-#. i18n: file tools/argchangeviewoption.ui line 110
-#: rc.cpp:2026
+#: tools/argchangeviewoption.ui:110
 #, no-c-format
 msgid "Option:"
 msgstr "Dewisiad :"
 
-#. i18n: file tools/argexportimage.ui line 32
-#: rc.cpp:2029
+#: tools/argexportimage.ui:32
 #, no-c-format
 msgid "File name:"
 msgstr "Enw'r ffeil:"
 
-#. i18n: file tools/argexportimage.ui line 114
-#: rc.cpp:2032
+#: tools/argexportimage.ui:114
 #, no-c-format
 msgid "Image width:"
 msgstr ""
 
-#. i18n: file tools/argexportimage.ui line 122
-#: rc.cpp:2035
+#: tools/argexportimage.ui:122
 #, no-c-format
 msgid "Image height:"
 msgstr ""
 
-#. i18n: file tools/arglooktoward.ui line 32
-#: rc.cpp:2038 rc.cpp:2297
+#: tools/arglooktoward.ui:32 tools/argstartfocusindi.ui:48
 #, no-c-format
 msgid "Dir:"
 msgstr ""
 
-#. i18n: file tools/arglooktoward.ui line 43
-#: rc.cpp:2041
+#: tools/arglooktoward.ui:43
 #, no-c-format
 msgid "north"
 msgstr "gogledd"
 
-#. i18n: file tools/arglooktoward.ui line 48
-#: rc.cpp:2044
+#: tools/arglooktoward.ui:48
 #, no-c-format
 msgid "northeast"
 msgstr ""
 
-#. i18n: file tools/arglooktoward.ui line 53
-#: rc.cpp:2047
+#: tools/arglooktoward.ui:53
 #, no-c-format
 msgid "east"
 msgstr "dwyrain"
 
-#. i18n: file tools/arglooktoward.ui line 58
-#: rc.cpp:2050
+#: tools/arglooktoward.ui:58
 #, no-c-format
 msgid "southeast"
 msgstr ""
 
-#. i18n: file tools/arglooktoward.ui line 63
-#: rc.cpp:2053
+#: tools/arglooktoward.ui:63
 #, no-c-format
 msgid "south"
 msgstr "de"
 
-#. i18n: file tools/arglooktoward.ui line 68
-#: rc.cpp:2056
+#: tools/arglooktoward.ui:68
 #, no-c-format
 msgid "southwest"
 msgstr ""
 
-#. i18n: file tools/arglooktoward.ui line 73
-#: rc.cpp:2059
+#: tools/arglooktoward.ui:73
 #, no-c-format
 msgid "west"
 msgstr "gorllewin"
 
-#. i18n: file tools/arglooktoward.ui line 78
-#: rc.cpp:2062
+#: tools/arglooktoward.ui:78
 #, no-c-format
 msgid "northwest"
 msgstr ""
 
-#. i18n: file tools/arglooktoward.ui line 83
-#: rc.cpp:2065
+#: tools/arglooktoward.ui:83
 #, no-c-format
 msgid "zenith"
 msgstr ""
 
-#. i18n: file tools/arglooktoward.ui line 93
-#: rc.cpp:2068
+#: tools/arglooktoward.ui:93
 #, no-c-format
 msgid "Target object or direction"
 msgstr ""
 
-#. i18n: file tools/arglooktoward.ui line 96
-#: rc.cpp:2071
+#: tools/arglooktoward.ui:96
 #, no-c-format
 msgid ""
 "Select a direction or object to center on.  The combo box provides a list of "
-"known directions including cardinal compass points on the horizon, as well as "
-"the Zenith.  You may also enter the name of a known object here, or select an "
-"object from the list of known objects by pressing the \"Object\" button."
+"known directions including cardinal compass points on the horizon, as well "
+"as the Zenith.  You may also enter the name of a known object here, or "
+"select an object from the list of known objects by pressing the \"Object\" "
+"button."
 msgstr ""
 
-#. i18n: file tools/arglooktoward.ui line 109
-#: rc.cpp:2074 rc.cpp:2259
+#: tools/arglooktoward.ui:109 tools/argsettargetnameindi.ui:108
 #, no-c-format
 msgid "Object"
 msgstr "Gwrthrych"
 
-#. i18n: file tools/arglooktoward.ui line 112
-#: rc.cpp:2077 rc.cpp:2262
+#: tools/arglooktoward.ui:112 tools/argsettargetnameindi.ui:111
 #, no-c-format
 msgid "Select object from a list"
 msgstr ""
 
-#. i18n: file tools/arglooktoward.ui line 115
-#: rc.cpp:2080 rc.cpp:2265
+#: 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 "
-"list of known objects.  When an object has been selected, its name will appear "
-"in the \"dir\" box at left."
+"list of known objects.  When an object has been selected, its name will "
+"appear in the \"dir\" box at left."
 msgstr ""
 
-#. i18n: file tools/argprintimage.ui line 24
-#: rc.cpp:2083
+#: tools/argprintimage.ui:24
 #, no-c-format
 msgid "Show print dialog"
 msgstr ""
 
-#. i18n: file tools/argprintimage.ui line 32
-#: rc.cpp:2086
+#: tools/argprintimage.ui:32
 #, no-c-format
 msgid "Use star chart colors"
 msgstr ""
 
-#. i18n: file tools/argsetactionindi.ui line 16
-#: rc.cpp:2089
+#: tools/argsetactionindi.ui:16
 #, no-c-format
 msgid "argSetActionINDI"
 msgstr ""
 
-#. i18n: file tools/argsetactionindi.ui line 51
-#: rc.cpp:2095 rc.cpp:2241
+#: tools/argsetactionindi.ui:51 tools/argsetscopeactionindi.ui:48
 #, no-c-format
 msgid "Action:"
 msgstr "Gweithred:"
 
-#. i18n: file tools/argsetaltaz.ui line 43
-#: rc.cpp:2098
+#: tools/argsetaltaz.ui:43
 #, no-c-format
 msgid "Altitude angle"
 msgstr ""
 
-#. i18n: file tools/argsetaltaz.ui line 48
-#: rc.cpp:2101
+#: tools/argsetaltaz.ui:46
 #, no-c-format
 msgid ""
-"Set the Altitude coordinate to be focused on in the sky map, 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"
+"Set the Altitude coordinate to be focused on in the sky map, 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"
 "The Altitude is one of the coordinates in the Horizontal coordinate system.  "
 "It is defined as the angle of an object above or below the horizon.  For "
-"example, the Zenith has an Altitude of 90 degrees.  Altitude is also known as "
-"Elevation."
+"example, the Zenith has an Altitude of 90 degrees.  Altitude is also known "
+"as Elevation."
 msgstr ""
 
-#. i18n: file tools/argsetaltaz.ui line 56
-#: rc.cpp:2106
+#: tools/argsetaltaz.ui:56
 #, no-c-format
 msgid "Az:"
 msgstr ""
 
-#. i18n: file tools/argsetaltaz.ui line 75
-#: rc.cpp:2109
+#: tools/argsetaltaz.ui:75
 #, no-c-format
 msgid "Azimuth angle"
 msgstr ""
 
-#. i18n: file tools/argsetaltaz.ui line 80
-#: rc.cpp:2112
+#: tools/argsetaltaz.ui:78
 #, no-c-format
 msgid ""
-"Set the Azimuth 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"
+"Set the Azimuth 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"
-"The azimuth is one of the coordinates in the horizontal coordinate system.  It "
-"is defined as the angle measured along the horizon, between the North point and "
-"the point on the horizon directly below the object.  Azimuth increases "
-"clockwise around the horizon"
+"The azimuth is one of the coordinates in the horizontal coordinate system.  "
+"It is defined as the angle measured along the horizon, between the North "
+"point and the point on the horizon directly below the object.  Azimuth "
+"increases clockwise around the horizon"
 msgstr ""
 
-#. i18n: file tools/argsetaltaz.ui line 88
-#: rc.cpp:2117
+#: tools/argsetaltaz.ui:88
 #, no-c-format
 msgid "Alt:"
 msgstr "Alt :"
 
-#. i18n: file tools/argsetccdtempindi.ui line 48
-#: rc.cpp:2123
+#: tools/argsetccdtempindi.ui:48
 #, fuzzy, no-c-format
 msgid "Temp:"
 msgstr "Math:"
 
-#. i18n: file tools/argsetcolor.ui line 32
-#: rc.cpp:2126
+#: tools/argsetcolor.ui:32
 #, fuzzy, no-c-format
 msgid "Color name:"
 msgstr "Constellation names:"
 
-#. i18n: file tools/argsetcolor.ui line 40
-#: rc.cpp:2129
+#: tools/argsetcolor.ui:40
 #, no-c-format
 msgid "Color value:"
 msgstr ""
 
-#. i18n: file tools/argsetfilternumindi.ui line 16
-#: rc.cpp:2132
+#: tools/argsetfilternumindi.ui:16
 #, no-c-format
 msgid "ArgSetCCDTempINDI"
 msgstr ""
 
-#. i18n: file tools/argsetfocusspeedindi.ui line 71
-#: rc.cpp:2144
+#: tools/argsetfocusspeedindi.ui:71
 #, no-c-format
 msgid "Speed:"
 msgstr "Cyflymder:"
 
-#. i18n: file tools/argsetfocustimeoutindi.ui line 48
-#: rc.cpp:2150
+#: tools/argsetfocustimeoutindi.ui:48
 #, no-c-format
 msgid "Timeout:"
 msgstr "Goramser:"
 
-#. i18n: file tools/argsetframetypeindi.ui line 48
-#: rc.cpp:2156
+#: tools/argsetframetypeindi.ui:48
 #, no-c-format
 msgid "Type:"
 msgstr "Math:"
 
-#. i18n: file tools/argsetgeolocation.ui line 56
-#: rc.cpp:2162
+#: tools/argsetgeolocation.ui:56
 #, no-c-format
 msgid "Country name"
 msgstr ""
 
-#. i18n: file tools/argsetgeolocation.ui line 59
-#: rc.cpp:2165
+#: tools/argsetgeolocation.ui:59
 #, no-c-format
 msgid ""
-"Enter the Country name for the desired location.  It might be easier to use the "
-"\"Find City\" location to choose your location from the list of predefined "
-"cities."
+"Enter the Country name for the desired location.  It might be easier to use "
+"the \"Find City\" location to choose your location from the list of "
+"predefined cities."
 msgstr ""
 
-#. i18n: file tools/argsetgeolocation.ui line 83
-#: rc.cpp:2174
+#: tools/argsetgeolocation.ui:83
 #, no-c-format
 msgid "City name"
 msgstr ""
 
-#. i18n: file tools/argsetgeolocation.ui line 86
-#: rc.cpp:2177
+#: tools/argsetgeolocation.ui:86
 #, no-c-format
 msgid ""
 "Enter the City name for the desired location.  It might be easier to use the "
@@ -27571,35 +32199,30 @@ msgid ""
 "cities."
 msgstr ""
 
-#. i18n: file tools/argsetgeolocation.ui line 94
-#: rc.cpp:2180
+#: tools/argsetgeolocation.ui:94
 #, no-c-format
 msgid "Province name"
 msgstr ""
 
-#. i18n: file tools/argsetgeolocation.ui line 97
-#: rc.cpp:2183
+#: tools/argsetgeolocation.ui:97
 #, no-c-format
 msgid ""
 "Enter the Province name for the desired location.  It might be easier to use "
-"the \"Find City\" location to choose your location from the list of predefined "
-"cities."
+"the \"Find City\" location to choose your location from the list of "
+"predefined cities."
 msgstr ""
 
-#. i18n: file tools/argsetgeolocation.ui line 132
-#: rc.cpp:2186
+#: tools/argsetgeolocation.ui:132
 #, no-c-format
 msgid "Find City"
 msgstr ""
 
-#. i18n: file tools/argsetgeolocation.ui line 135
-#: rc.cpp:2189
+#: tools/argsetgeolocation.ui:135
 #, no-c-format
 msgid "Open the Set Location tool"
 msgstr ""
 
-#. i18n: file tools/argsetgeolocation.ui line 138
-#: rc.cpp:2192
+#: tools/argsetgeolocation.ui:138
 #, no-c-format
 msgid ""
 "Press this button to open the Set Location dialog, which will allow you to "
@@ -27608,159 +32231,151 @@ msgid ""
 "filled in."
 msgstr ""
 
-#. i18n: file tools/argsetgeolocationindi.ui line 48
-#: rc.cpp:2198
+#: tools/argsetgeolocationindi.ui:48
 #, no-c-format
 msgid "Long:"
 msgstr "Hir :"
 
-#. i18n: file tools/argsetgeolocationindi.ui line 56
-#: rc.cpp:2201
+#: tools/argsetgeolocationindi.ui:56
 #, fuzzy, no-c-format
 msgid "Lat:"
 msgstr "Lladin"
 
-#. i18n: file tools/argsetlocaltime.ui line 57
-#: rc.cpp:2207
+#: tools/argsetlocaltime.ui:57
 #, no-c-format
 msgid "Set the Time"
 msgstr ""
 
-#. i18n: file tools/argsetradec.ui line 48
-#: rc.cpp:2219
+#: 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 degrees, "
-"arcminutes and arcseconds (\"45:20\", \"45:20:00\", \"45:20\", \"45 20.0\", "
-"etc.).\n"
+"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"
-"Declination is one of the coordinates in the Equatorial coordinate system; it "
-"measures the angle of an object North or South of the Celestial Equator.  The "
-"star Polaris, which is near the celestial north pole, has a Declination of "
-"nearly 90 degrees."
+"Declination is one of the coordinates in the Equatorial coordinate system; "
+"it measures the angle of an object North or South of the Celestial Equator.  "
+"The star Polaris, which is near the celestial north pole, has a Declination "
+"of nearly 90 degrees."
 msgstr ""
 
-#. i18n: file tools/argsetradec.ui line 80
-#: rc.cpp:2230
+#: tools/argsetradec.ui:78
 #, 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"
+"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"
 "\n"
-"Right Ascension is one of the coordinates in the Equatorial coordinate system.  "
-"It measures the angle around the celestial equator from the Vernal equinox, "
-"increasing to the East.  Right Ascension (RA) is almost always expressed in "
-"Hours instead of Degrees; the Celestial Equator is divided into 24 Hours, so 1 "
-"Hour of RA is equal to 360/24=15 Degrees.  See the AstroInfo article for more "
-"details,"
+"Right Ascension is one of the coordinates in the Equatorial coordinate "
+"system.  It measures the angle around the celestial equator from the Vernal "
+"equinox, increasing to the East.  Right Ascension (RA) is almost always "
+"expressed in Hours instead of Degrees; the Celestial Equator is divided into "
+"24 Hours, so 1 Hour of RA is equal to 360/24=15 Degrees.  See the AstroInfo "
+"article for more details,"
 msgstr ""
 
-#. i18n: file tools/argsettargetnameindi.ui line 48
-#: rc.cpp:2256
+#: tools/argsettargetnameindi.ui:48
 #, no-c-format
 msgid "Object:"
 msgstr "Gwrthrych :"
 
-#. i18n: file tools/argsettrack.ui line 32
-#: rc.cpp:2268
+#: tools/argsettrack.ui:32
 #, no-c-format
 msgid "Track"
 msgstr ""
 
-#. i18n: file tools/argsettrack.ui line 35
-#: rc.cpp:2271
+#: tools/argsettrack.ui:35
 #, no-c-format
 msgid "Toggle Tracking on/off"
 msgstr ""
 
-#. i18n: file tools/argsettrack.ui line 40
-#: rc.cpp:2274
+#: tools/argsettrack.ui:38
 #, no-c-format
 msgid ""
 "If checked, the sky will remain focused on its current position or object as "
-"time passes.  This is called \"Tracking\".  Note that tracking is automatically "
-"engaged whenever an object is centered at the focus point.  So, if you use "
-"\"lookToward\" with an object name, you do not need to engage tracking.  \n"
+"time passes.  This is called \"Tracking\".  Note that tracking is "
+"automatically engaged whenever an object is centered at the focus point.  "
+"So, if you use \"lookToward\" with an object name, you do not need to engage "
+"tracking.  \n"
 "\n"
 "If unchecked, then Tracking will be forced off, even if an object has been "
 "centered,  As time passes, the sky will then appear to drift by (due to the "
 "rotation of the Earth)."
 msgstr ""
 
-#. i18n: file tools/argsetutcindi.ui line 48
-#: rc.cpp:2282
+#: tools/argsetutcindi.ui:48
 #, no-c-format
 msgid "Date/Time:"
 msgstr "Dyddiad/Amser :"
 
-#. i18n: file tools/argstartexposureindi.ui line 48
-#: rc.cpp:2291
+#: tools/argstartexposureindi.ui:48
 #, no-c-format
 msgid "Duration:"
 msgstr "Hyd:"
 
-#. i18n: file tools/argwaitfor.ui line 32
-#: rc.cpp:2324
+#: tools/argswitchindi.ui:86
+#, no-c-format
+msgid "On"
+msgstr ""
+
+#: tools/argswitchindi.ui:97
+#, no-c-format
+msgid "Off"
+msgstr ""
+
+#: tools/argwaitfor.ui:32
 #, no-c-format
 msgid "<font color=\"#00007f\">Sec:</font>"
 msgstr ""
 
-#. i18n: file tools/argwaitfor.ui line 40
-#: rc.cpp:2327
+#: tools/argwaitfor.ui:40
 #, no-c-format
 msgid "Pause delay in seconds"
 msgstr ""
 
-#. i18n: file tools/argwaitfor.ui line 43
-#: rc.cpp:2330
+#: tools/argwaitfor.ui:43
 #, no-c-format
 msgid ""
-"Enter the number of seconds that the script should pause before executing the "
-"remaining commands."
+"Enter the number of seconds that the script should pause before executing "
+"the remaining commands."
 msgstr ""
 
-#. i18n: file tools/argwaitforkey.ui line 32
-#: rc.cpp:2333
+#: tools/argwaitforkey.ui:32
 #, no-c-format
 msgid "Key:"
 msgstr "Allwedd:"
 
-#. i18n: file tools/argwaitforkey.ui line 40
-#: rc.cpp:2336
+#: tools/argwaitforkey.ui:40
 #, no-c-format
 msgid "Wait for this key to be pressed"
 msgstr ""
 
-#. i18n: file tools/argwaitforkey.ui line 45
-#: rc.cpp:2339
+#: tools/argwaitforkey.ui:43
 #, no-c-format
 msgid ""
-"The script execution will pause until the user presses the key specified here.  "
-"\n"
+"The script execution will pause until the user presses the key specified "
+"here.  \n"
 "\n"
 "Only simple keys can currently be used; you cannot use modifier keys such as "
-"Ctrl or Shift.  Type \"space\" to specify the spacebar, otherwise use the key "
-"itself."
+"Ctrl or Shift.  Type \"space\" to specify the spacebar, otherwise use the "
+"key itself."
 msgstr ""
 
-#. i18n: file tools/argzoom.ui line 32
-#: rc.cpp:2344
+#: tools/argzoom.ui:32
 #, no-c-format
 msgid "Zoom level:"
 msgstr ""
 
-#. i18n: file tools/argzoom.ui line 40
-#: rc.cpp:2347
+#: tools/argzoom.ui:40
 #, no-c-format
 msgid "New Zoom level"
 msgstr ""
 
-#. i18n: file tools/argzoom.ui line 46
-#: rc.cpp:2350
+#: tools/argzoom.ui:43
 #, no-c-format
 msgid ""
 "Set the Zoom level for the display.  You can incrementally change this value "
@@ -27770,830 +32385,737 @@ msgid ""
 "Reasonable values should be between 300 and 10,000,000.\n"
 msgstr ""
 
-#. i18n: file tools/modcalcangdistdlg.ui line 16
-#: rc.cpp:2356 rc.cpp:2386 tools/astrocalc.cpp:84 tools/astrocalc.cpp:140
-#, no-c-format
-msgid "Angular Distance"
-msgstr ""
-
-#. i18n: file tools/modcalcangdistdlg.ui line 31
-#: rc.cpp:2359 rc.cpp:2440 rc.cpp:2530 rc.cpp:2692 rc.cpp:2800 rc.cpp:2875
-#: rc.cpp:2983 rc.cpp:3130 rc.cpp:3328 rc.cpp:3409 rc.cpp:3508
+#: 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 ""
 
-#. i18n: file tools/modcalcangdistdlg.ui line 50
-#: rc.cpp:2362
+#: tools/modcalcangdistdlg.ui:50
 #, no-c-format
 msgid "Initial Coordinates"
 msgstr ""
 
-#. i18n: file tools/modcalcangdistdlg.ui line 89
-#: rc.cpp:2365 rc.cpp:2374 rc.cpp:2455 rc.cpp:2476 rc.cpp:2491 rc.cpp:2569
-#: rc.cpp:2599 rc.cpp:2716 rc.cpp:2743 rc.cpp:2902 rc.cpp:2929 rc.cpp:3190
-#: rc.cpp:3340 rc.cpp:3358 rc.cpp:3367 rc.cpp:3538 rc.cpp:3586
+#: 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
 #, no-c-format
 msgid "Declination:"
 msgstr ""
 
-#. i18n: file tools/modcalcangdistdlg.ui line 97
-#: rc.cpp:2368 rc.cpp:2377 rc.cpp:2458 rc.cpp:2473 rc.cpp:2497 rc.cpp:2566
-#: rc.cpp:2596 rc.cpp:2713 rc.cpp:2737 rc.cpp:2896 rc.cpp:2923 rc.cpp:3187
-#: rc.cpp:3337 rc.cpp:3355 rc.cpp:3376 rc.cpp:3535 rc.cpp:3598
+#: 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
 #, no-c-format
 msgid "Right ascension:"
 msgstr ""
 
-#. i18n: file tools/modcalcangdistdlg.ui line 107
-#: rc.cpp:2371
+#: tools/modcalcangdistdlg.ui:107
 #, no-c-format
 msgid "Final Coordinates"
 msgstr ""
 
-#. i18n: file tools/modcalcangdistdlg.ui line 191
-#: rc.cpp:2380 rc.cpp:2464 rc.cpp:2659 rc.cpp:2821 rc.cpp:3223 rc.cpp:3346
+#: 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 ""
 
-#. i18n: file tools/modcalcangdistdlg.ui line 331
-#: rc.cpp:2392 rc.cpp:2479 rc.cpp:2584 rc.cpp:2731 rc.cpp:2836 rc.cpp:2914
-#: rc.cpp:3031 rc.cpp:3229 rc.cpp:3361 rc.cpp:3448 rc.cpp:3580
+#: tools/modcalcangdistdlg.ui:216 tools/modcalcapcoorddlg.ui:248
+#: tools/modcalcazeldlg.ui:254 tools/modcalcdaylengthdlg.ui:214
+#: tools/modcalceclipticcoordsdlg.ui:181 tools/modcalcequinoxdlg.ui:200
+#: tools/modcalcgalcoorddlg.ui:181 tools/modcalcgeoddlg.ui:168
+#: tools/modcalcjddlg.ui:368 tools/modcalcplanetsdlg.ui:743
+#: tools/modcalcprecdlg.ui:207 tools/modcalcsidtimedlg.ui:197
+#: tools/modcalcvlsrdlg.ui:546
+#, fuzzy, no-c-format
+msgid "Clear"
+msgstr "Gwagu'r Rhestr"
+
+#: 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 ""
 
-#. i18n: file tools/modcalcangdistdlg.ui line 353
-#: rc.cpp:2395 rc.cpp:2482 rc.cpp:2587 rc.cpp:2734 rc.cpp:2839 rc.cpp:2917
-#: rc.cpp:3034 rc.cpp:3232 rc.cpp:3364 rc.cpp:3451 rc.cpp:3583
+#: 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"
 msgstr ""
 
-#. i18n: file tools/modcalcangdistdlg.ui line 408
-#: rc.cpp:2398
+#: tools/modcalcangdistdlg.ui:408
 #, no-c-format
 msgid "Final right ascension:"
 msgstr ""
 
-#. i18n: file tools/modcalcangdistdlg.ui line 419
-#: rc.cpp:2401
+#: tools/modcalcangdistdlg.ui:419
 #, no-c-format
 msgid "Final declination:"
 msgstr ""
 
-#. i18n: file tools/modcalcangdistdlg.ui line 430
-#: rc.cpp:2404
+#: tools/modcalcangdistdlg.ui:430
 #, no-c-format
 msgid "Initial declination:"
 msgstr ""
 
-#. i18n: file tools/modcalcangdistdlg.ui line 441
-#: rc.cpp:2407
+#: tools/modcalcangdistdlg.ui:441
 #, no-c-format
 msgid "Initial right ascension:"
 msgstr ""
 
-#. i18n: file tools/modcalcangdistdlg.ui line 454
-#: rc.cpp:2410 rc.cpp:2500 rc.cpp:2617 rc.cpp:2770 rc.cpp:2845 rc.cpp:2953
-#: rc.cpp:3055 rc.cpp:3298 rc.cpp:3379 rc.cpp:3478 rc.cpp:3622
+#: 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 ""
 
-#. i18n: file tools/modcalcangdistdlg.ui line 465
-#: rc.cpp:2413 rc.cpp:2503 rc.cpp:2620 rc.cpp:2773 rc.cpp:2848 rc.cpp:2956
-#: rc.cpp:3058 rc.cpp:3301 rc.cpp:3382 rc.cpp:3481 rc.cpp:3625
+#: 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 ""
 
-#. i18n: file tools/modcalcangdistdlg.ui line 473
-#: rc.cpp:2416 rc.cpp:2506 rc.cpp:2623 rc.cpp:2776 rc.cpp:2851 rc.cpp:2959
-#: rc.cpp:3061 rc.cpp:3304 rc.cpp:3385 rc.cpp:3484 rc.cpp:3628
+#: 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 ""
 
-#. i18n: file tools/modcalcangdistdlg.ui line 497
-#: rc.cpp:2422 rc.cpp:2512 rc.cpp:2629 rc.cpp:2782 rc.cpp:2857 rc.cpp:2965
-#: rc.cpp:3067 rc.cpp:3310 rc.cpp:3391 rc.cpp:3490 rc.cpp:3634
+#: tools/modcalcangdistdlg.ui:486 tools/modcalcapcoorddlg.ui:586
+#: tools/modcalcazeldlg.ui:762 tools/modcalceclipticcoordsdlg.ui:687
+#: tools/modcalcequinoxdlg.ui:391 tools/modcalcgalcoorddlg.ui:670
+#: tools/modcalcgeoddlg.ui:545 tools/modcalcplanetsdlg.ui:1104
+#: tools/modcalcprecdlg.ui:512 tools/modcalcsidtimedlg.ui:608
+#: tools/modcalcvlsrdlg.ui:898
+#, fuzzy, no-c-format
+msgid "Files"
+msgstr "Cadwyd y ffeil."
+
+#: 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 ""
 
-#. i18n: file tools/modcalcangdistdlg.ui line 500
-#: rc.cpp:2425 rc.cpp:2515 rc.cpp:2632 rc.cpp:2785 rc.cpp:2860 rc.cpp:2968
-#: rc.cpp:3070 rc.cpp:3313 rc.cpp:3394 rc.cpp:3493 rc.cpp:3637
+#: 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 ""
 
-#. i18n: file tools/modcalcangdistdlg.ui line 518
-#: rc.cpp:2428 rc.cpp:2518 rc.cpp:2635 rc.cpp:2788 rc.cpp:2863 rc.cpp:2971
-#: rc.cpp:3073 rc.cpp:3316 rc.cpp:3397 rc.cpp:3496 rc.cpp:3640
+#: 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 ""
 
-#. i18n: file tools/modcalcangdistdlg.ui line 521
-#: rc.cpp:2431 rc.cpp:2521 rc.cpp:2638 rc.cpp:2791 rc.cpp:2866 rc.cpp:2974
-#: rc.cpp:3076 rc.cpp:3319 rc.cpp:3400 rc.cpp:3499 rc.cpp:3643
+#: 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 ""
 
-#. i18n: file tools/modcalcangdistdlg.ui line 564
-#: rc.cpp:2434 rc.cpp:2524 rc.cpp:2641 rc.cpp:2794 rc.cpp:2869 rc.cpp:2977
-#: rc.cpp:3079 rc.cpp:3322 rc.cpp:3403 rc.cpp:3502 rc.cpp:3646
+#: 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"
 msgstr "Rhedeg"
 
-#. i18n: file tools/modcalcapcoorddlg.ui line 16
-#: rc.cpp:2437 rc.cpp:2470 tools/astrocalc.cpp:81 tools/astrocalc.cpp:122
-#, no-c-format
-msgid "Apparent Coordinates"
-msgstr ""
-
-#. i18n: file tools/modcalcapcoorddlg.ui line 53
-#: rc.cpp:2443
+#: tools/modcalcapcoorddlg.ui:53
 #, no-c-format
 msgid "Target Time && Date"
 msgstr ""
 
-#. i18n: file tools/modcalcapcoorddlg.ui line 72
-#: rc.cpp:2449 rc.cpp:2485 rc.cpp:2590 rc.cpp:3112 rc.cpp:3244 rc.cpp:3439
-#: rc.cpp:3595
+#: 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/modcalcvlsrdlg.ui:641
 #, no-c-format
 msgid "UT:"
 msgstr ""
 
-#. i18n: file tools/modcalcapcoorddlg.ui line 118
-#: rc.cpp:2452
+#: tools/modcalcapcoorddlg.ui:118
 #, no-c-format
 msgid "Catalog Coordinates"
 msgstr ""
 
-#. i18n: file tools/modcalcazeldlg.ui line 19
-#: rc.cpp:2527 rc.cpp:2575 tools/astrocalc.cpp:82 tools/astrocalc.cpp:124
-#, no-c-format
-msgid "Horizontal Coordinates"
-msgstr ""
-
-#. i18n: file tools/modcalcazeldlg.ui line 45
-#: rc.cpp:2533 rc.cpp:3511
+#: tools/modcalcazeldlg.ui:45 tools/modcalcvlsrdlg.ui:42
 #, no-c-format
 msgid "Time && Location"
 msgstr ""
 
-#. i18n: file tools/modcalcazeldlg.ui line 85
-#: rc.cpp:2536 rc.cpp:3172 rc.cpp:3517
+#: tools/modcalcazeldlg.ui:85 tools/modcalcplanetsdlg.ui:214
+#: tools/modcalcvlsrdlg.ui:124
 #, no-c-format
 msgid "Universal time:"
 msgstr ""
 
-#. i18n: file tools/modcalcazeldlg.ui line 176
-#: rc.cpp:2548 rc.cpp:2803
+#: tools/modcalcazeldlg.ui:176 tools/modcalcequinoxdlg.ui:48
 #, no-c-format
 msgid "Select Input"
 msgstr ""
 
-#. i18n: file tools/modcalcazeldlg.ui line 187
-#: rc.cpp:2551
+#: tools/modcalcazeldlg.ui:187
 #, no-c-format
 msgid "Apparent coordinates"
 msgstr ""
 
-#. i18n: file tools/modcalcazeldlg.ui line 198
-#: rc.cpp:2554
+#: tools/modcalcazeldlg.ui:198
 #, no-c-format
 msgid "Horizontal coordinates"
 msgstr ""
 
-#. i18n: file tools/modcalcazeldlg.ui line 234
-#: rc.cpp:2557 rc.cpp:2704 rc.cpp:2887 rc.cpp:2998 rc.cpp:3124 rc.cpp:3430
-#: rc.cpp:3574
+#: 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 "Trosi"
 
-#. i18n: file tools/modcalcazeldlg.ui line 272
-#: rc.cpp:2563 rc.cpp:2710 rc.cpp:2893 rc.cpp:3184 rc.cpp:3532
+#: 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"
 msgstr ""
 
-#. i18n: file tools/modcalcdaylengthdlg.ui line 16
-#: rc.cpp:2644
+#: tools/modcalcdaylengthdlg.ui:16
 #, no-c-format
 msgid "Day Length"
 msgstr ""
 
-#. i18n: file tools/modcalcdaylengthdlg.ui line 33
-#: rc.cpp:2647
+#: tools/modcalcdaylengthdlg.ui:33
 #, no-c-format
 msgid "Location && Date"
 msgstr ""
 
-#. i18n: file tools/modcalcdaylengthdlg.ui line 241
-#: rc.cpp:2665
+#: tools/modcalcdaylengthdlg.ui:241
 #, no-c-format
 msgid "Sunrise, Noon && Sunset Data"
 msgstr ""
 
-#. i18n: file tools/modcalcdaylengthdlg.ui line 282
-#: rc.cpp:2668
+#: tools/modcalcdaylengthdlg.ui:282
 #, no-c-format
 msgid "Sunrise:"
 msgstr "Codiad Haul:"
 
-#. i18n: file tools/modcalcdaylengthdlg.ui line 312
-#: rc.cpp:2671
+#: tools/modcalcdaylengthdlg.ui:312
 #, no-c-format
 msgid "Noon:"
 msgstr "Hanner dydd :"
 
-#. i18n: file tools/modcalcdaylengthdlg.ui line 320
-#: rc.cpp:2674
+#: tools/modcalcdaylengthdlg.ui:320
 #, no-c-format
 msgid "Day length:"
 msgstr ""
 
-#. i18n: file tools/modcalcdaylengthdlg.ui line 372
-#: rc.cpp:2677
+#: tools/modcalcdaylengthdlg.ui:372
 #, no-c-format
 msgid "Sunset:"
 msgstr "Machlud Haul:"
 
-#. i18n: file tools/modcalcdaylengthdlg.ui line 407
-#: rc.cpp:2680
+#: tools/modcalcdaylengthdlg.ui:407
 #, no-c-format
 msgid "Sunrise azimuth:"
 msgstr ""
 
-#. i18n: file tools/modcalcdaylengthdlg.ui line 415
-#: rc.cpp:2683
+#: tools/modcalcdaylengthdlg.ui:415
 #, no-c-format
 msgid "Sunset azimuth:"
 msgstr ""
 
-#. i18n: file tools/modcalcdaylengthdlg.ui line 445
-#: rc.cpp:2686
+#: tools/modcalcdaylengthdlg.ui:445
 #, no-c-format
 msgid "Altitude at noon:"
 msgstr ""
 
-#. i18n: file tools/modcalceclipticcoordsdlg.ui line 16
-#: rc.cpp:2689
+#: tools/modcalceclipticcoordsdlg.ui:16
 #, no-c-format
 msgid "Geocentric Ecliptic Coordinates"
 msgstr ""
 
-#. i18n: file tools/modcalceclipticcoordsdlg.ui line 45
-#: rc.cpp:2695 rc.cpp:2878 rc.cpp:2986
+#: tools/modcalceclipticcoordsdlg.ui:45 tools/modcalcgalcoorddlg.ui:45
+#: tools/modcalcgeoddlg.ui:53
 #, no-c-format
 msgid "Choose Input Coordinates"
 msgstr ""
 
-#. i18n: file tools/modcalceclipticcoordsdlg.ui line 73
-#: rc.cpp:2698
+#: tools/modcalceclipticcoordsdlg.ui:73
 #, no-c-format
 msgid "Geocentric equatorial"
 msgstr ""
 
-#. i18n: file tools/modcalceclipticcoordsdlg.ui line 104
-#: rc.cpp:2701
+#: tools/modcalceclipticcoordsdlg.ui:104
 #, no-c-format
 msgid "Geocentric ecliptic"
 msgstr ""
 
-#. i18n: file tools/modcalceclipticcoordsdlg.ui line 333
-#: rc.cpp:2722 rc.cpp:3202 tools/astrocalc.cpp:83 tools/astrocalc.cpp:126
-#, no-c-format
-msgid "Ecliptic Coordinates"
-msgstr ""
-
-#. i18n: file tools/modcalceclipticcoordsdlg.ui line 527
-#: rc.cpp:2740 rc.cpp:2746 rc.cpp:2755 rc.cpp:2761 rc.cpp:2767 rc.cpp:2926
-#: rc.cpp:2932 rc.cpp:2938 rc.cpp:2944 rc.cpp:2950 rc.cpp:3457 rc.cpp:3463
-#: rc.cpp:3469 rc.cpp:3475
+#: 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"
+"If checked, value will be read from input file. If not, value will be read "
+"from adjacent box"
 msgstr ""
 
-#. i18n: file tools/modcalceclipticcoordsdlg.ui line 594
-#: rc.cpp:2749 rc.cpp:2920
+#: tools/modcalceclipticcoordsdlg.ui:594 tools/modcalcgalcoorddlg.ui:515
 #, no-c-format
 msgid "1950.0"
 msgstr ""
 
-#. i18n: file tools/modcalcequinoxdlg.ui line 16
-#: rc.cpp:2797
+#: tools/modcalcequinoxdlg.ui:16
 #, no-c-format
 msgid "Equinoxes, Solstices & Seasons"
 msgstr ""
 
-#. i18n: file tools/modcalcequinoxdlg.ui line 74
-#: rc.cpp:2806
+#: tools/modcalcequinoxdlg.ui:74
 #, no-c-format
 msgid "Spring Equinox"
 msgstr ""
 
-#. i18n: file tools/modcalcequinoxdlg.ui line 79
-#: rc.cpp:2809
+#: tools/modcalcequinoxdlg.ui:79
 #, no-c-format
 msgid "Summer Solstice"
 msgstr ""
 
-#. i18n: file tools/modcalcequinoxdlg.ui line 84
-#: rc.cpp:2812
+#: tools/modcalcequinoxdlg.ui:84
 #, no-c-format
 msgid "Autumn Equinox"
 msgstr ""
 
-#. i18n: file tools/modcalcequinoxdlg.ui line 89
-#: rc.cpp:2815
+#: tools/modcalcequinoxdlg.ui:89
 #, no-c-format
 msgid "Winter Solstice"
 msgstr ""
 
-#. i18n: file tools/modcalcequinoxdlg.ui line 118
-#: rc.cpp:2818 rc.cpp:2842
+#: tools/modcalcequinoxdlg.ui:118 tools/modcalcequinoxdlg.ui:321
 #, no-c-format
 msgid "Year:"
 msgstr "Blwyddyn :"
 
-#. i18n: file tools/modcalcequinoxdlg.ui line 227
-#: rc.cpp:2827
+#: tools/modcalcequinoxdlg.ui:227
 #, no-c-format
 msgid "Season Information"
 msgstr ""
 
-#. i18n: file tools/modcalcequinoxdlg.ui line 246
-#: rc.cpp:2830
+#: tools/modcalcequinoxdlg.ui:246
 #, no-c-format
 msgid "Duration of the season:"
 msgstr ""
 
-#. i18n: file tools/modcalcequinoxdlg.ui line 254
-#: rc.cpp:2833
+#: tools/modcalcequinoxdlg.ui:254
 #, fuzzy, no-c-format
 msgid "Start date & time:"
 msgstr "Dechrau"
 
-#. i18n: file tools/modcalcgalcoorddlg.ui line 16
-#: rc.cpp:2872 rc.cpp:2905 tools/astrocalc.cpp:79 tools/astrocalc.cpp:118
-#, no-c-format
-msgid "Galactic Coordinates"
-msgstr ""
-
-#. i18n: file tools/modcalcgalcoorddlg.ui line 73
-#: rc.cpp:2881
+#: tools/modcalcgalcoorddlg.ui:73
 #, no-c-format
 msgid "Equatorial"
 msgstr ""
 
-#. i18n: file tools/modcalcgalcoorddlg.ui line 104
-#: rc.cpp:2884
+#: tools/modcalcgalcoorddlg.ui:104
 #, no-c-format
 msgid "Galactic"
 msgstr ""
 
-#. i18n: file tools/modcalcgalcoorddlg.ui line 571
-#: rc.cpp:2941
+#: tools/modcalcgalcoorddlg.ui:571
 #, no-c-format
 msgid "Gal. long.:"
 msgstr ""
 
-#. i18n: file tools/modcalcgalcoorddlg.ui line 588
-#: rc.cpp:2947
+#: tools/modcalcgalcoorddlg.ui:588
 #, no-c-format
 msgid "Gal. lat.:"
 msgstr ""
 
-#. i18n: file tools/modcalcgeoddlg.ui line 16
-#: rc.cpp:2980 tools/astrocalc.cpp:89 tools/astrocalc.cpp:130
-#, no-c-format
-msgid "Geodetic Coordinates"
-msgstr ""
-
-#. i18n: file tools/modcalcgeoddlg.ui line 72
-#: rc.cpp:2989
+#: tools/modcalcgeoddlg.ui:72
 #, no-c-format
 msgid "Cartesian"
 msgstr ""
 
-#. i18n: file tools/modcalcgeoddlg.ui line 83
-#: rc.cpp:2992
+#: tools/modcalcgeoddlg.ui:83
 #, no-c-format
 msgid "Geographic"
 msgstr ""
 
-#. i18n: file tools/modcalcgeoddlg.ui line 98
-#: rc.cpp:2995
+#: tools/modcalcgeoddlg.ui:98
 #, no-c-format
 msgid "Ellipsoid Model"
 msgstr ""
 
-#. i18n: file tools/modcalcgeoddlg.ui line 203
-#: rc.cpp:3004
+#: tools/modcalcgeoddlg.ui:203
 #, no-c-format
 msgid "Cartesian Coordinates"
 msgstr ""
 
-#. i18n: file tools/modcalcgeoddlg.ui line 214
-#: rc.cpp:3007 rc.cpp:3049
+#: tools/modcalcgeoddlg.ui:214 tools/modcalcgeoddlg.ui:486
 #, no-c-format
 msgid "Y (km):"
 msgstr ""
 
-#. i18n: file tools/modcalcgeoddlg.ui line 222
-#: rc.cpp:3010 rc.cpp:3052
+#: tools/modcalcgeoddlg.ui:222 tools/modcalcgeoddlg.ui:500
 #, no-c-format
 msgid "Z (km):"
 msgstr ""
 
-#. i18n: file tools/modcalcgeoddlg.ui line 230
-#: rc.cpp:3013 rc.cpp:3046
+#: tools/modcalcgeoddlg.ui:230 tools/modcalcgeoddlg.ui:472
 #, no-c-format
 msgid "X (km):"
 msgstr ""
 
-#. i18n: file tools/modcalcgeoddlg.ui line 255
-#: rc.cpp:3016
+#: tools/modcalcgeoddlg.ui:255
 #, no-c-format
 msgid "Geographic Coordinates"
 msgstr ""
 
-#. i18n: file tools/modcalcgeoddlg.ui line 310
-#: rc.cpp:3025
+#: tools/modcalcgeoddlg.ui:310
 #, no-c-format
 msgid "Elevation (meters):"
 msgstr ""
 
-#. i18n: file tools/modcalcgeoddlg.ui line 318
-#: rc.cpp:3028 rc.cpp:3520
+#: tools/modcalcgeoddlg.ui:318 tools/modcalcvlsrdlg.ui:165
 #, no-c-format
 msgid "0.0"
 msgstr "0.0"
 
-#. i18n: file tools/modcalcgeoddlg.ui line 458
-#: rc.cpp:3043
+#: tools/modcalcgeoddlg.ui:458
 #, no-c-format
 msgid "Elev. (m):"
 msgstr ""
 
-#. i18n: file tools/modcalcjddlg.ui line 16
-#: rc.cpp:3082 rc.cpp:3097 tools/astrocalc.cpp:70 tools/astrocalc.cpp:116
-#, no-c-format
-msgid "Julian Day"
-msgstr ""
-
-#. i18n: file tools/modcalcjddlg.ui line 35
-#: rc.cpp:3085
+#: tools/modcalcjddlg.ui:35
 #, no-c-format
 msgid "Choose Input Field"
 msgstr ""
 
-#. i18n: file tools/modcalcjddlg.ui line 62
-#: rc.cpp:3088
+#: tools/modcalcjddlg.ui:62
 #, no-c-format
 msgid "Julian day"
 msgstr ""
 
-#. i18n: file tools/modcalcjddlg.ui line 78
-#: rc.cpp:3091
+#: tools/modcalcjddlg.ui:78
 #, no-c-format
 msgid "Modified Julian day"
 msgstr ""
 
-#. i18n: file tools/modcalcjddlg.ui line 94
-#: rc.cpp:3094
+#: tools/modcalcjddlg.ui:94
 #, no-c-format
 msgid "Date"
 msgstr "Dyddiad"
 
-#. i18n: file tools/modcalcjddlg.ui line 125
-#: rc.cpp:3100
+#: tools/modcalcjddlg.ui:125
 #, no-c-format
 msgid "JD:"
 msgstr ""
 
-#. i18n: file tools/modcalcjddlg.ui line 146
-#: rc.cpp:3103
+#: tools/modcalcjddlg.ui:146
 #, no-c-format
 msgid "Modified Julian Day"
 msgstr ""
 
-#. i18n: file tools/modcalcjddlg.ui line 157
-#: rc.cpp:3106
+#: tools/modcalcjddlg.ui:157
 #, no-c-format
 msgid "MJD:"
 msgstr ""
 
-#. i18n: file tools/modcalcjddlg.ui line 180
-#: rc.cpp:3109
+#: tools/modcalcjddlg.ui:180
 #, no-c-format
 msgid "Date && Time"
 msgstr "Dyddiad ac Amser"
 
-#. i18n: file tools/modcalcjddlg.ui line 323
-#: rc.cpp:3118 timedialog.cpp:75
-#, no-c-format
-msgid "Now"
-msgstr "Nawr"
-
-#. i18n: file tools/modcalcplanetsdlg.ui line 16
-#: rc.cpp:3127
+#: tools/modcalcplanetsdlg.ui:16
 #, no-c-format
 msgid "Solar System Bodies Coordinates"
 msgstr ""
 
-#. i18n: file tools/modcalcplanetsdlg.ui line 42
-#: rc.cpp:3133 rc.cpp:3412
+#: tools/modcalcplanetsdlg.ui:42 tools/modcalcsidtimedlg.ui:53
 #, no-c-format
 msgid "Input Selection"
 msgstr ""
 
-#. i18n: file tools/modcalcplanetsdlg.ui line 78
-#: rc.cpp:3136 rc.cpp:3247
+#: tools/modcalcplanetsdlg.ui:78 tools/modcalcplanetsdlg.ui:928
 #, no-c-format
 msgid "Solar system body:"
 msgstr ""
 
-#. i18n: file tools/modcalcplanetsdlg.ui line 410
-#: rc.cpp:3193
+#: tools/modcalcplanetsdlg.ui:410
 #, no-c-format
 msgid "Topocentric Coordinates"
 msgstr ""
 
-#. i18n: file tools/modcalcplanetsdlg.ui line 531
-#: rc.cpp:3205
+#: tools/modcalcplanetsdlg.ui:531
 #, no-c-format
 msgid "Dist. to Sun (AU):"
 msgstr ""
 
-#. i18n: file tools/modcalcplanetsdlg.ui line 550
-#: rc.cpp:3208
+#: tools/modcalcplanetsdlg.ui:550
 #, no-c-format
 msgid "Heliocentric long.:"
 msgstr ""
 
-#. i18n: file tools/modcalcplanetsdlg.ui line 569
-#: rc.cpp:3211
+#: tools/modcalcplanetsdlg.ui:569
 #, no-c-format
 msgid "Heliocentric lat.:"
 msgstr ""
 
-#. i18n: file tools/modcalcplanetsdlg.ui line 604
-#: rc.cpp:3214
+#: tools/modcalcplanetsdlg.ui:604
 #, no-c-format
 msgid "Dist. to Earth (AU):"
 msgstr ""
 
-#. i18n: file tools/modcalcplanetsdlg.ui line 634
-#: rc.cpp:3217
+#: tools/modcalcplanetsdlg.ui:634
 #, no-c-format
 msgid "Geocentric long.:"
 msgstr ""
 
-#. i18n: file tools/modcalcplanetsdlg.ui line 664
-#: rc.cpp:3220
+#: tools/modcalcplanetsdlg.ui:664
 #, no-c-format
 msgid "Geocentric lat.:"
 msgstr ""
 
-#. i18n: file tools/modcalcplanetsdlg.ui line 1012
-#: rc.cpp:3283
+#: tools/modcalcplanetsdlg.ui:1012
 #, no-c-format
 msgid "Select Fields in Output File"
 msgstr ""
 
-#. i18n: file tools/modcalcplanetsdlg.ui line 1026
-#: rc.cpp:3286
+#: tools/modcalcplanetsdlg.ui:1026
 #, no-c-format
 msgid "Heliocentric ecliptic coordinates"
 msgstr ""
 
-#. i18n: file tools/modcalcplanetsdlg.ui line 1037
-#: rc.cpp:3289
+#: tools/modcalcplanetsdlg.ui:1037
 #, no-c-format
 msgid "Equatorial geocentric coordinates"
 msgstr ""
 
-#. i18n: file tools/modcalcplanetsdlg.ui line 1048
-#: rc.cpp:3292
+#: tools/modcalcplanetsdlg.ui:1048
 #, no-c-format
 msgid "Topocentric coordinates"
 msgstr ""
 
-#. i18n: file tools/modcalcplanetsdlg.ui line 1059
-#: rc.cpp:3295
+#: tools/modcalcplanetsdlg.ui:1059
 #, no-c-format
 msgid "Geocentric ecliptic coordinates"
 msgstr ""
 
-#. i18n: file tools/modcalcprecdlg.ui line 16
-#: rc.cpp:3325 tools/astrocalc.cpp:80 tools/astrocalc.cpp:120
-#, no-c-format
-msgid "Precession"
-msgstr ""
-
-#. i18n: file tools/modcalcprecdlg.ui line 42
-#: rc.cpp:3331
+#: tools/modcalcprecdlg.ui:42
 #, no-c-format
 msgid "Input Coordinates"
 msgstr ""
 
-#. i18n: file tools/modcalcprecdlg.ui line 78
-#: rc.cpp:3334 rc.cpp:3370
+#: tools/modcalcprecdlg.ui:78 tools/modcalcprecdlg.ui:425
 #, no-c-format
 msgid "Input epoch:"
 msgstr ""
 
-#. i18n: file tools/modcalcprecdlg.ui line 128
-#: rc.cpp:3343 rc.cpp:3373
+#: tools/modcalcprecdlg.ui:128 tools/modcalcprecdlg.ui:433
 #, no-c-format
 msgid "Target epoch:"
 msgstr ""
 
-#. i18n: file tools/modcalcprecdlg.ui line 251
-#: rc.cpp:3352
+#: tools/modcalcprecdlg.ui:251
 #, no-c-format
 msgid "Precessed Coordinates"
 msgstr ""
 
-#. i18n: file tools/modcalcsidtimedlg.ui line 16
-#: rc.cpp:3406 rc.cpp:3442 tools/astrocalc.cpp:73 tools/astrocalc.cpp:112
-#, no-c-format
-msgid "Sidereal Time"
-msgstr ""
-
-#. i18n: file tools/modcalcsidtimedlg.ui line 64
-#: rc.cpp:3415
+#: tools/modcalcsidtimedlg.ui:64
 #, no-c-format
 msgid "Universal time"
 msgstr ""
 
-#. i18n: file tools/modcalcsidtimedlg.ui line 78
-#: rc.cpp:3418
+#: tools/modcalcsidtimedlg.ui:78
 #, no-c-format
 msgid "Sidereal time"
 msgstr ""
 
-#. i18n: file tools/modcalcsidtimedlg.ui line 232
-#: rc.cpp:3436
+#: tools/modcalcsidtimedlg.ui:232
 #, no-c-format
 msgid "Universal Time"
 msgstr ""
 
-#. i18n: file tools/modcalcsidtimedlg.ui line 320
-#: rc.cpp:3445
+#: tools/modcalcsidtimedlg.ui:320
 #, no-c-format
 msgid "ST:"
 msgstr ""
 
-#. i18n: file tools/modcalcsidtimedlg.ui line 434
-#: rc.cpp:3460
+#: tools/modcalcsidtimedlg.ui:434
 #, fuzzy, no-c-format
 msgid "Univ. time:"
 msgstr "Enw'r ffeil:"
 
-#. i18n: file tools/modcalcsidtimedlg.ui line 524
-#: rc.cpp:3466
+#: tools/modcalcsidtimedlg.ui:524
 #, fuzzy, no-c-format
 msgid "Sid. time:"
 msgstr "Enw'r ffeil:"
 
-#. i18n: file tools/modcalcvlsrdlg.ui line 16
-#: rc.cpp:3505 tools/astrocalc.cpp:85 tools/astrocalc.cpp:142
-#, no-c-format
-msgid "LSR Velocity"
-msgstr ""
-
-#. i18n: file tools/modcalcvlsrdlg.ui line 368
-#: rc.cpp:3544
+#: tools/modcalcvlsrdlg.ui:368
 #, no-c-format
 msgid "Radial Velocities"
 msgstr ""
 
-#. i18n: file tools/modcalcvlsrdlg.ui line 384
-#: rc.cpp:3547
+#: tools/modcalcvlsrdlg.ui:384
 #, no-c-format
 msgid "VLSR:"
 msgstr ""
 
-#. i18n: file tools/modcalcvlsrdlg.ui line 397
-#: rc.cpp:3550
+#: tools/modcalcvlsrdlg.ui:397
 #, no-c-format
 msgid "Heliocentric velocity:"
 msgstr ""
 
-#. i18n: file tools/modcalcvlsrdlg.ui line 410
-#: rc.cpp:3553
+#: tools/modcalcvlsrdlg.ui:410
 #, no-c-format
 msgid "Geocentric velocity:"
 msgstr ""
 
-#. i18n: file tools/modcalcvlsrdlg.ui line 418
-#: rc.cpp:3556
+#: tools/modcalcvlsrdlg.ui:418
 #, no-c-format
 msgid "Topocentric velocity:"
 msgstr ""
 
-#. i18n: file tools/modcalcvlsrdlg.ui line 450
-#: rc.cpp:3559
+#: tools/modcalcvlsrdlg.ui:450
 #, no-c-format
 msgid "Input Velocity"
 msgstr ""
 
-#. i18n: file tools/modcalcvlsrdlg.ui line 461
-#: rc.cpp:3562
+#: tools/modcalcvlsrdlg.ui:461
 #, no-c-format
 msgid "LSR"
 msgstr ""
 
-#. i18n: file tools/modcalcvlsrdlg.ui line 472
-#: rc.cpp:3565
+#: tools/modcalcvlsrdlg.ui:472
 #, no-c-format
 msgid "Heliocentric"
 msgstr ""
 
-#. i18n: file tools/modcalcvlsrdlg.ui line 480
-#: rc.cpp:3568
+#: tools/modcalcvlsrdlg.ui:480
 #, no-c-format
 msgid "Geocentric"
 msgstr ""
 
-#. i18n: file tools/modcalcvlsrdlg.ui line 488
-#: rc.cpp:3571
+#: tools/modcalcvlsrdlg.ui:488
 #, no-c-format
 msgid "Topocentric"
 msgstr ""
 
-#. i18n: file tools/modcalcvlsrdlg.ui line 804
-#: rc.cpp:3610
+#: tools/modcalcvlsrdlg.ui:804
 #, no-c-format
 msgid "LSR velocity:"
 msgstr ""
 
-#. i18n: file tools/modcalcvlsrdlg.ui line 815
-#: rc.cpp:3613
+#: tools/modcalcvlsrdlg.ui:815
 #, no-c-format
 msgid "Heliocentric v.:"
 msgstr ""
 
-#. i18n: file tools/modcalcvlsrdlg.ui line 823
-#: rc.cpp:3616
+#: tools/modcalcvlsrdlg.ui:823
 #, no-c-format
 msgid "Geocentric v.:"
 msgstr ""
 
-#. i18n: file tools/modcalcvlsrdlg.ui line 831
-#: rc.cpp:3619
+#: tools/modcalcvlsrdlg.ui:831
 #, no-c-format
 msgid "Topocentric v.:"
 msgstr ""
 
-#. i18n: file tools/modcalcvlsrdlg.ui line 1022
-#: rc.cpp:3649
+#: tools/modcalcvlsrdlg.ui:1022
 #, no-c-format
 msgid "Overview"
 msgstr "Trosolwg"
 
-#. i18n: file tools/modcalcvlsrdlg.ui line 1044
-#: rc.cpp:3652
+#: tools/modcalcvlsrdlg.ui:1033
 #, no-c-format
 msgid ""
-"<p> The Local Standard of Rest (LSR) is the location in which the mean value of "
-"the velocity of a selection of the stars in solar neighboorhood is zero. The "
-"local solar motion, that is, the velocity of the sun referred to the Local "
-"Standard of Rest is not null: the sun moves with a velocity of 20 km/s towards "
-"a point called, solar apex, whose coordinates are:</p>\n"
+"<p> The Local Standard of Rest (LSR) is the location in which the mean value "
+"of the velocity of a selection of the stars in solar neighboorhood is zero. "
+"The local solar motion, that is, the velocity of the sun referred to the "
+"Local Standard of Rest is not null: the sun moves with a velocity of 20 km/s "
+"towards a point called, solar apex, whose coordinates are:</p>\n"
 "<li>Ra= 18:03:50.2 (J2000)</li>\n"
 "<li>Dec = 30:0:16.8 (J2000)</li>\n"
 "<p>Astronomical sources move relative to the Sun and their velocity can be "
-"decomposed in radial velocity, and velocity on the plane of the sky, also know "
-"as proper motion in right ascension and declination. The radial velocity is "
-"usually obtained by analyzing their spectral emission and the frequency shift "
-"of the lines due to Doppler effect. Observational astronomers usually refer "
-"source's radial velocity to the LSR.</p>\n"
+"decomposed in radial velocity, and velocity on the plane of the sky, also "
+"know as proper motion in right ascension and declination. The radial "
+"velocity is usually obtained by analyzing their spectral emission and the "
+"frequency shift of the lines due to Doppler effect. Observational "
+"astronomers usually refer source's radial velocity to the LSR.</p>\n"
 "<p>This calculator module allows to obtain the radial velocity of the source "
 "referred to the center of the sun (what we call heliocentric velocity), "
-"referred to the center of the Earth (geocentric velocity) and to the observer "
-"site (topocentric velocity) from the LSR radial velocity</p>\n"
+"referred to the center of the Earth (geocentric velocity) and to the "
+"observer site (topocentric velocity) from the LSR radial velocity</p>\n"
 "<li>The heliocentric velocity (V<sub>hel</sub>) is computed by obtaining the "
-"scalar product of the radial velocity of the source referred to the LSR (V<sub>"
-"lsr</sub>) with the velocity of the Sun referred to the LSR (V<sub>sun</sub>:\n"
+"scalar product of the radial velocity of the source referred to the LSR "
+"(V<sub>lsr</sub>) with the velocity of the Sun referred to the LSR "
+"(V<sub>sun</sub>:\n"
 "<img src=\"vlsr1.png\">\n"
 "</li>\n"
-"<li>The geocentric velocity (V<sub>geo</sub>) is obtained from the heliocentric "
-"velocity, the velocity of the Earth (V<sub>E</sub>) and its position for a "
-"given date and time:\n"
+"<li>The geocentric velocity (V<sub>geo</sub>) is obtained from the "
+"heliocentric velocity, the velocity of the Earth (V<sub>E</sub>) and its "
+"position for a given date and time:\n"
 "<img src=\"vlsr2.png\">\n"
 "</li>\n"
 "<li>The topocentric velocity is obtained from the  geocentric velocity, the "
@@ -28601,387 +33123,287 @@ msgid ""
 "radial velocity of the source.</li>"
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 16
-#: rc.cpp:3666 tools/observinglist.cpp:57
-#, no-c-format
-msgid "Observing List"
-msgstr ""
-
-#. i18n: file tools/observinglistui.ui line 58
-#: rc.cpp:3669
+#: tools/observinglistui.ui:58
 #, no-c-format
 msgid "Open observing list"
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 61
-#: rc.cpp:3672
+#: tools/observinglistui.ui:61
 #, no-c-format
 msgid "Load an observing list from disk"
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 92
-#: rc.cpp:3675
+#: tools/observinglistui.ui:92
 #, no-c-format
 msgid "Save observing list"
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 95
-#: rc.cpp:3678
+#: tools/observinglistui.ui:95
 #, no-c-format
 msgid "Save the current observing list to disk"
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 126
-#: rc.cpp:3681
+#: tools/observinglistui.ui:126
 #, fuzzy, no-c-format
 msgid "Save observing list as..."
 msgstr "Cadw Lliwiau Cyfredol..."
 
-#. i18n: file tools/observinglistui.ui line 129
-#: rc.cpp:3684
+#: tools/observinglistui.ui:129
 #, no-c-format
 msgid "Save the current observing list to disk, specifying the filename"
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 160
-#: rc.cpp:3687 rc.cpp:3768 tools/obslistwizard.cpp:38
-#, fuzzy, no-c-format
-msgid "Observing List Wizard"
-msgstr "Cadw Lliwiau Cyfredol..."
-
-#. i18n: file tools/observinglistui.ui line 163
-#: rc.cpp:3690
+#: tools/observinglistui.ui:163
 #, no-c-format
 msgid ""
 "The list wizard helps you construct observing lists based on filtering by "
 "object type, position on the sky, and magnitude."
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 211
-#: rc.cpp:3693
+#: tools/observinglistui.ui:211
 #, no-c-format
 msgid "Make window small"
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 214
-#: rc.cpp:3696
+#: tools/observinglistui.ui:214
 #, no-c-format
 msgid ""
 "This button toggles between large and small states.  The small state may be "
 "useful if you want the Observing list open while working in the main window."
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 240
-#: rc.cpp:3699
+#: tools/observinglistui.ui:240
 #, no-c-format
 msgid "Ce&nter"
 msgstr "Ca&nol"
 
-#. i18n: file tools/observinglistui.ui line 243
-#: rc.cpp:3702
+#: tools/observinglistui.ui:243
 #, no-c-format
 msgid "Center sky map on highlighted object"
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 246
-#: rc.cpp:3705
+#: tools/observinglistui.ui:246
 #, no-c-format
 msgid "Center the sky map on the highlighted object in the list"
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 262
-#: rc.cpp:3708 tools/observinglist.cpp:707
-#, no-c-format
-msgid "Scope"
-msgstr "Amrediad"
-
-#. i18n: file tools/observinglistui.ui line 268
-#: rc.cpp:3711
+#: tools/observinglistui.ui:268
 #, no-c-format
 msgid "Point telescope at highlighted object"
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 271
-#: rc.cpp:3714
+#: tools/observinglistui.ui:271
 #, no-c-format
 msgid "Point the telescope at the highlighted object in the list"
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 293
-#: rc.cpp:3720
+#: tools/observinglistui.ui:293
 #, no-c-format
 msgid "Show details for highlighted object"
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 296
-#: rc.cpp:3723
+#: tools/observinglistui.ui:296
 #, no-c-format
 msgid "Open the Details window for the highlighted object"
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 312
-#: rc.cpp:3726
+#: tools/observinglistui.ui:312
 #, fuzzy, no-c-format
 msgid "&Alt vs Time"
 msgstr "Dyddiad ac Amser"
 
-#. i18n: file tools/observinglistui.ui line 315
-#: rc.cpp:3729
+#: tools/observinglistui.ui:315
 #, no-c-format
 msgid "Show altitude plot"
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 318
-#: rc.cpp:3732
+#: tools/observinglistui.ui:318
 #, no-c-format
 msgid ""
-"Open the Altitude vs. Time tool, with curves for the highlighted objects shown"
+"Open the Altitude vs. Time tool, with curves for the highlighted objects "
+"shown"
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 337
-#: rc.cpp:3738
+#: tools/observinglistui.ui:337
 #, fuzzy, no-c-format
 msgid "Remove from list"
 msgstr "Gwaredu Cyswllt"
 
-#. i18n: file tools/observinglistui.ui line 340
-#: rc.cpp:3741
+#: tools/observinglistui.ui:340
 #, no-c-format
 msgid "Remove the highlighted object(s) from the observing list"
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 402
-#: rc.cpp:3747
+#: tools/observinglistui.ui:402
 #, no-c-format
 msgid "RA"
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 413
-#: rc.cpp:3750
+#: tools/observinglistui.ui:413
 #, no-c-format
 msgid "Dec"
 msgstr "Rhag"
 
-#. i18n: file tools/observinglistui.ui line 424
-#: rc.cpp:3753
+#: tools/observinglistui.ui:424
 #, no-c-format
 msgid "Mag"
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 435
-#: rc.cpp:3756 rc.cpp:3915
+#: tools/observinglistui.ui:435 tools/optionstreeview.ui:50
 #, no-c-format
 msgid "Type"
 msgstr "Math"
 
-#. i18n: file tools/observinglistui.ui line 460
-#: rc.cpp:3759
+#: tools/observinglistui.ui:460
 #, no-c-format
 msgid ""
-"Table showing the current observing list.  The list can be sorted by any of the "
-"data columns"
+"Table showing the current observing list.  The list can be sorted by any of "
+"the data columns"
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 519
-#: rc.cpp:3762
+#: tools/observinglistui.ui:519
 #, no-c-format
 msgid "observing notes for object:"
 msgstr ""
 
-#. i18n: file tools/observinglistui.ui line 550
-#: rc.cpp:3765
+#: tools/observinglistui.ui:550
 #, no-c-format
 msgid "Your observing notes for the highlighted object"
 msgstr ""
 
-#. i18n: file tools/obslistwizardui.ui line 43
-#: rc.cpp:3771
+#: tools/obslistwizardui.ui:43
 #, fuzzy, no-c-format
 msgid "Selection filters:"
 msgstr "Dewis Dim"
 
-#. i18n: file tools/obslistwizardui.ui line 60
-#: rc.cpp:3777
+#: tools/obslistwizardui.ui:60
 #, fuzzy, no-c-format
 msgid "1. Object type(s)"
 msgstr "Math Gwrthrych"
 
-#. i18n: file tools/obslistwizardui.ui line 68
-#: rc.cpp:3780
+#: tools/obslistwizardui.ui:68
 #, no-c-format
 msgid "2. Region"
 msgstr ""
 
-#. i18n: file tools/obslistwizardui.ui line 75
-#: rc.cpp:3783
+#: tools/obslistwizardui.ui:75
 #, fuzzy, no-c-format
 msgid "a. In constellation(s)"
 msgstr "cyfseriad"
 
-#. i18n: file tools/obslistwizardui.ui line 83
-#: rc.cpp:3786
+#: tools/obslistwizardui.ui:83
 #, no-c-format
 msgid "b. Rectangular"
 msgstr ""
 
-#. i18n: file tools/obslistwizardui.ui line 91
-#: rc.cpp:3789
+#: tools/obslistwizardui.ui:91
 #, no-c-format
 msgid "c. Circular"
 msgstr ""
 
-#. i18n: file tools/obslistwizardui.ui line 100
-#: rc.cpp:3792
+#: tools/obslistwizardui.ui:100
 #, fuzzy, no-c-format
 msgid "3. Magnitude limit"
 msgstr "Hydred"
 
-#. i18n: file tools/obslistwizardui.ui line 139
-#: rc.cpp:3795
+#: tools/obslistwizardui.ui:139
 #, fuzzy, no-c-format
 msgid "Filter arguments:"
 msgstr "Enw'r ffeil:"
 
-#. i18n: file tools/obslistwizardui.ui line 162
-#: rc.cpp:3798
+#: tools/obslistwizardui.ui:162
 #, no-c-format
 msgid "Select object types:"
 msgstr ""
 
-#. i18n: file tools/obslistwizardui.ui line 181
-#: rc.cpp:3804 tools/obslistwizard.cpp:221 tools/obslistwizard.cpp:240
-#: tools/obslistwizard.cpp:341
-#, no-c-format
-msgid "Sun, Moon, Planets"
-msgstr ""
-
-#. i18n: file tools/obslistwizardui.ui line 201
-#: rc.cpp:3816 tools/obslistwizard.cpp:212 tools/obslistwizard.cpp:250
-#: tools/obslistwizard.cpp:359
-#, no-c-format
-msgid "Globular Clusters"
-msgstr ""
-
-#. i18n: file tools/obslistwizardui.ui line 206
-#: rc.cpp:3819 tools/obslistwizard.cpp:213 tools/obslistwizard.cpp:252
-#: tools/obslistwizard.cpp:360
-#, no-c-format
-msgid "Gaseous Nebulae"
-msgstr ""
-
-#. i18n: file tools/obslistwizardui.ui line 211
-#: rc.cpp:3822 tools/obslistwizard.cpp:214 tools/obslistwizard.cpp:254
-#: tools/obslistwizard.cpp:361
-#, no-c-format
-msgid "Planetary Nebulae"
-msgstr ""
-
-#. i18n: file tools/obslistwizardui.ui line 239
-#: rc.cpp:3828
+#: tools/obslistwizardui.ui:239
 #, no-c-format
 msgid "All"
 msgstr "Popeth"
 
-#. i18n: file tools/obslistwizardui.ui line 247
-#: rc.cpp:3831
+#: tools/obslistwizardui.ui:247
 #, no-c-format
 msgid "&None"
 msgstr "&Dim"
 
-#. i18n: file tools/obslistwizardui.ui line 255
-#: rc.cpp:3834
+#: tools/obslistwizardui.ui:255
 #, no-c-format
 msgid "Deep-Sk&y"
 msgstr ""
 
-#. i18n: file tools/obslistwizardui.ui line 263
-#: rc.cpp:3837
+#: tools/obslistwizardui.ui:263
 #, no-c-format
 msgid "Sol&ar System"
 msgstr ""
 
-#. i18n: file tools/obslistwizardui.ui line 305
-#: rc.cpp:3840
+#: tools/obslistwizardui.ui:305
 #, fuzzy, no-c-format
 msgid "Select objects in constell&ation(s):"
 msgstr "Defnyddio enwau cyfseriadau Lladin"
 
-#. i18n: file tools/obslistwizardui.ui line 337
-#: rc.cpp:3843
+#: tools/obslistwizardui.ui:337
 #, fuzzy, no-c-format
 msgid "Select objects in region:"
 msgstr "Defnyddio enwau cyfseriadau Lladin"
 
-#. i18n: file tools/obslistwizardui.ui line 356
-#: rc.cpp:3846 rc.cpp:3855
+#: tools/obslistwizardui.ui:356 tools/obslistwizardui.ui:440
 #, no-c-format
 msgid "to"
 msgstr "i"
 
-#. i18n: file tools/obslistwizardui.ui line 524
-#: rc.cpp:3858
+#: tools/obslistwizardui.ui:524
 #, no-c-format
 msgid "Select objects within circle:"
 msgstr ""
 
-#. i18n: file tools/obslistwizardui.ui line 543
-#: rc.cpp:3861
+#: tools/obslistwizardui.ui:543
 #, fuzzy, no-c-format
 msgid "Center RA:"
 msgstr "Gwrthrych"
 
-#. i18n: file tools/obslistwizardui.ui line 551
-#: rc.cpp:3864
+#: tools/obslistwizardui.ui:551
 #, fuzzy, no-c-format
 msgid "Center Dec:"
 msgstr "Gwrthrych"
 
-#. i18n: file tools/obslistwizardui.ui line 559
-#: rc.cpp:3867
+#: tools/obslistwizardui.ui:559
 #, no-c-format
 msgid "Radius (degrees):"
 msgstr ""
 
-#. i18n: file tools/obslistwizardui.ui line 657
-#: rc.cpp:3870
+#: tools/obslistwizardui.ui:657
 #, no-c-format
 msgid "Select objects observ&able on:"
 msgstr ""
 
-#. i18n: file tools/obslistwizardui.ui line 719
-#: rc.cpp:3873
+#: tools/obslistwizardui.ui:719
 #, no-c-format
 msgid "from"
 msgstr "o"
 
-#. i18n: file tools/obslistwizardui.ui line 732
-#: rc.cpp:3876
+#: tools/obslistwizardui.ui:732
 #, no-c-format
 msgid "Tucson, Arizona, USA"
 msgstr ""
 
-#. i18n: file tools/obslistwizardui.ui line 770
-#: rc.cpp:3879
+#: tools/obslistwizardui.ui:770
 #, fuzzy, no-c-format
 msgid "Cha&nge Location"
 msgstr "Cysylltiad"
 
-#. i18n: file tools/obslistwizardui.ui line 827
-#: rc.cpp:3882
+#: tools/obslistwizardui.ui:827
 #, no-c-format
 msgid "Select objects &brighter than:"
 msgstr ""
 
-#. i18n: file tools/obslistwizardui.ui line 882
-#: rc.cpp:3888
+#: tools/obslistwizardui.ui:881
 #, no-c-format
 msgid ""
 "Exclude objects which\n"
 "have &no magnitude"
 msgstr ""
 
-#. i18n: file tools/obslistwizardui.ui line 931
-#: rc.cpp:3892
+#: tools/obslistwizardui.ui:923
 #, no-c-format
 msgid ""
 "There are three ways to select objects from\n"
@@ -28995,126 +33417,102 @@ msgid ""
 "select from a region on the sky."
 msgstr ""
 
-#. i18n: file tools/obslistwizardui.ui line 955
-#: rc.cpp:3903
+#: tools/obslistwizardui.ui:955
 #, no-c-format
 msgid "Current selection: 100 objects"
 msgstr ""
 
-#. i18n: file tools/optionstreeview.ui line 16
-#: rc.cpp:3906
+#: tools/optionstreeview.ui:16
 #, no-c-format
 msgid "View Options"
 msgstr ""
 
-#. i18n: file tools/optionstreeview.ui line 28
-#: rc.cpp:3909
+#: tools/optionstreeview.ui:28
 #, fuzzy, no-c-format
 msgid "Option Name"
 msgstr "Constellation names"
 
-#. i18n: file tools/optionstreeview.ui line 39
-#: rc.cpp:3912
+#: tools/optionstreeview.ui:39
 #, no-c-format
 msgid "Description"
 msgstr "Disgrifiad"
 
-#. i18n: file tools/planetviewerui.ui line 16
-#: rc.cpp:3924
+#: tools/planetviewerui.ui:16
 #, no-c-format
 msgid "Planet Viewer"
 msgstr ""
 
-#. i18n: file tools/planetviewerui.ui line 92
-#: rc.cpp:3927
+#: tools/planetviewerui.ui:92
 #, no-c-format
 msgid "Today"
 msgstr "Heddiw"
 
-#. i18n: file tools/scriptbuilderui.ui line 16
-#: rc.cpp:3930 tools/scriptbuilder.cpp:104
-#, no-c-format
-msgid "Script Builder"
-msgstr ""
-
-#. i18n: file tools/scriptbuilderui.ui line 58
-#: rc.cpp:3933
+#: tools/scriptbuilderui.ui:58
 #, no-c-format
 msgid "New Script"
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 61
-#: rc.cpp:3936
+#: tools/scriptbuilderui.ui:61
 #, no-c-format
 msgid ""
-"Discards current script and starts a new one.  Will prompt to save any unsaved "
-"changes in the current script."
+"Discards current script and starts a new one.  Will prompt to save any "
+"unsaved changes in the current script."
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 92
-#: rc.cpp:3939
+#: tools/scriptbuilderui.ui:92
 #, no-c-format
 msgid "Open Script"
 msgstr "Agor Sgript"
 
-#. i18n: file tools/scriptbuilderui.ui line 95
-#: rc.cpp:3942
+#: tools/scriptbuilderui.ui:95
 #, no-c-format
 msgid ""
 "Opens an existing script.  Will prompt to save any unsaved changes in the "
 "current script."
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 126
-#: rc.cpp:3945
+#: tools/scriptbuilderui.ui:126
 #, no-c-format
 msgid "Save Script"
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 129
-#: rc.cpp:3948
+#: tools/scriptbuilderui.ui:129
 #, no-c-format
 msgid ""
 "Save the current script.  If the script has not been saved before, this is "
 "equivalent to \"Save As...\""
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 160
-#: rc.cpp:3951
+#: tools/scriptbuilderui.ui:160
 #, fuzzy, no-c-format
 msgid "Save Script As..."
 msgstr "Cadw Lliwiau Cyfredol..."
 
-#. i18n: file tools/scriptbuilderui.ui line 163
-#: rc.cpp:3954
+#: tools/scriptbuilderui.ui:163
 #, no-c-format
 msgid ""
 "Saves the script to a file, allowing you to first specify the filename and a "
 "name for the script."
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 186
-#: rc.cpp:3957
+#: tools/scriptbuilderui.ui:186
 #, no-c-format
 msgid "Test Script"
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 189
-#: rc.cpp:3960
+#: tools/scriptbuilderui.ui:189
 #, no-c-format
 msgid ""
-"Executes the script in the KStars main window.  You may want to reposition the "
-"Script Builder tool so that the Sky map is visible.  "
+"Executes the script in the KStars main window.  You may want to reposition "
+"the Script Builder tool so that the Sky map is visible.  "
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 235
-#: rc.cpp:3963
+#: tools/scriptbuilderui.ui:235
 #, no-c-format
 msgid "Current Script"
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 265
-#: rc.cpp:3966
+#: tools/scriptbuilderui.ui:265
 #, no-c-format
 msgid ""
 "This shows the list of commands present in the current working script.  "
@@ -29123,2888 +33521,993 @@ msgid ""
 "the position of the selected command.  "
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 296
-#: rc.cpp:3969
+#: tools/scriptbuilderui.ui:296
 #, no-c-format
 msgid "Add Function"
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 300
-#: rc.cpp:3972
+#: tools/scriptbuilderui.ui:299
 #, no-c-format
 msgid ""
-"If a function is highlighted in the \"Function Browser\" box, this button will "
-"add it to the current working script.  The new function is inserted directly "
-"after the highlighted function in the \"Current Script\" box.\n"
+"If a function is highlighted in the \"Function Browser\" box, this button "
+"will add it to the current working script.  The new function is inserted "
+"directly after the highlighted function in the \"Current Script\" box.\n"
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 323
-#: rc.cpp:3976
+#: tools/scriptbuilderui.ui:323
 #, no-c-format
 msgid "Remove Function"
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 326
-#: rc.cpp:3979
+#: tools/scriptbuilderui.ui:326
 #, no-c-format
 msgid ""
 "If a function is highlighted in the \"Current Script\" box, this button will "
 "remove it from the script."
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 349
-#: rc.cpp:3982
+#: tools/scriptbuilderui.ui:349
 #, no-c-format
 msgid "Copy Function"
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 352
-#: rc.cpp:3985
+#: tools/scriptbuilderui.ui:352
 #, no-c-format
 msgid ""
 "If a function is highlighted in the \"Current Script\" box, this button will "
 "add a duplicate of the function."
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 375
-#: rc.cpp:3988
+#: tools/scriptbuilderui.ui:375
 #, no-c-format
 msgid "Move Up"
 msgstr "Symud i Fyny"
 
-#. i18n: file tools/scriptbuilderui.ui line 378
-#: rc.cpp:3991
+#: tools/scriptbuilderui.ui:378
 #, no-c-format
 msgid ""
 "If a function is highlighted in the \"Current Script\" box, this button will "
 "move it up one position in the script."
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 401
-#: rc.cpp:3994
+#: tools/scriptbuilderui.ui:401
 #, no-c-format
 msgid "Move Down"
 msgstr "Symud i Lawr"
 
-#. i18n: file tools/scriptbuilderui.ui line 404
-#: rc.cpp:3997
+#: tools/scriptbuilderui.ui:404
 #, no-c-format
 msgid ""
 "If a function is highlighted in the \"Current Script\" box, this button will "
 "move it down one position in the script."
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 447
-#: rc.cpp:4000
+#: tools/scriptbuilderui.ui:447
 #, no-c-format
 msgid "Function Arguments"
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 497
-#: rc.cpp:4003
+#: tools/scriptbuilderui.ui:497
 #, no-c-format
 msgid "Function Browser"
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 545
-#: rc.cpp:4006
+#: tools/scriptbuilderui.ui:545
 #, no-c-format
 msgid "Function Help"
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 548
-#: rc.cpp:4009
+#: tools/scriptbuilderui.ui:548
 #, no-c-format
 msgid ""
-"If a function is highlighted in the Function Browser, this area will show some "
-"brief documentation about the function."
+"If a function is highlighted in the Function Browser, this area will show "
+"some brief documentation about the function."
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 576
-#: rc.cpp:4012
+#: tools/scriptbuilderui.ui:576
 #, no-c-format
 msgid "Append WaitForINDIAction after any INDI action"
 msgstr ""
 
-#. i18n: file tools/scriptbuilderui.ui line 587
-#: rc.cpp:4015
+#: tools/scriptbuilderui.ui:587
 #, no-c-format
 msgid "Reuse INDI device name"
 msgstr ""
 
-#. i18n: file tools/scriptnamedialog.ui line 16
-#: rc.cpp:4018
+#: tools/scriptnamedialog.ui:16
 #, no-c-format
 msgid "Enter Name for Script"
 msgstr ""
 
-#. i18n: file tools/scriptnamedialog.ui line 38
-#: rc.cpp:4021
+#: tools/scriptnamedialog.ui:38
 #, no-c-format
 msgid "Enter name for the script"
 msgstr ""
 
-#. i18n: file tools/scriptnamedialog.ui line 41
-#: rc.cpp:4024
+#: tools/scriptnamedialog.ui:41
 #, no-c-format
 msgid ""
 "Enter a name for the script.  This is not the file name, just a short "
 "descriptive line of text."
 msgstr ""
 
-#. i18n: file tools/scriptnamedialog.ui line 55
-#: rc.cpp:4027
+#: tools/scriptnamedialog.ui:55
 #, fuzzy, no-c-format
 msgid "Script name:"
 msgstr "Dechrau"
 
-#. i18n: file tools/scriptnamedialog.ui line 63
-#: rc.cpp:4030
+#: tools/scriptnamedialog.ui:63
 #, no-c-format
 msgid "Author:"
 msgstr "Awdur:"
 
-#. i18n: file tools/scriptnamedialog.ui line 71
-#: rc.cpp:4033
+#: tools/scriptnamedialog.ui:71
 #, no-c-format
 msgid "Enter author's name"
 msgstr ""
 
-#. i18n: file tools/scriptnamedialog.ui line 129
-#: rc.cpp:4042
+#: tools/scriptnamedialog.ui:129
 #, no-c-format
 msgid ""
 "Press Ok to accept the script name and author name, and open the Save File "
 "Dialog."
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 16
-#: rc.cpp:4045
+#: tools/wutdialogui.ui:16
 #, no-c-format
 msgid "What's Up Tonight?"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 68
-#: rc.cpp:4048
+#: tools/wutdialogui.ui:68
 #, no-c-format
 msgid "at LOCATION"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 121
-#: rc.cpp:4051
+#: tools/wutdialogui.ui:121
 #, no-c-format
 msgid "The night of DATE"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 156
-#: rc.cpp:4054
+#: tools/wutdialogui.ui:156
 #, no-c-format
 msgid "Show objects which are up:"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 176
-#: rc.cpp:4057
+#: tools/wutdialogui.ui:176
 #, no-c-format
 msgid "Change Date..."
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 179
-#: rc.cpp:4060
+#: tools/wutdialogui.ui:179
 #, no-c-format
 msgid "Choose a new date"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 182
-#: rc.cpp:4063
+#: tools/wutdialogui.ui:182
 #, no-c-format
 msgid ""
 "Press this button to select a new date for the \"What's Up Tonight\" tool.  "
 "Note that the date of the main window is not changed."
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 190
-#: rc.cpp:4066
+#: tools/wutdialogui.ui:190
 #, no-c-format
 msgid "Change Location..."
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 193
-#: rc.cpp:4069
+#: tools/wutdialogui.ui:193
 #, no-c-format
 msgid "Choose a new geographic location"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 196
-#: rc.cpp:4072
+#: tools/wutdialogui.ui:196
 #, no-c-format
 msgid ""
 "Press this button to select a new geographic location for the \"What's Up "
 "Tonight\" tool.  Note that the location of the main window is not changed."
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 202
-#: rc.cpp:4075
+#: tools/wutdialogui.ui:202
 #, no-c-format
 msgid "In the Evening"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 207
-#: rc.cpp:4078
+#: tools/wutdialogui.ui:207
 #, no-c-format
 msgid "In the Morning"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 212
-#: rc.cpp:4081
+#: tools/wutdialogui.ui:212
 #, no-c-format
 msgid "Any Time Tonight"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 219
-#: rc.cpp:4084
+#: tools/wutdialogui.ui:219
 #, no-c-format
 msgid "Choose time interval"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 222
-#: rc.cpp:4087
+#: tools/wutdialogui.ui:222
 #, no-c-format
 msgid ""
-"By default, the \"What's Up Tonight\" tool displays all objects which are above "
-"the horizon between sunset and midnight (i.e., \"in the evening\").  You can "
-"also choose to show objects which are up between midnight and dawn (i.e., \"in "
-"the morning\"), or objects which are up at any time between sunset and sunrise "
-"(i.e., \"any time tonight\")"
+"By default, the \"What's Up Tonight\" tool displays all objects which are "
+"above the horizon between sunset and midnight (i.e., \"in the evening\").  "
+"You can also choose to show objects which are up between midnight and dawn "
+"(i.e., \"in the morning\"), or objects which are up at any time between "
+"sunset and sunrise (i.e., \"any time tonight\")"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 234
-#: rc.cpp:4090
+#: tools/wutdialogui.ui:234
 #, no-c-format
 msgid "Almanac"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 251
-#: rc.cpp:4093
+#: tools/wutdialogui.ui:251
 #, no-c-format
 msgid "Sunrise:  07:15"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 254
-#: rc.cpp:4096
+#: tools/wutdialogui.ui:254
 #, no-c-format
 msgid "Time of sunrise"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 257
-#: rc.cpp:4099
+#: tools/wutdialogui.ui:257
 #, no-c-format
 msgid "Displays the time of sunrise for the selected date."
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 271
-#: rc.cpp:4102
+#: tools/wutdialogui.ui:271
 #, no-c-format
 msgid "Moon rise:  13:19"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 274
-#: rc.cpp:4105
+#: tools/wutdialogui.ui:274
 #, no-c-format
 msgid "Time of moon rise"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 277
-#: rc.cpp:4108
+#: tools/wutdialogui.ui:277
 #, no-c-format
 msgid "Displays the time at which the moon rises on the selected date."
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 291
-#: rc.cpp:4111
+#: tools/wutdialogui.ui:291
 #, no-c-format
 msgid "Moon set: 04:27 "
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 294
-#: rc.cpp:4114
+#: tools/wutdialogui.ui:294
 #, no-c-format
 msgid "Time of moon set"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 297
-#: rc.cpp:4117
+#: tools/wutdialogui.ui:297
 #, no-c-format
 msgid "Displays the time at which the moon sets on the selected date."
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 311
-#: rc.cpp:4120
+#: tools/wutdialogui.ui:311
 #, no-c-format
 msgid "Sunset:  19:15"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 314
-#: rc.cpp:4123
+#: tools/wutdialogui.ui:314
 #, no-c-format
 msgid "Time of sunset"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 317
-#: rc.cpp:4126
+#: tools/wutdialogui.ui:317
 #, no-c-format
 msgid "Displays the time of sunset for the selected date."
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 331
-#: rc.cpp:4129
+#: tools/wutdialogui.ui:331
 #, no-c-format
 msgid "Night duration: 11:00 hours"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 334
-#: rc.cpp:4132
+#: tools/wutdialogui.ui:334
 #, no-c-format
 msgid "Duration of night for selected date"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 337
-#: rc.cpp:4135
+#: tools/wutdialogui.ui:337
 #, no-c-format
 msgid "Displays the duration between sunset and sunrise for the selected date."
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 351
-#: rc.cpp:4138
+#: tools/wutdialogui.ui:351
 #, no-c-format
 msgid "Moon illum: 42%"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 354
-#: rc.cpp:4141
+#: tools/wutdialogui.ui:354
 #, no-c-format
 msgid "Moon's illumination fraction"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 357
-#: rc.cpp:4144
+#: tools/wutdialogui.ui:357
 #, no-c-format
 msgid "Displays the illumination fraction of the Moon for the selected date."
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 398
-#: rc.cpp:4147
+#: tools/wutdialogui.ui:398
 #, no-c-format
 msgid "Choose a category:"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 412
-#: rc.cpp:4150
+#: tools/wutdialogui.ui:412
 #, no-c-format
 msgid "List of objects above horizon tonight"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 415
-#: rc.cpp:4153
+#: tools/wutdialogui.ui:415
 #, no-c-format
 msgid ""
 "Objects listed here are above the horizon on the selected date, and have the "
 "object type which is highlighted in the \"Choose a Category\" list."
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 423
-#: rc.cpp:4156
+#: tools/wutdialogui.ui:423
 #, no-c-format
 msgid "Object Name"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 434
-#: rc.cpp:4159
+#: tools/wutdialogui.ui:434
 #, no-c-format
 msgid "Rises at:  22:12"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 440
-#: rc.cpp:4162
+#: tools/wutdialogui.ui:440
 #, no-c-format
 msgid ""
 "Displays the time at which the highlighted object rises above the horizon on "
 "the selected date."
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 448
-#: rc.cpp:4165
+#: tools/wutdialogui.ui:448
 #, no-c-format
 msgid "Transits at:  03:45"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 454
-#: rc.cpp:4168
+#: tools/wutdialogui.ui:454
 #, no-c-format
 msgid ""
 "Displays the time at which the highlighted object transits across the local "
 "meridian on the selected date."
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 462
-#: rc.cpp:4171
+#: tools/wutdialogui.ui:462
 #, no-c-format
 msgid "Sets at:  08:22"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 468
-#: rc.cpp:4174
+#: tools/wutdialogui.ui:468
 #, no-c-format
 msgid ""
-"Displays the time at which the highlighted object sets below the horizon on the "
-"selected date."
+"Displays the time at which the highlighted object sets below the horizon on "
+"the selected date."
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 493
-#: rc.cpp:4177
+#: tools/wutdialogui.ui:493
 #, fuzzy, no-c-format
 msgid "Center Object"
 msgstr "Gwrthrych"
 
-#. i18n: file tools/wutdialogui.ui line 496
-#: rc.cpp:4180
+#: tools/wutdialogui.ui:496
 #, no-c-format
 msgid "Center this object in the sky display"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 499
-#: rc.cpp:4183
+#: tools/wutdialogui.ui:499
 #, no-c-format
 msgid ""
 "Center the sky display on this object, and begin tracking it.  Equivalent to "
 "the \"Center and Track\" item in the popup menu."
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 510
-#: rc.cpp:4189
+#: tools/wutdialogui.ui:510
 #, no-c-format
 msgid "Open the Object Details window"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 513
-#: rc.cpp:4192
+#: tools/wutdialogui.ui:513
 #, no-c-format
 msgid "Open the Details window for the highlighted object."
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 529
-#: rc.cpp:4195
+#: tools/wutdialogui.ui:529
 #, no-c-format
 msgid "List of object categories"
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 532
-#: rc.cpp:4198
+#: tools/wutdialogui.ui:532
 #, no-c-format
 msgid ""
-"Select an item in the Categories list to display objects in that category which "
-"are above the horizon on the selected date."
+"Select an item in the Categories list to display objects in that category "
+"which are above the horizon on the selected date."
 msgstr ""
 
-#. i18n: file tools/wutdialogui.ui line 546
-#: rc.cpp:4201
+#: tools/wutdialogui.ui:546
 #, no-c-format
 msgid "Matching objects:"
 msgstr ""
 
-#. i18n: file fitsviewer.rc line 36
-#: rc.cpp:4216
-#, no-c-format
-msgid "Process ToolBar"
-msgstr ""
-
-#. i18n: file kstarsui.rc line 20
-#: rc.cpp:4222
-#, no-c-format
-msgid "T&ime"
-msgstr "A&mser"
-
-#. i18n: file kstarsui.rc line 27
-#: rc.cpp:4225
-#, no-c-format
-msgid "&Pointing"
-msgstr ""
-
-#. i18n: file kstarsui.rc line 51
-#: rc.cpp:4231
-#, no-c-format
-msgid "&Devices"
-msgstr "&Dyfeisiau"
-
-#. i18n: file kstarsui.rc line 79
-#: rc.cpp:4240
-#, no-c-format
-msgid "&Info Boxes"
-msgstr ""
-
-#. i18n: file kstarsui.rc line 86
-#: rc.cpp:4243
-#, no-c-format
-msgid "&Toolbars"
-msgstr "&Barrau Offer:"
-
-#. i18n: file kstarsui.rc line 90
-#: rc.cpp:4246
-#, no-c-format
-msgid "&Statusbar"
-msgstr ""
-
-#. i18n: file kstarsui.rc line 131
-#: rc.cpp:4255
-#, no-c-format
-msgid "View Toolbar"
-msgstr "Gweld Bar Offer"
-
-#: simclock.cpp:129
-msgid "Stopping the timer"
-msgstr ""
-
-#: simclock.cpp:147
-msgid "Starting the timer"
-msgstr ""
-
-#: simclock.cpp:165
-msgid "Setting clock:  UTC: %1  JD: %2"
-msgstr ""
-
-#: simclock.cpp:169
-msgid "Cannot set SimClock:  Invalid Date/Time."
-msgstr ""
-
-#: simclock.cpp:175
-msgid "New clock scale: %1 sec"
-msgstr ""
-
-#: skymap.cpp:508
-msgid "Requested Position Below Horizon"
-msgstr ""
-
-#: skymap.cpp:509
-msgid ""
-"The requested position is below the horizon.\n"
-"Would you like to go there anyway?"
-msgstr ""
-
-#: skymap.cpp:511
-msgid "Go Anyway"
-msgstr ""
-
-#: skymap.cpp:511
-#, fuzzy
-msgid "Keep Position"
-msgstr "Lleoliad"
-
-#: skymap.cpp:602 skymap.cpp:644
-msgid ""
-"Digitized Sky Survey image provided by the Space Telescope Science Institute."
-msgstr ""
-
-#: skymap.cpp:670 skymap.cpp:674
-msgid "Angular distance: "
-msgstr ""
-
-#: skymap.cpp:741
-msgid "No object selected."
-msgstr ""
-
-#: skymap.cpp:1337
-msgid ""
-"Custom image-links file could not be opened.\n"
-"Link cannot be recorded for future sessions."
-msgstr ""
-
-#: skymap.cpp:1355
-msgid ""
-"Custom information-links file could not be opened.\n"
-"Link cannot be recorded for future sessions."
-msgstr ""
-
-#: skymap.cpp:1355
-msgid "Could not Open File"
-msgstr "Methwyd agor y ffeil"
-
-#: skymapdraw.cpp:932
-msgid ""
-"_: North\n"
-"N"
-msgstr "N"
-
-#: skymapdraw.cpp:942
-msgid ""
-"_: Northeast\n"
-"NE"
-msgstr "Gogledd Ddwyrain"
-
-#: skymapdraw.cpp:952
-msgid ""
-"_: East\n"
-"E"
-msgstr "Dwyrain"
-
-#: skymapdraw.cpp:962
-msgid ""
-"_: Southeast\n"
-"SE"
-msgstr "De Ddwyrain"
-
-#: skymapdraw.cpp:972
-msgid ""
-"_: South\n"
-"S"
-msgstr "Eil"
-
-#: skymapdraw.cpp:982
-msgid ""
-"_: Southwest\n"
-"SW"
-msgstr "De Orllewin"
-
-#: skymapdraw.cpp:992
-msgid ""
-"_: West\n"
-"W"
-msgstr "W"
-
-#: skymapdraw.cpp:1002
-msgid ""
-"_: Northwest\n"
-"NW"
-msgstr "Gogledd Orllewin"
-
-#: ksplanetbase.h:83 skyobject.cpp:35
-msgid "unnamed"
-msgstr "di-enw"
-
-#: skyobject.cpp:36
-msgid "unnamed object"
-msgstr ""
-
-#: skyobject.cpp:312
-msgid "Star"
-msgstr "Seren"
-
-#: skyobject.cpp:313
-msgid "Catalog Star"
-msgstr ""
-
-#: skyobject.cpp:314
-msgid "Planet"
-msgstr ""
-
-#: skyobject.cpp:315
-msgid "Open Cluster"
-msgstr ""
-
-#: skyobject.cpp:316
-msgid "Globular Cluster"
-msgstr ""
-
-#: skyobject.cpp:317
-msgid "Gaseous Nebula"
-msgstr ""
-
-#: skyobject.cpp:318
-msgid "Planetary Nebula"
-msgstr ""
-
-#: skyobject.cpp:319
-msgid "Supernova Remnant"
-msgstr ""
-
-#: skyobject.cpp:320
-msgid "Galaxy"
-msgstr "Galaeth"
-
-#: skyobject.cpp:321
-msgid "Comet"
-msgstr ""
-
-#: skyobject.cpp:322
-msgid "Asteroid"
-msgstr ""
-
-#: skyobject.cpp:323
-msgid "Unknown Type"
-msgstr "Math anhysbys"
-
-#: skyobject.cpp:346
-msgid "Show HST Image"
-msgstr ""
-
-#: skyobject.cpp:347
-msgid "%1: Hubble Space Telescope, operated by STScI for NASA [public domain]"
-msgstr ""
-
-#: skyobject.cpp:350
-msgid "Show Spitzer Image"
-msgstr ""
-
-#: skyobject.cpp:351
-msgid "%1: Spitzer Space Telescope, courtesy NASA/JPL-Caltech [public domain]"
-msgstr ""
-
-#: skyobject.cpp:354
-msgid "Show SEDS Image"
-msgstr ""
-
-#: skyobject.cpp:355
-msgid "%1: SEDS, http://www.seds.org [free for non-commercial use]"
-msgstr ""
-
-#: skyobject.cpp:358
-msgid "Show KPNO AOP Image"
-msgstr ""
-
-#: skyobject.cpp:359
-msgid ""
-"%1: Advanced Observing Program at Kitt Peak National Observatory [free for "
-"non-commercial use; no physical reproductions]"
-msgstr ""
-
-#: skyobject.cpp:362
-msgid "Show NOAO Image"
-msgstr ""
-
-#: skyobject.cpp:363
-msgid ""
-"%1: National Optical Astronomy Observatories and AURA [free for non-commercial "
-"use]"
-msgstr ""
-
-#: skyobject.cpp:367
-msgid ""
-"%1: Very Large Telescope, operated by the European Southern Observatory [free "
-"for non-commercial use; no reproductions]"
-msgstr ""
-
-#: skyobject.cpp:370
-msgid "Show"
-msgstr "Dangos"
-
-#: skyobject.cpp:427
-msgid "user log file could not be opened."
-msgstr ""
-
-#: skypoint.cpp:94 skypoint.cpp:97
-msgid "Coordinate out of range."
-msgstr ""
-
-#: skypoint.cpp:245
-msgid "lat and LST parameters should only be used in KSPlanetBase objects."
-msgstr ""
-
-#: skypoint.cpp:592 skypoint.cpp:633 skypoint.cpp:646 skypoint.cpp:666
-#: skypoint.cpp:679 skypoint.cpp:716 skypoint.cpp:735 skypoint.cpp:748
-#: skypoint.cpp:764
-msgid "No constellation found for point: (%1, %2)"
-msgstr ""
-
-#: starobject.cpp:98
-msgid "alpha"
-msgstr "alffa"
-
-#: starobject.cpp:99
-msgid "beta"
-msgstr ""
-
-#: starobject.cpp:100
-msgid "gamma"
-msgstr "gama"
-
-#: starobject.cpp:101
-msgid "delta"
-msgstr ""
-
-#: starobject.cpp:102
-msgid "epsilon"
-msgstr ""
-
-#: starobject.cpp:103
-msgid "zeta"
-msgstr ""
-
-#: starobject.cpp:104
-msgid "eta"
-msgstr ""
-
-#: starobject.cpp:105
-msgid "theta"
-msgstr ""
-
-#: starobject.cpp:106
-msgid "iota"
-msgstr ""
-
-#: starobject.cpp:107
-msgid "kappa"
-msgstr ""
-
-#: starobject.cpp:108
-msgid "lambda"
-msgstr ""
-
-#: starobject.cpp:109
-msgid "mu"
-msgstr ""
-
-#: starobject.cpp:110
-msgid "nu"
-msgstr ""
-
-#: starobject.cpp:111
-msgid "xi"
-msgstr ""
-
-#: starobject.cpp:112
-msgid "omicron"
-msgstr ""
-
-#: starobject.cpp:113
-msgid "pi"
-msgstr ""
-
-#: starobject.cpp:114
-msgid "rho"
-msgstr ""
-
-#: starobject.cpp:117
-msgid "sigma"
-msgstr ""
-
-#: starobject.cpp:118
-msgid "tau"
-msgstr ""
-
-#: starobject.cpp:119
-msgid "upsilon"
-msgstr ""
-
-#: starobject.cpp:120
-msgid "phi"
-msgstr ""
-
-#: starobject.cpp:121
-msgid "chi"
-msgstr ""
-
-#: starobject.cpp:122
-msgid "psi"
-msgstr ""
-
-#: starobject.cpp:123
-msgid "omega"
-msgstr ""
-
-#: telescopeprop.cpp:93
-msgid "Telescope label is missing."
-msgstr ""
-
-#: telescopeprop.cpp:99
-msgid "Telescope driver is missing."
-msgstr ""
-
-#: telescopeprop.cpp:105
-msgid "Telescope driver version is missing."
-msgstr ""
-
-#: telescopeprop.cpp:161
-msgid "You need to restart KStars for changes to take effect."
-msgstr ""
-
-#: telescopeprop.cpp:231
-msgid "Are you sure you want to remove %1?"
-msgstr "A ydych yn sicr eich bod am waredu %1?"
-
-#: telescopewizardprocess.cpp:143
-msgid "Autoscan"
-msgstr ""
-
-#: telescopewizardprocess.cpp:143
-msgid ""
-"Please wait while KStars scan communication ports for attached telescopes.\n"
-"This process might take few minutes to complete."
-msgstr ""
-
-#: telescopewizardprocess.cpp:152
-msgid "Please wait while KStars tries to connect to your telescope..."
-msgstr ""
-
-#: telescopewizardprocess.cpp:154
-msgid "Error. Unable to locate telescope drivers."
-msgstr ""
-
-#: telescopewizardprocess.cpp:279
-msgid "Error: connection timeout. Unable to communicate with an INDI server"
-msgstr ""
-
-#: telescopewizardprocess.cpp:336
-msgid ""
-"Sorry. KStars failed to detect any attached telescopes, please check your "
-"settings and try again."
-msgstr ""
-
-#: thumbnaileditor.cpp:33
-msgid "Edit Thumbnail Image"
-msgstr ""
-
-#: thumbnaileditor.cpp:65
-msgid "Crop region: [%1,%2  %3x%4]"
-msgstr ""
-
-#: thumbnailpicker.cpp:47
-msgid "Choose Thumbnail Image"
-msgstr ""
-
-#: thumbnailpicker.cpp:101
-msgid "Loading images..."
-msgstr ""
-
-#: thumbnailpicker.cpp:316
-#, fuzzy, c-format
-msgid "Failed to load image at %1"
-msgstr "Methu cadw'r ddelwedd : %1 "
-
-#: thumbnailpicker.cpp:317
-#, fuzzy
-msgid "Failed to Load Image"
-msgstr "Methu cadw'r ddelwedd : %1 "
-
-#: timedialog.cpp:33
+#: data/tips:3
 msgid ""
-"_: set clock to a new time\n"
-"Set Time"
-msgstr ""
-
-#: timespinbox.cpp:121 timespinbox.cpp:122 timespinbox.cpp:123
-#: timespinbox.cpp:124 timespinbox.cpp:126 timespinbox.cpp:127
-#: timespinbox.cpp:128 timespinbox.cpp:129 timespinbox.cpp:130
-msgid ""
-"_: seconds\n"
-"secs"
-msgstr ""
-
-#: timespinbox.cpp:125
-msgid ""
-"_: second\n"
-"sec"
-msgstr ""
-
-#: timespinbox.cpp:131
-msgid ""
-"_: minute\n"
-"min"
-msgstr "mun"
-
-#: timespinbox.cpp:132 timespinbox.cpp:133 timespinbox.cpp:134
-#: timespinbox.cpp:135 timespinbox.cpp:136
-msgid ""
-"_: minutes\n"
-"mins"
-msgstr ""
-
-#: timespinbox.cpp:137
-msgid "hour"
-msgstr "awr"
-
-#: timespinbox.cpp:138 timespinbox.cpp:139 timespinbox.cpp:140
-#: timespinbox.cpp:141
-msgid ""
-"_: hours\n"
-"hrs"
-msgstr ""
-
-#: timespinbox.cpp:143 timespinbox.cpp:146 timespinbox.cpp:147
-#: timespinbox.cpp:148 tools/lcgenerator.cpp:207
-msgid "days"
-msgstr "diwrnod"
-
-#: timespinbox.cpp:145
-msgid "day"
-msgstr "diwrnod"
-
-#: timespinbox.cpp:149
-msgid "week"
-msgstr "wythnos"
-
-#: timespinbox.cpp:150 timespinbox.cpp:151
-msgid ""
-"_: weeks\n"
-"wks"
-msgstr ""
-
-#: timespinbox.cpp:152
-msgid "month"
-msgstr "mis"
-
-#: timespinbox.cpp:153 timespinbox.cpp:154 timespinbox.cpp:155
-#: timespinbox.cpp:156 timespinbox.cpp:157
-msgid ""
-"_: months\n"
-"mths"
-msgstr ""
-
-#: timespinbox.cpp:158
-msgid "year"
-msgstr "blwyddyn"
-
-#: timespinbox.cpp:159 timespinbox.cpp:160 timespinbox.cpp:161
-#: timespinbox.cpp:162 timespinbox.cpp:163 timespinbox.cpp:164
-#: timespinbox.cpp:165
-msgid ""
-"_: years\n"
-"yrs"
-msgstr ""
-
-#: timespinbox.cpp:209
-msgid "Reporting new timestep value: "
-msgstr ""
-
-#: timestepbox.cpp:32
-msgid "Adjust time step"
-msgstr ""
-
-#: timestepbox.cpp:33
-msgid "Adjust time step units"
-msgstr ""
-
-#: timestepbox.cpp:35
-msgid ""
-"Set the timescale for the simulation clock.  A setting of \"1 sec\" means the "
-"clock advances in real-time, keeping up perfectly with your CPU clock.  Higher "
-"values make the simulation clock run faster, lower values make it run slower.  "
-"Negative values make it run backwards.\n"
-"\n"
-"There are two pairs of up/down buttons.  The left pair will cycle through all "
-"available timesteps in sequence.  Since there are a large number of timesteps, "
-"the right pair is provided to skip to the next higher/lower unit of time.  For "
-"example, if the timescale is currently \"1 min\", the right up button will make "
-"it \"1 hour\", and the right down button will make it \"1 sec\""
-msgstr ""
-
-#: timezonerule.cpp:51
-msgid "Error parsing TimeZoneRule, setting to empty rule."
-msgstr ""
-
-#: timezonerule.cpp:80
-msgid "Daylight Saving Time active"
-msgstr ""
-
-#: timezonerule.cpp:83
-msgid "Daylight Saving Time inactive"
-msgstr ""
-
-#: timezonerule.cpp:104 timezonerule.cpp:144
-msgid "Could not parse "
-msgstr ""
-
-#: timezonerule.cpp:104
-msgid " as a valid month code."
-msgstr ""
-
-#: timezonerule.cpp:144
-msgid " as a valid day code."
-msgstr ""
-
-#: timezonerule.cpp:256
-msgid "Next Daylight Savings Time change (Local Time): "
-msgstr ""
-
-#: timezonerule.cpp:290
-msgid "Previous Daylight Savings Time change (Local Time): "
-msgstr ""
-
-#: timezonerule.cpp:299
-msgid "Next Daylight Savings Time change (UTC): "
-msgstr ""
-
-#: timezonerule.cpp:312
-msgid "Previous Daylight Savings Time change (UTC): "
-msgstr ""
-
-#: tips.cpp:3
-msgid ""
-"\t\t"
-"<p>You can locate objects in the sky by their name.\n"
+"\t\t<p>You can locate objects in the sky by their name.\n"
 "\t\t\tUse Ctrl+F, the \"Focus->Find Object\" menu item, or the \"Find\"\n"
 "\t\t\tToolbar button.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:12
+#: data/tips:11
 msgid ""
-"\t\t"
-"<p>To change your Geographic Location,\n"
+"\t\t<p>To change your Geographic Location,\n"
 "\t\t\tuse Ctrl+G, the \"Settings->Set Geographic Location...\" menu item,\n"
 "\t\t\tor the \"globe\" Toolbar button.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:21
+#: data/tips:19
 msgid ""
-"\t\t"
-"<p>You can Track an object, so it will always be centered\n"
-"\t\t\tin the display."
-"<br/>\n"
+"\t\t<p>You can Track an object, so it will always be centered\n"
+"\t\t\tin the display.<br/>\n"
 "\t\t\tUse Ctrl+T, the \"Focus->Track Object\" menu item, or the \"lock\"\n"
 "\t\t\tToolbar button. You can also simply center the object by\n"
 "\t\t\tdouble-clicking on it or selecting \"Center and Track\" from the\n"
 "\t\t\tobject's popup menu.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:33
+#: data/tips:30
 msgid ""
-"\t\t"
-"<p>The KStars Handbook includes the AstroInfo Project, a series\n"
+"\t\t<p>The KStars Handbook includes the AstroInfo Project, a series\n"
 "\t\t\tof informative articles about Astronomy.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:41
+#: data/tips:37
 msgid ""
-"\t\t"
-"<p>There are three on-screen \"Info Boxes\" which show data related to the\n"
-"\t\t\ttime/date, your geographic location, and the current central position on "
+"\t\t<p>There are three on-screen \"Info Boxes\" which show data related to "
 "the\n"
-"\t\t\tsky (the focus).  You can drag these boxes with the mouse, and \"shade\" "
-"them\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\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"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:52
+#: data/tips:47
 msgid ""
-"\t\t"
-"<p>KStars has a full-screen mode; you can toggle this mode using the\n"
+"\t\t<p>KStars has a full-screen mode; you can toggle this mode using the\n"
 "\t\t\t\"fullscreen\" toolbar button, or by pressing Ctrl+Shift+F.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:60
+#: data/tips:54
 msgid ""
-"\t\t"
-"<p>The N,S,E,W keys will point the display at the North,\n"
+"\t\t<p>The N,S,E,W keys will point the display at the North,\n"
 "\t\t\tSouth, East and West points on the Horizon.  The Z key will point the\n"
 "\t\t\tdisplay at the Zenith.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:69
+#: data/tips:62
 msgid ""
-"\t\t"
-"<p>The 0-9 keys will center the display on one of the major solar system\n"
+"\t\t<p>The 0-9 keys will center the display on one of the major solar "
+"system\n"
 "\t\t\tbodies.  0 centers on the Sun, 3 centers on the Moon; the rest are the "
 "eight\n"
 "\t\t\tplanets, in order of their distance from the Sun.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:78
+#: data/tips:70
 msgid ""
-"\t\t"
-"<p>Click and Drag with the mouse to slew the skymap to a new position on\n"
+"\t\t<p>Click and Drag with the mouse to slew the skymap to a new position "
+"on\n"
 "\t\t\tthe sky.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:86
+#: data/tips:77
 msgid ""
-"\t\t"
-"<p>Double-click with the mouse to center the display on the location\n"
+"\t\t<p>Double-click with the mouse to center the display on the location\n"
 "\t\t\tof the mouse cursor.  If you double-click on an object, KStars will\n"
 "\t\t\tautomatically begin tracking it.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:95
+#: data/tips:85
 msgid ""
-"\t\t"
-"<p>The status bar displays the current sky coordinates of the mouse cursor,\n"
+"\t\t<p>The status bar displays the current sky coordinates of the mouse "
+"cursor,\n"
 "\t\t\tin both Equatorial and Horizontal coordinate systems.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:103
+#: data/tips:92
 msgid ""
-"\t\t"
-"<p>The display can be zoomed in or out by spinning your mouse's scroll wheel,\n"
-"\t\t\tor by dragging the mouse up or down with the middle mouse button pressed. "
-" You\n"
-"\t\t\tcan also use the +/- keys, or the \"Zoom In\"/\"Zoom Out\" items in the "
-"toolbar and\n"
-"\t\t\tin the View menu.  The Zoom Level can be set manually using the \"Zoom to "
-"Angular\n"
+"\t\t<p>The display can be zoomed in or out by spinning your mouse's scroll "
+"wheel,\n"
+"\t\t\tor by dragging the mouse up or down with the middle mouse button "
+"pressed.  You\n"
+"\t\t\tcan also use the +/- keys, or the \"Zoom In\"/\"Zoom Out\" items in "
+"the toolbar and\n"
+"\t\t\tin the View menu.  The Zoom Level can be set manually using the \"Zoom "
+"to Angular\n"
 "\t\t\tSize\" item in the View menu (Shift+Ctrl+Z), and you can set it "
 "graphically by\n"
 "\t\t\tholding down the Ctrl button while dragging the mouse to define a "
 "rectangle for\n"
 "\t\t\tthe new window boundaries.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:116
+#: data/tips:104
 msgid ""
-"\t\t"
-"<p>You can manually set the coordinates of the central Focus point.\n"
-"\t\t\tPress Ctrl+M, or use the \"Focus->Set Focus Manually...\" menu item, and "
-"enter\n"
+"\t\t<p>You can manually set the coordinates of the central Focus point.\n"
+"\t\t\tPress Ctrl+M, or use the \"Focus->Set Focus Manually...\" menu item, "
+"and enter\n"
 "\t\t\tthe desired coordinates in the popup window.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:125
+#: data/tips:112
 msgid ""
-"\t\t"
-"<p>To switch between Equatorial and Horizontal coordinate\n"
-"\t\t\tsystems, use the \"View->Coordinates\" menu item, or press the spacebar.\n"
+"\t\t<p>To switch between Equatorial and Horizontal coordinate\n"
+"\t\t\tsystems, use the \"View->Coordinates\" menu item, or press the "
+"spacebar.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:133
+#: data/tips:119
 msgid ""
-"\t\t"
-"<p>To set the Time and Date, type Ctrl+S, use the \"Time->"
-"Set Time\" menu item,\n"
-"\t\t\tor press the \"time\" toolbar button.  Note that dates in KStars can be "
-"very\n"
+"\t\t<p>To set the Time and Date, type Ctrl+S, use the \"Time->Set Time\" "
+"menu item,\n"
+"\t\t\tor press the \"time\" toolbar button.  Note that dates in KStars can "
+"be very\n"
 "\t\t\tremote; you can use any year between -50,000 and +50,000.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:142
+#: data/tips:127
 msgid ""
-"\t\t"
-"<p>You can use Ctrl+E or the \"Time->Set Time to Now\" menu item to "
+"\t\t<p>You can use Ctrl+E or the \"Time->Set Time to Now\" menu item to "
 "synchronize\n"
 "\t\t\tthe simulation clock with your CPU clock.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:150
+#: data/tips:134
 msgid ""
-"\t\t"
-"<p>The Spin Box in the Toolbar allows you to adjust the time step\n"
+"\t\t<p>The Spin Box in the Toolbar allows you to adjust the time step\n"
 "\t\t\tused by the KStars clock; setting it to \"1.0 sec\" provides \"real "
 "time\".\n"
 "\t\t\tNote: negative values make time run backwards.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:159
+#: data/tips:142
 msgid ""
-"\t\t"
-"<p>You can stop and start the clock with the \"Play/Pause\" button\n"
+"\t\t<p>You can stop and start the clock with the \"Play/Pause\" button\n"
 "\t\t\tin the Toolbar, or with the \"Time->Stop/Start Clock\" menu item.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:167
+#: data/tips:149
 msgid ""
-"\t\t"
-"<p>You can advance the simulation clock forward or backward by a single\n"
+"\t\t<p>You can advance the simulation clock forward or backward by a single\n"
 "\t\t\ttime step by pressing the \"&gt;\" or \"&lt;\" keys.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:175
+#: data/tips:156
 msgid ""
-"\t\t"
-"<p>When you click your mouse in the map, the object in the sky nearest\n"
+"\t\t<p>When you click your mouse in the map, the object in the sky nearest\n"
 "\t\t\tthe mouse cursor is identified in the status bar.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:183
+#: data/tips:163
 msgid ""
-"\t\t"
-"<p>When you hold the mouse cursor still for a moment, the nearest object\n"
+"\t\t<p>When you hold the mouse cursor still for a moment, the nearest "
+"object\n"
 "\t\t\twill be identified by a temporary name label that automatically fades\n"
 "\t\t\tout when you move the mouse again.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:192
+#: data/tips:171
 msgid ""
-"\t\t"
-"<p>Right-click with the mouse to open a popup menu of detailed options\n"
+"\t\t<p>Right-click with the mouse to open a popup menu of detailed options\n"
 "\t\t\tfor a particular object, including links to images and information on\n"
 "\t\t\tthe Internet.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:201
+#: data/tips:179
 msgid ""
-"\t\t"
-"<p>The deep-sky objects with a special color (the default is Red)\n"
+"\t\t<p>The deep-sky objects with a special color (the default is Red)\n"
 "\t\t\thave extra URL links available in their popup menu.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:209
+#: data/tips:186
 msgid ""
-"\t\t"
-"<p>By default, stars in KStars are displayed with realistic colors.\n"
+"\t\t<p>By default, stars in KStars are displayed with realistic colors.\n"
 "\t\t\tA star's color depends on its temperature; cooler stars are red,\n"
 "\t\t\twhile hotter stars are blue.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:218
+#: data/tips:194
 msgid ""
-"\t\t"
-"<p>If you want the very latest orbital information for asteroids and\n"
+"\t\t<p>If you want the very latest orbital information for asteroids and\n"
 "\t\t\tcomets (including recently-discovered objects), check the \"Download\n"
 "\t\t\tData\" tool (\"File|Download Data\" or Ctrl+D) frequently for updated\n"
 "\t\t\tephemerides.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:228
+#: data/tips:203
 msgid ""
-"\t\t"
-"<p>The Details window provides a large amount of information on any \n"
+"\t\t<p>The Details window provides a large amount of information on any \n"
 "\t\t\tobject in the sky, including coordinates, rise/set times, internet \n"
 "\t\t\tlinks, and your own custom notes.  Access the Details window through \n"
 "\t\t\tthe popup menu, or by clicking on an object and then pressing \"D\".\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:238
+#: data/tips:212
 msgid ""
-"\t\t"
-"<p>You can attach a name label to any object in the sky.  Toggle the \n"
+"\t\t<p>You can attach a name label to any object in the sky.  Toggle the \n"
 "\t\t\tlabel in the popup menu, or by clicking on the object and then \n"
 "\t\t\tpressing \"L\".\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:247
+#: data/tips:220
 msgid ""
-"\t\t"
-"<p>The KStars Astrocalculator (Ctrl+C) gives you direct access to many \n"
+"\t\t<p>The KStars Astrocalculator (Ctrl+C) gives you direct access to many \n"
 "\t\t\tof the calculations that KStars does behind-the-scenes.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:255
+#: data/tips:227
 msgid ""
-"\t\t"
-"<p>The AAVSO Light Curve Generator tool (Ctrl+V) connects to a server at the\n"
+"\t\t<p>The AAVSO Light Curve Generator tool (Ctrl+V) connects to a server at "
+"the\n"
 "\t\t\tAmerican Association of Variable Star Observers, and constructs a\n"
 "\t\t\tlightcurve for any of the 6000+ variable stars that they monitor\n"
 "\t\t\ton a daily basis.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:265
+#: data/tips:236
 msgid ""
-"\t\t"
-"<p>The Altitude vs. Time tool (Ctrl+A) will plot altitude curves for any group\n"
+"\t\t<p>The Altitude vs. Time tool (Ctrl+A) will plot altitude curves for any "
+"group\n"
 "\t\t\tof objects that you select.  This is a great tool for planning\n"
 "\t\t\tobserving sessions.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:274
+#: data/tips:244
 msgid ""
-"\t\t"
-"<p>With the What's Up Tonight? tool (Ctrl+U), you can tell at a glance what\n"
+"\t\t<p>With the What's Up Tonight? tool (Ctrl+U), you can tell at a glance "
+"what\n"
 "\t\t\tobjects will be visible from your location on a given night.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:282
+#: data/tips:251
 msgid ""
-"\t\t"
-"<p>The Observing List tool (Ctrl+L) gives you easy access to a selected group \n"
+"\t\t<p>The Observing List tool (Ctrl+L) gives you easy access to a selected "
+"group \n"
 "\t\t\tof objects.  Add objects to the list through the popup menu, or by\n"
 "\t\t\tclicking on the object, and pressing \"O\".\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:291
+#: data/tips:259
 msgid ""
-"\t\t"
-"<p>The ScriptBuilder tool allows you to construct complex DCOP\n"
+"\t\t<p>The ScriptBuilder tool allows you to construct complex DCOP\n"
 "\t\t\tscripts using a simple GUI.  The scripts can be played back later\n"
 "\t\t\tfrom the command line, or from within KStars.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:300
+#: data/tips:267
 msgid ""
-"\t\t"
-"<p>The Solar System Viewer tool (Ctrl+Y) shows an overhead view of the solar\n"
+"\t\t<p>The Solar System Viewer tool (Ctrl+Y) shows an overhead view of the "
+"solar\n"
 "\t\t\tsystem, showing the positions of the major planets for the current\n"
 "\t\t\tsimulation date.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:309
+#: data/tips:275
 msgid ""
-"\t\t"
-"<p>The Jupiter Moons tool (Ctrl+J) shows the relative positions of Jupiter's\n"
+"\t\t<p>The Jupiter Moons tool (Ctrl+J) shows the relative positions of "
+"Jupiter's\n"
 "\t\t\tfour largest moons (Io, Europa, Ganymede and Callisto), as seen from\n"
 "\t\t\tEarth, and as a function of time.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:318
+#: data/tips:283
 msgid ""
-"\t\t"
-"<p>You can export the sky image to a file using the \"Save Sky Image\"\n"
+"\t\t<p>You can export the sky image to a file using the \"Save Sky Image\"\n"
 "\t\t\titem in the File menu, or by pressing Ctrl+I.  In addition, you can\n"
-"\t\t\trun KStars from a command prompt with the \"--dump\" argument to save a\n"
+"\t\t\trun KStars from a command prompt with the \"--dump\" argument to save "
+"a\n"
 "\t\t\tsky image to disk without even opening the program window.  This can\n"
 "\t\t\tbe used to generate dynamic wallpaper for your KDE desktop.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:329
+#: data/tips:293
 msgid ""
-"\t\t"
-"<p>To add your own custom Object Catalogs, select\n"
+"\t\t<p>To add your own custom Object Catalogs, select\n"
 "\t\t\t\"Add Catalog\" from the Catalogs tab in the KStars Configuration "
 "window.\n"
 "\t\t\tSee the Handbook for instructions on formatting your catalog file.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:338
+#: data/tips:301
 msgid ""
-"\t\t"
-"<p>To add your own custom image/information URLs to\n"
+"\t\t<p>To add your own custom image/information URLs to\n"
 "\t\t\tany object, select \"Add Link...\" from the object's popup menu.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:346
+#: data/tips:308
 msgid ""
-"\t\t"
-"<p>You can adjust dozens of display options by clicking the\n"
-"\t\t\t\"configure\" Toolbar button, or selecting the \"Settings->"
-"Configure KStars...\"\n"
+"\t\t<p>You can adjust dozens of display options by clicking the\n"
+"\t\t\t\"configure\" Toolbar button, or selecting the \"Settings->Configure "
+"KStars...\"\n"
 "\t\t\tmenu item.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:355
+#: data/tips:316
 msgid ""
-"\t\t"
-"<p>The on-screen Info Boxes can be hidden or shown using the\n"
+"\t\t<p>The on-screen Info Boxes can be hidden or shown using the\n"
 "\t\t\t\"Settings->Info Boxes\" menu.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:363
+#: data/tips:323
 msgid ""
-"\t\t"
-"<p>The Toolbars can be hidden or shown using the \"Settings->Toolbars\" menu.\n"
+"\t\t<p>The Toolbars can be hidden or shown using the \"Settings->Toolbars\" "
+"menu.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:370
+#: data/tips:329
 msgid ""
-"\t\t"
-"<p>You can hide either the Ra/Dec or Az/Alt coordinate fields in the "
+"\t\t<p>You can hide either the Ra/Dec or Az/Alt coordinate fields in the "
 "statusbar,\n"
 "\t\t\tor hide the stausbar completely, using the Settings|Statusbar menu.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:378
+#: data/tips:336
 msgid ""
-"\t\t"
-"<p>You can easily switch between predefined color schemes by selecting\n"
+"\t\t<p>You can easily switch between predefined color schemes by selecting\n"
 "\t\t\tthe scheme from the \"Settings->Color Schemes\" menu.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:386
+#: data/tips:343
 msgid ""
-"\t\t"
-"<p>You can define your own Geographic Locations.  Fill in the\n"
+"\t\t<p>You can define your own Geographic Locations.  Fill in the\n"
 "\t\t\trequired fields in the \"Change Location\" Dialog and then press the\n"
 "\t\t\t\"Add to List\" button. Your Locations will be available in all\n"
 "\t\t\tfuture sessions.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:396
+#: data/tips:352
 msgid ""
-"\t\t"
-"<p>You can define your own Color Schemes.  Adjust the colors\n"
-"\t\t\tin the Configuration Window's \"Colors\" Tab, and then press the \"Save\n"
+"\t\t<p>You can define your own Color Schemes.  Adjust the colors\n"
+"\t\t\tin the Configuration Window's \"Colors\" Tab, and then press the "
+"\"Save\n"
 "\t\t\tCurrent Colors\" button. Your Color Scheme will appear in the list in\n"
 "\t\t\tall future sessions.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:406
+#: data/tips:361
 msgid ""
-"\t\t"
-"<p>You can construct your own field-of-view (FOV) symbols, using the\n"
+"\t\t<p>You can construct your own field-of-view (FOV) symbols, using the\n"
 "\t\t\tFOV Editor under the Tools menu.  You can set the angular size, the\n"
 "\t\t\tshape, and the color of your new symbols.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:415
+#: data/tips:369
 msgid ""
-"\t\t"
-"<p>The Advanced tab of the KStars Configuration window allows you to fine-tune\n"
+"\t\t<p>The Advanced tab of the KStars Configuration window allows you to "
+"fine-tune\n"
 "\t\t\tthe behavior of KStars. You can specify whether to correct for "
 "atmospheric\n"
 "\t\t\trefraction, and whether to use animated slewing. You can also specify "
 "which\n"
 "\t\t\tobjects are hidden while the display is in motion.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:425
+#: data/tips:378
 msgid ""
-"\t\t"
-"<p>KStars displays 126,000 stars, 13,000 deep-sky objects, 88 constellations,\n"
+"\t\t<p>KStars displays 126,000 stars, 13,000 deep-sky objects, 88 "
+"constellations,\n"
 "\t\t\tall planets, the Sun, the Moon, thousands of comets and asteroids, and "
 "the\n"
 "\t\t\tMilky Way.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:434
+#: data/tips:386
 msgid ""
-"\t\t"
-"<p>The line in the sky that the Sun and all the Planets seem to follow\n"
+"\t\t<p>The line in the sky that the Sun and all the Planets seem to follow\n"
 "\t\t\tis called the Ecliptic.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:442
+#: data/tips:393
 msgid ""
-"\t\t"
-"<p>Object positions in KStars include the effects of precession, nutation,\n"
-"\t\t\taberration, atmospheric refraction, and light travel time (for planets).\n"
+"\t\t<p>Object positions in KStars include the effects of precession, "
+"nutation,\n"
+"\t\t\taberration, atmospheric refraction, and light travel time (for "
+"planets).\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:450
+#: data/tips:400
 msgid ""
-"\t\t"
-"<p>The nearest star to the Sun is Rigel Kentaurus (alpha Centauri).\n"
+"\t\t<p>The nearest star to the Sun is Rigel Kentaurus (alpha Centauri).\n"
 "\t\t\tThe brightest star in the sky is Sirius (alpha Canis Majoris).\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:458
+#: data/tips:407
 msgid ""
-"\t\t"
-"<p>The large group of galaxies between Leo, Virgo and Coma Berenices\n"
+"\t\t<p>The large group of galaxies between Leo, Virgo and Coma Berenices\n"
 "\t\t\tis called the Virgo Cluster of Galaxies.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:466
+#: data/tips:414
 msgid ""
-"\t\t"
-"<p>The large group of clusters and nebulae near the south celestial pole\n"
+"\t\t<p>The large group of clusters and nebulae near the south celestial "
+"pole\n"
 "\t\t\tare objects in the Large Magellanic Cloud, which is a dwarf galaxy in\n"
 "\t\t\torbit around the Milky Way.\n"
 "\t\t</p>\n"
-"\t\n"
+"\t"
 msgstr ""
 
-#: tips.cpp:475
+#: data/tips:422
 msgid ""
-"\t\t"
-"<p>The Messier Catalog is a list of 110 of the brightest non-stellar objects\n"
-"\t\t\tin the sky.  It includes such famous objects as the Orion Nebula (M 42), "
-"the\n"
+"\t\t<p>The Messier Catalog is a list of 110 of the brightest non-stellar "
+"objects\n"
+"\t\t\tin the sky.  It includes such famous objects as the Orion Nebula (M "
+"42), the\n"
 "\t\t\tAndromeda Galaxy (M 31), and the Pleiades (M 45).\n"
 "\t\t</p>\n"
-"\t\n"
-msgstr ""
-
-#: addlinkdialog.h:42
-msgid "object"
-msgstr "gwrthrych"
-
-#: ksnewstuff.h:68
-msgid "Uploading data is not possible yet!"
-msgstr ""
-
-#: tools/altvstime.cpp:60
-#, fuzzy
-msgid "Local Time"
-msgstr "Wedi'u Lleoleiddio"
-
-#: tools/altvstime.cpp:61
-msgid "Local Sidereal Time"
-msgstr ""
-
-#: tools/altvstime.cpp:62
-msgid ""
-"_: the angle of an object above (or below) the horizon\n"
-"Altitude"
-msgstr "Uchder"
-
-#: tools/astrocalc.cpp:42
-msgid "Calculator"
-msgstr "Cyfrifiannell"
-
-#: tools/astrocalc.cpp:51
-msgid "<H2>KStars Astrocalculator</H2>"
-msgstr ""
-
-#: tools/astrocalc.cpp:67 tools/astrocalc.cpp:110
-msgid "Time Calculators"
-msgstr ""
-
-#: tools/astrocalc.cpp:74 tools/astrocalc.cpp:132
-msgid "Day Duration"
-msgstr ""
-
-#: tools/astrocalc.cpp:75 tools/astrocalc.cpp:134
-msgid "Equinoxes & Solstices"
-msgstr ""
-
-#: tools/astrocalc.cpp:78 tools/astrocalc.cpp:114
-msgid "Celestial Coordinates"
-msgstr ""
-
-#: tools/astrocalc.cpp:87 tools/astrocalc.cpp:128
-msgid "Earth Coordinates"
-msgstr ""
-
-#: tools/astrocalc.cpp:93 tools/astrocalc.cpp:138
-msgid "Planets Coordinates"
-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>"
-msgstr ""
-
-#: tools/astrocalc.cpp:185
-msgid ""
-"<QT>Section with algorithms for the conversion of different astronomical "
-"systems of coordinates<UL><LI><B>Precessor:</B> Precession of coordinates "
-"between epochs</LI><LI><B>Galactic:</B> Galactic/Equatorial coordinates "
-"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>"
-msgstr ""
-
-#: tools/astrocalc.cpp:221
-msgid ""
-"<QT>Section with algorithms for the conversion of systems of coordinates for "
-"the Earth<UL><LI><B>Geodetic Coordinates:</B> Geodetic/XYZ coordinate "
-"conversion</LI></UL></QT>"
-msgstr ""
-
-#: tools/astrocalc.cpp:240
-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>"
-msgstr ""
-
-#: tools/jmoontool.cpp:34
-msgid "Jupiter Moons Tool"
-msgstr ""
-
-#: tools/jmoontool.cpp:80
-msgid "offset from Jupiter (arcmin)"
-msgstr ""
-
-#: tools/jmoontool.cpp:81
-msgid "time since now (days)"
-msgstr ""
-
-#: tools/lcgenerator.cpp:43
-msgid "AAVSO Light Curve Generator"
-msgstr ""
-
-#: tools/lcgenerator.cpp:189
-#, fuzzy
-msgid "Star Info"
-msgstr "Seren"
-
-#: tools/lcgenerator.cpp:190
-msgid "Designation:"
-msgstr ""
-
-#: tools/lcgenerator.cpp:191
-msgid "Or name:"
-msgstr ""
-
-#: tools/lcgenerator.cpp:192
-msgid "Start date:"
-msgstr "Dyddiad dechrau:"
-
-#: tools/lcgenerator.cpp:193
-msgid "Start date for the light curve plot in mm/dd/yy or JD"
-msgstr ""
-
-#: tools/lcgenerator.cpp:194
-msgid "End date:"
-msgstr "Dyddiad gorffen:"
-
-#: tools/lcgenerator.cpp:195
-msgid "End date for the light curve plot in mm/dd/yy or JD"
-msgstr ""
-
-#: tools/lcgenerator.cpp:196 tools/lcgenerator.cpp:197
-#: tools/lcgenerator.cpp:231 tools/lcgenerator.cpp:232
-#: tools/lcgenerator.cpp:292
-msgid "default"
-msgstr "rhagosodiad"
-
-#: tools/lcgenerator.cpp:198
-msgid "Data Selection"
-msgstr ""
-
-#: tools/lcgenerator.cpp:199
-msgid "Visual"
-msgstr ""
-
-#: tools/lcgenerator.cpp:200
-msgid "Fainter thans"
-msgstr ""
-
-#: tools/lcgenerator.cpp:201
-msgid "Discrepant data"
-msgstr ""
-
-#: tools/lcgenerator.cpp:202
-msgid "CCDB"
-msgstr ""
-
-#: tools/lcgenerator.cpp:203
-msgid "CCDV"
-msgstr ""
-
-#: tools/lcgenerator.cpp:204
-msgid "CCDR"
-msgstr ""
-
-#: tools/lcgenerator.cpp:205
-msgid "CCDI"
-msgstr ""
-
-#: tools/lcgenerator.cpp:206
-msgid "Plot average:"
-msgstr ""
-
-#: tools/lcgenerator.cpp:208
-msgid "Retrieve Curve"
+"\t"
 msgstr ""
 
-#: tools/lcgenerator.cpp:209
-msgid "Update List"
-msgstr "Adnewyddu'r Rhestr"
-
-#: tools/lcgenerator.cpp:246
-msgid "End date must occur after start date."
-msgstr ""
-
-#: tools/lcgenerator.cpp:256 tools/lcgenerator.cpp:263
-msgid "Average days must be a positive integer."
-msgstr ""
-
-#: tools/lcgenerator.cpp:286
-msgid ""
-"Invalid date format. Correct format is mm/dd/yyyy or JD, leave 'default' to "
-"generate light curves for the past 500 days."
-msgstr ""
-
-#: tools/lcgenerator.cpp:287
-msgid ""
-"Invalid date format. Correct format is mm/dd/yyyy or JD, leave 'default' to "
-"generate light curves until today."
-msgstr ""
-
-#: tools/lcgenerator.cpp:327 tools/lcgenerator.cpp:363
-#, c-format
-msgid "No data available for JD prior to %d"
-msgstr ""
-
-#: tools/lcgenerator.cpp:400
-msgid "Light Curve produced by the American Amateur Variable Star Observers"
-msgstr ""
-
-#: tools/lcgenerator.cpp:462
-msgid "AAVSO Star list downloaded successfully."
-msgstr ""
-
-#: tools/modcalcangdist.cpp:101 tools/modcalcapcoord.cpp:185
-#: tools/modcalcazel.cpp:331 tools/modcalceclipticcoords.cpp:226
-#: tools/modcalcequinox.cpp:141 tools/modcalcgalcoord.cpp:228
-#: tools/modcalcgeodcoord.cpp:239 tools/modcalcplanets.cpp:313
-#: tools/modcalcprec.cpp:179 tools/modcalcsidtime.cpp:195
-#: tools/modcalcvlsr.cpp:376 tools/scriptbuilder.cpp:762
-#: tools/scriptbuilder.cpp:822 tools/scriptbuilder.cpp:888
-#, c-format
-msgid "Could not open file %1."
-msgstr "Methwyd agor y ffeil %1."
-
-#: tools/modcalcangdist.cpp:113 tools/modcalcapcoord.cpp:197
-#: tools/modcalcazel.cpp:343 tools/modcalceclipticcoords.cpp:238
-#: tools/modcalcequinox.cpp:153 tools/modcalcgalcoord.cpp:240
-#: tools/modcalcgeodcoord.cpp:251 tools/modcalcplanets.cpp:323
-#: tools/modcalcprec.cpp:191 tools/modcalcsidtime.cpp:207
-#: tools/modcalcvlsr.cpp:388
-#, c-format
-msgid "Invalid file: %1"
-msgstr "Ffeil Annilys : %1"
-
-#: tools/modcalcangdist.cpp:114 tools/modcalcapcoord.cpp:198
-#: tools/modcalcazel.cpp:344 tools/modcalceclipticcoords.cpp:239
-#: tools/modcalcequinox.cpp:154 tools/modcalcgalcoord.cpp:241
-#: tools/modcalcgeodcoord.cpp:252 tools/modcalcplanets.cpp:324
-#: tools/modcalcprec.cpp:192 tools/modcalcsidtime.cpp:208
-#: tools/modcalcvlsr.cpp:389
-msgid "Invalid file"
-msgstr "Ffeil Annilys"
-
-#: tools/modcalcapcoord.cpp:84 tools/modcalcazel.cpp:104
-#: tools/modcalcequinox.cpp:52 tools/modcalcprec.cpp:76
-#: tools/modcalcvlsr.cpp:102
-msgid "Could not parse epoch string; assuming J2000"
-msgstr ""
-
-#: tools/modcalcplanets.cpp:400
-msgid "Incorrect number of fields in line %1: "
-msgstr ""
-
-#: tools/modcalcplanets.cpp:401
-msgid "Present fields %1. "
-msgstr ""
-
-#: tools/modcalcplanets.cpp:402
-msgid "Required fields %1. "
-msgstr ""
-
-#: tools/modcalcplanets.cpp:420
 #, fuzzy
-msgid "Unknown planet "
-msgstr "Math anhysbys"
-
-#: tools/modcalcplanets.cpp:422
-msgid " in line %1: "
-msgstr ""
-
-#: tools/modcalcplanets.cpp:444
-msgid "Line %1 contains an invalid time"
-msgstr ""
-
-#: tools/modcalcplanets.cpp:464
-msgid "Line %1 contains an invalid date: "
-msgstr ""
-
-#: tools/modcalcplanets.cpp:586
-msgid "Errors found while parsing some lines in the input file"
-msgstr ""
-
-#: tools/modcalcplanets.cpp:587
-msgid "Errors in lines"
-msgstr ""
-
-#: tools/modcalcvlsr.cpp:128
-msgid "Could not parse height string; assuming 0"
-msgstr ""
-
-#: tools/observinglist.cpp:167
-msgid "Added %1 to observing list."
-msgstr ""
-
-#: tools/observinglist.cpp:203
-msgid "Cannot remove Object %1; not found in table."
-msgstr ""
-
-#: tools/observinglist.cpp:271
-msgid "Object %1 not found in obsList."
-msgstr ""
-
-#: tools/observinglist.cpp:283
-msgid "observing notes for %1:"
-msgstr ""
-
-#: tools/observinglist.cpp:507
-msgid "Observing notes for object:"
-msgstr ""
-
-#: tools/observinglist.cpp:582
-msgid "The specified file is invalid.  Try another file?"
-msgstr ""
-
-#: tools/observinglist.cpp:583
-msgid "Invalid File"
-msgstr "Ffeil Annilys"
-
-#: tools/observinglist.cpp:594
-msgid "Do you want to save the current list before opening a new list?"
-msgstr ""
-
-#: tools/observinglist.cpp:596
-#, fuzzy
-msgid "Save Current List?"
-msgstr "Cadw Lliwiau Cyfredol..."
-
-#: tools/observinglist.cpp:609
-#, fuzzy
-msgid "Enter List Name"
-msgstr "Dangos enw"
-
-#: tools/observinglist.cpp:610
-#, fuzzy
-msgid "List name:"
-msgstr "Enw:"
-
-#: tools/observinglist.cpp:630
-#, fuzzy
-msgid "Could not open file %1.  Try a different filename?"
-msgstr "Methwyd agor y ffeil %1."
-
-#: tools/observinglist.cpp:632
-msgid "Try Different"
-msgstr ""
-
-#: tools/observinglist.cpp:685
-msgid ""
-"_: First letter in 'Center'\n"
-"C"
-msgstr "C"
-
-#: tools/observinglist.cpp:686
-msgid ""
-"_: First letter in 'Scope'\n"
-"S"
-msgstr "Eil"
-
-#: tools/observinglist.cpp:687
-msgid ""
-"_: First letter in 'Details'\n"
-"D"
-msgstr "D"
-
-#: tools/observinglist.cpp:688
-msgid ""
-"_: First letter in 'Alt vs Time'\n"
-"A"
-msgstr "A"
-
-#: tools/observinglist.cpp:689
-msgid ""
-"_: First letter in 'Remove'\n"
-"R"
-msgstr "R"
-
-#: tools/observinglist.cpp:709
-#, fuzzy
-msgid "Alt vs Time"
-msgstr "Dyddiad ac Amser"
-
-#: tools/obslistwizard.cpp:198
-#, fuzzy
-msgid "Object type(s)"
-msgstr "Math Gwrthrych"
-
-#: tools/obslistwizard.cpp:199
-msgid "Region"
-msgstr "Ardal"
-
-#: tools/obslistwizard.cpp:200
-#, fuzzy
-msgid "In constellation(s)"
-msgstr "cyfseriad"
-
-#: tools/obslistwizard.cpp:201
-msgid "Circular"
-msgstr "Crwn"
-
-#: tools/obslistwizard.cpp:202
-msgid "Rectangular"
-msgstr "Hirsgwar"
-
-#: tools/obslistwizard.cpp:204
-#, fuzzy
-msgid "Magnitude limit"
-msgstr "Hydred"
-
-#: tools/obslistwizard.cpp:414
-msgid "Current selection: %1 objects"
-msgstr ""
-
-#: tools/planetviewer.cpp:39
-msgid "Solar System Viewer"
-msgstr ""
-
-#: tools/planetviewer.cpp:45
-msgid ""
-"_: axis label for x-coordinate of solar system viewer.  AU means astronomical "
-"unit.\n"
-"X-position (AU)"
-msgstr ""
-
-#: tools/planetviewer.cpp:46
-msgid ""
-"_: axis label for y-coordinate of solar system viewer.  AU means astronomical "
-"unit.\n"
-"Y-position (AU)"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:120
-msgid ""
-"Point the display at the specified location. %1 can be the name of an object, a "
-"cardinal point on the compass, or 'zenith'."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:122
-msgid ""
-"Point the display at the specified RA/Dec coordinates.  %1 is expressed in "
-"Hours; %2 is expressed in Degrees."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:124
-msgid ""
-"Point the display at the specified Alt/Az coordinates.  %1 and %2 are expressed "
-"in Degrees."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:126
-msgid "Increase the display Zoom Level."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:127
-msgid "Decrease the display Zoom Level."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:128
-msgid "Set the display Zoom Level to its default value."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:129
-msgid "Set the display Zoom Level manually."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:130
-msgid "Set the system clock to the specified Local Time."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:132
-msgid "Pause script execution for %1 seconds."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:133
-msgid ""
-"Halt script execution until the key %1 is pressed.  Only single-key strokes are "
-"possible; use 'space' for the spacebar."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:135
-msgid "Set whether the display is tracking the current location."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:136
-msgid "Change view option named %1 to value %2."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:137
-msgid "Set the geographic location to the city specified by %1, %2 and %3."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:139
-msgid "Set the color named %1 to the value %2."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:140
-#, c-format
-msgid "Load the color scheme named %1."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:141
-msgid "Export the sky image to the file %1, with width %2 and height %3."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:142
-msgid ""
-"Print the sky image to a printer or file.  If %1 is true, it will show the "
-"print dialog.  If %2 is true, it will use the Star Chart color scheme for "
-"printing."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:143
-msgid "Halt the simulation clock."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:144
-msgid "Start the simulation clock."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:145
-msgid ""
-"Set the timescale of the simulation clock to %1.  1.0 means real-time; 2.0 "
-"means twice real-time; etc."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:150
-msgid "Establish an INDI device either in local mode or server mode."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:153
-msgid "Shutdown an INDI device."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:156
-msgid "Connect or Disconnect an INDI device."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:160
-msgid "Set INDI's device connection port."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:164
-msgid ""
-"Set the telescope action. Available actions are SLEW, TRACK, SYNC, PARK, and "
-"ABORT."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:168
-msgid ""
-"Set the telescope target coordinates to the RA/Dec coordinates.  RA is "
-"expressed in Hours; DEC is expressed in Degrees."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:172
-msgid ""
-"Set the telescope target coorinates to the RA/Dec coordinates of the selected "
-"object."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:176
-msgid "Set the telescope longitude and latitude. The longitude is E of N."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:180
-msgid "Set the device UTC time in ISO 8601 format YYYY/MM/DDTHH:MM:SS."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:184
-msgid ""
-"Activate an INDI action. The action is the name of any INDI switch property "
-"element supported by the device."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:187
-msgid ""
-"Pause script execution until action returns with OK status. The action can be "
-"the name of any INDI property supported by the device."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:190
-msgid ""
-"Set the telescope focuser speed. Set speed to 0 to halt the focuser. 1-3 "
-"correspond to slow, medium, and fast speeds respectively."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:194
-msgid ""
-"Start moving the focuser in the direction Dir, and for the duration specified "
-"by setINDIFocusTimeout."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:198
-msgid ""
-"Set the telescope focuser timer in seconds. This is the duration of any "
-"focusing procedure performed by calling startINDIFocus."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:202
-msgid "Set the target CCD chip temperature."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:206
-msgid "Set the target filter position."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:210
-msgid ""
-"Set the CCD camera frame type. Available options are FRAME_LIGHT, FRAME_BIAS, "
-"FRAME_DARK, and FRAME_FLAT."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:214
-msgid "Start Camera/CCD exposure. The duration is in seconds."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:223
-msgid "Functions"
-msgstr "Ffwythiannau"
-
-#: tools/scriptbuilder.cpp:518
-msgid "InfoBoxes"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:519
-#, fuzzy
-msgid "Toggle display of all InfoBoxes"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:519 tools/scriptbuilder.cpp:520
-#: tools/scriptbuilder.cpp:521 tools/scriptbuilder.cpp:522
-#: tools/scriptbuilder.cpp:523 tools/scriptbuilder.cpp:524
-#: tools/scriptbuilder.cpp:525 tools/scriptbuilder.cpp:536
-#: tools/scriptbuilder.cpp:537 tools/scriptbuilder.cpp:543
-#: tools/scriptbuilder.cpp:544 tools/scriptbuilder.cpp:545
-#: tools/scriptbuilder.cpp:546 tools/scriptbuilder.cpp:547
-#: tools/scriptbuilder.cpp:548 tools/scriptbuilder.cpp:549
-#: tools/scriptbuilder.cpp:550 tools/scriptbuilder.cpp:551
-#: tools/scriptbuilder.cpp:552 tools/scriptbuilder.cpp:553
-#: tools/scriptbuilder.cpp:554 tools/scriptbuilder.cpp:555
-#: tools/scriptbuilder.cpp:556 tools/scriptbuilder.cpp:557
-#: tools/scriptbuilder.cpp:558 tools/scriptbuilder.cpp:559
-#: tools/scriptbuilder.cpp:560 tools/scriptbuilder.cpp:561
-#: tools/scriptbuilder.cpp:583 tools/scriptbuilder.cpp:584
-#: tools/scriptbuilder.cpp:585 tools/scriptbuilder.cpp:586
-#: tools/scriptbuilder.cpp:587 tools/scriptbuilder.cpp:588
-#: tools/scriptbuilder.cpp:589 tools/scriptbuilder.cpp:590
-#: tools/scriptbuilder.cpp:591 tools/scriptbuilder.cpp:592
-#: tools/scriptbuilder.cpp:593 tools/scriptbuilder.cpp:594
-#: tools/scriptbuilder.cpp:595 tools/scriptbuilder.cpp:596
-#: tools/scriptbuilder.cpp:597 tools/scriptbuilder.cpp:615
-#: tools/scriptbuilder.cpp:616 tools/scriptbuilder.cpp:617
-#: tools/scriptbuilder.cpp:623 tools/scriptbuilder.cpp:625
-#: tools/scriptbuilder.cpp:626 tools/scriptbuilder.cpp:627
-#: tools/scriptbuilder.cpp:628 tools/scriptbuilder.cpp:629
-#: tools/scriptbuilder.cpp:630 tools/scriptbuilder.cpp:631
-#: tools/scriptbuilder.cpp:632 tools/scriptbuilder.cpp:633
-#: tools/scriptbuilder.cpp:634 tools/scriptbuilder.cpp:649
-#: tools/scriptbuilder.cpp:654 tools/scriptbuilder.cpp:655
-#: tools/scriptbuilder.cpp:656 tools/scriptbuilder.cpp:657
-#: tools/scriptbuilder.cpp:658 tools/scriptbuilder.cpp:659
-msgid "bool"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:520
-#, fuzzy
-msgid "Toggle display of Time InfoBox"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:521
-#, fuzzy
-msgid "Toggle display of Geographic InfoBox"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:522
-#, fuzzy
-msgid "Toggle display of Focus InfoBox"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:523
-msgid "(un)Shade Time InfoBox"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:524
-msgid "(un)Shade Geographic InfoBox"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:525
-msgid "(un)Shade Focus InfoBox"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:535
-msgid "Toolbars"
-msgstr "Barrau Offer:"
-
-#: tools/scriptbuilder.cpp:536
-#, fuzzy
-msgid "Toggle display of main toolbar"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:537
-#, fuzzy
-msgid "Toggle display of view toolbar"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:542
-msgid "Show Objects"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:543
-#, fuzzy
-msgid "Toggle display of Stars"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:544
-#, fuzzy
-msgid "Toggle display of all deep-sky objects"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:545
-#, fuzzy
-msgid "Toggle display of Messier object symbols"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:546
-#, fuzzy
-msgid "Toggle display of Messier object images"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:547
-#, fuzzy
-msgid "Toggle display of NGC objects"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:548
-#, fuzzy
-msgid "Toggle display of IC objects"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:549
-#, fuzzy
-msgid "Toggle display of all solar system bodies"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:550
-#, fuzzy
-msgid "Toggle display of Sun"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:551
-#, fuzzy
-msgid "Toggle display of Moon"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:552
-#, fuzzy
-msgid "Toggle display of Mercury"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:553
-#, fuzzy
-msgid "Toggle display of Venus"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:554
-#, fuzzy
-msgid "Toggle display of Mars"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:555
-#, fuzzy
-msgid "Toggle display of Jupiter"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:556
-#, fuzzy
-msgid "Toggle display of Saturn"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:557
-#, fuzzy
-msgid "Toggle display of Uranus"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:558
-#, fuzzy
-msgid "Toggle display of Neptune"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:559
-#, fuzzy
-msgid "Toggle display of Pluto"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:560
-#, fuzzy
-msgid "Toggle display of Asteroids"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:561
-#, fuzzy
-msgid "Toggle display of Comets"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:582
-msgid "Show Other"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:583
-#, fuzzy
-msgid "Toggle display of constellation lines"
-msgstr "Dangos llinellau cyfseriadau?"
-
-#: tools/scriptbuilder.cpp:584
-#, fuzzy
-msgid "Toggle display of constellation boundaries"
-msgstr "Constellation names"
-
-#: tools/scriptbuilder.cpp:585
-#, fuzzy
-msgid "Toggle display of constellation names"
-msgstr "Constellation names"
-
-#: tools/scriptbuilder.cpp:586
-#, fuzzy
-msgid "Toggle display of Milky Way"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:587
-#, fuzzy
-msgid "Toggle display of the coordinate grid"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:588
-#, fuzzy
-msgid "Toggle display of the celestial equator"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:589
-#, fuzzy
-msgid "Toggle display of the ecliptic"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:590
-#, fuzzy
-msgid "Toggle display of the horizon line"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:591
-#, fuzzy
-msgid "Toggle display of the opaque ground"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:592
-#, fuzzy
-msgid "Toggle display of star name labels"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:593
-#, fuzzy
-msgid "Toggle display of star magnitude labels"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:594
-#, fuzzy
-msgid "Toggle display of asteroid name labels"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:595
-#, fuzzy
-msgid "Toggle display of comet name labels"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:596
-#, fuzzy
-msgid "Toggle display of planet name labels"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:597
-#, fuzzy
-msgid "Toggle display of planet images"
-msgstr "Toggle display of star name labels"
-
-#: tools/scriptbuilder.cpp:614
-msgid "Constellation Names"
-msgstr "Constellation names"
-
-#: tools/scriptbuilder.cpp:615
-#, fuzzy
-msgid "Show Latin constellation names"
-msgstr "Defnyddio enwau cyfseriadau Lladin"
-
-#: tools/scriptbuilder.cpp:616
-#, fuzzy
-msgid "Show constellation names in local language"
-msgstr "Llunio enwau'r cyfseriadau?"
-
-#: tools/scriptbuilder.cpp:617
-#, fuzzy
-msgid "Show IAU-standard constellation abbreviations"
-msgstr "Dangos llinellau cyfseriadau?"
-
-#: tools/scriptbuilder.cpp:622
-msgid "Hide Items"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:623
-msgid "Toggle whether objects hidden while slewing display"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:624
-msgid "Timestep threshold (in seconds) for hiding objects"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:624 tools/scriptbuilder.cpp:650
-#: tools/scriptbuilder.cpp:651 tools/scriptbuilder.cpp:674
-#: tools/scriptbuilder.cpp:675 tools/scriptbuilder.cpp:676
-#: tools/scriptbuilder.cpp:677 tools/scriptbuilder.cpp:678
-#: tools/scriptbuilder.cpp:679 tools/scriptbuilder.cpp:680
-#: tools/scriptbuilder.cpp:681 tools/scriptbuilder.cpp:682
-msgid "double"
-msgstr "dwbl"
-
-#: tools/scriptbuilder.cpp:625
-#, fuzzy
-msgid "Hide faint stars while slewing?"
-msgstr "Cuddio enwau cyfseriadau wrth symud?"
-
-#: tools/scriptbuilder.cpp:626
-#, fuzzy
-msgid "Hide solar system bodies while slewing?"
-msgstr "Cuddio enwau cyfseriadau wrth symud?"
-
-#: tools/scriptbuilder.cpp:627
-#, fuzzy
-msgid "Hide Messier objects while slewing?"
-msgstr "Cuddio enwau cyfseriadau wrth symud?"
-
-#: tools/scriptbuilder.cpp:628
-#, fuzzy
-msgid "Hide NGC objects while slewing?"
-msgstr "Cuddio enwau cyfseriadau wrth symud?"
-
-#: tools/scriptbuilder.cpp:629
-#, fuzzy
-msgid "Hide IC objects while slewing?"
-msgstr "Cuddio enwau cyfseriadau wrth symud?"
+#~ msgid ""
+#~ "_: Image/info menu item (should be translated)\n"
+#~ "  05 March 2005"
+#~ msgstr "Lleuad"
 
-#: tools/scriptbuilder.cpp:630
 #, fuzzy
-msgid "Hide Milky Way while slewing?"
-msgstr "Cuddio enwau cyfseriadau wrth symud?"
+#~ msgid ""
+#~ "_: Image/info menu item (should be translated)\n"
+#~ "  Object_Name"
+#~ msgstr "Tudalen JPL NASA"
 
-#: tools/scriptbuilder.cpp:631
 #, fuzzy
-msgid "Hide constellation names while slewing?"
-msgstr "Cuddio enwau cyfseriadau wrth symud?"
+#~ msgid ""
+#~ "_: Image/info menu item (should be translated)\n"
+#~ " image_url.dat"
+#~ msgstr "Dangos Delwedd VLT"
 
-#: tools/scriptbuilder.cpp:632
 #, fuzzy
-msgid "Hide constellation lines while slewing?"
-msgstr "Cuddio enwau cyfseriadau wrth symud?"
+#~ msgid ""
+#~ "_: Image/info menu item (should be translated)\n"
+#~ "  09 March 2004"
+#~ msgstr "Lleuad"
 
-#: tools/scriptbuilder.cpp:633
 #, fuzzy
-msgid "Hide constellation boundaries while slewing?"
-msgstr "Cuddio enwau cyfseriadau wrth symud?"
+#~ msgid ""
+#~ "_: Image/info menu item (should be translated)\n"
+#~ " Gaspra is missing from asteroids.dat!"
+#~ msgstr "Lleuad"
 
-#: tools/scriptbuilder.cpp:634
 #, fuzzy
-msgid "Hide coordinate grid while slewing?"
-msgstr "Cuddio enwau cyfseriadau wrth symud?"
-
-#: tools/scriptbuilder.cpp:648
-msgid "Skymap Options"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:649
-msgid "Use Horizontal coordinates? (otherwise, use Equatorial)"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:650
-msgid "Set the Zoom Factor"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:651
-msgid "Select angular size for the FOV symbol (in arcmin)"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:652
-msgid ""
-"Select shape for the FOV symbol (0=Square, 1=Circle, 2=Crosshairs, 4=Bullseye)"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:652
-msgid "int"
-msgstr "int"
-
-#: tools/scriptbuilder.cpp:653
-msgid "Select color for the FOV symbol"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:653
-msgid "string"
-msgstr "llinell"
-
-#: tools/scriptbuilder.cpp:654
-msgid "Use animated slewing? (otherwise, \"snap\" to new focus)"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:655
-msgid "Correct for atmospheric refraction?"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:656
-msgid "Automatically attach name label to centered object?"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:657
-msgid "Attach temporary name label when hovering mouse over an object?"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:658
-msgid "Automatically add trail to centered solar system body?"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:659
-msgid "Planet trails fade to sky color? (otherwise color is constant)"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:673
-msgid "Limits"
-msgstr "Terfynau"
-
-#: tools/scriptbuilder.cpp:674
-msgid "magnitude of faintest star drawn on map when zoomed in"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:675
-msgid "magnitude of faintest star drawn on map when zoomed out"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:676
-msgid "magnitude of faintest nonstellar object drawn on map when zoomed in"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:677
-msgid "magnitude of faintest nonstellar object drawn on map when zoomed out"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:678
-msgid "magnitude of faintest star labeled on map"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:679
-msgid "magnitude of brightest star hidden while slewing"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:680
-msgid "magnitude of faintest asteroid drawn on map"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:681
-msgid "magnitude of faintest asteroid labeled on map"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:682
-msgid "comets nearer to the Sun than this (in AU) are labeled on map"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:757
-msgid "Could not download remote file."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:859
-msgid "Save Changes to Script?"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:860
-msgid ""
-"The current script has unsaved changes.  Would you like to save before closing "
-"it?"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:993
-#, c-format
-msgid "Could not parse script.  Line was: %1"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:1311 tools/scriptbuilder.cpp:1313
-#: tools/scriptbuilder.cpp:1349 tools/scriptbuilder.cpp:2050
-#: tools/scriptbuilder.cpp:2187 tools/scriptbuilder.cpp:2188
-msgid "true"
-msgstr "gwir"
-
-#: tools/scriptbuilder.cpp:1796
-msgid "Function index out of bounds."
-msgstr ""
-
-#: tools/scriptbuilder.cpp:1823 tools/scriptbuilder.cpp:1872
-#: tools/scriptbuilder.cpp:1896 tools/scriptbuilder.cpp:1920
-#: tools/scriptbuilder.cpp:1942 tools/scriptbuilder.cpp:1965
-#: tools/scriptbuilder.cpp:1982 tools/scriptbuilder.cpp:1999
-#: tools/scriptbuilder.cpp:2019 tools/scriptbuilder.cpp:2040
-#: tools/scriptbuilder.cpp:2053 tools/scriptbuilder.cpp:2072
-#: tools/scriptbuilder.cpp:2092 tools/scriptbuilder.cpp:2112
-#: tools/scriptbuilder.cpp:2132 tools/scriptbuilder.cpp:2145
-#: tools/scriptbuilder.cpp:2162 tools/scriptbuilder.cpp:2177
-#: tools/scriptbuilder.cpp:2191 tools/scriptbuilder.cpp:2208
-#: tools/scriptbuilder.cpp:2224 tools/scriptbuilder.cpp:2237
-#: tools/scriptbuilder.cpp:2266 tools/scriptbuilder.cpp:2285
-#: tools/scriptbuilder.cpp:2311 tools/scriptbuilder.cpp:2337
-#: tools/scriptbuilder.cpp:2359 tools/scriptbuilder.cpp:2387
-#: tools/scriptbuilder.cpp:2415 tools/scriptbuilder.cpp:2441
-#: tools/scriptbuilder.cpp:2474 tools/scriptbuilder.cpp:2507
-#: tools/scriptbuilder.cpp:2534 tools/scriptbuilder.cpp:2561
-#: tools/scriptbuilder.cpp:2588 tools/scriptbuilder.cpp:2614
-#: tools/scriptbuilder.cpp:2641 tools/scriptbuilder.cpp:2667
-#: tools/scriptbuilder.cpp:2693 tools/scriptbuilder.cpp:2714
-#: tools/scriptbuilder.cpp:2740 tools/scriptbuilder.cpp:2761
-#: tools/scriptbuilder.cpp:2787 tools/scriptbuilder.cpp:2807
-#: tools/scriptbuilder.cpp:2833 tools/scriptbuilder.cpp:2866
-#: tools/scriptbuilder.cpp:2899 tools/scriptbuilder.cpp:2925
-#: tools/scriptbuilder.cpp:2946 tools/scriptbuilder.cpp:2973
-#: tools/scriptbuilder.cpp:3001 tools/scriptbuilder.cpp:3029
-#: tools/scriptbuilder.cpp:3051 tools/scriptbuilder.cpp:3078
-#: tools/scriptbuilder.cpp:3099 tools/scriptbuilder.cpp:3125
-#: tools/scriptbuilder.cpp:3146 tools/scriptbuilder.cpp:3173
-#: tools/scriptbuilder.cpp:3194
-msgid "Mismatch between function and Arg widget (expected %1.)"
-msgstr ""
-
-#: tools/scriptbuilder.cpp:2050 tools/scriptbuilder.cpp:2187
-#: tools/scriptbuilder.cpp:2188
-msgid "false"
-msgstr "ffug"
-
-#: tools/wutdialog.cpp:48
-msgid "What's up Tonight"
-msgstr ""
-
-#: tools/wutdialog.cpp:84 tools/wutdialog.cpp:424
-#, c-format
-msgid "at %1"
-msgstr ""
-
-#: tools/wutdialog.cpp:85 tools/wutdialog.cpp:406
-#, c-format
-msgid "The night of %1"
-msgstr ""
-
-#: tools/wutdialog.cpp:109
-msgid "Planets"
-msgstr ""
-
-#: tools/wutdialog.cpp:114
-msgid "Star Clusters"
-msgstr ""
-
-#: tools/wutdialog.cpp:115
-msgid "Nebulae"
-msgstr ""
-
-#: tools/wutdialog.cpp:143 tools/wutdialog.cpp:144 tools/wutdialog.cpp:180
-#: tools/wutdialog.cpp:181 tools/wutdialog.cpp:330 tools/wutdialog.cpp:331
-msgid "circumpolar"
-msgstr ""
-
-#: tools/wutdialog.cpp:147 tools/wutdialog.cpp:148 tools/wutdialog.cpp:183
-#: tools/wutdialog.cpp:184 tools/wutdialog.cpp:333 tools/wutdialog.cpp:334
-msgid "does not rise"
-msgstr ""
-
-#: tools/wutdialog.cpp:167
-#, c-format
-msgid "Sunset: %1"
-msgstr "Machlud Haul: %1"
-
-#: tools/wutdialog.cpp:168
-#, c-format
-msgid "Sunrise: %1"
-msgstr "Codiad Haul: %1"
-
-#: tools/wutdialog.cpp:169
-msgid "Night duration: %1 hours"
-msgstr ""
-
-#: tools/wutdialog.cpp:192
-#, c-format
-msgid "Moon rises at: %1"
-msgstr ""
-
-#: tools/wutdialog.cpp:193
-#, c-format
-msgid "Moon sets at: %1"
-msgstr ""
-
-#: tools/wutdialog.cpp:318
-msgid "No Object Selected"
-msgstr ""
+#~ msgid ""
+#~ "_: Image/info menu item (should be translated)\n"
+#~ " info_url.dat"
+#~ msgstr "Lleuad"
 
-#: tools/wutdialog.cpp:355
-#, c-format
-msgid "Rises at: %1"
-msgstr ""
+#~ msgid ""
+#~ "_: Image/info menu item (should be translated)\n"
+#~ "Moon"
+#~ msgstr "Lleuad"
 
-#: tools/wutdialog.cpp:356
-#, c-format
-msgid "Transits at: %1"
-msgstr ""
+#~ msgid ""
+#~ "_: star name\n"
+#~ "Name"
+#~ msgstr "Enw"
 
-#: tools/wutdialog.cpp:357
-#, c-format
-msgid "Sets at: %1"
-msgstr ""
+#~ msgid ""
+#~ "_: object name (optional)\n"
+#~ "Longname"
+#~ msgstr "Hirenw"
 
 #, fuzzy
 #~ msgid ""
@@ -32048,9 +34551,6 @@ msgstr ""
 #~ msgid "Details..."
 #~ msgstr "Manylion..."
 
-#~ msgid "O&K"
-#~ msgstr "I&awn"
-
 #~ msgid "Longitude"
 #~ msgstr "Hydred"
 
@@ -32153,106 +34653,6 @@ msgstr ""
 #~ msgid "&Time"
 #~ msgstr "&Amser"
 
-#, fuzzy
-#~ msgid "Hide extra objects while moving?"
-#~ msgstr "Cuddio enwau cyfseriadau wrth symud?"
-
-#, fuzzy
-#~ msgid "Toggle whether asteroids are drawn in the sky map."
-#~ msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
-
-#, fuzzy
-#~ msgid "Toggle whether asteroid name labels are drawn in the sky map."
-#~ msgstr "Os brithir, llunir enwau cyfseriadau ar fap yr awyr."
-
-#, fuzzy
-#~ msgid "Toggle whether comets are drawn in the sky map."
-#~ msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
-
-#, fuzzy
-#~ msgid "Toggle whether comet name labels are drawn in the sky map."
-#~ msgstr "Os brithir, llunir enwau cyfseriadau ar fap yr awyr."
-
-#, fuzzy
-#~ msgid "Draw constellation boundaries in the sky map?"
-#~ msgstr "Llunio enwau'r cyfseriadau?"
-
-#, fuzzy
-#~ msgid "Toggle whether constellation boundaries are drawn in the sky map."
-#~ msgstr "Os brithir, llunir enwau cyfseriadau ar fap yr awyr."
-
-#, fuzzy
-#~ msgid "Draw constellation lines in the sky map?"
-#~ msgstr "Llunio enwau'r cyfseriadau?"
-
-#, fuzzy
-#~ msgid "Toggle whether constellation lines are drawn in the sky map."
-#~ msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
-
-#, fuzzy
-#~ msgid "Toggle whether constellation name labels are drawn in the sky map."
-#~ msgstr "Os brithir, llunir enwau cyfseriadau ar fap yr awyr."
-
-#, fuzzy
-#~ msgid "Toggle whether the ecliptic line is drawn in the sky map."
-#~ msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
-
-#, fuzzy
-#~ msgid "Toggle whether the equator line is drawn in the sky map."
-#~ msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
-
-#, fuzzy
-#~ msgid "Toggle whether the horizon line is drawn in the sky map."
-#~ msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
-
-#, fuzzy
-#~ msgid "Toggle whether the Moon is drawn in the sky map."
-#~ msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
-
-#, fuzzy
-#~ msgid "Toggle whether Pluto is drawn in the sky map."
-#~ msgstr "Os brithir, llunir llinellau cyfseriadau ar fap yr awyr."
-
-#, fuzzy
-#~ msgid "Toggle whether star name labels are shown in the sky map."
-#~ msgstr "Os brithir, llunir enwau cyfseriadau ar fap yr awyr."
-
-#, fuzzy
-#~ msgid "Use abbreviated constellation names?"
-#~ msgstr "Defnyddio enwau cyfseriadau wedi'u lleoleiddio"
-
-#, fuzzy
-#~ msgid "Use official IAU abbreviations for constellation names."
-#~ msgstr "Defnyddio enwau cyfseriadau Lladin"
-
-#, fuzzy
-#~ msgid "Use Latin constellation names?"
-#~ msgstr "Defnyddio enwau cyfseriadau Lladin"
-
-#, fuzzy
-#~ msgid "Use Latin constellation names."
-#~ msgstr "Defnyddio enwau cyfseriadau Lladin"
-
-#, fuzzy
-#~ msgid "Use localized constellation names?"
-#~ msgstr "Defnyddio enwau cyfseriadau wedi'u lleoleiddio"
-
-#, fuzzy
-#~ msgid "The color for the constellation boundary lines."
-#~ msgstr "Dangos llinellau cyfseriadau?"
-
-#, fuzzy
-#~ msgid "The color for the constellation figure lines."
-#~ msgstr "Dangos llinellau cyfseriadau?"
-
-#, fuzzy
-#~ msgid "The color for the constellation names."
-#~ msgstr "Defnyddio enwau cyfseriadau wedi'u lleoleiddio"
-
-#, fuzzy
-#~ msgid "The color for star name labels."
-#~ msgstr "Toggle display of star name labels"
-
 #~ msgid ""
 #~ "_: City name (optional, probably does not need a translation)\n"
 #~ "Kapteyn"
@@ -32294,51 +34694,6 @@ msgstr ""
 #~ msgstr "Dangos Delwedd KPNO AOP"
 
 #~ msgid ""
-#~ "_: Image/info menu item (should be translated)\n"
-#~ "About the Moon Images"
-#~ msgstr "Ynglyn â Delweddau'r Lleuad"
-
-#~ msgid ""
-#~ "_: star name\n"
-#~ "Alcor"
-#~ msgstr "Alcor"
-
-#~ msgid ""
-#~ "_: star name\n"
-#~ "Asterope"
-#~ msgstr "Asterope"
-
-#~ msgid ""
-#~ "_: star name\n"
-#~ "Atlas"
-#~ msgstr "Atlas"
-
-#~ msgid ""
-#~ "_: star name\n"
-#~ "Electra"
-#~ msgstr "Electra"
-
-#~ msgid ""
 #~ "_: star name\n"
 #~ "Kaitain"
 #~ msgstr "Kaitain"
-
-#~ msgid ""
-#~ "_: star name\n"
-#~ "Maia"
-#~ msgstr "Maia"
-
-#~ msgid ""
-#~ "_: star name\n"
-#~ "Merope"
-#~ msgstr "Merope"
-
-#~ msgid ""
-#~ "_: star name\n"
-#~ "Pleione"
-#~ msgstr "Pleione"
-
-#~ msgid ""
-#~ "_: star name\n"
-#~ "Taygeta"
-#~ msgstr "Taygeta"
author	TDE Weblate <weblate@mirror.git.trinitydesktop.org>	2018-12-27 18:34:52 +0000
committer	Slávek Banko <slavek.banko@axis.cz>	2018-12-27 19:38:51 +0100
commit	3f92e0cc566442607e0420a95c1e6c4ec675ae4d (patch)
tree	a6a4f26402da287ee3719357b4c1a1006e7dc62a /tde-i18n-cy
parent	e4f197c9d51ab4471928776f722c9d23f70a192a (diff)
download	tde-i18n-3f92e0cc566442607e0420a95c1e6c4ec675ae4d.tar.gz tde-i18n-3f92e0cc566442607e0420a95c1e6c4ec675ae4d.zip