X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/e270cd3d8aa62bca2630191b41958be0d0cbd430..7a5b9f809c909ae047526032bbd2407499f17592:/po/el.po?ds=sidebyside

diff --git a/po/el.po b/po/el.po
index 8df19138..1c6cb466 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: viking\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-16 21:33+0200\n"
-"PO-Revision-Date: 2008-02-22 20:43+0000\n"
-"Last-Translator: George & Elina <Unknown>\n"
+"POT-Creation-Date: 2009-08-20 09:50+0200\n"
+"PO-Revision-Date: 2008-09-17 04:02+0000\n"
+"Last-Translator: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "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-06-18 02:44+0000\n"
+"X-Launchpad-Export-Date: 2009-09-09 20:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../src/acquire.c:118
@@ -26,28 +26,28 @@ msgstr "Εργασία..."
 msgid "Error: acquisition failed."
 msgstr ""
 
-#: ../src/acquire.c:149 ../src/vikgpslayer.c:924
+#: ../src/acquire.c:149 ../src/vikgpslayer.c:953
 msgid "Done."
 msgstr "Ολοκληρώθηκε."
 
-#: ../src/acquire.c:326 ../src/vikgpslayer.c:963
+#: ../src/acquire.c:326 ../src/vikgpslayer.c:992
 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 ""
 
@@ -72,135 +72,139 @@ msgid ""
 "into."
 msgstr ""
 
-#: ../src/curl_download.c:85
+#: ../src/curl_download.c:94
 #, c-format
 msgid "%s() Curl perform failed: %s"
 msgstr ""
 
-#: ../src/dialog.c:49 ../src/dialog.c:97
+#: ../src/dialog.c:54 ../src/dialog.c:102
 msgid "Go to Lat/Lon"
 msgstr ""
 
-#: ../src/dialog.c:61 ../src/dialog.c:211
+#: ../src/dialog.c:66 ../src/dialog.c:230
 msgid "Latitude:"
 msgstr "Γεωγραφικό πλάτος:"
 
-#: ../src/dialog.c:67 ../src/dialog.c:216
+#: ../src/dialog.c:72 ../src/dialog.c:235
 msgid "Longitude:"
 msgstr "Γεωγραφικό μήκος:"
 
-#: ../src/dialog.c:110
+#: ../src/dialog.c:115
 msgid "Northing:"
 msgstr ""
 
-#: ../src/dialog.c:116
+#: ../src/dialog.c:121
 msgid "Easting:"
 msgstr ""
 
-#: ../src/dialog.c:123
+#: ../src/dialog.c:128
 msgid "Zone:"
 msgstr ""
 
-#: ../src/dialog.c:126
+#: ../src/dialog.c:131
 msgid "Letter:"
 msgstr "Επιστολή:"
 
-#: ../src/dialog.c:173 ../src/viktrwlayer.c:1548
-msgid "Create"
+#: ../src/dialog.c:192
+msgid "Waypoint Properties"
 msgstr ""
 
-#: ../src/dialog.c:199
+#: ../src/dialog.c:218
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: ../src/dialog.c:221
+#: ../src/dialog.c:240
 msgid "Altitude:"
 msgstr "Υψόμετρο:"
 
-#: ../src/dialog.c:226
+#: ../src/dialog.c:245
 msgid "Comment:"
 msgstr "Σχόλιο:"
 
-#: ../src/dialog.c:232
+#: ../src/dialog.c:259
 msgid "Image:"
 msgstr "Εικόνα:"
 
-#: ../src/dialog.c:237
+#: ../src/dialog.c:264
 msgid "Symbol:"
 msgstr ""
 
-#: ../src/dialog.c:244
+#: ../src/dialog.c:273
 msgid "(none)"
 msgstr "(κανένα)"
 
 #. TODO: other checks (isalpha or whatever )
-#: ../src/dialog.c:299
+#: ../src/dialog.c:328
 msgid "Please enter a name for the waypoint."
 msgstr ""
 
-#: ../src/dialog.c:303
+#: ../src/dialog.c:332
 #, c-format
 msgid "The waypoint \"%s\" exists, do you want to overwrite it?"
 msgstr ""
 
-#: ../src/dialog.c:375
+#: ../src/dialog.c:462 ../src/geonamessearch.c:301
+msgid "Nothing was selected"
+msgstr ""
+
+#: ../src/dialog.c:470
 msgid "Add Track"
 msgstr ""
 
-#: ../src/dialog.c:383
+#: ../src/dialog.c:478
 msgid "Track Name:"
 msgstr ""
 
-#: ../src/dialog.c:398
+#: ../src/dialog.c:493
 msgid "Please enter a name for the track."
 msgstr ""
 
-#: ../src/dialog.c:402
+#: ../src/dialog.c:497
 #, c-format
 msgid "The track \"%s\" exists, do you want to overwrite it?"
 msgstr ""
 
-#: ../src/dialog.c:464
+#: ../src/dialog.c:559
 msgid "Zoom Factors..."
 msgstr ""
 
-#: ../src/dialog.c:478
+#: ../src/dialog.c:573
 msgid "Zoom factor (in meters per pixel:"
 msgstr ""
 
-#: ../src/dialog.c:479
+#: ../src/dialog.c:574
 msgid "X (easting): "
 msgstr ""
 
-#: ../src/dialog.c:480
+#: ../src/dialog.c:575
 msgid "Y (northing): "
 msgstr ""
 
-#: ../src/dialog.c:485
+#: ../src/dialog.c:580
 msgid "X and Y zoom factors must be equal"
 msgstr ""
 
-#: ../src/dialog.c:538
+#: ../src/dialog.c:633
 msgid "1 min"
 msgstr ""
 
-#: ../src/dialog.c:539
+#: ../src/dialog.c:634
 msgid "1 hour"
 msgstr ""
 
-#: ../src/dialog.c:540
+#: ../src/dialog.c:635
 msgid "1 day"
 msgstr ""
 
-#: ../src/dialog.c:541
+#: ../src/dialog.c:636
 msgid "Custom (in minutes):"
 msgstr ""
 
-#: ../src/dialog.c:596
+#: ../src/dialog.c:691
 msgid "GPS Data and Topo Analyzer, Explorer, and Manager."
 msgstr ""
 
-#: ../src/dialog.c:597
+#: ../src/dialog.c:692
 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 +221,73 @@ msgid ""
 "Place, Suite 330, Boston, MA 02111-1307, USA"
 msgstr ""
 
