X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/c8724a34399bf3cecfd1c900545f3c6a8bc2d789..5b0a97613fbb3d179184c020beb3381fc92bd376:/po/he.po

diff --git a/po/he.po b/po/he.po
index 172be3e3..199ee900 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: viking\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-16 21:33+0200\n"
+"POT-Creation-Date: 2010-06-08 22:39+0200\n"
 "PO-Revision-Date: 2008-08-18 20:47+0000\n"
 "Last-Translator: Krylov Ilya <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2008-09-10 21:16+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 20:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../src/acquire.c:118
@@ -26,28 +26,32 @@ msgstr "עובד..."
 msgid "Error: acquisition failed."
 msgstr ""
 
-#: ../src/acquire.c:149 ../src/vikgpslayer.c:924
+#: ../src/acquire.c:149 ../src/vikgpslayer.c:1013
 msgid "Done."
 msgstr ""
 
-#: ../src/acquire.c:326 ../src/vikgpslayer.c:963
+#: ../src/acquire.c:156
+msgid "No data."
+msgstr ""
+
+#: ../src/acquire.c:338 ../src/vikgpslayer.c:1052
 msgid "Status: detecting gpsbabel"
 msgstr ""
 
-#: ../src/background.c:54
+#: ../src/background.c:57
 #, c-format
 msgid "%d items"
 msgstr ""
 
-#: ../src/background.c:212
+#: ../src/background.c:224
 msgid "Job"
 msgstr ""
 
-#: ../src/background.c:216
+#: ../src/background.c:228
 msgid "Progress"
 msgstr ""
 
-#: ../src/background.c:227
+#: ../src/background.c:239
 msgid "Viking Background Jobs"
 msgstr ""
 
@@ -62,7 +66,7 @@ msgstr ""
 #: ../src/clipboard.c:113
 #, c-format
 msgid ""
-"The clipboard contains sublayer data for a %s layers.You must select a layer "
+"The clipboard contains sublayer data for %s layers. You must select a layer "
 "of this type to paste the clipboard data."
 msgstr ""
 
@@ -72,7 +76,7 @@ msgid ""
 "into."
 msgstr ""
 
-#: ../src/curl_download.c:85
+#: ../src/curl_download.c:98
 #, c-format
 msgid "%s() Curl perform failed: %s"
 msgstr ""
@@ -81,11 +85,11 @@ msgstr ""
 msgid "Go to Lat/Lon"
 msgstr ""
 
-#: ../src/dialog.c:61 ../src/dialog.c:211
+#: ../src/dialog.c:61 ../src/dialog.c:236
 msgid "Latitude:"
 msgstr ""
 
-#: ../src/dialog.c:67 ../src/dialog.c:216
+#: ../src/dialog.c:67 ../src/dialog.c:241
 msgid "Longitude:"
 msgstr ""
 
@@ -105,102 +109,106 @@ msgstr ""
 msgid "Letter:"
 msgstr ""
 
-#: ../src/dialog.c:173 ../src/viktrwlayer.c:1548
-msgid "Create"
+#: ../src/dialog.c:187
+msgid "Waypoint Properties"
 msgstr ""
 
-#: ../src/dialog.c:199
+#: ../src/dialog.c:224
 msgid "Name:"
 msgstr ""
 
-#: ../src/dialog.c:221
+#: ../src/dialog.c:246
 msgid "Altitude:"
 msgstr ""
 
-#: ../src/dialog.c:226
+#: ../src/dialog.c:251
 msgid "Comment:"
 msgstr ""
 
-#: ../src/dialog.c:232
+#: ../src/dialog.c:258
 msgid "Image:"
 msgstr ""
 
-#: ../src/dialog.c:237
+#: ../src/dialog.c:263
 msgid "Symbol:"
 msgstr ""
 
-#: ../src/dialog.c:244
+#: ../src/dialog.c:272
 msgid "(none)"
 msgstr ""
 
 #. TODO: other checks (isalpha or whatever )
-#: ../src/dialog.c:299
+#: ../src/dialog.c:327
 msgid "Please enter a name for the waypoint."
 msgstr ""
 
-#: ../src/dialog.c:303
+#: ../src/dialog.c:331
 #, c-format
 msgid "The waypoint \"%s\" exists, do you want to overwrite it?"
 msgstr ""
 
-#: ../src/dialog.c:375
+#: ../src/dialog.c:484 ../src/geonamessearch.c:228
+msgid "Nothing was selected"
+msgstr ""
+
+#: ../src/dialog.c:492
 msgid "Add Track"
 msgstr ""
 
-#: ../src/dialog.c:383
+#: ../src/dialog.c:500
 msgid "Track Name:"
 msgstr ""
 
-#: ../src/dialog.c:398
+#: ../src/dialog.c:515
 msgid "Please enter a name for the track."
 msgstr ""
 
-#: ../src/dialog.c:402
+#: ../src/dialog.c:519
 #, c-format
 msgid "The track \"%s\" exists, do you want to overwrite it?"
 msgstr ""
 
-#: ../src/dialog.c:464
+#: ../src/dialog.c:581
 msgid "Zoom Factors..."
 msgstr ""
 
-#: ../src/dialog.c:478
-msgid "Zoom factor (in meters per pixel:"
+#: ../src/dialog.c:595
+msgid "Zoom factor (in meters per pixel):"
 msgstr ""
 
-#: ../src/dialog.c:479
+#: ../src/dialog.c:596
 msgid "X (easting): "
 msgstr ""
 
-#: ../src/dialog.c:480
+#: ../src/dialog.c:597
 msgid "Y (northing): "
 msgstr ""
 
-#: ../src/dialog.c:485
+#: ../src/dialog.c:602
 msgid "X and Y zoom factors must be equal"
 msgstr ""
 
-#: ../src/dialog.c:538
+#: ../src/dialog.c:655
 msgid "1 min"
 msgstr ""
 
-#: ../src/dialog.c:539
+#: ../src/dialog.c:656
 msgid "1 hour"
 msgstr ""
 
-#: ../src/dialog.c:540
+#: ../src/dialog.c:657
 msgid "1 day"
 msgstr ""
 
-#: ../src/dialog.c:541
+#: ../src/dialog.c:658
 msgid "Custom (in minutes):"
 msgstr ""
 
-#: ../src/dialog.c:596
+#: ../src/dialog.c:713
 msgid "GPS Data and Topo Analyzer, Explorer, and Manager."
 msgstr ""
 
-#: ../src/dialog.c:597
+#: ../src/dialog.c:714
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -217,97 +225,87 @@ msgid ""
 "Place, Suite 330, Boston, MA 02111-1307, USA"
 msgstr ""
 
-#: ../src/dialog.c:631
+#: ../src/dialog.c:748
 msgid "Download along track"
 msgstr ""
 
-#: ../src/dialog.c:633
+#: ../src/dialog.c:750
 msgid "Map type:"
 msgstr ""
 
-#: ../src/dialog.c:638
+#: ../src/dialog.c:755
 msgid "Zoom level:"
 msgstr ""
 
-#: ../src/expedia.c:48
+#: ../src/expedia.c:51
 msgid "Expedia Street Maps"
 msgstr ""
 
-#: ../src/expedia.c:76
+#: ../src/expedia.c:79
 msgid "Invalid expedia altitude"
 msgstr ""
 
-#: ../src/expedia.c:107
+#: ../src/expedia.c:110
 #, c-format
 msgid ""
 "Couldn't open EXPEDIA image file (right after successful download! Please "
 "report and delete image file!): %s"
 msgstr ""
 
-#: ../src/expedia.c:120
+#: ../src/expedia.c:123
 #, c-format
 msgid ""
 "Couldn't save EXPEDIA image file (right after successful download! Please "
 "report and delete image file!): %s"
 msgstr ""
 
-#: ../src/google.c:57
-msgid "Google Maps"
-msgstr ""
-
-#: ../src/google.c:58
-msgid "Transparent Google Maps"
-msgstr ""
-
-#: ../src/google.c:59
-msgid "Google Satellite Images"
+#: ../src/geonamessearch.c:98
+msgid "Search"
 msgstr ""
 
-#: ../src/google.c:60
-msgid "Google Terrain Maps"
+#: ../src/geonamessearch.c:100
+msgid "No entries found!"
 msgstr ""
 
-#: ../src/google.c:133
-#, c-format
-msgid "couldn't open temp file %s"
+#: ../src/geonamessearch.c:254 ../src/googlesearch.c:121
+msgid "couldn't map temp file"
 msgstr ""
 
-#. error
-#: ../src/google.c:144
-#, c-format
-msgid "Failed downloading %s"
+#: ../src/geonamessearch.c:395 ../src/vikgototool.c:250
+msgid "couldn't open temp file"
 msgstr ""
 
-#: ../src/google.c:147 ../src/googlesearch.c:126
-msgid "couldn't map temp file"
+#: ../src/globals.c:42
+msgid "Degree format:"
 msgstr ""
 
-#: ../src/google.c:154
-msgid "Failed fetching Google numbers (\"GLoadApi\" not found)"
+#: ../src/globals.c:46
+msgid "Distance units:"
 msgstr ""
 
-#: ../src/google.c:190
-msgid "Failed getting google version numbers"
+#: ../src/globals.c:50
+msgid "Speed units:"
 msgstr ""
 