-#: ../src/dialog.c:631
+#: ../src/dialog.c:726
 msgid "Download along track"
 msgstr ""
 
-#: ../src/dialog.c:633
+#: ../src/dialog.c:728
 msgid "Map type:"
 msgstr ""
 
-#: ../src/dialog.c:638
+#: ../src/dialog.c:733
 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:117 ../src/geonamessearch.c:133
+#: ../src/geonamessearch.c:151 ../src/googlesearch.c:68
+#: ../src/googlesearch.c:86
+msgid "Search"
 msgstr ""
 
-#: ../src/google.c:60
-msgid "Google Terrain Maps"
+#: ../src/geonamessearch.c:119
+msgid "No entries found!"
 msgstr ""
 
-#: ../src/google.c:133
-#, c-format
-msgid "couldn't open temp file %s"
+#: ../src/geonamessearch.c:135 ../src/googlesearch.c:70
+msgid "I don't know that place. Do you want another search?"
 msgstr ""
 
-#. error
-#: ../src/google.c:144
-#, c-format
-msgid "Failed downloading %s"
+#: ../src/geonamessearch.c:153 ../src/googlesearch.c:88
+msgid "Enter address or place name:"
 msgstr ""
 
-#: ../src/google.c:147 ../src/googlesearch.c:126
+#: ../src/geonamessearch.c:327 ../src/googlesearch.c:127
 msgid "couldn't map temp file"
 msgstr ""
 
-#: ../src/google.c:154
-msgid "Failed fetching Google numbers (\"GLoadApi\" not found)"
-msgstr ""
-
-#: ../src/google.c:190
-msgid "Failed getting google version numbers"
-msgstr ""
-
-#: ../src/googlemaps.c:46
-msgid "Old Google Maps"
-msgstr ""
-
-#: ../src/googlesearch.c:67 ../src/googlesearch.c:85
-msgid "Search"
+#: ../src/geonamessearch.c:509 ../src/googlesearch.c:200
+msgid "couldn't open temp file"
 msgstr ""
 
-#: ../src/googlesearch.c:69
-msgid "I don't know that place. Do you want another search?"
+#: ../src/globals.c:41
+msgid "Degree format:"
 msgstr ""
 
-#: ../src/googlesearch.c:87
-msgid "Enter address or place name:"
-msgstr ""
-
-#: ../src/googlesearch.c:220
-msgid "couldn't open temp file"
+#. Webtools
+#: ../src/google.c:34
+msgid "Google"
 msgstr ""
 
 #: ../src/datasource_gc.c:62
@@ -364,14 +344,14 @@ msgstr ""
 msgid "using cmdline '%s' and file '%s'\n"
 msgstr ""
 
-#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:678
+#: ../src/datasource_gps.c:150 ../src/vikgpslayer.c:707
 #, 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:152 ../src/vikgpslayer.c:709
 #, c-format
 msgid "Downloading %d trackpoint..."
 msgid_plural "Downloading %d trackpoints..."
@@ -388,36 +368,36 @@ msgstr ""
 msgid "Downloaded %d %s."
 msgstr ""
 
-#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:750
+#: ../src/datasource_gps.c:185 ../src/vikgpslayer.c:779
 #, c-format
 msgid "GPS Device: %s"
 msgstr ""
 
-#: ../src/datasource_gps.c:262 ../src/vikgpslayer.c:109
+#: ../src/datasource_gps.c:262 ../src/vikgpslayer.c:133
 msgid "GPS Protocol:"
 msgstr ""
 
-#: ../src/datasource_gps.c:269 ../src/vikgpslayer.c:110
+#: ../src/datasource_gps.c:269 ../src/vikgpslayer.c:134
 msgid "Serial Port:"
 msgstr ""
 
-#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:968
+#: ../src/datasource_gps.c:299 ../src/vikgpslayer.c:997
 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 ""
@@ -427,6 +407,133 @@ msgstr ""
 msgid "Download error: %s"
 msgstr ""
 
+#: ../src/file.c:426 ../src/file.c:430
+#, c-format
+msgid "Draw mode '%s' no more supported"
+msgstr ""
+
+#: ../src/mapcache.c:63
+msgid "Mapcache memory size (MB):"
+msgstr ""
+
+#: ../src/print.c:53
+msgid "None"
+msgstr ""
+
+#: ../src/print.c:54
+msgid "Horizontally"
+msgstr ""
+
+#: ../src/print.c:55
+msgid "Vertically"
+msgstr ""
+
+#: ../src/print.c:56
+msgid "Both"
+msgstr ""
+
+#: ../src/print.c:120
+msgid "Image Settings"
+msgstr ""
+
+#: ../src/print.c:550
+msgid "done"
+msgstr ""
+
+#. Page Size
+#: ../src/print.c:579
+msgid "_Adjust Page Size and Orientation"
+msgstr ""
+
+#: ../src/print.c:595
+msgid "C_enter:"
+msgstr ""
+
+#. ignore page margins
+#: ../src/print.c:613
+msgid "Ignore Page _Margins"
+msgstr ""
+
+#: ../src/print.c:632
+msgid "Image S_ize:"
+msgstr ""
+
+#: ../src/util.c:76
+msgid "Could not launch web browser."
+msgstr ""
+
+#: ../src/util.c:87
+msgid "Could not create new email."
+msgstr ""
+
+#: ../src/vikcoordlayer.c:46 ../src/vikdemlayer.c:110
+msgid "Color:"
+msgstr ""
+
+#: ../src/vikcoordlayer.c:47
+msgid "Minutes Width:"
+msgstr ""
+
+#: ../src/vikcoordlayer.c:48 ../src/vikdemlayer.c:113
+msgid "Line Thickness:"
+msgstr ""
+
+#: ../src/datasource_bfilter.c:46
+msgid "Max number of points:"
+msgstr ""
+
+#: ../src/datasource_bfilter.c:54
+msgid "Simplify All Tracks"
+msgstr ""
+
+#: ../src/datasource_bfilter.c:55
+msgid "Simplified Tracks"
+msgstr ""
+
+#: ../src/datasource_bfilter.c:87 ../src/datasource_bfilter.c:88
+msgid "Remove Duplicate Waypoints"
+msgstr ""
+
+#: ../src/datasource_bfilter.c:117
+msgid "Waypoints Inside This"
+msgstr ""
+
+#: ../src/datasource_bfilter.c:118 ../src/datasource_bfilter.c:151
+msgid "Polygonzied Layer"
+msgstr ""
+
+#: ../src/datasource_bfilter.c:150
+msgid "Waypoints Outside This"
+msgstr ""
+
+#: ../src/main.c:116
+msgid "Use smaller symbols for waypoints"
+msgstr ""
+
+#: ../src/main.c:117
+msgid "Enable debug output"
+msgstr ""
+
+#: ../src/main.c:118
+msgid "Enable verbose output"
+msgstr ""
+
+#: ../src/main.c:119
+msgid "Show version"
+msgstr ""
+
+#: ../src/osm.c:85
+msgid "OSM (view)"
+msgstr ""
+
+#: ../src/osm.c:89
+msgid "OSM (edit)"
+msgstr ""
+
+#: ../src/osm.c:93
+msgid "OSM (render)"
+msgstr ""
+
 #: ../src/osm-traces.c:77
 msgid "OSM username:"
 msgstr ""
@@ -531,147 +638,49 @@ msgstr ""
 msgid "Uploading %s to OSM"
 msgstr ""
 
-#: ../src/print.c:53
-msgid "None"
-msgstr ""
-
-#: ../src/print.c:54
-msgid "Horizontally"
-msgstr ""
-
-#: ../src/print.c:55
-msgid "Vertically"
-msgstr ""
-
-#: ../src/print.c:56
-msgid "Both"
-msgstr ""
-
-#: ../src/print.c:120
-msgid "Image Settings"
-msgstr ""
-
-#: ../src/print.c:550
-msgid "done"
-msgstr ""
-
-#. Page Size
-#: ../src/print.c:579
-msgid "_Adjust Page Size and Orientation"
-msgstr ""
-
-#: ../src/print.c:595
-msgid "C_enter:"
-msgstr ""
-
-#. ignore page margins
-#: ../src/print.c:613
-msgid "Ignore Page _Margins"
-msgstr ""
-
-#: ../src/print.c:632
-msgid "Image S_ize:"
-msgstr ""
-
-#: ../src/util.c:74
-msgid "Could not launch web browser."
-msgstr ""
-
-#: ../src/util.c:85
-msgid "Could not create new email."
-msgstr ""
-
-#: ../src/vikcoordlayer.c:43 ../src/vikdemlayer.c:100
-msgid "Color:"
-msgstr ""
-
-#: ../src/vikcoordlayer.c:44
-msgid "Minutes Width:"
-msgstr ""
-
-#: ../src/vikcoordlayer.c:45 ../src/vikdemlayer.c:103
-msgid "Line Thickness:"
-msgstr ""
-
-#: ../src/datasource_bfilter.c:46
-msgid "Max number of points:"
-msgstr ""
-
-#: ../src/datasource_bfilter.c:54
-msgid "Simplify All Tracks"
-msgstr ""
-
-#: ../src/datasource_bfilter.c:55
-msgid "Simplified Tracks"
-msgstr ""
-
-#: ../src/datasource_bfilter.c:87 ../src/datasource_bfilter.c:88
-msgid "Remove Duplicate Waypoints"
-msgstr ""
-
-#: ../src/datasource_bfilter.c:117
-msgid "Waypoints Inside This"
-msgstr ""
-
-#: ../src/datasource_bfilter.c:118 ../src/datasource_bfilter.c:151
-msgid "Polygonzied Layer"
+#: ../src/uibuilder.c:134
+msgid "Take care that this password will be stored clearly in a plain file."
 msgstr ""
 
-#: ../src/datasource_bfilter.c:150
-msgid "Waypoints Outside This"
-msgstr ""
-
-#: ../src/main.c:116
-msgid "Enable debug output"
-msgstr ""
-
-#: ../src/main.c:117
-msgid "Enable verbose output"
-msgstr ""
-
-#: ../src/main.c:118
-msgid "Show version"
-msgstr ""
-
-#: ../src/vikdemlayer.c:98
+#: ../src/vikdemlayer.c:108
 msgid "DEM Files:"
 msgstr ""
 
-#: ../src/vikdemlayer.c:99
+#: ../src/vikdemlayer.c:109
 msgid "Download Source:"
 msgstr ""
 
-#: ../src/vikdemlayer.c:101
+#: ../src/vikdemlayer.c:111
 msgid "Min Elev:"
 msgstr ""
 
-#: ../src/vikdemlayer.c:102
+#: ../src/vikdemlayer.c:112
 msgid "Max Elev:"
 msgstr ""
 
-#: ../src/vikdemlayer.c:114
+#: ../src/vikdemlayer.c:124
 msgid "DEM Download/Import"
 msgstr ""
 
-#: ../src/vikdemlayer.c:744
+#: ../src/vikdemlayer.c:754
 #, c-format
 msgid "No SRTM data available for %f, %f"
 msgstr ""
 
-#: ../src/vikdemlayer.c:983
+#: ../src/vikdemlayer.c:992
 msgid "No download source selected. Edit layer properties."
 msgstr ""
 
-#: ../src/vikdemlayer.c:1006
+#: ../src/vikdemlayer.c:1015
 #, 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 ""
 
@@ -695,7 +704,7 @@ msgstr ""
 msgid "Georef Zoom Tool"
 msgstr ""
 
-#: ../src/vikgeoreflayer.c:268 ../src/vikmapslayer.c:539
+#: ../src/vikgeoreflayer.c:268 ../src/vikmapslayer.c:544
 #, c-format
 msgid "Couldn't open image file: %s"
 msgstr ""
@@ -760,142 +769,146 @@ msgstr ""
 msgid "Export to World File"
 msgstr ""
 
-#: ../src/vikgpslayer.c:113
+#: ../src/vikgpslayer.c:137
 msgid "Recording tracks"
 msgstr ""
 
-#: ../src/vikgpslayer.c:114
+#: ../src/vikgpslayer.c:138
 msgid "Jump to current position on start"
 msgstr ""
 
-#: ../src/vikgpslayer.c:115
-msgid "Keep current position at center"
+#: ../src/vikgpslayer.c:139
+msgid "Moving Map Method:"
 msgstr ""
 
-#: ../src/vikgpslayer.c:116
+#: ../src/vikgpslayer.c:140
 msgid "Gpsd Host:"
 msgstr ""
 
-#: ../src/vikgpslayer.c:117
+#: ../src/vikgpslayer.c:141
 msgid "Gpsd Port:"
 msgstr ""
 