-#: ../src/googlemaps.c:46
-msgid "Old Google Maps"
+#: ../src/globals.c:54
+msgid "Height units:"
 msgstr ""
 
-#: ../src/googlesearch.c:67 ../src/googlesearch.c:85
-msgid "Search"
+#: ../src/globals.c:58
+msgid "Use large waypoint icons:"
 msgstr ""
 
-#: ../src/googlesearch.c:69
-msgid "I don't know that place. Do you want another search?"
+#: ../src/globals.c:62
+msgid "Default latitude:"
 msgstr ""
 
-#: ../src/googlesearch.c:87
-msgid "Enter address or place name:"
+#: ../src/globals.c:65
+msgid "Default longitude:"
 msgstr ""
 
-#: ../src/googlesearch.c:220
-msgid "couldn't open temp file"
+#. Webtools
+#: ../src/google.c:36
+msgid "Google"
 msgstr ""
 
 #: ../src/datasource_gc.c:62
@@ -318,24 +316,24 @@ msgstr ""
 msgid "Geocaching.com Caches"
 msgstr ""
 
-#: ../src/datasource_gc.c:78
+#: ../src/datasource_gc.c:79
 msgid "geocaching.com username:"
 msgstr ""
 
-#: ../src/datasource_gc.c:79
+#: ../src/datasource_gc.c:80
 msgid "geocaching.com password:"
 msgstr ""
 
-#: ../src/datasource_gc.c:107
+#: ../src/datasource_gc.c:108
 msgid ""
 "Can't find gcget in path! Check that you have installed gcget correctly."
 msgstr ""
 
-#: ../src/datasource_gc.c:169
+#: ../src/datasource_gc.c:170
 msgid "Number geocaches:"
 msgstr ""
 
-#: ../src/datasource_gc.c:171
+#: ../src/datasource_gc.c:172
 msgid "Centered around:"
 msgstr ""
 
@@ -343,170 +341,195 @@ msgstr ""
 msgid "Google Directions"
 msgstr ""
 
-#: ../src/datasource_google.c:74
+#: ../src/datasource_google.c:75
 msgid "From:"
 msgstr ""
 
-#: ../src/datasource_google.c:76
+#: ../src/datasource_google.c:77
 msgid "To:"
 msgstr ""
 
-#: ../src/datasource_gps.c:48
+#: ../src/datasource_gps.c:53
 msgid "Acquire from GPS"
 msgstr ""
 
-#: ../src/datasource_gps.c:49
+#: ../src/datasource_gps.c:54
 msgid "Acquired from GPS"
 msgstr ""
 
-#: ../src/datasource_gps.c:133
+#: ../src/datasource_gps.c:142
 #, c-format
 msgid "using cmdline '%s' and file '%s'\n"
 msgstr ""
 
-#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:678
+#: ../src/datasource_gps.c:204 ../src/vikgpslayer.c:755
 #, c-format
 msgid "Downloading %d waypoint..."
 msgid_plural "Downloading %d waypoints..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/datasource_gps.c:152 ../src/vikgpslayer.c:680
+#: ../src/datasource_gps.c:206 ../src/vikgpslayer.c:757
 #, c-format
 msgid "Downloading %d trackpoint..."
 msgid_plural "Downloading %d trackpoints..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/datasource_gps.c:170
+#: ../src/datasource_gps.c:224
 #, c-format
 msgid "Downloaded %d out of %d %s..."
 msgstr ""
 
-#: ../src/datasource_gps.c:172
+#: ../src/datasource_gps.c:226
 #, c-format
 msgid "Downloaded %d %s."
 msgstr ""
 
-#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:750
+#: ../src/datasource_gps.c:239 ../src/vikgpslayer.c:827
 #, c-format
 msgid "GPS Device: %s"
 msgstr ""
 
-#: ../src/datasource_gps.c:262 ../src/vikgpslayer.c:109
+#: ../src/datasource_gps.c:328 ../src/vikgpslayer.c:144
 msgid "GPS Protocol:"
 msgstr ""
 
-#: ../src/datasource_gps.c:269 ../src/vikgpslayer.c:110
+#: ../src/datasource_gps.c:335 ../src/vikgpslayer.c:145
 msgid "Serial Port:"
 msgstr ""
 
-#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:968
+#: ../src/datasource_gps.c:356
+msgid ""
+"Turn Off After Transfer\n"
+"(Garmin Only)"
+msgstr ""
+
+#: ../src/datasource_gps.c:377 ../src/vikgpslayer.c:1057
 msgid "GPS device: N/A"
 msgstr ""
 
-#: ../src/dem.c:53 ../src/dem.c:67
+#: ../src/dem.c:59 ../src/dem.c:73
 msgid "Invalid DEM"
 msgstr ""
 
-#: ../src/dem.c:109
+#: ../src/dem.c:115
 msgid "Invalid DEM header"
 msgstr ""
 
-#: ../src/dem.c:178 ../src/dem.c:191
+#: ../src/dem.c:184 ../src/dem.c:197
 msgid "Incorrect DEM Class B record: expected 1"
 msgstr ""
 
-#: ../src/dem.c:348
+#: ../src/dem.c:354
 #, c-format
 msgid "Couldn't map file %s: %s"
 msgstr ""
 
-#: ../src/download.c:121
+#: ../src/download.c:111
+msgid "Tile age (s):"
+msgstr ""
+
+#: ../src/download.c:206
 #, c-format
 msgid "Download error: %s"
 msgstr ""
 
-#: ../src/osm-traces.c:77
+#: ../src/file.c:426 ../src/file.c:430
+#, c-format
+msgid "Draw mode '%s' no more supported"
+msgstr ""
+
+#: ../src/osm-traces.c:73
+msgid "Identifiable (public w/ timestamps)"
+msgstr ""
+
+#: ../src/osm-traces.c:74
+msgid "Trackable (private w/ timestamps)"
+msgstr ""
+
+#: ../src/osm-traces.c:75
+msgid "Public"
+msgstr ""
+
+#: ../src/osm-traces.c:76
+msgid "Private"
+msgstr ""
+
+#: ../src/osm-traces.c:93
 msgid "OSM username:"
 msgstr ""
 
-#: ../src/osm-traces.c:78
+#: ../src/osm-traces.c:94
 msgid "OSM password:"
 msgstr ""
 
-#: ../src/osm-traces.c:218
+#: ../src/osm-traces.c:229
 #, c-format
 msgid "failed to upload data: HTTP response is %ld"
 msgstr ""
 
-#: ../src/osm-traces.c:221
+#: ../src/osm-traces.c:232
 #, c-format
 msgid "curl_easy_getinfo failed: %d"
 msgstr ""
 
-#: ../src/osm-traces.c:225
+#: ../src/osm-traces.c:236
 #, c-format
 msgid "curl request failed: %s"
 msgstr ""
 
-#: ../src/osm-traces.c:253
+#: ../src/osm-traces.c:264
 #, c-format
 msgid "failed to open temporary file: %s"
 msgstr ""
 
-#: ../src/osm-traces.c:287
+#: ../src/osm-traces.c:298
 #, c-format
 msgid "failed to unlink temporary file: %s"
 msgstr ""
 
-#: ../src/osm-traces.c:299
+#: ../src/osm-traces.c:310
 msgid "OSM upload"
 msgstr ""
 
-#: ../src/osm-traces.c:322
+#: ../src/osm-traces.c:331
 msgid "Email:"
 msgstr ""
 
-#: ../src/osm-traces.c:335
-msgid "The email used as login"
-msgstr ""
-
-#: ../src/osm-traces.c:336
-msgid "Enter the email you use to login into www.openstreetmap.org."
+#: ../src/osm-traces.c:342
+msgid ""
+"The email used as login\n"
+"<small>Enter the email you use to login into www.openstreetmap.org.</small>"
 msgstr ""
 
-#: ../src/osm-traces.c:338
+#: ../src/osm-traces.c:345
 msgid "Password:"
 msgstr ""
 
-#: ../src/osm-traces.c:351
-msgid "The password used to login"
-msgstr ""
-
-#: ../src/osm-traces.c:352
-msgid "Enter the password you use to login into www.openstreetmap.org."
+#: ../src/osm-traces.c:356
+msgid ""
+"The password used to login\n"
+"<small>Enter the password you use to login into "
+"www.openstreetmap.org.</small>"
 msgstr ""
 
-#: ../src/osm-traces.c:354
+#: ../src/osm-traces.c:359
 msgid "File's name:"
 msgstr ""
 
-#: ../src/osm-traces.c:366
-msgid "The name of the file on OSM"
-msgstr ""
-
-#: ../src/osm-traces.c:367
+#: ../src/osm-traces.c:369
 msgid ""
-"This is the name of the file created on the server. This is not the name of "
-"the local file."
+"The name of the file on OSM\n"
+"<small>This is the name of the file created on the server.This is not the "
+"name of the local file.</small>"
 msgstr ""
 
-#: ../src/osm-traces.c:370
+#: ../src/osm-traces.c:373
 msgid "Description:"
 msgstr ""
 
-#: ../src/osm-traces.c:377
+#: ../src/osm-traces.c:378
 msgid "The description of the trace"
 msgstr ""
 
@@ -514,23 +537,19 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: ../src/osm-traces.c:387
+#: ../src/osm-traces.c:385
 msgid "The tags associated to the trace"
 msgstr ""
 