-#: ../src/vikgpslayer.c:181 ../src/vikgpslayer.c:956
+#: ../src/vikgpslayer.c:142
+msgid "Gpsd Retry Interval (seconds):"
+msgstr ""
+
+#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985
 msgid "GPS Download"
 msgstr ""
 
-#: ../src/vikgpslayer.c:181 ../src/vikgpslayer.c:956
+#: ../src/vikgpslayer.c:206 ../src/vikgpslayer.c:985
 msgid "GPS Upload"
 msgstr ""
 
-#: ../src/vikgpslayer.c:183
+#: ../src/vikgpslayer.c:208
 msgid "GPS Realtime Tracking"
 msgstr ""
 
-#: ../src/vikgpslayer.c:347
+#: ../src/vikgpslayer.c:371
 msgid "Unknown GPS Protocol"
 msgstr ""
 
-#: ../src/vikgpslayer.c:353
+#: ../src/vikgpslayer.c:377
 msgid "Unknown serial port device"
 msgstr ""
 
-#: ../src/vikgpslayer.c:413
+#: ../src/vikgpslayer.c:442
 #, c-format
 msgid "%s: unknown parameter"
 msgstr ""
 
-#: ../src/vikgpslayer.c:510
+#: ../src/vikgpslayer.c:541
 msgid "Upload to GPS"
 msgstr ""
 
-#: ../src/vikgpslayer.c:515
+#: ../src/vikgpslayer.c:546
 msgid "Download from GPS"
 msgstr ""
 
-#: ../src/vikgpslayer.c:533
+#: ../src/vikgpslayer.c:564
 msgid "Empty Upload"
 msgstr ""
 
-#: ../src/vikgpslayer.c:538
+#: ../src/vikgpslayer.c:569
 msgid "Empty Download"
 msgstr ""
 
-#: ../src/vikgpslayer.c:543
+#: ../src/vikgpslayer.c:574
 msgid "Empty All"
 msgstr ""
 
-#: ../src/vikgpslayer.c:685
+#: ../src/vikgpslayer.c:714
 #, c-format
 msgid "Uploading %d waypoint..."
 msgid_plural "Uploading %d waypoints..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:687
+#: ../src/vikgpslayer.c:716
 #, c-format
 msgid "Uploading %d trackpoint..."
 msgid_plural "Uploading %d trackpoints..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:711
+#: ../src/vikgpslayer.c:740
 #, 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:742
 #, 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:746
 #, 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:748
 #, 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:755
 #, c-format
 msgid "Downloaded %d waypoint"
 msgid_plural "Downloaded %d waypoints"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:728
+#: ../src/vikgpslayer.c:757
 #, c-format
 msgid "Downloaded %d trackpoint"
 msgid_plural "Downloaded %d trackpoints"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:732
+#: ../src/vikgpslayer.c:761
 #, c-format
 msgid "Uploaded %d waypoint"
 msgid_plural "Uploaded %d waypoints"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:734
+#: ../src/vikgpslayer.c:763
 #, c-format
 msgid "Uploaded %d trackpoint"
 msgid_plural "Uploaded %d trackpoints"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikgpslayer.c:919
+#: ../src/vikgpslayer.c:948
 msgid "Error: couldn't find gpsbabel."
 msgstr ""
 
@@ -940,542 +953,579 @@ msgid "Are you sure you wish to delete all layers?"
 msgstr ""
 
 #. ******* MAPZOOMS ********
-#: ../src/vikmapslayer.c:83
+#: ../src/vikmapslayer.c:88
 msgid "Use Viking Zoom Level"
 msgstr ""
 
-#: ../src/vikmapslayer.c:114
+#: ../src/vikmapslayer.c:119
 msgid "Map Type:"
 msgstr ""
 
-#: ../src/vikmapslayer.c:115
-msgid "Maps Directory (Optional):"
+#: ../src/vikmapslayer.c:120
+msgid "Maps Directory:"
 msgstr ""
 
-#: ../src/vikmapslayer.c:116
+#: ../src/vikmapslayer.c:121
 msgid "Alpha:"
 msgstr ""
 
-#: ../src/vikmapslayer.c:117
+#: ../src/vikmapslayer.c:122
 msgid "Autodownload maps:"
 msgstr ""
 
-#: ../src/vikmapslayer.c:118
+#: ../src/vikmapslayer.c:123
 msgid "Zoom Level:"
 msgstr ""
 
-#: ../src/vikmapslayer.c:124
+#: ../src/vikmapslayer.c:129
 msgid "Maps Download"
 msgstr ""
 
-#: ../src/vikmapslayer.c:130
+#: ../src/vikmapslayer.c:135
 msgid "Map"
 msgstr ""
 
-#: ../src/vikmapslayer.c:383
+#: ../src/vikmapslayer.c:388
 msgid "Unknown map type"
 msgstr ""
 
-#: ../src/vikmapslayer.c:393
+#: ../src/vikmapslayer.c:398
 msgid "Unknown Map Zoom"
 msgstr ""
 
-#: ../src/vikmapslayer.c:462
+#: ../src/vikmapslayer.c:467
 #, 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:609
 #, 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:927
 #, 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:929
 #, 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:933 ../src/vikmapslayer.c:1004
 #, c-format
 msgid "Downloading %d %s map..."
 msgid_plural "Downloading %d %s maps..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/vikmapslayer.c:1053
+#: ../src/vikmapslayer.c:1061
 msgid "Redownload bad map(s)"
 msgstr ""
 
-#: ../src/vikmapslayer.c:1057
+#: ../src/vikmapslayer.c:1065
 msgid "Redownload all map(s)"
 msgstr ""
 
-#: ../src/vikmapslayer.c:1137
+#: ../src/vikmapslayer.c:1145
 #, 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:1150
 msgid "Wrong zoom level for this map."
 msgstr ""
 
-#: ../src/vikmapslayer.c:1167
+#: ../src/vikmapslayer.c:1175
 msgid "Download Onscreen Maps"
 msgstr ""
 
-#: ../src/vikmapslayer.c:1172
+#. TODO Add GTK_STOCK_REFRESH icon
+#: ../src/vikmapslayer.c:1181
 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:1399
+#: ../src/viktrwlayer.c:1401
 msgid "Waypoints"
 msgstr ""
 