-#: ../src/osm-traces.c:390
-msgid "Public"
-msgstr ""
-
-#: ../src/osm-traces.c:396
-msgid "Indicates if the trace is public or not"
-msgstr ""
-
-#: ../src/osm-traces.c:417
+#: ../src/osm-traces.c:415
 #, c-format
 msgid "Uploading %s to OSM"
 msgstr ""
 
+#: ../src/mapcache.c:61
+msgid "Mapcache memory size (MB):"
+msgstr ""
+
 #: ../src/print.c:53
 msgid "None"
 msgstr ""
@@ -573,23 +592,23 @@ msgstr ""
 msgid "Image S_ize:"
 msgstr ""
 
-#: ../src/util.c:74
+#: ../src/util.c:76
 msgid "Could not launch web browser."
 msgstr ""
 
-#: ../src/util.c:85
+#: ../src/util.c:87
 msgid "Could not create new email."
 msgstr ""
 
-#: ../src/vikcoordlayer.c:43 ../src/vikdemlayer.c:100
+#: ../src/vikcoordlayer.c:46 ../src/vikdemlayer.c:121
 msgid "Color:"
 msgstr ""
 
-#: ../src/vikcoordlayer.c:44
+#: ../src/vikcoordlayer.c:47
 msgid "Minutes Width:"
 msgstr ""
 
-#: ../src/vikcoordlayer.c:45 ../src/vikdemlayer.c:103
+#: ../src/vikcoordlayer.c:48 ../src/vikdemlayer.c:125
 msgid "Line Thickness:"
 msgstr ""
 
@@ -597,81 +616,113 @@ msgstr ""
 msgid "Max number of points:"
 msgstr ""
 
-#: ../src/datasource_bfilter.c:54
+#: ../src/datasource_bfilter.c:60
 msgid "Simplify All Tracks"
 msgstr ""
 
-#: ../src/datasource_bfilter.c:55
+#: ../src/datasource_bfilter.c:61
 msgid "Simplified Tracks"
 msgstr ""
 
-#: ../src/datasource_bfilter.c:87 ../src/datasource_bfilter.c:88
+#: ../src/datasource_bfilter.c:94 ../src/datasource_bfilter.c:95
 msgid "Remove Duplicate Waypoints"
 msgstr ""
 
-#: ../src/datasource_bfilter.c:117
+#: ../src/datasource_bfilter.c:125
 msgid "Waypoints Inside This"
 msgstr ""
 
-#: ../src/datasource_bfilter.c:118 ../src/datasource_bfilter.c:151
-msgid "Polygonzied Layer"
+#: ../src/datasource_bfilter.c:126
+msgid "Polygonized Layer"
 msgstr ""
 
-#: ../src/datasource_bfilter.c:150
+#: ../src/datasource_bfilter.c:159
 msgid "Waypoints Outside This"
 msgstr ""
 
-#: ../src/main.c:116
-msgid "Enable debug output"
+#: ../src/datasource_bfilter.c:160
+msgid "Polygonzied Layer"
 msgstr ""
 
 #: ../src/main.c:117
-msgid "Enable verbose output"
+msgid "Enable debug output"
 msgstr ""
 
 #: ../src/main.c:118
+msgid "Enable verbose output"
+msgstr ""
+
+#: ../src/main.c:119
 msgid "Show version"
 msgstr ""
 
-#: ../src/vikdemlayer.c:98
+#: ../src/osm.c:77
+msgid "OSM (view)"
+msgstr ""
+
+#: ../src/osm.c:81
+msgid "OSM (edit)"
+msgstr ""
+
+#: ../src/osm.c:85
+msgid "OSM (render)"
+msgstr ""
+
+#: ../src/uibuilder.c:148
+msgid "Take care that this password will be stored clearly in a plain file."
+msgstr ""
+
+#: ../src/vikdemlayer.c:101
+msgid "Absolute height"
+msgstr ""
+
+#: ../src/vikdemlayer.c:102
+msgid "Height gradient"
+msgstr ""
+
+#: ../src/vikdemlayer.c:119
 msgid "DEM Files:"
 msgstr ""
 
-#: ../src/vikdemlayer.c:99
+#: ../src/vikdemlayer.c:120
 msgid "Download Source:"
 msgstr ""
 
-#: ../src/vikdemlayer.c:101
+#: ../src/vikdemlayer.c:122
+msgid "Type:"
+msgstr ""
+
+#: ../src/vikdemlayer.c:123
 msgid "Min Elev:"
 msgstr ""
 
-#: ../src/vikdemlayer.c:102
+#: ../src/vikdemlayer.c:124
 msgid "Max Elev:"
 msgstr ""
 
-#: ../src/vikdemlayer.c:114
+#: ../src/vikdemlayer.c:136
 msgid "DEM Download/Import"
 msgstr ""
 
-#: ../src/vikdemlayer.c:744
+#: ../src/vikdemlayer.c:804
 #, c-format
 msgid "No SRTM data available for %f, %f"
 msgstr ""
 
-#: ../src/vikdemlayer.c:983
+#: ../src/vikdemlayer.c:1042
 msgid "No download source selected. Edit layer properties."
 msgstr ""
 
-#: ../src/vikdemlayer.c:1006
+#: ../src/vikdemlayer.c:1065
 #, c-format
 msgid "Downloading DEM %s"
 msgstr ""
 
-#: ../src/vikfileentry.c:67
+#: ../src/vikfileentry.c:68
 msgid "Browse..."
 msgstr ""
 
-#: ../src/vikfileentry.c:94
+#: ../src/vikfileentry.c:96
 msgid "Choose file"
 msgstr ""
 
@@ -687,859 +738,1002 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:66
+#: ../src/vikgeoreflayer.c:68
 msgid "Georef Move Map"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:70
+#: ../src/vikgeoreflayer.c:72
 msgid "Georef Zoom Tool"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:268 ../src/vikmapslayer.c:539
+#: ../src/vikgeoreflayer.c:311 ../src/vikmapslayer.c:606
 #, c-format
 msgid "Couldn't open image file: %s"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:293
+#: ../src/vikgeoreflayer.c:341
 msgid "Unexpected end of file reading World file."
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:309 ../src/vikgeoreflayer.c:354
+#: ../src/vikgeoreflayer.c:357 ../src/vikgeoreflayer.c:402
 msgid "Choose World file"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:322
+#: ../src/vikgeoreflayer.c:370
 msgid "The World file you requested could not be opened for reading."
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:367
+#: ../src/vikgeoreflayer.c:415
 msgid "The file you requested could not be opened for writing."
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:384
+#: ../src/vikgeoreflayer.c:432 ../src/viklayer.c:463
 msgid "Layer Properties"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:400
+#: ../src/vikgeoreflayer.c:448
 msgid "World File Parameters:"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:401
+#: ../src/vikgeoreflayer.c:449
 msgid "Load From File..."
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:406
+#: ../src/vikgeoreflayer.c:454
 msgid "Corner pixel easting:"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:409
+#: ../src/vikgeoreflayer.c:456
+msgid "the UTM \"easting\" value of the upper-right corner pixel of the map"
+msgstr ""
+
+#: ../src/vikgeoreflayer.c:458
 msgid "Corner pixel northing:"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:412
+#: ../src/vikgeoreflayer.c:460
+msgid "the UTM \"northing\" value of the upper-right corner pixel of the map"
+msgstr ""
+
+#: ../src/vikgeoreflayer.c:462
 msgid "X (easting) scale (mpp): "
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:413
+#: ../src/vikgeoreflayer.c:463
 msgid "Y (northing) scale (mpp): "
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:418
+#: ../src/vikgeoreflayer.c:466
+msgid "the scale of the map in the X direction (meters per pixel)"
+msgstr ""
+
+#: ../src/vikgeoreflayer.c:468
+msgid "the scale of the map in the Y direction (meters per pixel)"
+msgstr ""
+
+#: ../src/vikgeoreflayer.c:470
 msgid "Map Image:"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:522
+#: ../src/vikgeoreflayer.c:574
 msgid "Zoom to Fit Map"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:527
+#: ../src/vikgeoreflayer.c:579
 msgid "Goto Map Center"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:532
+#: ../src/vikgeoreflayer.c:584
 msgid "Export to World File"
 msgstr ""
 
-#: ../src/vikgpslayer.c:113
+#: ../src/vikgoto.c:77
+msgid "No goto tool available."
+msgstr ""
+
+#: ../src/vikgoto.c:90 ../src/vikgoto.c:108
+msgid "goto"
+msgstr ""
+
+#: ../src/vikgoto.c:92
+msgid "I don't know that place. Do you want another goto?"
+msgstr ""
+
+#: ../src/vikgoto.c:110
+msgid "goto provider:"
+msgstr ""
+
+#: ../src/vikgoto.c:125
+msgid "Enter address or place name:"
+msgstr ""
+
+#: ../src/vikgpslayer.c:148
 msgid "Recording tracks"
 msgstr ""
 
-#: ../src/vikgpslayer.c:114
+#: ../src/vikgpslayer.c:149
 msgid "Jump to current position on start"
 msgstr ""
 
-#: ../src/vikgpslayer.c:115
-msgid "Keep current position at center"
+#: ../src/vikgpslayer.c:150
+msgid "Moving Map Method:"
 msgstr ""
 
-#: ../src/vikgpslayer.c:116
+#: ../src/vikgpslayer.c:151
 msgid "Gpsd Host:"
 msgstr ""
 
-#: ../src/vikgpslayer.c:117
+#: ../src/vikgpslayer.c:152
 msgid "Gpsd Port:"
 msgstr ""
 
-#: ../src/vikgpslayer.c:181 ../src/vikgpslayer.c:956
+#: ../src/vikgpslayer.c:153
+msgid "Gpsd Retry Interval (seconds):"
+msgstr ""
+
+#: ../src/vikgpslayer.c:217 ../src/vikgpslayer.c:1045
 msgid "GPS Download"
 msgstr ""
 
-#: ../src/vikgpslayer.c:181 ../src/vikgpslayer.c:956
+#: ../src/vikgpslayer.c:217 ../src/vikgpslayer.c:1045
 msgid "GPS Upload"
 msgstr ""
 
-#: ../src/vikgpslayer.c:183
+#: ../src/vikgpslayer.c:219
 msgid "GPS Realtime Tracking"
 msgstr ""
 
-#: ../src/vikgpslayer.c:347
+#: ../src/vikgpslayer.c:382
 msgid "Unknown GPS Protocol"
 msgstr ""
 
-#: ../src/vikgpslayer.c:353
+#: ../src/vikgpslayer.c:401
 msgid "Unknown serial port device"
 msgstr ""
 
-#: ../src/vikgpslayer.c:413
+#: ../src/vikgpslayer.c:467
 #, c-format
 msgid "%s: unknown parameter"
 msgstr ""
 
-#: ../src/vikgpslayer.c:510
+#: ../src/vikgpslayer.c:581
 msgid "Upload to GPS"
 msgstr ""
 
-#: ../src/vikgpslayer.c:515
+#: ../src/vikgpslayer.c:586
 msgid "Download from GPS"
 msgstr ""
 
-#: ../src/vikgpslayer.c:533
+#: ../src/vikgpslayer.c:604
 msgid "Empty Upload"
 msgstr ""
 
-#: ../src/vikgpslayer.c:538
+#: ../src/vikgpslayer.c:609
 msgid "Empty Download"
 msgstr ""
 
-#: ../src/vikgpslayer.c:543
+#: ../src/vikgpslayer.c:614
 msgid "Empty All"
 msgstr ""
 
-#: ../src/vikgpslayer.c:685
+#. 
+#. NB It's not fatal if this gives 2 for example! Hence removal of the g_assert
+#. This happens when copied GPS layer is deleted (not sure why the number_handlers would be 2)
+#. I don't think there's any side effects and certainly better than the program just aborting
+#. 
+#: ../src/vikgpslayer.c:630
+#, c-format
+msgid "Unexpected number of disconnected handlers: %d"
+msgstr ""
+
+#: ../src/vikgpslayer.c:762
 #, c-format
 msgid "Uploading %d waypoint..."
 msgid_plural "Uploading %d waypoints..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:687
+#: ../src/vikgpslayer.c:764
 #, c-format
 msgid "Uploading %d trackpoint..."
 msgid_plural "Uploading %d trackpoints..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:711
+#: ../src/vikgpslayer.c:788
 #, c-format
 msgid "Downloaded %d out of %d waypoint..."
 msgid_plural "Downloaded %d out of %d waypoints..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:713
+#: ../src/vikgpslayer.c:790
 #, c-format
 msgid "Downloaded %d out of %d trackpoint..."
 msgid_plural "Downloaded %d out of %d trackpoints..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:717
+#: ../src/vikgpslayer.c:794
 #, c-format
 msgid "Uploaded %d out of %d waypoint..."
 msgid_plural "Uploaded %d out of %d waypoints..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:719
+#: ../src/vikgpslayer.c:796
 #, c-format
 msgid "Uploaded %d out of %d trackpoint..."
 msgid_plural "Uploaded %d out of %d trackpoints..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:726
+#: ../src/vikgpslayer.c:803
 #, c-format
 msgid "Downloaded %d waypoint"
 msgid_plural "Downloaded %d waypoints"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:728
+#: ../src/vikgpslayer.c:805
 #, c-format
 msgid "Downloaded %d trackpoint"
 msgid_plural "Downloaded %d trackpoints"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:732
+#: ../src/vikgpslayer.c:809
 #, c-format
 msgid "Uploaded %d waypoint"
 msgid_plural "Uploaded %d waypoints"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:734
+#: ../src/vikgpslayer.c:811
 #, c-format
 msgid "Uploaded %d trackpoint"
 msgid_plural "Uploaded %d trackpoints"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:919
+#: ../src/vikgpslayer.c:1008
 msgid "Error: couldn't find gpsbabel."
 msgstr ""
 
-#: ../src/viklayerspanel.c:59
+#: ../src/viklayerspanel.c:57
 msgid "/C_ut"
 msgstr ""
 
-#: ../src/viklayerspanel.c:60
+#: ../src/viklayerspanel.c:58
 msgid "/_Copy"
 msgstr ""
 
-#: ../src/viklayerspanel.c:61
+#: ../src/viklayerspanel.c:59
 msgid "/_Paste"
 msgstr ""
 
-#: ../src/viklayerspanel.c:62
+#: ../src/viklayerspanel.c:60
 msgid "/_Delete"
 msgstr ""
 
-#: ../src/viklayerspanel.c:63
+#: ../src/viklayerspanel.c:61
 msgid "/New Layer"
 msgstr ""
 
-#: ../src/viklayerspanel.c:152
+#: ../src/viklayerspanel.c:150
 msgid "Top Layer"
 msgstr ""
 
-#: ../src/viklayerspanel.c:487
+#: ../src/viklayerspanel.c:165
+msgid "Add new layer"
+msgstr ""
+
+#: ../src/viklayerspanel.c:172
+msgid "Remove selected layer"
+msgstr ""
+
+#: ../src/viklayerspanel.c:179
+msgid "Move selected layer up"
+msgstr ""
+
+#: ../src/viklayerspanel.c:186
+msgid "Move selected layer down"
+msgstr ""
+
+#: ../src/viklayerspanel.c:193
+msgid "Cut selected layer"
+msgstr ""
+
+#: ../src/viklayerspanel.c:200
+msgid "Copy selected layer"
+msgstr ""
+
+#: ../src/viklayerspanel.c:207
+msgid "Paste layer below selected layer"
+msgstr ""
+
+#: ../src/viklayerspanel.c:492
 msgid "Aggregate Layers have no settable properties."
 msgstr ""
 
-#: ../src/viklayerspanel.c:537
+#: ../src/viklayerspanel.c:542
 msgid "You cannot cut the Top Layer."
 msgstr ""
 
-#: ../src/viklayerspanel.c:592
+#: ../src/viklayerspanel.c:597
 msgid "You cannot delete the Top Layer."
 msgstr ""
 
-#: ../src/viklayerspanel.c:676
+#: ../src/viklayerspanel.c:681
 msgid "Are you sure you wish to delete all layers?"
 msgstr ""
 
 #. ******* MAPZOOMS ********
-#: ../src/vikmapslayer.c:83
+#: ../src/vikmapslayer.c:90
 msgid "Use Viking Zoom Level"
 msgstr ""
 
-#: ../src/vikmapslayer.c:114
+#: ../src/vikmapslayer.c:122
 msgid "Map Type:"
 msgstr ""
 
-#: ../src/vikmapslayer.c:115
-msgid "Maps Directory (Optional):"
+#: ../src/vikmapslayer.c:123
+msgid "Maps Directory:"
 msgstr ""
 
-#: ../src/vikmapslayer.c:116
+#: ../src/vikmapslayer.c:124
 msgid "Alpha:"
 msgstr ""
 
-#: ../src/vikmapslayer.c:117
+#: ../src/vikmapslayer.c:125
 msgid "Autodownload maps:"
 msgstr ""
 
-#: ../src/vikmapslayer.c:118
+#: ../src/vikmapslayer.c:126
 msgid "Zoom Level:"
 msgstr ""
 
-#: ../src/vikmapslayer.c:124
+#: ../src/vikmapslayer.c:132
 msgid "Maps Download"
 msgstr ""
 
-#: ../src/vikmapslayer.c:130
+#: ../src/vikmapslayer.c:138
 msgid "Map"
 msgstr ""
 
-#: ../src/vikmapslayer.c:383
+#: ../src/vikmapslayer.c:212
+msgid "Default maplayer directory:"
+msgstr ""
+
+#: ../src/vikmapslayer.c:449
 msgid "Unknown map type"
 msgstr ""
 
-#: ../src/vikmapslayer.c:393
+#: ../src/vikmapslayer.c:459
 msgid "Unknown Map Zoom"
 msgstr ""
 
-#: ../src/vikmapslayer.c:462
+#: ../src/vikmapslayer.c:528
 #, c-format
 msgid ""
 "New map cannot be displayed in the current drawmode.\n"
 "Select \"%s\" from View menu to view it."
 msgstr ""
 
-#: ../src/vikmapslayer.c:604
+#: ../src/vikmapslayer.c:670
 #, c-format
 msgid ""
 "Cowardly refusing to draw tiles or existence of tiles beyond %d zoom out "
 "factor"
 msgstr ""
 