-#: ../src/viktrwlayer.c:327 ../src/viktrwlayer.c:1372
-#: ../src/viktrwlayer.c:1374
+#: ../src/viktrwlayer.c:337 ../src/viktrwlayer.c:1389
+#: ../src/viktrwlayer.c:1391
 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:1538
 msgid "This layer has no waypoints or trackpoints."
 msgstr ""
 
-#: ../src/viktrwlayer.c:1498
+#: ../src/viktrwlayer.c:1546
 msgid "Export Layer"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1517 ../src/vikwindow.c:1437 ../src/vikwindow.c:1805
+#: ../src/viktrwlayer.c:1565 ../src/vikwindow.c:1438 ../src/vikwindow.c:1817
 #, 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:1575 ../src/vikwindow.c:1456
 msgid "The filename you requested could not be opened for writing."
 msgstr ""
 
-#: ../src/viktrwlayer.c:1558
+#: ../src/viktrwlayer.c:1596
+msgid "Create"
+msgstr ""
+
+#: ../src/viktrwlayer.c:1606
 msgid "Waypoint Name:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1578
+#: ../src/viktrwlayer.c:1626
 msgid "Waypoint not found in this layer."
 msgstr ""
 
-#: ../src/viktrwlayer.c:1632
+#: ../src/viktrwlayer.c:1723
 msgid "Goto Center of Layer"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1637
+#: ../src/viktrwlayer.c:1728
 msgid "Goto Waypoint"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1643
+#: ../src/viktrwlayer.c:1734
 msgid "Export layer"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1648
+#: ../src/viktrwlayer.c:1739
 msgid "Export as GPSPoint"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1653
+#: ../src/viktrwlayer.c:1744
 msgid "Export as GPSMapper"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1658
+#: ../src/viktrwlayer.c:1749
 msgid "Export as GPX"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1663 ../src/viktrwlayer.c:2594
+#: ../src/viktrwlayer.c:1754 ../src/viktrwlayer.c:2794
 msgid "New Waypoint"
 msgstr ""
 
-#: ../src/viktrwlayer.c:1669 ../src/viktrwlayer.c:2560
+#: ../src/viktrwlayer.c:1761
+msgid "Add Wikipedia Waypoints"
+msgstr ""
+
+#: ../src/viktrwlayer.c:1766
+msgid "Within layer bounds"
+msgstr ""
+
+#: ../src/viktrwlayer.c:1771
+msgid "Within current view"
+msgstr ""
+
+#: ../src/viktrwlayer.c:1778 ../src/viktrwlayer.c:2760
 msgid "Upload to OSM"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2152
+#: ../src/viktrwlayer.c:2289
+msgid "Failed. This track does not have timestamp"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2303
+msgid "Failed. No other track in this layer has timestamp"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2309
+msgid "Merge with..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:2309
+msgid "Select track to merge with"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2346
 msgid "Merge Threshold..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:2153
+#: ../src/viktrwlayer.c:2347
 msgid "Merge when time between tracks less than:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2244
+#: ../src/viktrwlayer.c:2439
 msgid "Split Threshold..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:2245
+#: ../src/viktrwlayer.c:2440
 msgid "Split when time between trackpoints exceeds:"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2328
+#: ../src/viktrwlayer.c:2523
 msgid "Waypoint Already Exists"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2369
+#: ../src/viktrwlayer.c:2564
 msgid "Track Already Exists"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2491
+#: ../src/viktrwlayer.c:2686
 msgid "Goto"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2499
+#: ../src/viktrwlayer.c:2694
 msgid "Visit Geocache Webpage"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2514
+#: ../src/viktrwlayer.c:2709
 msgid "Goto Startpoint"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2519
+#: ../src/viktrwlayer.c:2714
 msgid "Goto \"Center\""
 msgstr ""
 
-#: ../src/viktrwlayer.c:2524
+#: ../src/viktrwlayer.c:2719
 msgid "Goto Endpoint"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2529
+#: ../src/viktrwlayer.c:2724
 msgid "Merge By Time"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2534
+#: ../src/viktrwlayer.c:2729
+msgid "Merge With Other Tracks..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:2734
 msgid "Split By Time"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2539
+#: ../src/viktrwlayer.c:2739
 msgid "Download maps along track..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:2544
+#: ../src/viktrwlayer.c:2744
 msgid "Apply DEM Data"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2549
+#: ../src/viktrwlayer.c:2749
 msgid "Extend track end"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2554
+#: ../src/viktrwlayer.c:2754
 msgid "Extend using magic scissors"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2568
+#: ../src/viktrwlayer.c:2768
 msgid "View Google Directions"
 msgstr ""
 
-#: ../src/viktrwlayer.c:2574
+#: ../src/viktrwlayer.c:2774
 msgid "Use with filter"
 msgstr ""
 
-#: ../src/viktrwlayer.c:3536
+#: ../src/viktrwlayer.c:3735
 msgid "Could not launch eog to open file."
 msgstr ""
 
-#: ../src/viktrwlayer.c:3590
+#: ../src/viktrwlayer.c:3789
 #, c-format
 msgid "Creating %d Image Thumbnails..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:3810
+#: ../src/viktrwlayer.c:4009
 msgid "No map layer in use. Create one first"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:650
+#: ../src/viktrwlayer_propwin.c:661
 msgid "Failed spliting track. Track unchanged"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:667
+#: ../src/viktrwlayer_propwin.c:678
 msgid "Operation Aborted. Track unchanged"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:721
+#: ../src/viktrwlayer_propwin.c:732
 #, c-format
 msgid "%s - Track Properties"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:726
+#: ../src/viktrwlayer_propwin.c:737
 msgid "Split at Marker"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:727
+#: ../src/viktrwlayer_propwin.c:738
 msgid "Split Segments"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:728
+#: ../src/viktrwlayer_propwin.c:739
 msgid "Reverse"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:729
+#: ../src/viktrwlayer_propwin.c:740
 msgid "Delete Dupl."
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:763
 msgid "<b>Comment:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:763
 msgid "<b>Track Length:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:763
 msgid "<b>Trackpoints:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:763
 msgid "<b>Segments:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:763
 msgid "<b>Duplicate Points:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:763
 msgid "<b>Max Speed:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:763
 msgid "<b>Avg. Speed:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:763
 msgid "<b>Avg. Dist. Between TPs:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:763
 msgid "<b>Elevation Range:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:763
 msgid "<b>Total Elevation Gain/Loss:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:763
 msgid "<b>Start:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:763
 msgid "<b>End:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:752