-#: ../src/vikmapslayer.c:919
+#: ../src/vikmapslayer.c:1043
 #, c-format
 msgid "Redownloading up to %d %s map..."
 msgid_plural "Redownloading up to %d %s maps..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikmapslayer.c:921
+#: ../src/vikmapslayer.c:1045
 #, c-format
 msgid "Redownloading %d %s map..."
 msgid_plural "Redownloading %d %s maps..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikmapslayer.c:925 ../src/vikmapslayer.c:996
+#: ../src/vikmapslayer.c:1049 ../src/vikmapslayer.c:1120
 #, c-format
 msgid "Downloading %d %s map..."
 msgid_plural "Downloading %d %s maps..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikmapslayer.c:1053
+#: ../src/vikmapslayer.c:1183
 msgid "Redownload bad map(s)"
 msgstr ""
 
-#: ../src/vikmapslayer.c:1057
+#: ../src/vikmapslayer.c:1187
+msgid "Redownload new map(s)"
+msgstr ""
+
+#: ../src/vikmapslayer.c:1191
 msgid "Redownload all map(s)"
 msgstr ""
 
-#: ../src/vikmapslayer.c:1137
+#: ../src/vikmapslayer.c:1271
 #, c-format
 msgid ""
 "Wrong drawmode for this map.\n"
 "Select \"%s\" from View menu and try again."
 msgstr ""
 
-#: ../src/vikmapslayer.c:1142
+#: ../src/vikmapslayer.c:1276
 msgid "Wrong zoom level for this map."
 msgstr ""
 
-#: ../src/vikmapslayer.c:1167
-msgid "Download Onscreen Maps"
+#: ../src/vikmapslayer.c:1306
+msgid "Download missing Onscreen Maps"
 msgstr ""
 
-#: ../src/vikmapslayer.c:1172
+#: ../src/vikmapslayer.c:1312
+msgid "Download new Onscreen Maps from server"
+msgstr ""
+
+#. TODO Add GTK_STOCK_REFRESH icon
+#: ../src/vikmapslayer.c:1319
 msgid "Refresh Onscreen Tiles"
 msgstr ""
 
-#: ../src/viktreeview.c:200
+#: ../src/viktreeview.c:203
 msgid "Layer Name"
 msgstr ""
 
-#: ../src/viktreeview.c:597
+#: ../src/viktreeview.c:624
 #, c-format
 msgid "delete data from %s\n"
 msgstr ""
 
-#: ../src/viktrwlayer.c:297
+#: ../src/viktrwlayer.c:307
 msgid "Create Waypoint"
 msgstr ""
 
-#: ../src/viktrwlayer.c:300
+#: ../src/viktrwlayer.c:310
 msgid "Create Track"
 msgstr ""
 
-#: ../src/viktrwlayer.c:304
+#: ../src/viktrwlayer.c:314
 msgid "Begin Track"
 msgstr ""
 
-#: ../src/viktrwlayer.c:307
+#: ../src/viktrwlayer.c:317
 msgid "Edit Waypoint"
 msgstr ""
 
-#: ../src/viktrwlayer.c:312
+#: ../src/viktrwlayer.c:322
 msgid "Edit Trackpoint"
 msgstr ""
 
-#: ../src/viktrwlayer.c:317
+#: ../src/viktrwlayer.c:327
 msgid "Show Picture"
 msgstr ""
 
-#: ../src/viktrwlayer.c:320
+#: ../src/viktrwlayer.c:330
 msgid "Magic Scissors"
 msgstr ""
 
 #. ***** PARAMETERS *****
-#: ../src/viktrwlayer.c:327 ../src/viktrwlayer.c:1382
-#: ../src/viktrwlayer.c:1384
+#: ../src/viktrwlayer.c:337 ../src/viktrwlayer.c:1401
+#: ../src/viktrwlayer.c:1403
 msgid "Waypoints"
 msgstr ""
 
-#: ../src/viktrwlayer.c:327 ../src/viktrwlayer.c:1372
-#: ../src/viktrwlayer.c:1374
+#: ../src/viktrwlayer.c:337 ../src/viktrwlayer.c:1391
+#: ../src/viktrwlayer.c:1393
 msgid "Tracks"
 msgstr ""
 
-#: ../src/viktrwlayer.c:327
+#: ../src/viktrwlayer.c:337
 msgid "Waypoint Images"
 msgstr ""
 
-#: ../src/viktrwlayer.c:330
+#: ../src/viktrwlayer.c:340
 msgid "Draw by Track"
 msgstr ""
 
-#: ../src/viktrwlayer.c:330
+#: ../src/viktrwlayer.c:340
 msgid "Draw by Velocity"
 msgstr ""
 
-#: ../src/viktrwlayer.c:330
+#: ../src/viktrwlayer.c:340
 msgid "All Tracks Black"
 msgstr ""
 
-#: ../src/viktrwlayer.c:331
+#: ../src/viktrwlayer.c:341
 msgid "Filled Square"
 msgstr ""
 
-#: ../src/viktrwlayer.c:331
+#: ../src/viktrwlayer.c:341
 msgid "Square"
 msgstr ""
 
-#: ../src/viktrwlayer.c:331
+#: ../src/viktrwlayer.c:341
 msgid "Circle"
 msgstr ""
 
-#: ../src/viktrwlayer.c:331
+#: ../src/viktrwlayer.c:341
 msgid "X"
 msgstr ""
 
-#: ../src/viktrwlayer.c:353
+#: ../src/viktrwlayer.c:363
 msgid "Track Drawing Mode:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:354
+#: ../src/viktrwlayer.c:364
 msgid "Draw Track Lines"
 msgstr ""
 
-#: ../src/viktrwlayer.c:355
+#: ../src/viktrwlayer.c:365
 msgid "Draw Trackpoints"
 msgstr ""
 
-#: ../src/viktrwlayer.c:356
+#: ../src/viktrwlayer.c:366
 msgid "Draw Elevation"
 msgstr ""
 
-#: ../src/viktrwlayer.c:357
+#: ../src/viktrwlayer.c:367
 msgid "Draw Elevation Height %:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:359
+#: ../src/viktrwlayer.c:369
 msgid "Draw Stops"
 msgstr ""
 
-#: ../src/viktrwlayer.c:360
+#: ../src/viktrwlayer.c:370
 msgid "Min Stop Length (seconds):"
 msgstr ""
 
-#: ../src/viktrwlayer.c:362
+#: ../src/viktrwlayer.c:372
 msgid "Track Thickness:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:363
+#: ../src/viktrwlayer.c:373
 msgid "Track BG Thickness:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:364
+#: ../src/viktrwlayer.c:374
 msgid "Track Background Color"
 msgstr ""
 
-#: ../src/viktrwlayer.c:365
+#: ../src/viktrwlayer.c:375
 msgid "Min Track Velocity:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:366
+#: ../src/viktrwlayer.c:376
 msgid "Max Track Velocity:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:368
+#: ../src/viktrwlayer.c:378
 msgid "Draw Labels"
 msgstr ""
 
-#: ../src/viktrwlayer.c:369
+#: ../src/viktrwlayer.c:379
 msgid "Waypoint Color:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:370
+#: ../src/viktrwlayer.c:380
 msgid "Waypoint Text:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:371
+#: ../src/viktrwlayer.c:381
 msgid "Background:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:372
+#: ../src/viktrwlayer.c:382
 msgid "Fake BG Color Translucency:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:373
+#: ../src/viktrwlayer.c:383
 msgid "Waypoint marker:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:374
+#: ../src/viktrwlayer.c:384
 msgid "Waypoint size:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:375
+#: ../src/viktrwlayer.c:385
 msgid "Draw Waypoint Symbols:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:377
+#: ../src/viktrwlayer.c:387
 msgid "Draw Waypoint Images"
 msgstr ""
 
-#: ../src/viktrwlayer.c:378
+#: ../src/viktrwlayer.c:388
 msgid "Image Size (pixels):"
 msgstr ""
 
-#: ../src/viktrwlayer.c:379
+#: ../src/viktrwlayer.c:389
 msgid "Image Alpha:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:380
+#: ../src/viktrwlayer.c:390
 msgid "Image Memory Cache Size:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1490
+#: ../src/viktrwlayer.c:1540
 msgid "This layer has no waypoints or trackpoints."
 msgstr ""
 
-#: ../src/viktrwlayer.c:1498
+#: ../src/viktrwlayer.c:1548
 msgid "Export Layer"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1517 ../src/vikwindow.c:1437 ../src/vikwindow.c:1805
+#: ../src/viktrwlayer.c:1567 ../src/vikwindow.c:1577 ../src/vikwindow.c:2020
 #, c-format
 msgid "The file \"%s\" exists, do you wish to overwrite it?"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1527 ../src/vikwindow.c:1455
+#: ../src/viktrwlayer.c:1577 ../src/vikwindow.c:1598
 msgid "The filename you requested could not be opened for writing."
 msgstr ""
 
-#: ../src/viktrwlayer.c:1558
+#: ../src/viktrwlayer.c:1598
+msgid "Create"
+msgstr ""
+
+#: ../src/viktrwlayer.c:1608
 msgid "Waypoint Name:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1578
+#: ../src/viktrwlayer.c:1628
 msgid "Waypoint not found in this layer."
 msgstr ""
 
-#: ../src/viktrwlayer.c:1632
+#: ../src/viktrwlayer.c:1725
 msgid "Goto Center of Layer"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1637
+#: ../src/viktrwlayer.c:1730
 msgid "Goto Waypoint"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1643
+#: ../src/viktrwlayer.c:1736
 msgid "Export layer"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1648
+#: ../src/viktrwlayer.c:1741
 msgid "Export as GPSPoint"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1653
+#: ../src/viktrwlayer.c:1746
 msgid "Export as GPSMapper"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1658
+#: ../src/viktrwlayer.c:1751
 msgid "Export as GPX"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1663 ../src/viktrwlayer.c:2594
+#: ../src/viktrwlayer.c:1756 ../src/viktrwlayer.c:2796
 msgid "New Waypoint"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1669 ../src/viktrwlayer.c:2560
+#: ../src/viktrwlayer.c:1763
+msgid "Add Wikipedia Waypoints"
+msgstr ""
+
+#: ../src/viktrwlayer.c:1768
+msgid "Within layer bounds"
+msgstr ""
+
+#: ../src/viktrwlayer.c:1773
+msgid "Within current view"
+msgstr ""
+
+#: ../src/viktrwlayer.c:1780 ../src/viktrwlayer.c:2762
 msgid "Upload to OSM"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2152
+#: ../src/viktrwlayer.c:2291
+msgid "Failed. This track does not have timestamp"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2305
+msgid "Failed. No other track in this layer has timestamp"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2311
+msgid "Merge with..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:2311
+msgid "Select track to merge with"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2348
 msgid "Merge Threshold..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:2153
+#: ../src/viktrwlayer.c:2349
 msgid "Merge when time between tracks less than:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2244
+#: ../src/viktrwlayer.c:2441
 msgid "Split Threshold..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:2245
+#: ../src/viktrwlayer.c:2442
 msgid "Split when time between trackpoints exceeds:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2328
+#: ../src/viktrwlayer.c:2525
 msgid "Waypoint Already Exists"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2369
+#: ../src/viktrwlayer.c:2566
 msgid "Track Already Exists"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2491
+#: ../src/viktrwlayer.c:2688
 msgid "Goto"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2499
+#: ../src/viktrwlayer.c:2696
 msgid "Visit Geocache Webpage"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2514
+#: ../src/viktrwlayer.c:2711
 msgid "Goto Startpoint"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2519
+#: ../src/viktrwlayer.c:2716
 msgid "Goto \"Center\""
 msgstr ""
 
-#: ../src/viktrwlayer.c:2524
+#: ../src/viktrwlayer.c:2721
 msgid "Goto Endpoint"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2529
+#: ../src/viktrwlayer.c:2726
 msgid "Merge By Time"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2534
+#: ../src/viktrwlayer.c:2731
+msgid "Merge With Other Tracks..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:2736
 msgid "Split By Time"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2539
+#: ../src/viktrwlayer.c:2741
 msgid "Download maps along track..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:2544
+#: ../src/viktrwlayer.c:2746
 msgid "Apply DEM Data"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2549
+#: ../src/viktrwlayer.c:2751
 msgid "Extend track end"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2554
+#: ../src/viktrwlayer.c:2756
 msgid "Extend using magic scissors"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2568
+#: ../src/viktrwlayer.c:2770
 msgid "View Google Directions"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2574
+#: ../src/viktrwlayer.c:2776
 msgid "Use with filter"
 msgstr ""
 
-#: ../src/viktrwlayer.c:3536
+#: ../src/viktrwlayer.c:3739
 msgid "Could not launch eog to open file."
 msgstr ""
 
-#: ../src/viktrwlayer.c:3590
+#: ../src/viktrwlayer.c:3793
 #, c-format
 msgid "Creating %d Image Thumbnails..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:3810
+#: ../src/viktrwlayer.c:4013
 msgid "No map layer in use. Create one first"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:650
+#: ../src/viktrwlayer_propwin.c:686
 msgid "Failed spliting track. Track unchanged"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:667
+#: ../src/viktrwlayer_propwin.c:703
 msgid "Operation Aborted. Track unchanged"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:721
+#: ../src/viktrwlayer_propwin.c:757
 #, c-format
 msgid "%s - Track Properties"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:726
+#: ../src/viktrwlayer_propwin.c:762
 msgid "Split at Marker"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:727
+#: ../src/viktrwlayer_propwin.c:763
 msgid "Split Segments"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:728
+#: ../src/viktrwlayer_propwin.c:764
 msgid "Reverse"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:729
+#: ../src/viktrwlayer_propwin.c:765
 msgid "Delete Dupl."
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Comment:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Track Length:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Trackpoints:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Segments:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Duplicate Points:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Max Speed:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Avg. Speed:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Avg. Dist. Between TPs:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Elevation Range:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Total Elevation Gain/Loss:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Start:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>End:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:788
 msgid "<b>Duration:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:780 ../src/viktrwlayer_propwin.c:787
-#: ../src/viktrwlayer_propwin.c:796 ../src/viktrwlayer_propwin.c:803
-#: ../src/viktrwlayer_propwin.c:842 ../src/viktrwlayer_propwin.c:843
-#: ../src/viktrwlayer_propwin.c:844 ../src/viktrwlayer_propwin.c:866
-#: ../src/viktrwlayer_propwin.c:873
+#: ../src/viktrwlayer_propwin.c:828 ../src/viktrwlayer_propwin.c:852
+#: ../src/viktrwlayer_propwin.c:889 ../src/viktrwlayer_propwin.c:907
+#: ../src/viktrwlayer_propwin.c:957 ../src/viktrwlayer_propwin.c:958
+#: ../src/viktrwlayer_propwin.c:959 ../src/viktrwlayer_propwin.c:981
+#: ../src/viktrwlayer_propwin.c:988
 #, c-format
 msgid "No Data"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:839
+#: ../src/viktrwlayer_propwin.c:954
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:862
+#: ../src/viktrwlayer_propwin.c:977
 msgid "Statistics"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:867
+#: ../src/viktrwlayer_propwin.c:982
 msgid "<b>Track Distance:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:868
+#: ../src/viktrwlayer_propwin.c:983
 msgid "Elevation-distance"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:874
+#: ../src/viktrwlayer_propwin.c:989
 msgid "<b>Track Time:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:875
+#: ../src/viktrwlayer_propwin.c:990
 msgid "Speed-time"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:101
+#: ../src/viktrwlayer_tpwin.c:115
 msgid "<b>Part of Track:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:102
+#: ../src/viktrwlayer_tpwin.c:116
 msgid "<b>Latitude:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:103
+#: ../src/viktrwlayer_tpwin.c:117
 msgid "<b>Longitude:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:104
+#: ../src/viktrwlayer_tpwin.c:118
 msgid "<b>Altitude:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:105
+#: ../src/viktrwlayer_tpwin.c:119
 msgid "<b>Timestamp:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:106
+#: ../src/viktrwlayer_tpwin.c:120
 msgid "<b>Time:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:107
+#: ../src/viktrwlayer_tpwin.c:121
 msgid "<b>Distance Difference:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:108
+#: ../src/viktrwlayer_tpwin.c:122
 msgid "<b>Time Difference:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:109
+#: ../src/viktrwlayer_tpwin.c:123
 msgid "<b>\"Speed\" Between:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:117
+#: ../src/viktrwlayer_tpwin.c:124
+msgid "<b>VDOP:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:125
+msgid "<b>HDOP:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:126
+msgid "<b>PDOP:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:127
+msgid "<b>SAT/FIX:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:136
 msgid "Trackpoint"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:122
+#: ../src/viktrwlayer_tpwin.c:141
 msgid "Split Here"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:123
+#: ../src/viktrwlayer_tpwin.c:142
 msgid "Join With Last"
 msgstr ""
 
-#: ../src/vikwindow.c:176
+#: ../src/vikwindow.c:186
 msgid "Pan"
 msgstr ""
 
-#: ../src/vikwindow.c:176
+#: ../src/vikwindow.c:186
 msgid "Zoom"
 msgstr ""
 
-#: ../src/vikwindow.c:176
+#: ../src/vikwindow.c:186
 msgid "Ruler"
 msgstr ""
 
-#: ../src/vikwindow.c:350
+#: ../src/vikwindow.c:361
 #, c-format
 msgid ""
 "Do you want to save the changes you made to the document \"%s\"?\n"
@@ -1547,453 +1741,527 @@ msgid ""
 "Your changes will be lost if you don't save them."
 msgstr ""
 
-#: ../src/vikwindow.c:353 ../src/vikwindow.c:1301
+#: ../src/vikwindow.c:364 ../src/vikwindow.c:1366
 msgid "Untitled"
 msgstr ""
 
-#: ../src/vikwindow.c:354
+#: ../src/vikwindow.c:365
 msgid "Don't Save"
 msgstr ""
 
-#: ../src/vikwindow.c:387
+#: ../src/vikwindow.c:398
 msgid "mpp"
 msgstr ""
 
-#: ../src/vikwindow.c:387
+#: ../src/vikwindow.c:398
 msgid "pixelfact"
 msgstr ""
 
-#: ../src/vikwindow.c:514
+#: ../src/vikwindow.c:532
 #, c-format
 msgid "%s %s %dm"
 msgstr ""
 