+#: ../src/viktrwlayer_propwin.c:763
 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:791 ../src/viktrwlayer_propwin.c:798
+#: ../src/viktrwlayer_propwin.c:807 ../src/viktrwlayer_propwin.c:814
+#: ../src/viktrwlayer_propwin.c:853 ../src/viktrwlayer_propwin.c:854
+#: ../src/viktrwlayer_propwin.c:855 ../src/viktrwlayer_propwin.c:877
+#: ../src/viktrwlayer_propwin.c:884
 #, c-format
 msgid "No Data"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:839
+#: ../src/viktrwlayer_propwin.c:850
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:862
+#: ../src/viktrwlayer_propwin.c:873
 msgid "Statistics"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:867
+#: ../src/viktrwlayer_propwin.c:878
 msgid "<b>Track Distance:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:868
+#: ../src/viktrwlayer_propwin.c:879
 msgid "Elevation-distance"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:874
+#: ../src/viktrwlayer_propwin.c:885
 msgid "<b>Track Time:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:875
+#: ../src/viktrwlayer_propwin.c:886
 msgid "Speed-time"
 msgstr ""
 
@@ -1515,31 +1565,47 @@ msgstr ""
 msgid "<b>\"Speed\" Between:</b>"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:117
-msgid "Trackpoint"
+#: ../src/viktrwlayer_tpwin.c:110
+msgid "<b>VDOP:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:111
+msgid "<b>HDOP:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:112
+msgid "<b>PDOP:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:113
+msgid "<b>SAT/FIX:</b>"
 msgstr ""
 
 #: ../src/viktrwlayer_tpwin.c:122
+msgid "Trackpoint"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:127
 msgid "Split Here"
 msgstr ""
 
-#: ../src/viktrwlayer_tpwin.c:123
+#: ../src/viktrwlayer_tpwin.c:128
 msgid "Join With Last"
 msgstr ""
 
-#: ../src/vikwindow.c:176
+#: ../src/vikwindow.c:189
 msgid "Pan"
 msgstr ""
 
-#: ../src/vikwindow.c:176
+#: ../src/vikwindow.c:189
 msgid "Zoom"
 msgstr ""
 
-#: ../src/vikwindow.c:176
+#: ../src/vikwindow.c:189
 msgid "Ruler"
 msgstr ""
 
-#: ../src/vikwindow.c:350
+#: ../src/vikwindow.c:364
 #, c-format
 msgid ""
 "Do you want to save the changes you made to the document \"%s\"?\n"
@@ -1547,453 +1613,457 @@ msgid ""
 "Your changes will be lost if you don't save them."
 msgstr ""
 
-#: ../src/vikwindow.c:353 ../src/vikwindow.c:1301
+#: ../src/vikwindow.c:367 ../src/vikwindow.c:1306
 msgid "Untitled"
 msgstr ""
 
-#: ../src/vikwindow.c:354
+#: ../src/vikwindow.c:368
 msgid "Don't Save"
 msgstr ""
 
-#: ../src/vikwindow.c:387
+#: ../src/vikwindow.c:401
 msgid "mpp"
 msgstr ""
 
-#: ../src/vikwindow.c:387
+#: ../src/vikwindow.c:401
 msgid "pixelfact"
 msgstr ""
 
-#: ../src/vikwindow.c:514
+#: ../src/vikwindow.c:528
 #, c-format
 msgid "%s %s %dm"
 msgstr ""
 
-#: ../src/vikwindow.c:516
+#: ../src/vikwindow.c:530
 #, c-format
 msgid "%s %s"
 msgstr ""
 
-#: ../src/vikwindow.c:1100
+#: ../src/vikwindow.c:1105
 msgid "You must select a layer to show its properties."
 msgstr ""
 
-#: ../src/vikwindow.c:1116
+#: ../src/vikwindow.c:1121
 msgid "You must select a layer to delete."
 msgstr ""
 
-#: ../src/vikwindow.c:1338
+#: ../src/vikwindow.c:1339
 msgid "The file you requested could not be opened."
 msgstr ""
 
-#: ../src/vikwindow.c:1381
+#: ../src/vikwindow.c:1382
 msgid "Please select a GPS data file to open. "
 msgstr ""
 
-#: ../src/vikwindow.c:1424
+#: ../src/vikwindow.c:1425
 msgid "Save as Viking File."
 msgstr ""
 
-#: ../src/vikwindow.c:1652
+#: ../src/vikwindow.c:1664
 msgid ""
 "Viewable region outside allowable pixel size bounds for image. Clipping "
 "width/height values."
 msgstr ""
 
-#: ../src/vikwindow.c:1671
+#: ../src/vikwindow.c:1683
 #, c-format
 msgid "Total area: %ldm x %ldm (%.3f sq. km)"
 msgstr ""
 
 #. todo: default for answers inside VikWindow or static (thruout instance)
-#: ../src/vikwindow.c:1679
+#: ../src/vikwindow.c:1691
 msgid "Save to Image File"
 msgstr ""
 
-#: ../src/vikwindow.c:1697
+#: ../src/vikwindow.c:1709
 msgid "Width (pixels):"
 msgstr ""
 
-#: ../src/vikwindow.c:1699
+#: ../src/vikwindow.c:1711
 msgid "Height (pixels):"
 msgstr ""
 
-#: ../src/vikwindow.c:1702
+#: ../src/vikwindow.c:1714
 msgid "Zoom (meters per pixel):"
 msgstr ""
 
-#: ../src/vikwindow.c:1708
+#: ../src/vikwindow.c:1720
 msgid "Area in current viewable window"
 msgstr ""
 
-#: ../src/vikwindow.c:1718
+#: ../src/vikwindow.c:1730
 msgid "Save as PNG"
 msgstr ""
 
-#: ../src/vikwindow.c:1719
+#: ../src/vikwindow.c:1731
 msgid "Save as JPEG"
 msgstr ""
 
-#: ../src/vikwindow.c:1739
+#: ../src/vikwindow.c:1751
 msgid "East-west image tiles:"
 msgstr ""
 
-#: ../src/vikwindow.c:1741
+#: ../src/vikwindow.c:1753
 msgid "North-south image tiles:"
 msgstr ""
 
-#: ../src/vikwindow.c:1781
+#: ../src/vikwindow.c:1793
 msgid "You must be in UTM mode to use this feature"
 msgstr ""
 