-#: ../src/vikwindow.c:516
+#: ../src/vikwindow.c:534
 #, c-format
 msgid "%s %s"
 msgstr ""
 
-#: ../src/vikwindow.c:1100
+#: ../src/vikwindow.c:1155
 msgid "You must select a layer to show its properties."
 msgstr ""
 
-#: ../src/vikwindow.c:1116
+#: ../src/vikwindow.c:1181
 msgid "You must select a layer to delete."
 msgstr ""
 
-#: ../src/vikwindow.c:1338
+#: ../src/vikwindow.c:1461
+#, c-format
+msgid "Unable to add '%s' to the list of recently used documents"
+msgstr ""
+
+#: ../src/vikwindow.c:1475
 msgid "The file you requested could not be opened."
 msgstr ""
 
-#: ../src/vikwindow.c:1381
+#: ../src/vikwindow.c:1521
 msgid "Please select a GPS data file to open. "
 msgstr ""
 
-#: ../src/vikwindow.c:1424
+#: ../src/vikwindow.c:1564
 msgid "Save as Viking File."
 msgstr ""
 
-#: ../src/vikwindow.c:1652
+#: ../src/vikwindow.c:1855
 msgid ""
 "Viewable region outside allowable pixel size bounds for image. Clipping "
 "width/height values."
 msgstr ""
 
-#: ../src/vikwindow.c:1671
+#: ../src/vikwindow.c:1877
 #, c-format
 msgid "Total area: %ldm x %ldm (%.3f sq. km)"
 msgstr ""
 
+#: ../src/vikwindow.c:1880
+#, c-format
+msgid "Total area: %ldm x %ldm (%.3f sq. miles)"
+msgstr ""
+
 #. todo: default for answers inside VikWindow or static (thruout instance)
-#: ../src/vikwindow.c:1679
+#: ../src/vikwindow.c:1894
 msgid "Save to Image File"
 msgstr ""
 
-#: ../src/vikwindow.c:1697
+#: ../src/vikwindow.c:1912
 msgid "Width (pixels):"
 msgstr ""
 
-#: ../src/vikwindow.c:1699
+#: ../src/vikwindow.c:1914
 msgid "Height (pixels):"
 msgstr ""
 
-#: ../src/vikwindow.c:1702
+#: ../src/vikwindow.c:1917
 msgid "Zoom (meters per pixel):"
 msgstr ""
 
-#: ../src/vikwindow.c:1708
+#: ../src/vikwindow.c:1923
 msgid "Area in current viewable window"
 msgstr ""
 
-#: ../src/vikwindow.c:1718
+#: ../src/vikwindow.c:1933
 msgid "Save as PNG"
 msgstr ""
 
-#: ../src/vikwindow.c:1719
+#: ../src/vikwindow.c:1934
 msgid "Save as JPEG"
 msgstr ""
 
-#: ../src/vikwindow.c:1739
+#: ../src/vikwindow.c:1954
 msgid "East-west image tiles:"
 msgstr ""
 
-#: ../src/vikwindow.c:1741
+#: ../src/vikwindow.c:1956
 msgid "North-south image tiles:"
 msgstr ""
 
-#: ../src/vikwindow.c:1781
+#: ../src/vikwindow.c:1996
 msgid "You must be in UTM mode to use this feature"
 msgstr ""
 
-#: ../src/vikwindow.c:1792
+#: ../src/vikwindow.c:2007
 msgid "Save Image"
 msgstr ""
 
-#: ../src/vikwindow.c:1819
+#: ../src/vikwindow.c:2034
 msgid "Choose a directory to hold images"
 msgstr ""
 
-#: ../src/vikwindow.c:1911
+#: ../src/vikwindow.c:2120
 msgid "Choose a background color"
 msgstr ""
 
-#: ../src/vikwindow.c:1932
+#: ../src/vikwindow.c:2141
 msgid "_File"
 msgstr ""
 
-#: ../src/vikwindow.c:1933
+#: ../src/vikwindow.c:2142
 msgid "_Edit"
 msgstr ""
 
-#: ../src/vikwindow.c:1934
+#: ../src/vikwindow.c:2143
 msgid "_View"
 msgstr ""
 
-#: ../src/vikwindow.c:1935 ../src/vikwindow.c:2007
+#: ../src/vikwindow.c:2144 ../src/vikwindow.c:2228
 msgid "_Zoom"
 msgstr ""
 
-#: ../src/vikwindow.c:1936 ../src/vikwindow.c:2006
+#: ../src/vikwindow.c:2145 ../src/vikwindow.c:2227
 msgid "_Pan"
 msgstr ""
 
-#: ../src/vikwindow.c:1937
+#: ../src/vikwindow.c:2146
 msgid "_Layers"
 msgstr ""
 
-#: ../src/vikwindow.c:1938
+#: ../src/vikwindow.c:2147
 msgid "_Tools"
 msgstr ""
 
-#: ../src/vikwindow.c:1939
+#: ../src/vikwindow.c:2148
+msgid "_Webtools"
+msgstr ""
+
+#: ../src/vikwindow.c:2149 ../src/vikwindow.c:2215
 msgid "_Help"
 msgstr ""
 
-#: ../src/vikwindow.c:1941
+#: ../src/vikwindow.c:2151
 msgid "_New"
 msgstr ""
 
-#: ../src/vikwindow.c:1941
+#: ../src/vikwindow.c:2151
 msgid "New file"
 msgstr ""
 
-#: ../src/vikwindow.c:1942
-msgid "_Open"
+#: ../src/vikwindow.c:2152
+msgid "_Open..."
 msgstr ""
 
-#: ../src/vikwindow.c:1942
+#: ../src/vikwindow.c:2152
 msgid "Open a file"
 msgstr ""
 
-#: ../src/vikwindow.c:1943
-msgid "A_ppend File"
+#: ../src/vikwindow.c:2153
+msgid "Open _Recent File"
+msgstr ""
+
+#: ../src/vikwindow.c:2154
+msgid "Append _File..."
 msgstr ""
 
-#: ../src/vikwindow.c:1943
+#: ../src/vikwindow.c:2154
 msgid "Append data from a different file"
 msgstr ""
 
-#: ../src/vikwindow.c:1944
+#: ../src/vikwindow.c:2155
 msgid "A_cquire"
 msgstr ""
 
-#: ../src/vikwindow.c:1945
-msgid "From _GPS"
+#: ../src/vikwindow.c:2156
+msgid "From _GPS..."
 msgstr ""
 
-#: ../src/vikwindow.c:1945
+#: ../src/vikwindow.c:2156
 msgid "Transfer data from a GPS device"
 msgstr ""
 
-#: ../src/vikwindow.c:1946
-msgid "Google _Directions"
+#: ../src/vikwindow.c:2157
+msgid "Google _Directions..."
 msgstr ""
 
-#: ../src/vikwindow.c:1946
+#: ../src/vikwindow.c:2157
 msgid "Get driving directions from Google"
 msgstr ""
 
-#: ../src/vikwindow.c:1948
-msgid "Geo_caches"
+#: ../src/vikwindow.c:2159
+msgid "Geo_caches..."
 msgstr ""
 
-#: ../src/vikwindow.c:1948
+#: ../src/vikwindow.c:2159
 msgid "Get Geocaches from geocaching.com"
 msgstr ""
 
-#: ../src/vikwindow.c:1950
+#: ../src/vikwindow.c:2161
 msgid "_Save"
 msgstr ""
 
-#: ../src/vikwindow.c:1950
+#: ../src/vikwindow.c:2161
 msgid "Save the file"
 msgstr ""
 
-#: ../src/vikwindow.c:1951
-msgid "Save _As"
+#: ../src/vikwindow.c:2162
+msgid "Save _As..."
 msgstr ""
 
-#: ../src/vikwindow.c:1951
+#: ../src/vikwindow.c:2162
 msgid "Save the file under different name"
 msgstr ""
 
-#: ../src/vikwindow.c:1952
-msgid "_Generate Image File"
+#: ../src/vikwindow.c:2163
+msgid "_Generate Image File..."
 msgstr ""
 
-#: ../src/vikwindow.c:1952
+#: ../src/vikwindow.c:2163
 msgid "Save a snapshot of the workspace into a file"
 msgstr ""
 
-#: ../src/vikwindow.c:1953
-msgid "Generate _Directory of Images"
+#: ../src/vikwindow.c:2164
+msgid "Generate _Directory of Images..."
 msgstr ""
 
-#: ../src/vikwindow.c:1953
+#: ../src/vikwindow.c:2164
 msgid "FIXME:IMGDIR"
 msgstr ""
 
-#: ../src/vikwindow.c:1956
+#: ../src/vikwindow.c:2167
 msgid "_Print..."
 msgstr ""
 
-#: ../src/vikwindow.c:1956
+#: ../src/vikwindow.c:2167
 msgid "Print maps"
 msgstr ""
 
-#: ../src/vikwindow.c:1959
+#: ../src/vikwindow.c:2170
 msgid "E_xit"
 msgstr ""
 
-#: ../src/vikwindow.c:1959
+#: ../src/vikwindow.c:2170
 msgid "Exit the program"
 msgstr ""
 
-#: ../src/vikwindow.c:1960
+#: ../src/vikwindow.c:2171
 msgid "Save and Exit"
 msgstr ""
 
-#: ../src/vikwindow.c:1960
+#: ../src/vikwindow.c:2171
 msgid "Save and Exit the program"
 msgstr ""
 
-#: ../src/vikwindow.c:1962
-msgid "Go To Google Maps location"
+#: ../src/vikwindow.c:2173
+msgid "Go to the _Default Location"
+msgstr ""
+
+#: ../src/vikwindow.c:2173
+msgid "Go to the default location"
+msgstr ""
+
+#: ../src/vikwindow.c:2174
+msgid "Go to Location..."
 msgstr ""
 
-#: ../src/vikwindow.c:1962
-msgid "Go to address/place using Google Maps search"
+#: ../src/vikwindow.c:2174
+msgid "Go to address/place using text search"
 msgstr ""
 
-#: ../src/vikwindow.c:1963
-msgid "_Go to Lat\\/Lon..."
+#: ../src/vikwindow.c:2175
+msgid "_Go to Lat/Lon..."
 msgstr ""
 
-#: ../src/vikwindow.c:1963
-msgid "Go to arbitrary lat\\/lon coordinate"
+#: ../src/vikwindow.c:2175
+msgid "Go to arbitrary lat/lon coordinate"
 msgstr ""
 
-#: ../src/vikwindow.c:1964
+#: ../src/vikwindow.c:2176
 msgid "Go to UTM..."
 msgstr ""
 
-#: ../src/vikwindow.c:1964
+#: ../src/vikwindow.c:2176
 msgid "Go to arbitrary UTM coordinate"
 msgstr ""
 
-#: ../src/vikwindow.c:1965
+#: ../src/vikwindow.c:2177
 msgid "Set Background Color..."
 msgstr ""
 
-#: ../src/vikwindow.c:1966
+#: ../src/vikwindow.c:2178
 msgid "Zoom _In"
 msgstr ""
 
-#: ../src/vikwindow.c:1967
+#: ../src/vikwindow.c:2179
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../src/vikwindow.c:1968
-msgid "Zoom _To"
+#: ../src/vikwindow.c:2180
+msgid "Zoom _To..."
 msgstr ""
 
-#: ../src/vikwindow.c:1969
+#: ../src/vikwindow.c:2181
 msgid "0.25"
 msgstr ""
 
-#: ../src/vikwindow.c:1970
+#: ../src/vikwindow.c:2182
 msgid "0.5"
 msgstr ""
 
-#: ../src/vikwindow.c:1971
+#: ../src/vikwindow.c:2183
 msgid "1"
 msgstr ""
 
-#: ../src/vikwindow.c:1972
+#: ../src/vikwindow.c:2184
 msgid "2"
 msgstr ""
 
-#: ../src/vikwindow.c:1973
+#: ../src/vikwindow.c:2185
 msgid "4"
 msgstr ""
 
-#: ../src/vikwindow.c:1974
+#: ../src/vikwindow.c:2186
 msgid "8"
 msgstr ""
 
-#: ../src/vikwindow.c:1975
+#: ../src/vikwindow.c:2187
 msgid "16"
 msgstr ""
 
-#: ../src/vikwindow.c:1976
+#: ../src/vikwindow.c:2188
 msgid "32"
 msgstr ""
 
-#: ../src/vikwindow.c:1977
+#: ../src/vikwindow.c:2189
 msgid "64"
 msgstr ""
 
-#: ../src/vikwindow.c:1978
+#: ../src/vikwindow.c:2190
 msgid "128"
 msgstr ""
 
-#: ../src/vikwindow.c:1979
+#: ../src/vikwindow.c:2191
+msgid "256"
+msgstr ""
+
+#: ../src/vikwindow.c:2192
+msgid "512"
+msgstr ""
+
+#: ../src/vikwindow.c:2193
+msgid "1024"
+msgstr ""
+
+#: ../src/vikwindow.c:2194
+msgid "2048"
+msgstr ""
+
+#: ../src/vikwindow.c:2195
+msgid "4096"
+msgstr ""
+
+#: ../src/vikwindow.c:2196
+msgid "8192"
+msgstr ""
+
+#: ../src/vikwindow.c:2197
+msgid "16384"
+msgstr ""
+
+#: ../src/vikwindow.c:2198
+msgid "32768"
+msgstr ""
+
+#: ../src/vikwindow.c:2199
 msgid "Pan North"
 msgstr ""
 
-#: ../src/vikwindow.c:1980
+#: ../src/vikwindow.c:2200
 msgid "Pan East"
 msgstr ""
 
-#: ../src/vikwindow.c:1981
+#: ../src/vikwindow.c:2201
 msgid "Pan South"
 msgstr ""
 
-#: ../src/vikwindow.c:1982
+#: ../src/vikwindow.c:2202
 msgid "Pan West"
 msgstr ""
 
-#: ../src/vikwindow.c:1983
+#: ../src/vikwindow.c:2203
 msgid "Background _Jobs"
 msgstr ""
 
-#: ../src/vikwindow.c:1985
+#: ../src/vikwindow.c:2205
 msgid "Cu_t"
 msgstr ""
 
-#: ../src/vikwindow.c:1986
+#: ../src/vikwindow.c:2206
 msgid "_Copy"
 msgstr ""
 
-#: ../src/vikwindow.c:1987
+#: ../src/vikwindow.c:2207
 msgid "_Paste"
 msgstr ""
 
-#: ../src/vikwindow.c:1988
+#: ../src/vikwindow.c:2208
 msgid "_Delete"
 msgstr ""
 
-#: ../src/vikwindow.c:1989
+#: ../src/vikwindow.c:2209
 msgid "Delete All"
 msgstr ""
 
-#: ../src/vikwindow.c:1990
-msgid "_Preferences..."
+#: ../src/vikwindow.c:2210
+msgid "_Flush Map Cache"
 msgstr ""
 
-#: ../src/vikwindow.c:1991
-msgid "_Properties"
+#: ../src/vikwindow.c:2211
+msgid "_Set the Default Location"
 msgstr ""
 
-#: ../src/vikwindow.c:1993
-msgid "_About"
+#: ../src/vikwindow.c:2211
+msgid "Set the Default Location to the current position"
 msgstr ""
 
-#: ../src/vikwindow.c:1998
-msgid "_UTM Mode"
+#: ../src/vikwindow.c:2212
+msgid "_Preferences"
 msgstr ""
 
-#: ../src/vikwindow.c:1999
-msgid "_Expedia Mode"
+#: ../src/vikwindow.c:2213
+msgid "_Properties"
+msgstr ""
+
+#: ../src/vikwindow.c:2216
+msgid "_About"
 msgstr ""
 
-#: ../src/vikwindow.c:2000
-msgid "_Old Google Mode"
+#: ../src/vikwindow.c:2221
+msgid "_UTM Mode"
 msgstr ""
 
-#: ../src/vikwindow.c:2001
-msgid "Old _KH Mode"
+#: ../src/vikwindow.c:2222
+msgid "_Expedia Mode"
 msgstr ""
 
-#: ../src/vikwindow.c:2002
-msgid "_Google Mode"
+#: ../src/vikwindow.c:2223
+msgid "_Mercator Mode"
 msgstr ""
 
-#: ../src/vikwindow.c:2006
+#: ../src/vikwindow.c:2227
 msgid "Pan Tool"
 msgstr ""
 
-#: ../src/vikwindow.c:2007
+#: ../src/vikwindow.c:2228
 msgid "Zoom Tool"
 msgstr ""
 
-#: ../src/vikwindow.c:2008
+#: ../src/vikwindow.c:2229
 msgid "_Ruler"
 msgstr ""
 
-#: ../src/vikwindow.c:2008
+#: ../src/vikwindow.c:2229
 msgid "Ruler Tool"
 msgstr ""
 
-#: ../src/vikwindow.c:2012
+#: ../src/vikwindow.c:2233
+msgid "_Show Scale"
+msgstr ""
+
+#: ../src/vikwindow.c:2233
 msgid "Show Scale"
 msgstr ""
 
-#: ../src/vikwindow.c:2013
+#: ../src/vikwindow.c:2234
+msgid "Show _Center Mark"
+msgstr ""
+
+#: ../src/vikwindow.c:2234
 msgid "Show Center Mark"
 msgstr ""
 
-#: ../src/vikwindow.c:2014
-msgid "Full Screen"
+#: ../src/vikwindow.c:2235
+msgid "_Full Screen"
 msgstr ""
 
-#: ../src/vikwindow.c:2014
+#: ../src/vikwindow.c:2235
 msgid "Activate full screen mode"
 msgstr ""
 
-#: ../src/vikwindow.c:2015
+#: ../src/vikwindow.c:2236
 msgid "Show Side Panel"
 msgstr ""
 
-#: ../src/vikwindow.c:2077
+#: ../src/vikwindow.c:2298
 #, c-format
 msgid "New %s Layer"
 msgstr ""
 
 #: ../src/viking.desktop.in.h:1
-msgid "Map Based GPS Data Manager (live data capable)."
+msgid "GPS Data Manager"
 msgstr ""
 
 #: ../src/viking.desktop.in.h:2
+msgid "Map Based GPS Data Manager (live data capable)."
+msgstr ""
+
+#: ../src/viking.desktop.in.h:3
 msgid "Viking"
 msgstr ""