-#: ../src/vikwindow.c:1792
+#: ../src/vikwindow.c:1804
 msgid "Save Image"
 msgstr ""
 
-#: ../src/vikwindow.c:1819
+#: ../src/vikwindow.c:1831
 msgid "Choose a directory to hold images"
 msgstr ""
 
-#: ../src/vikwindow.c:1911
+#: ../src/vikwindow.c:1917
 msgid "Choose a background color"
 msgstr ""
 
-#: ../src/vikwindow.c:1932
+#: ../src/vikwindow.c:1938
 msgid "_File"
 msgstr ""
 
-#: ../src/vikwindow.c:1933
+#: ../src/vikwindow.c:1939
 msgid "_Edit"
 msgstr ""
 
-#: ../src/vikwindow.c:1934
+#: ../src/vikwindow.c:1940
 msgid "_View"
 msgstr ""
 
-#: ../src/vikwindow.c:1935 ../src/vikwindow.c:2007
+#: ../src/vikwindow.c:1941 ../src/vikwindow.c:2013
 msgid "_Zoom"
 msgstr ""
 
-#: ../src/vikwindow.c:1936 ../src/vikwindow.c:2006
+#: ../src/vikwindow.c:1942 ../src/vikwindow.c:2012
 msgid "_Pan"
 msgstr ""
 
-#: ../src/vikwindow.c:1937
+#: ../src/vikwindow.c:1943
 msgid "_Layers"
 msgstr ""
 
-#: ../src/vikwindow.c:1938
+#: ../src/vikwindow.c:1944
 msgid "_Tools"
 msgstr ""
 
-#: ../src/vikwindow.c:1939
+#: ../src/vikwindow.c:1945
+msgid "_Webtools"
+msgstr ""
+
+#: ../src/vikwindow.c:1946
 msgid "_Help"
 msgstr ""
 
-#: ../src/vikwindow.c:1941
+#: ../src/vikwindow.c:1948
 msgid "_New"
 msgstr ""
 
-#: ../src/vikwindow.c:1941
+#: ../src/vikwindow.c:1948
 msgid "New file"
 msgstr ""
 
-#: ../src/vikwindow.c:1942
+#: ../src/vikwindow.c:1949
 msgid "_Open"
 msgstr ""
 
-#: ../src/vikwindow.c:1942
+#: ../src/vikwindow.c:1949
 msgid "Open a file"
 msgstr ""
 
-#: ../src/vikwindow.c:1943
+#: ../src/vikwindow.c:1950
 msgid "A_ppend File"
 msgstr ""
 
-#: ../src/vikwindow.c:1943
+#: ../src/vikwindow.c:1950
 msgid "Append data from a different file"
 msgstr ""
 
-#: ../src/vikwindow.c:1944
+#: ../src/vikwindow.c:1951
 msgid "A_cquire"
 msgstr ""
 
-#: ../src/vikwindow.c:1945
+#: ../src/vikwindow.c:1952
 msgid "From _GPS"
 msgstr ""
 
-#: ../src/vikwindow.c:1945
+#: ../src/vikwindow.c:1952
 msgid "Transfer data from a GPS device"
 msgstr ""
 
-#: ../src/vikwindow.c:1946
+#: ../src/vikwindow.c:1953
 msgid "Google _Directions"
 msgstr ""
 
-#: ../src/vikwindow.c:1946
+#: ../src/vikwindow.c:1953
 msgid "Get driving directions from Google"
 msgstr ""
 
-#: ../src/vikwindow.c:1948
+#: ../src/vikwindow.c:1955
 msgid "Geo_caches"
 msgstr ""
 
-#: ../src/vikwindow.c:1948
+#: ../src/vikwindow.c:1955
 msgid "Get Geocaches from geocaching.com"
 msgstr ""
 
-#: ../src/vikwindow.c:1950
+#: ../src/vikwindow.c:1957
 msgid "_Save"
 msgstr ""
 
-#: ../src/vikwindow.c:1950
+#: ../src/vikwindow.c:1957
 msgid "Save the file"
 msgstr ""
 
-#: ../src/vikwindow.c:1951
+#: ../src/vikwindow.c:1958
 msgid "Save _As"
 msgstr ""
 
-#: ../src/vikwindow.c:1951
+#: ../src/vikwindow.c:1958
 msgid "Save the file under different name"
 msgstr ""
 
-#: ../src/vikwindow.c:1952
+#: ../src/vikwindow.c:1959
 msgid "_Generate Image File"
 msgstr ""
 
-#: ../src/vikwindow.c:1952
+#: ../src/vikwindow.c:1959
 msgid "Save a snapshot of the workspace into a file"
 msgstr ""
 
-#: ../src/vikwindow.c:1953
+#: ../src/vikwindow.c:1960
 msgid "Generate _Directory of Images"
 msgstr ""
 
-#: ../src/vikwindow.c:1953
+#: ../src/vikwindow.c:1960
 msgid "FIXME:IMGDIR"
 msgstr ""
 
-#: ../src/vikwindow.c:1956
+#: ../src/vikwindow.c:1963
 msgid "_Print..."
 msgstr ""
 
-#: ../src/vikwindow.c:1956
+#: ../src/vikwindow.c:1963
 msgid "Print maps"
 msgstr ""
 
-#: ../src/vikwindow.c:1959
+#: ../src/vikwindow.c:1966
 msgid "E_xit"
 msgstr ""
 
-#: ../src/vikwindow.c:1959
+#: ../src/vikwindow.c:1966
 msgid "Exit the program"
 msgstr ""
 
-#: ../src/vikwindow.c:1960
+#: ../src/vikwindow.c:1967
 msgid "Save and Exit"
 msgstr ""
 
-#: ../src/vikwindow.c:1960
+#: ../src/vikwindow.c:1967
 msgid "Save and Exit the program"
 msgstr ""
 
-#: ../src/vikwindow.c:1962
-msgid "Go To Google Maps location"
+#: ../src/vikwindow.c:1969
+msgid "Go To location"
 msgstr ""
 
-#: ../src/vikwindow.c:1962
-msgid "Go to address/place using Google Maps search"
+#: ../src/vikwindow.c:1969
+msgid "Go to address/place using text search"
 msgstr ""
 
-#: ../src/vikwindow.c:1963
+#: ../src/vikwindow.c:1970
 msgid "_Go to Lat\\/Lon..."
 msgstr ""
 
-#: ../src/vikwindow.c:1963
+#: ../src/vikwindow.c:1970
 msgid "Go to arbitrary lat\\/lon coordinate"
 msgstr ""
 
-#: ../src/vikwindow.c:1964
+#: ../src/vikwindow.c:1971
 msgid "Go to UTM..."
 msgstr ""
 
-#: ../src/vikwindow.c:1964
+#: ../src/vikwindow.c:1971
 msgid "Go to arbitrary UTM coordinate"
 msgstr ""
 
-#: ../src/vikwindow.c:1965
+#: ../src/vikwindow.c:1972
 msgid "Set Background Color..."
 msgstr ""
 
-#: ../src/vikwindow.c:1966
+#: ../src/vikwindow.c:1973
 msgid "Zoom _In"
 msgstr ""
 
-#: ../src/vikwindow.c:1967
+#: ../src/vikwindow.c:1974
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../src/vikwindow.c:1968
+#: ../src/vikwindow.c:1975
 msgid "Zoom _To"
 msgstr ""
 
-#: ../src/vikwindow.c:1969
+#: ../src/vikwindow.c:1976
 msgid "0.25"
 msgstr ""
 
-#: ../src/vikwindow.c:1970
+#: ../src/vikwindow.c:1977
 msgid "0.5"
 msgstr ""
 
-#: ../src/vikwindow.c:1971
+#: ../src/vikwindow.c:1978
 msgid "1"
 msgstr ""
 
-#: ../src/vikwindow.c:1972
+#: ../src/vikwindow.c:1979
 msgid "2"
 msgstr ""
 
-#: ../src/vikwindow.c:1973
+#: ../src/vikwindow.c:1980
 msgid "4"
 msgstr ""
 
-#: ../src/vikwindow.c:1974
+#: ../src/vikwindow.c:1981
 msgid "8"
 msgstr ""
 
-#: ../src/vikwindow.c:1975
+#: ../src/vikwindow.c:1982
 msgid "16"
 msgstr ""
 
-#: ../src/vikwindow.c:1976
+#: ../src/vikwindow.c:1983
 msgid "32"
 msgstr ""
 
-#: ../src/vikwindow.c:1977
+#: ../src/vikwindow.c:1984
 msgid "64"
 msgstr ""
 
-#: ../src/vikwindow.c:1978
+#: ../src/vikwindow.c:1985
 msgid "128"
 msgstr ""
 
-#: ../src/vikwindow.c:1979
+#: ../src/vikwindow.c:1986
 msgid "Pan North"
 msgstr ""
 
-#: ../src/vikwindow.c:1980
+#: ../src/vikwindow.c:1987
 msgid "Pan East"
 msgstr ""
 
-#: ../src/vikwindow.c:1981
+#: ../src/vikwindow.c:1988
 msgid "Pan South"
 msgstr ""
 
-#: ../src/vikwindow.c:1982
+#: ../src/vikwindow.c:1989
 msgid "Pan West"
 msgstr ""
 
-#: ../src/vikwindow.c:1983
+#: ../src/vikwindow.c:1990
 msgid "Background _Jobs"
 msgstr ""
 
-#: ../src/vikwindow.c:1985
+#: ../src/vikwindow.c:1992
 msgid "Cu_t"
 msgstr ""
 
-#: ../src/vikwindow.c:1986
+#: ../src/vikwindow.c:1993
 msgid "_Copy"
 msgstr ""
 
-#: ../src/vikwindow.c:1987
+#: ../src/vikwindow.c:1994
 msgid "_Paste"
 msgstr ""
 
-#: ../src/vikwindow.c:1988
+#: ../src/vikwindow.c:1995
 msgid "_Delete"
 msgstr ""
 
-#: ../src/vikwindow.c:1989
+#: ../src/vikwindow.c:1996
 msgid "Delete All"
 msgstr ""
 
-#: ../src/vikwindow.c:1990
+#: ../src/vikwindow.c:1997
+msgid "Flush Map cache"
+msgstr ""
+
+#: ../src/vikwindow.c:1998
 msgid "_Preferences..."
 msgstr ""
 
-#: ../src/vikwindow.c:1991
+#: ../src/vikwindow.c:1999
 msgid "_Properties"
 msgstr ""
 
-#: ../src/vikwindow.c:1993
+#: ../src/vikwindow.c:2001
 msgid "_About"
 msgstr ""
 
-#: ../src/vikwindow.c:1998
+#: ../src/vikwindow.c:2006
 msgid "_UTM Mode"
 msgstr ""
 
-#: ../src/vikwindow.c:1999
+#: ../src/vikwindow.c:2007
 msgid "_Expedia Mode"
 msgstr ""
 
-#: ../src/vikwindow.c:2000
-msgid "_Old Google Mode"
-msgstr ""
-
-#: ../src/vikwindow.c:2001
-msgid "Old _KH Mode"
-msgstr ""
-
-#: ../src/vikwindow.c:2002
-msgid "_Google Mode"
+#: ../src/vikwindow.c:2008
+msgid "_Mercator Mode"
 msgstr ""
 
-#: ../src/vikwindow.c:2006
+#: ../src/vikwindow.c:2012
 msgid "Pan Tool"
 msgstr ""
 
-#: ../src/vikwindow.c:2007
+#: ../src/vikwindow.c:2013
 msgid "Zoom Tool"
 msgstr ""
 
-#: ../src/vikwindow.c:2008
+#: ../src/vikwindow.c:2014
 msgid "_Ruler"
 msgstr ""
 
-#: ../src/vikwindow.c:2008
+#: ../src/vikwindow.c:2014
 msgid "Ruler Tool"
 msgstr ""
 
-#: ../src/vikwindow.c:2012
+#: ../src/vikwindow.c:2018
 msgid "Show Scale"
 msgstr ""
 
-#: ../src/vikwindow.c:2013
+#: ../src/vikwindow.c:2019
 msgid "Show Center Mark"
 msgstr ""
 
-#: ../src/vikwindow.c:2014
+#: ../src/vikwindow.c:2020
 msgid "Full Screen"
 msgstr ""
 
-#: ../src/vikwindow.c:2014
+#: ../src/vikwindow.c:2020
 msgid "Activate full screen mode"
 msgstr ""
 
-#: ../src/vikwindow.c:2015
+#: ../src/vikwindow.c:2021
 msgid "Show Side Panel"
 msgstr ""
 
-#: ../src/vikwindow.c:2077
+#: ../src/vikwindow.c:2083
 #, 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 ""