Import Launchpad translation updates

[andy/viking.git] / po / sv.po

diff --git a/po/sv.po b/po/sv.po
index a49039d9879aeab863b83c5fb0c01111d5c6d121..889a888d6217b85972192dd2b02143e941608a7e 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: viking\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: viking\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2011-01-29 14:38+0100\n"
+"POT-Creation-Date: 2013-09-03 21:58+0200\n"

 "PO-Revision-Date: 2010-12-30 21:34+0000\n"
 "Last-Translator: Erik Simmesgård <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "PO-Revision-Date: 2010-12-30 21:34+0000\n"
 "Last-Translator: Erik Simmesgård <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"


@@ -15,204 +15,231 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\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: 2011-02-08 20:52+0000\n"
-"X-Generator: Launchpad (build 12335)\n"
+"X-Launchpad-Export-Date: 2013-10-12 09:04+0000\n"
+"X-Generator: Launchpad (build 16799)\n"

 
 

-#: ../src/acquire.c:118
+#: ../src/acquire.c:103 ../src/vikgpslayer.c:1235
+msgid "Done."
+msgstr "Färdig."
+
+#: ../src/acquire.c:112
+msgid "No data."
+msgstr "Ingen data."
+
+#: ../src/acquire.c:154 ../src/acquire.c:424
+msgid "Error: acquisition failed."
+msgstr ""
+
+#: ../src/acquire.c:352

 msgid "Working..."
 msgstr "Arbetar..."
 
 msgid "Working..."
 msgstr "Arbetar..."
 

-#: ../src/acquire.c:141
-msgid "Error: acquisition failed."
+#. This shouldn't happen...
+#: ../src/acquire.c:415
+msgid ""
+"Unable to create command\n"
+"Acquire method failed."

 msgstr ""
 
 msgstr ""
 

-#: ../src/acquire.c:149 ../src/vikgpslayer.c:1034
-msgid "Done."
-msgstr "Färdig."
+#: ../src/acquire.c:517
+msgid "_Filter"
+msgstr ""

 
 

-#: ../src/acquire.c:156
-msgid "No data."
-msgstr "Ingen data."
+#: ../src/acquire.c:532
+#, c-format
+msgid "Filter with %s"
+msgstr ""

 
 

-#: ../src/acquire.c:353 ../src/vikgpslayer.c:1088
-msgid "Status: detecting gpsbabel"
-msgstr "Status: letar efter gpsbabel"
+#: ../src/acquire.c:549
+msgid "Filter"
+msgstr ""

 
 

-#: ../src/background.c:57
+#: ../src/background.c:53

 #, c-format
 msgid "%d items"
 msgstr "%d föremål"
 
 #, c-format
 msgid "%d items"
 msgstr "%d föremål"
 

-#: ../src/background.c:225
+#: ../src/background.c:254

 msgid "Job"
 msgstr "Jobb"
 
 msgid "Job"
 msgstr "Jobb"
 

-#: ../src/background.c:229
+#: ../src/background.c:258

 msgid "Progress"
 msgstr "Förlopp"
 
 msgid "Progress"
 msgstr "Förlopp"
 

-#: ../src/background.c:245
+#: ../src/background.c:274

 msgid "Viking Background Jobs"
 msgstr ""
 
 msgid "Viking Background Jobs"
 msgstr ""
 

-#: ../src/clipboard.c:85
+#: ../src/bing.c:47
+msgid "Bing"
+msgstr ""
+
+#. VIK_GTK_WINDOW_FROM_WIDGET(vp)
+#: ../src/bingmapsource.c:499
+msgid "Bing attribution Loading"
+msgstr ""
+
+#: ../src/clipboard.c:95

 msgid "paste failed"
 msgstr "inklistring misslyckades"
 
 msgid "paste failed"
 msgstr "inklistring misslyckades"
 

-#: ../src/clipboard.c:95
+#: ../src/clipboard.c:105

 msgid "wrong clipboard data size"
 msgstr ""
 
 msgid "wrong clipboard data size"
 msgstr ""
 

-#: ../src/clipboard.c:114
+#: ../src/clipboard.c:124

 #, c-format
 msgid ""
 "The clipboard contains sublayer data for %s layers. You must select a layer "
 "of this type to paste the clipboard data."
 msgstr ""
 
 #, c-format
 msgid ""
 "The clipboard contains sublayer data for %s layers. You must select a layer "
 "of this type to paste the clipboard data."
 msgstr ""
 

-#: ../src/clipboard.c:220
+#: ../src/clipboard.c:236

 msgid ""
 "In order to paste a waypoint, please select an appropriate layer to paste "
 "into."
 msgstr ""
 
 msgid ""
 "In order to paste a waypoint, please select an appropriate layer to paste "
 "into."
 msgstr ""
 

-#: ../src/curl_download.c:118
-#, c-format
-msgid "%s() Curl perform failed: %s"
-msgstr ""
-
-#: ../src/dialog.c:52
+#: ../src/dialog.c:53

 msgid "Go to Lat/Lon"
 msgstr "Gå till Lat/Lon"
 
 msgid "Go to Lat/Lon"
 msgstr "Gå till Lat/Lon"
 

-#: ../src/dialog.c:64 ../src/dialog.c:243
+#: ../src/dialog.c:65 ../src/dialog.c:244

 msgid "Latitude:"
 msgstr "Latitud:"
 
 msgid "Latitude:"
 msgstr "Latitud:"
 

-#: ../src/dialog.c:70 ../src/dialog.c:248
+#: ../src/dialog.c:71 ../src/dialog.c:249

 msgid "Longitude:"
 msgstr "Longitud:"
 
 msgid "Longitude:"
 msgstr "Longitud:"
 

-#: ../src/dialog.c:102
+#: ../src/dialog.c:103

 msgid "Go to UTM"
 msgstr ""
 
 msgid "Go to UTM"
 msgstr ""
 

-#: ../src/dialog.c:115
+#: ../src/dialog.c:116

 msgid "Northing:"
 msgstr "Norrvärde"
 
 msgid "Northing:"
 msgstr "Norrvärde"
 

-#: ../src/dialog.c:121
+#: ../src/dialog.c:122

 msgid "Easting:"
 msgstr "Östvärde"
 
 msgid "Easting:"
 msgstr "Östvärde"
 

-#: ../src/dialog.c:128
+#: ../src/dialog.c:129

 msgid "Zone:"
 msgstr "Zon:"
 
 msgid "Zone:"
 msgstr "Zon:"
 

-#: ../src/dialog.c:131
+#: ../src/dialog.c:132

 msgid "Letter:"
 msgstr ""
 
 msgid "Letter:"
 msgstr ""
 

-#: ../src/dialog.c:194
+#: ../src/dialog.c:199

 msgid "Waypoint Properties"
 msgstr "Waypoint Egenskaper"
 
 msgid "Waypoint Properties"
 msgstr "Waypoint Egenskaper"
 

-#: ../src/dialog.c:231
+#: ../src/dialog.c:235

 msgid "Name:"
 msgstr "Namn:"
 
 msgid "Name:"
 msgstr "Namn:"
 

-#: ../src/dialog.c:253
+#: ../src/dialog.c:254

 msgid "Altitude:"
 msgstr "Höjd:"
 
 msgid "Altitude:"
 msgstr "Höjd:"
 

-#: ../src/dialog.c:258
+#: ../src/dialog.c:259

 msgid "Comment:"
 msgstr "Kommentar:"
 
 msgid "Comment:"
 msgstr "Kommentar:"
 

-#: ../src/dialog.c:265
+#: ../src/dialog.c:267 ../src/osm-traces.c:445
+msgid "Description:"
+msgstr "Beskrivning :"
+
+#: ../src/dialog.c:270

 msgid "Image:"
 msgstr "Bild:"
 
 msgid "Image:"
 msgstr "Bild:"
 

-#: ../src/dialog.c:270
+#: ../src/dialog.c:275

 msgid "Symbol:"
 msgstr "Symbol:"
 
 msgid "Symbol:"
 msgstr "Symbol:"
 

-#: ../src/dialog.c:279
+#: ../src/dialog.c:284

 msgid "(none)"
 msgstr "(ingen)"
 
 msgid "(none)"
 msgstr "(ingen)"
 

+#: ../src/dialog.c:326
+msgid "Time:"
+msgstr ""
+

 #. TODO: other checks (isalpha or whatever )
 #. TODO: other checks (isalpha or whatever )

-#: ../src/dialog.c:340
+#: ../src/dialog.c:363

 msgid "Please enter a name for the waypoint."
 msgstr "Ange ett namn för waypointen"
 
 msgid "Please enter a name for the waypoint."
 msgstr "Ange ett namn för waypointen"
 

-#: ../src/dialog.c:344
-#, c-format
-msgid "The waypoint \"%s\" exists, do you want to overwrite it?"
-msgstr "Waypointen \"%s\" finns redan, vill du skriva över den?"
-
-#: ../src/dialog.c:513 ../src/geonamessearch.c:237
+#: ../src/dialog.c:502 ../src/geonamessearch.c:244
+#: ../src/datasource_osm_my_traces.c:507

 msgid "Nothing was selected"
 msgstr "Inget markerat"
 
 msgid "Nothing was selected"
 msgstr "Inget markerat"
 

-#: ../src/dialog.c:521
+#: ../src/dialog.c:510
+msgid "Add Route"
+msgstr ""
+
+#: ../src/dialog.c:510

 msgid "Add Track"
 msgstr "Lägg till spår"
 
 msgid "Add Track"
 msgstr "Lägg till spår"
 

-#: ../src/dialog.c:529
+#: ../src/dialog.c:518
+msgid "Route Name:"
+msgstr ""
+
+#: ../src/dialog.c:518

 msgid "Track Name:"
 msgstr "Spårnamn:"
 
 msgid "Track Name:"
 msgstr "Spårnamn:"
 

-#: ../src/dialog.c:549
+#: ../src/dialog.c:538

 msgid "Please enter a name for the track."
 msgstr "Vänligen skriv in ett namn för spåret"
 
 msgid "Please enter a name for the track."
 msgstr "Vänligen skriv in ett namn för spåret"
 

-#: ../src/dialog.c:553
-#, c-format
-msgid "The track \"%s\" exists, do you want to overwrite it?"
-msgstr "Spåret \"%s\" existerar, vill du skriva över det?"
-
-#: ../src/dialog.c:615
+#: ../src/dialog.c:596

 msgid "Zoom Factors..."
 msgstr ""
 
 msgid "Zoom Factors..."
 msgstr ""
 

-#: ../src/dialog.c:629
+#: ../src/dialog.c:610

 msgid "Zoom factor (in meters per pixel):"
 msgstr "Zoomfaktor (i meter per pixlar)"
 
 msgid "Zoom factor (in meters per pixel):"
 msgstr "Zoomfaktor (i meter per pixlar)"
 

-#: ../src/dialog.c:630
+#: ../src/dialog.c:611

 msgid "X (easting): "
 msgstr "X (östvärde): "
 
 msgid "X (easting): "
 msgstr "X (östvärde): "
 

-#: ../src/dialog.c:631
+#: ../src/dialog.c:612

 msgid "Y (northing): "
 msgstr "Y (norrvärde): "
 
 msgid "Y (northing): "
 msgstr "Y (norrvärde): "
 

-#: ../src/dialog.c:636
+#: ../src/dialog.c:617

 msgid "X and Y zoom factors must be equal"
 msgstr "X och Y zoomfaktorerna måste vara unika"
 
 msgid "X and Y zoom factors must be equal"
 msgstr "X och Y zoomfaktorerna måste vara unika"
 

-#: ../src/dialog.c:691
+#: ../src/dialog.c:672

 msgid "1 min"
 msgstr "1 min"
 
 msgid "1 min"
 msgstr "1 min"
 

-#: ../src/dialog.c:692
+#: ../src/dialog.c:673

 msgid "1 hour"
 msgstr "1 timme"
 
 msgid "1 hour"
 msgstr "1 timme"
 

-#: ../src/dialog.c:693
+#: ../src/dialog.c:674

 msgid "1 day"
 msgstr "1 dag"
 
 msgid "1 day"
 msgstr "1 dag"
 

-#: ../src/dialog.c:694
+#: ../src/dialog.c:675

 msgid "Custom (in minutes):"
 msgstr "Anpassad (i minuter):"
 
 msgid "Custom (in minutes):"
 msgstr "Anpassad (i minuter):"
 

-#: ../src/dialog.c:751
+#: ../src/dialog.c:786

 msgid "GPS Data and Topo Analyzer, Explorer, and Manager."
 msgstr ""
 
 msgid "GPS Data and Topo Analyzer, Explorer, and Manager."
 msgstr ""
 

-#: ../src/dialog.c:752
+#: ../src/dialog.c:787

 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 "
 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 "


@@ -229,28 +256,28 @@ msgid ""
 "Place, Suite 330, Boston, MA 02111-1307, USA"
 msgstr ""
 
 "Place, Suite 330, Boston, MA 02111-1307, USA"
 msgstr ""
 

-#: ../src/dialog.c:780
+#: ../src/dialog.c:852

 msgid "Translation is coordinated on http://launchpad.net/viking"
 msgstr ""
 
 msgid "Translation is coordinated on http://launchpad.net/viking"
 msgstr ""
 

-#: ../src/dialog.c:788
+#: ../src/dialog.c:861

 msgid "Download along track"
 msgstr "Ladda ned längsmed spår"
 
 msgid "Download along track"
 msgstr "Ladda ned längsmed spår"
 

-#: ../src/dialog.c:794
+#: ../src/dialog.c:868

 msgid "Map type:"
 msgstr "Karttyp:"
 
 msgid "Map type:"
 msgstr "Karttyp:"
 

-#: ../src/dialog.c:799
+#: ../src/dialog.c:874

 msgid "Zoom level:"
 msgstr "Zoomnivå:"
 
 msgid "Zoom level:"
 msgstr "Zoomnivå:"
 

-#: ../src/dialog.c:839
+#: ../src/dialog.c:914

 #, c-format
 msgid "The map data is licensed: %s."
 msgstr ""
 
 #, c-format
 msgid "The map data is licensed: %s."
 msgstr ""
 

-#: ../src/dialog.c:842
+#: ../src/dialog.c:917

 #, c-format
 msgid ""
 "The data provided by '<b>%s</b>' are licensed under the following license: "
 #, c-format
 msgid ""
 "The data provided by '<b>%s</b>' are licensed under the following license: "


@@ -258,7 +285,7 @@ msgid ""
 "Please, read the license before continuing."
 msgstr ""
 
 "Please, read the license before continuing."
 msgstr ""
 

-#: ../src/dialog.c:847
+#: ../src/dialog.c:922

 msgid "Open license"
 msgstr ""
 
 msgid "Open license"
 msgstr ""
 


@@ -288,255 +315,633 @@ msgstr ""
 "Kunde inte spara EXPEDIA-bildfil (Direkt efter lyckad nedladdning! Vänligen "
 "rapportera och ta bort bildfil!): %s"
 
 "Kunde inte spara EXPEDIA-bildfil (Direkt efter lyckad nedladdning! Vänligen "
 "rapportera och ta bort bildfil!): %s"
 

-#: ../src/geonamessearch.c:97
+#. *
+#. * See http://www.geonames.org/export/wikipedia-webservice.html#wikipediaBoundingBox
+#. 
+#. Translators may wish to change this setting as appropriate to get Wikipedia articles in that language
+#: ../src/geonamessearch.c:46
+msgid "en"
+msgstr ""
+
+#: ../src/geonamessearch.c:121

 msgid "Search"
 msgstr "Sök"
 
 msgid "Search"
 msgstr "Sök"
 

-#: ../src/geonamessearch.c:99
+#: ../src/geonamessearch.c:123

 msgid "No entries found!"
 msgstr "Inga inlägg hittades!"
 
 msgid "No entries found!"
 msgstr "Inga inlägg hittades!"
 

-#: ../src/geonamessearch.c:263 ../src/googlesearch.c:120
+#. NB could allow columns to be shifted around by doing this after each new
+#. gtk_tree_view_column_set_reorderable ( column, TRUE );
+#. However I don't think is that useful, so I haven't put it in
+#: ../src/geonamessearch.c:177 ../src/datasource_osm_my_traces.c:424
+#: ../src/viktrwlayer_tracklist.c:521
+msgid "Name"
+msgstr ""
+
+#: ../src/geonamessearch.c:182
+msgid "Feature"
+msgstr ""
+
+#: ../src/geonamessearch.c:187 ../src/datasource_osm_my_traces.c:439
+msgid "Lat/Lon"
+msgstr ""
+
+#: ../src/geonamessearch.c:270 ../src/googlesearch.c:100 ../src/vikgoto.c:306

 msgid "couldn't map temp file"
 msgstr ""
 
 msgid "couldn't map temp file"
 msgstr ""
 

-#: ../src/geonamessearch.c:404 ../src/vikgototool.c:250
-msgid "couldn't open temp file"
-msgstr "kunde inte öppna temp fil"
+#: ../src/globals.c:73
+msgid "Absolute"
+msgstr ""
+
+#: ../src/globals.c:73
+msgid "Relative"
+msgstr ""

 
 

-#: ../src/globals.c:44
+#: ../src/globals.c:76

 msgid "Degree format:"
 msgstr "Gradformat:"
 
 msgid "Degree format:"
 msgstr "Gradformat:"
 

-#: ../src/globals.c:48
+#: ../src/globals.c:77

 msgid "Distance units:"
 msgstr ""
 
 msgid "Distance units:"
 msgstr ""
 

-#: ../src/globals.c:52
+#: ../src/globals.c:78

 msgid "Speed units:"
 msgstr ""
 
 msgid "Speed units:"
 msgstr ""
 

-#: ../src/globals.c:56
+#: ../src/globals.c:79

 msgid "Height units:"
 msgstr ""
 
 msgid "Height units:"
 msgstr ""
 

-#: ../src/globals.c:60
+#: ../src/globals.c:80

 msgid "Use large waypoint icons:"
 msgstr ""
 
 msgid "Use large waypoint icons:"
 msgstr ""
 

-#: ../src/globals.c:64
+#: ../src/globals.c:81

 msgid "Default latitude:"
 msgstr ""
 
 msgid "Default latitude:"
 msgstr ""
 

-#: ../src/globals.c:67
+#: ../src/globals.c:82

 msgid "Default longitude:"
 msgstr ""
 
 msgid "Default longitude:"
 msgstr ""
 

+#: ../src/globals.c:88
+msgid "Alphabetical"
+msgstr ""
+
+#: ../src/globals.c:88 ../src/datasource_osm_my_traces.c:434
+msgid "Time"
+msgstr ""
+
+#: ../src/globals.c:88
+msgid "Creation"
+msgstr ""
+
+#: ../src/globals.c:89
+msgid "Title Case"
+msgstr ""
+
+#: ../src/globals.c:89
+msgid "Lowercase"
+msgstr ""
+
+#: ../src/globals.c:92
+msgid "KML File Export Units:"
+msgstr ""
+
+#: ../src/globals.c:93
+msgid "GPX Track Order:"
+msgstr ""
+
+#: ../src/globals.c:94
+msgid "GPX Waypoint Symbols:"
+msgstr ""
+
+#: ../src/globals.c:95
+msgid ""
+"Save GPX Waypoint Symbol names in the specified case. May be useful for "
+"compatibility with various devices"
+msgstr ""
+
+#: ../src/globals.c:100
+msgid "Image Viewer:"
+msgstr ""
+
+#: ../src/globals.c:105
+msgid "External GPX Program 1:"
+msgstr ""
+
+#: ../src/globals.c:106
+msgid "External GPX Program 2:"
+msgstr ""
+
+#: ../src/globals.c:110
+msgid "Save File Reference Mode:"
+msgstr ""
+
+#: ../src/globals.c:111
+msgid ""
+"When saving a Viking .vik file, this determines how the directory paths of "
+"filenames are written."
+msgstr ""
+
+#: ../src/globals.c:112
+msgid "Show Tooltip during Track Creation:"
+msgstr ""
+
+#: ../src/globals.c:115
+msgid "Home Location"
+msgstr ""
+
+#: ../src/globals.c:115
+msgid "Last Location"
+msgstr ""
+
+#: ../src/globals.c:115
+msgid "Specified File"
+msgstr ""
+
+#: ../src/globals.c:115
+msgid "Auto Location"
+msgstr ""
+
+#: ../src/globals.c:118
+msgid "Restore Window Setup:"
+msgstr ""
+
+#: ../src/globals.c:119
+msgid "Restore window size and layout"
+msgstr ""
+
+#: ../src/globals.c:120
+msgid "Add a Default Map Layer:"
+msgstr ""
+
+#: ../src/globals.c:121
+msgid ""
+"The default map layer added is defined by the Layer Defaults. Use the menu "
+"Edit->Layer Defaults->Map... to change the map type and other values."
+msgstr ""
+
+#: ../src/globals.c:122
+msgid "Startup Method:"
+msgstr ""
+
+#: ../src/globals.c:123
+msgid "Startup File:"
+msgstr ""
+
+#: ../src/globals.c:124
+msgid ""
+"The default file to load on startup. Only applies when the startup method is "
+"set to 'Specified File'"
+msgstr ""
+
+#: ../src/globals.c:125
+msgid "Check For New Version:"
+msgstr ""
+
+#: ../src/globals.c:126
+msgid "Periodically check to see if a new version of Viking is available"
+msgstr ""
+
+#. Defaults for the options are setup here
+#: ../src/globals.c:163
+msgid "General"
+msgstr ""
+
+#. New Tab
+#: ../src/globals.c:188
+msgid "Startup"
+msgstr ""
+
+#. New Tab
+#: ../src/globals.c:206
+msgid "Export/External"
+msgstr ""
+
+#. 'Advanced' Properties
+#: ../src/globals.c:230
+msgid "Advanced"
+msgstr ""
+

 #. Webtools
 #. Webtools

-#: ../src/google.c:36
+#: ../src/google.c:38

 msgid "Google"
 msgstr "Google"
 
 msgid "Google"
 msgstr "Google"
 

-#: ../src/datasource_gc.c:62
+#: ../src/datasource_file.c:59
+msgid "Import file with GPSBabel"
+msgstr ""
+
+#: ../src/datasource_file.c:60
+msgid "Imported file"
+msgstr ""
+
+#. The file selector
+#: ../src/datasource_file.c:127
+msgid "File:"
+msgstr ""
+
+#: ../src/datasource_file.c:128
+msgid "File to import"
+msgstr ""
+
+#: ../src/datasource_file.c:135
+msgid "All files"
+msgstr ""
+
+#. The file format selector
+#: ../src/datasource_file.c:142
+msgid "File type:"
+msgstr ""
+
+#: ../src/datasource_file.c:184
+#, c-format
+msgid "using babel args '%s' and file '%s'"
+msgstr ""
+
+#: ../src/datasource_gc.c:66

 msgid "Download Geocaches"
 msgstr "Ladda ned Geocachar"
 
 msgid "Download Geocaches"
 msgstr "Ladda ned Geocachar"
 

-#: ../src/datasource_gc.c:63
+#: ../src/datasource_gc.c:67

 msgid "Geocaching.com Caches"
 msgstr "Geocaching.com Cachar"
 
 msgid "Geocaching.com Caches"
 msgstr "Geocaching.com Cachar"
 

-#: ../src/datasource_gc.c:80
+#: ../src/datasource_gc.c:85

 msgid "geocaching.com username:"
 msgstr "geocaching.com användarnamn:"
 
 msgid "geocaching.com username:"
 msgstr "geocaching.com användarnamn:"
 

-#: ../src/datasource_gc.c:81
+#: ../src/datasource_gc.c:86

 msgid "geocaching.com password:"
 msgstr "geocaching.com lösenord:"
 
 msgid "geocaching.com password:"
 msgstr "geocaching.com lösenord:"
 

-#: ../src/datasource_gc.c:109
+#: ../src/datasource_gc.c:127
+#, c-format

 msgid ""
 msgid ""

-"Can't find gcget in path! Check that you have installed gcget correctly."
+"Can't find %s or %s in path! Check that you have installed it correctly."

 msgstr ""
 
 msgstr ""
 

-#: ../src/datasource_gc.c:171
+#: ../src/datasource_gc.c:189

 msgid "Number geocaches:"
 msgstr "Antal cahar:"
 
 msgid "Number geocaches:"
 msgstr "Antal cahar:"
 

-#: ../src/datasource_gc.c:173
+#: ../src/datasource_gc.c:191

 msgid "Centered around:"
 msgstr "Centrera runt:"
 
 msgid "Centered around:"
 msgstr "Centrera runt:"
 

-#: ../src/datasource_google.c:49 ../src/datasource_google.c:50
-msgid "Google Directions"
-msgstr "Google Vägvisning"
+#: ../src/datasource_gc.c:230
+msgid "Broken input - using some defaults"
+msgstr ""
+
+#: ../src/datasource_geotag.c:51
+msgid "Create Waypoints from Geotagged Images"
+msgstr ""

 
 

-#: ../src/datasource_google.c:76
-msgid "From:"
-msgstr "Från:"
+#: ../src/datasource_geotag.c:52
+msgid "Geotagged Images"
+msgstr ""

 
 

-#: ../src/datasource_google.c:78
-msgid "To:"
-msgstr "Till:"
+#: ../src/datasource_geotag.c:102 ../src/vikwindow.c:2655
+#: ../src/vikwindow.c:2729 ../src/vikwindow.c:3380
+msgid "All"
+msgstr ""

 
 

-#: ../src/datasource_gps.c:55
+#: ../src/datasource_geotag.c:107 ../src/vikwindow.c:3385
+msgid "JPG"
+msgstr ""
+
+#: ../src/datasource_geotag.c:168
+#, c-format
+msgid "Unable to create waypoint from %s"
+msgstr ""
+
+#: ../src/datasource_gps.c:54

 msgid "Acquire from GPS"
 msgstr "Hämta från GPS"
 
 msgid "Acquire from GPS"
 msgstr "Hämta från GPS"
 

-#: ../src/datasource_gps.c:56
+#: ../src/datasource_gps.c:55

 msgid "Acquired from GPS"
 msgstr ""
 
 msgid "Acquired from GPS"
 msgstr ""
 

-#: ../src/datasource_gps.c:151
+#: ../src/datasource_gps.c:245

 #, c-format
 msgid "using cmdline '%s' and file '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "using cmdline '%s' and file '%s'\n"
 msgstr ""
 

-#: ../src/datasource_gps.c:217 ../src/vikgpslayer.c:776
+#: ../src/datasource_gps.c:327 ../src/vikgpslayer.c:934

 #, c-format
 msgid "Downloading %d waypoint..."
 msgid_plural "Downloading %d waypoints..."
 msgstr[0] "Laddar ned %d waypoint..."
 msgstr[1] "Laddar ned %d waypoints..."
 
 #, c-format
 msgid "Downloading %d waypoint..."
 msgid_plural "Downloading %d waypoints..."
 msgstr[0] "Laddar ned %d waypoint..."
 msgstr[1] "Laddar ned %d waypoints..."
 

-#: ../src/datasource_gps.c:219 ../src/vikgpslayer.c:778
+#: ../src/datasource_gps.c:328 ../src/vikgpslayer.c:935

 #, c-format
 msgid "Downloading %d trackpoint..."
 msgid_plural "Downloading %d trackpoints..."
 msgstr[0] "Laddar ned %d trackpoint..."
 msgstr[1] "Laddar ned %d trackpoints..."
 
 #, c-format
 msgid "Downloading %d trackpoint..."
 msgid_plural "Downloading %d trackpoints..."
 msgstr[0] "Laddar ned %d trackpoint..."
 msgstr[1] "Laddar ned %d trackpoints..."
 

-#: ../src/datasource_gps.c:237
+#: ../src/datasource_gps.c:333 ../src/vikgpslayer.c:940
+#, c-format
+msgid "Downloading %d routepoint..."
+msgid_plural "Downloading %d routepoints..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/datasource_gps.c:355 ../src/datasource_gps.c:356
+#: ../src/datasource_gps.c:357

 #, c-format
 msgid "Downloaded %d out of %d %s..."
 msgstr "Laddade ned %d av %d %s..."
 
 #, c-format
 msgid "Downloaded %d out of %d %s..."
 msgstr "Laddade ned %d av %d %s..."
 

-#: ../src/datasource_gps.c:239
+#: ../src/datasource_gps.c:361 ../src/datasource_gps.c:362
+#: ../src/datasource_gps.c:363

 #, c-format
 msgid "Downloaded %d %s."
 msgstr "Laddade ned %d %s."
 
 #, c-format
 msgid "Downloaded %d %s."
 msgstr "Laddade ned %d %s."
 

-#: ../src/datasource_gps.c:252 ../src/vikgpslayer.c:848
+#: ../src/datasource_gps.c:377 ../src/vikgpslayer.c:1018

 #, c-format
 msgid "GPS Device: %s"
 msgstr "GPS enhet: %s"
 
 #, c-format
 msgid "GPS Device: %s"
 msgstr "GPS enhet: %s"
 

-#: ../src/datasource_gps.c:341 ../src/vikgpslayer.c:152
+#: ../src/datasource_gps.c:400 ../src/vikgpslayer.c:1092
+#: ../src/vikgpslayer.c:1160
+msgid "Status: Working..."
+msgstr ""
+
+#. NB gps_layer_inst_init() is performed after parameter registeration
+#. thus to give the protocols some potential values use the old static list
+#. TODO: find another way to use gps_layer_inst_init()?
+#: ../src/datasource_gps.c:500 ../src/vikgpslayer.c:207

 msgid "GPS Protocol:"
 msgstr "GPS protokoll"
 
 msgid "GPS Protocol:"
 msgstr "GPS protokoll"
 

-#: ../src/datasource_gps.c:350 ../src/vikgpslayer.c:153
+#. List reassigned at runtime
+#: ../src/datasource_gps.c:526 ../src/vikgpslayer.c:208

 msgid "Serial Port:"
 msgstr "Seriell Port:"
 
 msgid "Serial Port:"
 msgstr "Seriell Port:"
 

-#: ../src/datasource_gps.c:371
+#: ../src/datasource_gps.c:576

 msgid ""
 "Turn Off After Transfer\n"
 "(Garmin/NAViLink Only)"
 msgstr ""
 
 msgid ""
 "Turn Off After Transfer\n"
 "(Garmin/NAViLink Only)"
 msgstr ""
 

-#: ../src/datasource_gps.c:392 ../src/vikgpslayer.c:1093
+#: ../src/datasource_gps.c:583
+msgid "Tracks:"
+msgstr ""
+
+#: ../src/datasource_gps.c:590
+msgid "Routes:"
+msgstr ""
+
+#: ../src/datasource_gps.c:597
+msgid "Waypoints:"
+msgstr ""
+
+#: ../src/datasource_gps.c:675 ../src/vikgpslayer.c:1355

 msgid "GPS device: N/A"
 msgstr "GPS-enhet: Inte tillgänglig"
 
 msgid "GPS device: N/A"
 msgstr "GPS-enhet: Inte tillgänglig"
 

-#: ../src/dem.c:60 ../src/dem.c:74
+#: ../src/datasource_osm.c:52 ../src/datasource_osm.c:53
+msgid "OSM traces"
+msgstr ""
+
+#: ../src/datasource_osm.c:82
+msgid "Page number:"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:59 ../src/datasource_osm_my_traces.c:60
+msgid "OSM My Traces"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:104
+msgid "Username:"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:109
+msgid "The email or username used to login to OSM"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:111 ../src/osm-traces.c:421
+msgid "Password:"
+msgstr "Lösenord:"
+
+#: ../src/datasource_osm_my_traces.c:114
+msgid "The password used to login to OSM"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:429
+msgid "Description"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:444
+msgid "Privacy"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:451
+msgid "Within Current View"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:518
+msgid "GPS Traces"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:520
+msgid "None found!"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:634
+msgid "My OSM Traces"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:649
+#, c-format
+msgid "Unable to get trace: %s"
+msgstr ""
+
+#: ../src/datasource_routing.c:53 ../src/datasource_routing.c:54
+msgid "Directions"
+msgstr ""
+
+#. Engine selector
+#: ../src/datasource_routing.c:83
+msgid "Engine:"
+msgstr ""
+
+#. From and To entries
+#: ../src/datasource_routing.c:88
+msgid "From:"
+msgstr "Från:"
+
+#: ../src/datasource_routing.c:90
+msgid "To:"
+msgstr "Till:"
+
+#: ../src/datasource_wikipedia.c:32
+msgid "Create Waypoints from Wikipedia Articles"
+msgstr ""
+
+#: ../src/datasource_wikipedia.c:33
+msgid "Wikipedia Waypoints"
+msgstr ""
+
+#: ../src/dem.c:65 ../src/dem.c:79

 msgid "Invalid DEM"
 msgstr "Ogiltig DEM"
 
 msgid "Invalid DEM"
 msgstr "Ogiltig DEM"
 

-#: ../src/dem.c:116
+#: ../src/dem.c:121

 msgid "Invalid DEM header"
 msgstr ""
 
 msgid "Invalid DEM header"
 msgstr ""
 

-#: ../src/dem.c:185 ../src/dem.c:198
+#: ../src/dem.c:190 ../src/dem.c:203

 msgid "Incorrect DEM Class B record: expected 1"
 msgstr ""
 
 msgid "Incorrect DEM Class B record: expected 1"
 msgstr ""
 

-#: ../src/dem.c:355
+#: ../src/dem.c:288 ../src/download.c:170

 #, c-format
 msgid "Couldn't map file %s: %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't map file %s: %s"
 msgstr ""
 

-#: ../src/download.c:112
-msgid "Tile age (s):"
+#: ../src/download.c:130
+msgid "Tile age (days):"

 msgstr ""
 
 msgstr ""
 

-#: ../src/download.c:233
+#: ../src/download.c:321

 #, c-format
 msgid "Download error: %s"
 msgstr "Nedladdningsfel: %s"
 
 #, c-format
 msgid "Download error: %s"
 msgstr "Nedladdningsfel: %s"
 

-#: ../src/file.c:427 ../src/file.c:431
+#: ../src/download.c:404
+msgid "couldn't open temp file"
+msgstr "kunde inte öppna temp fil"
+
+#: ../src/file.c:451 ../src/file.c:456

 #, c-format
 msgid "Draw mode '%s' no more supported"
 msgstr ""
 
 #, c-format
 msgid "Draw mode '%s' no more supported"
 msgstr ""
 

-#: ../src/osm-traces.c:73
+#: ../src/geotag_exif.c:421
+msgid "Not enough memory."
+msgstr ""
+
+#: ../src/geotag_exif.c:439
+msgid "Setting a value for this tag is unsupported!"
+msgstr ""
+
+#: ../src/geotag_exif.c:458
+#, c-format
+msgid "Too few components specified (need %d, found %d)\n"
+msgstr ""
+
+#: ../src/geotag_exif.c:462
+msgid "Numeric value expected\n"
+msgstr ""
+
+#: ../src/geotag_exif.c:470
+msgid "This shouldn't happen!"
+msgstr ""
+
+#: ../src/geotag_exif.c:540
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/geotag_exif.c:553
+msgid "Warning; Too many components specified!"
+msgstr ""
+
+#: ../src/osm-traces.c:76

 msgid "Identifiable (public w/ timestamps)"
 msgstr "Indentifierbar (publik med tidsstämpel)"
 
 msgid "Identifiable (public w/ timestamps)"
 msgstr "Indentifierbar (publik med tidsstämpel)"
 

-#: ../src/osm-traces.c:74
+#: ../src/osm-traces.c:77

 msgid "Trackable (private w/ timestamps)"
 msgstr "Spårbar (privat med tidsstämpel)"
 
 msgid "Trackable (private w/ timestamps)"
 msgstr "Spårbar (privat med tidsstämpel)"
 

-#: ../src/osm-traces.c:75
+#: ../src/osm-traces.c:78

 msgid "Public"
 msgstr "Publik"
 
 msgid "Public"
 msgstr "Publik"
 

-#: ../src/osm-traces.c:76
+#: ../src/osm-traces.c:79

 msgid "Private"
 msgstr "Privat"
 
 msgid "Private"
 msgstr "Privat"
 

-#: ../src/osm-traces.c:93
+#: ../src/osm-traces.c:97

 msgid "OSM username:"
 msgstr "OSM användarnamn:"
 
 msgid "OSM username:"
 msgstr "OSM användarnamn:"
 

-#: ../src/osm-traces.c:94
+#: ../src/osm-traces.c:98

 msgid "OSM password:"
 msgstr "OSM lösenord:"
 
 msgid "OSM password:"
 msgstr "OSM lösenord:"
 

-#: ../src/osm-traces.c:229
+#. Preferences
+#: ../src/osm-traces.c:155
+msgid "OpenStreetMap Traces"
+msgstr ""
+
+#: ../src/osm-traces.c:238

 #, c-format
 msgid "failed to upload data: HTTP response is %ld"
 msgstr "kunde inte ladda upp data: HTTP svar är %ld"
 
 #, c-format
 msgid "failed to upload data: HTTP response is %ld"
 msgstr "kunde inte ladda upp data: HTTP svar är %ld"
 

-#: ../src/osm-traces.c:232
+#: ../src/osm-traces.c:243

 #, c-format
 msgid "curl_easy_getinfo failed: %d"
 msgstr "curl_easy_getinfo misslyckades: %d"
 
 #, c-format
 msgid "curl_easy_getinfo failed: %d"
 msgstr "curl_easy_getinfo misslyckades: %d"
 

-#: ../src/osm-traces.c:236
+#: ../src/osm-traces.c:248

 #, c-format
 msgid "curl request failed: %s"
 msgstr "curlförfrågan misslyckades: %s"
 
 #, c-format
 msgid "curl request failed: %s"
 msgstr "curlförfrågan misslyckades: %s"
 

-#: ../src/osm-traces.c:264
+#: ../src/osm-traces.c:279

 #, c-format
 msgid "failed to open temporary file: %s"
 msgstr "kunde inte öppna temporär fil: %s"
 
 #, c-format
 msgid "failed to open temporary file: %s"
 msgstr "kunde inte öppna temporär fil: %s"
 

-#: ../src/osm-traces.c:298
+#. Success
+#: ../src/osm-traces.c:340
+msgid "Uploaded to OSM"
+msgstr ""
+
+#: ../src/osm-traces.c:344
+msgid "FAILED TO UPLOAD DATA TO OSM - CURL PROBLEM"
+msgstr ""
+
+#: ../src/osm-traces.c:347
+msgid "FAILED TO UPLOAD DATA TO OSM"
+msgstr ""
+
+#: ../src/osm-traces.c:347
+msgid "HTTP response code"
+msgstr ""
+
+#: ../src/osm-traces.c:355

 #, c-format
 msgid "failed to unlink temporary file: %s"
 msgstr ""
 
 #, c-format
 msgid "failed to unlink temporary file: %s"
 msgstr ""
 

-#: ../src/osm-traces.c:310
+#: ../src/osm-traces.c:394

 msgid "OSM upload"
 msgstr "OSM-uppladdning"
 
 msgid "OSM upload"
 msgstr "OSM-uppladdning"
 

-#: ../src/osm-traces.c:331
+#: ../src/osm-traces.c:413

 msgid "Email:"
 msgstr "E-post:"
 
 msgid "Email:"
 msgstr "E-post:"
 

-#: ../src/osm-traces.c:342
+#: ../src/osm-traces.c:418

 msgid ""
 "The email used as login\n"
 "<small>Enter the email you use to login into www.openstreetmap.org.</small>"
 msgstr ""
 
 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:345
-msgid "Password:"
-msgstr "Lösenord:"
-
-#: ../src/osm-traces.c:356
+#: ../src/osm-traces.c:426

 msgid ""
 "The password used to login\n"
 "<small>Enter the password you use to login into "
 msgid ""
 "The password used to login\n"
 "<small>Enter the password you use to login into "


@@ -546,11 +951,11 @@ msgstr ""
 "<small>Skriv in lösenordet du använder för att logga in till "
 "www.openstreetmap.org.</small>"
 
 "<small>Skriv in lösenordet du använder för att logga in till "
 "www.openstreetmap.org.</small>"
 

-#: ../src/osm-traces.c:359
+#: ../src/osm-traces.c:431

 msgid "File's name:"
 msgstr "Filnamn:"
 
 msgid "File's name:"
 msgstr "Filnamn:"
 

-#: ../src/osm-traces.c:369
+#: ../src/osm-traces.c:441

 msgid ""
 "The name of the file on OSM\n"
 "<small>This is the name of the file created on the server.This is not the "
 msgid ""
 "The name of the file on OSM\n"
 "<small>This is the name of the file created on the server.This is not the "


@@ -560,216 +965,364 @@ msgstr ""
 "<small>Namnet på filen hos servern. Det är inte samma som namnet på den "
 "lokala filen.</small>"
 
 "<small>Namnet på filen hos servern. Det är inte samma som namnet på den "
 "lokala filen.</small>"
 

-#: ../src/osm-traces.c:373
-msgid "Description:"
-msgstr "Beskrivning :"
-
-#: ../src/osm-traces.c:378
+#: ../src/osm-traces.c:450

 msgid "The description of the trace"
 msgstr "Beskrivningen utav spåret"
 
 msgid "The description of the trace"
 msgstr "Beskrivningen utav spåret"
 

-#: ../src/osm-traces.c:380
-msgid "Tags:"
-msgstr "Märken:"
-
-#: ../src/osm-traces.c:385
-msgid "The tags associated to the trace"
+#: ../src/osm-traces.c:453
+msgid "Anonymize Times:"

 msgstr ""
 
 msgstr ""
 

-#: ../src/osm-traces.c:418
+#: ../src/osm-traces.c:458
+msgid ""
+"Anonymize times of the trace.\n"
+"<small>You may choose to make the trace identifiable, yet mask the actual "
+"real time values</small>"
+msgstr ""
+
+#: ../src/osm-traces.c:462
+msgid "Tags:"
+msgstr "Märken:"
+
+#: ../src/osm-traces.c:467
+msgid "The tags associated to the trace"
+msgstr ""
+
+#: ../src/osm-traces.c:529

 #, c-format
 msgid "Uploading %s to OSM"
 msgstr "Laddar upp %s till OSM"
 
 #: ../src/mapcache.c:61
 #, c-format
 msgid "Uploading %s to OSM"
 msgstr "Laddar upp %s till OSM"
 
 #: ../src/mapcache.c:61

-msgid "Mapcache memory size (MB):"
+msgid "Map cache memory size (MB):"

 msgstr ""
 
 msgstr ""
 

-#: ../src/print.c:53
+#: ../src/print.c:51 ../src/viktrwlayer.c:509

 msgid "None"
 msgstr "Ingen"
 
 msgid "None"
 msgstr "Ingen"
 

-#: ../src/print.c:54
+#: ../src/print.c:52

 msgid "Horizontally"
 msgstr "Horisontell"
 
 msgid "Horizontally"
 msgstr "Horisontell"
 

-#: ../src/print.c:55
+#: ../src/print.c:53

 msgid "Vertically"
 msgstr "Vertikal"
 
 msgid "Vertically"
 msgstr "Vertikal"
 

-#: ../src/print.c:56
+#: ../src/print.c:54

 msgid "Both"
 msgstr "Båda"
 
 msgid "Both"
 msgstr "Båda"
 

-#: ../src/print.c:120
+#: ../src/print.c:118

 msgid "Image Settings"
 msgstr "Bildinställningar"
 
 msgid "Image Settings"
 msgstr "Bildinställningar"
 

-#: ../src/print.c:550
+#: ../src/print.c:548

 msgid "done"
 msgstr "färdig"
 
 #. Page Size
 msgid "done"
 msgstr "färdig"
 
 #. Page Size

-#: ../src/print.c:579
+#: ../src/print.c:577

 msgid "_Adjust Page Size and Orientation"
 msgstr "_Justera sidstorlek och orientering"
 
 msgid "_Adjust Page Size and Orientation"
 msgstr "_Justera sidstorlek och orientering"
 

-#: ../src/print.c:595
+#: ../src/print.c:593

 msgid "C_enter:"
 msgstr "C_entrum:"
 
 #. ignore page margins
 msgid "C_enter:"
 msgstr "C_entrum:"
 
 #. ignore page margins

-#: ../src/print.c:613
+#: ../src/print.c:611

 msgid "Ignore Page _Margins"
 msgstr "Ignorera sid_marginaler"
 
 msgid "Ignore Page _Margins"
 msgstr "Ignorera sid_marginaler"
 

-#: ../src/print.c:632
+#: ../src/print.c:630

 msgid "Image S_ize:"
 msgstr "Bild S_torlek"
 
 msgid "Image S_ize:"
 msgstr "Bild S_torlek"
 

-#: ../src/util.c:77
-msgid "Could not launch web browser."
-msgstr "Kunde inte starta webbläsare."
+#: ../src/util.c:65
+#, c-format
+msgid "Could not launch web browser. %s"
+msgstr ""
+
+#: ../src/util.c:76
+#, c-format
+msgid "Could not create new email. %s"
+msgstr ""
+
+#: ../src/util.c:177
+#, c-format
+msgid ""
+"There is a newer version of Viking available: %s\n"
+"\n"
+"Do you wish to go to Viking's website now?"
+msgstr ""

 
 

-#: ../src/util.c:88
-msgid "Could not create new email."
-msgstr "Kunde inte skapa nytt e-postmeddelande."
+#: ../src/util.c:304
+msgid ""
+"This appears to be Viking's very first run.\n"
+"\n"
+"Do you wish to enable automatic internet features?\n"
+"\n"
+"Individual settings can be controlled in the Preferences."
+msgstr ""

 
 

-#: ../src/vikcoordlayer.c:46
+#: ../src/vikcoordlayer.c:57

 msgid "Color:"
 msgstr "Färg:"
 
 msgid "Color:"
 msgstr "Färg:"
 

-#: ../src/vikcoordlayer.c:47
+#: ../src/vikcoordlayer.c:58

 msgid "Minutes Width:"
 msgstr ""
 
 msgid "Minutes Width:"
 msgstr ""
 

-#: ../src/vikcoordlayer.c:48
+#: ../src/vikcoordlayer.c:59

 msgid "Line Thickness:"
 msgstr "Linjens tjocklek:"
 
 msgid "Line Thickness:"
 msgstr "Linjens tjocklek:"
 

+#: ../src/vikcoordlayer.c:66
+msgid "Coordinate"
+msgstr ""
+

 #: ../src/datasource_bfilter.c:46
 msgid "Max number of points:"
 msgstr "Max antal punkter:"
 
 #: ../src/datasource_bfilter.c:60
 #: ../src/datasource_bfilter.c:46
 msgid "Max number of points:"
 msgstr "Max antal punkter:"
 
 #: ../src/datasource_bfilter.c:60

-msgid "Simplify All Tracks"
-msgstr "Förenkla alla spår"
+msgid "Simplify All Tracks..."
+msgstr ""

 
 #: ../src/datasource_bfilter.c:61
 msgid "Simplified Tracks"
 msgstr "Förenklade spår"
 
 
 #: ../src/datasource_bfilter.c:61
 msgid "Simplified Tracks"
 msgstr "Förenklade spår"
 

-#: ../src/datasource_bfilter.c:95 ../src/datasource_bfilter.c:96
+#: ../src/datasource_bfilter.c:96 ../src/datasource_bfilter.c:97

 msgid "Remove Duplicate Waypoints"
 msgstr "Ta bort dubbla Waypoints"
 
 msgid "Remove Duplicate Waypoints"
 msgstr "Ta bort dubbla Waypoints"
 

-#: ../src/datasource_bfilter.c:127
+#: ../src/datasource_bfilter.c:129

 msgid "Waypoints Inside This"
 msgstr ""
 
 msgid "Waypoints Inside This"
 msgstr ""
 

-#: ../src/datasource_bfilter.c:128
+#: ../src/datasource_bfilter.c:130

 msgid "Polygonized Layer"
 msgstr ""
 
 msgid "Polygonized Layer"
 msgstr ""
 

-#: ../src/datasource_bfilter.c:162
+#: ../src/datasource_bfilter.c:165

 msgid "Waypoints Outside This"
 msgstr ""
 
 msgid "Waypoints Outside This"
 msgstr ""
 

-#: ../src/datasource_bfilter.c:163
+#: ../src/datasource_bfilter.c:166

 msgid "Polygonzied Layer"
 msgstr "Polygoniserade lager"
 
 msgid "Polygonzied Layer"
 msgstr "Polygoniserade lager"
 

-#: ../src/main.c:117
+#: ../src/main.c:92
+#, c-format
+msgid "Ignoring Xlib error: error code %d request code %d\n"
+msgstr ""
+
+#: ../src/main.c:105

 msgid "Enable debug output"
 msgstr "Aktivera felsökningsutskrifter"
 
 msgid "Enable debug output"
 msgstr "Aktivera felsökningsutskrifter"
 

-#: ../src/main.c:118
+#: ../src/main.c:106

 msgid "Enable verbose output"
 msgstr "Aktivera utförlig utskrift"
 
 msgid "Enable verbose output"
 msgstr "Aktivera utförlig utskrift"
 

-#: ../src/main.c:119
+#: ../src/main.c:107

 msgid "Show version"
 msgstr "Visa version"
 
 msgid "Show version"
 msgstr "Visa version"
 

-#: ../src/osm.c:107
+#: ../src/osm.c:99
+msgid "On Disk OSM Tile Format"
+msgstr ""
+
+#: ../src/osm.c:113

 msgid "OSM (view)"
 msgstr "OSM (vy)"
 
 msgid "OSM (view)"
 msgstr "OSM (vy)"
 

-#: ../src/osm.c:111
+#: ../src/osm.c:117

 msgid "OSM (edit)"
 msgstr "OSM (redigera)"
 
 msgid "OSM (edit)"
 msgstr "OSM (redigera)"
 

-#: ../src/osm.c:115
+#: ../src/osm.c:121

 msgid "OSM (render)"
 msgstr "OSM (rendera)"
 
 msgid "OSM (render)"
 msgstr "OSM (rendera)"
 

-#: ../src/preferences.c:287
+#. Example: http://127.0.0.1:8111/load_and_zoom?left=8.19&right=8.20&top=48.605&bottom=48.590&select=node413602999
+#. JOSM or merkaartor must already be running with remote interface enabled
+#: ../src/osm.c:128
+msgid "Local port 8111 (eg JOSM)"
+msgstr ""
+
+#: ../src/osm.c:134
+msgid "OpenStreetMap Notes"
+msgstr ""
+
+#: ../src/osm.c:138
+msgid "OpenStreetBugs"
+msgstr ""
+
+#. Not really OSM but can't be bothered to create somewhere else to put it...
+#: ../src/osm.c:164
+msgid "Wikimedia Toolserver GeoHack"
+msgstr ""
+
+#: ../src/preferences.c:191

 msgid "Preferences"
 msgstr "Inställningar"
 
 msgid "Preferences"
 msgstr "Inställningar"
 

-#: ../src/uibuilder.c:148
+#: ../src/viklayer_defaults.c:232
+#, c-format
+msgid "Could not open file: %s"
+msgstr ""
+
+#: ../src/viklayer_defaults.c:303
+msgid "Layer Defaults"
+msgstr ""
+
+#: ../src/uibuilder.c:185

 msgid "Take care that this password will be stored clearly in a plain file."
 msgstr "Notera att detta lösenord kommer sparas i klartext."
 
 msgid "Take care that this password will be stored clearly in a plain file."
 msgstr "Notera att detta lösenord kommer sparas i klartext."
 

-#: ../src/vikdemlayer.c:102
+#: ../src/vikaggregatelayer.c:42
+msgid "Aggregate"
+msgstr ""
+
+#. VikLayersPanel *vlp = VIK_LAYERS_PANEL(lav[1]);
+#: ../src/vikaggregatelayer.c:484 ../src/viktrwlayer.c:10238
+#, c-format
+msgid "%s: Track and Route List"
+msgstr ""
+
+#: ../src/vikaggregatelayer.c:529 ../src/viktrwlayer.c:7354
+#: ../src/viktrwlayer.c:7420 ../src/viktrwlayer.c:7498
+msgid "_Visibility"
+msgstr ""
+
+#: ../src/vikaggregatelayer.c:534
+msgid "_Show All"
+msgstr ""
+
+#: ../src/vikaggregatelayer.c:540
+msgid "_Hide All"
+msgstr ""
+
+#: ../src/vikaggregatelayer.c:546 ../src/viktrwlayer.c:7371
+#: ../src/viktrwlayer.c:7437 ../src/viktrwlayer.c:7515
+msgid "_Toggle"
+msgstr ""
+
+#: ../src/vikaggregatelayer.c:553 ../src/viktrwlayer.c:7536
+msgid "_Sort"
+msgstr ""
+
+#: ../src/vikaggregatelayer.c:559 ../src/viktrwlayer.c:7542
+msgid "Name _Ascending"
+msgstr ""
+
+#: ../src/vikaggregatelayer.c:565 ../src/viktrwlayer.c:7548
+msgid "Name _Descending"
+msgstr ""
+
+#: ../src/vikaggregatelayer.c:571 ../src/viktrwlayer.c:7449
+#: ../src/viktrwlayer.c:7527 ../src/viktrwlayer.c:7587
+#: ../src/viktrwlayer_tracklist.c:237
+msgid "_Statistics"
+msgstr ""
+
+#: ../src/vikaggregatelayer.c:576 ../src/viktrwlayer.c:3971
+msgid "Track _List..."
+msgstr ""
+
+#: ../src/vikdemlayer.c:92

 msgid "Absolute height"
 msgstr "Absolut höjd"
 
 msgid "Absolute height"
 msgstr "Absolut höjd"
 

-#: ../src/vikdemlayer.c:103
+#: ../src/vikdemlayer.c:93

 msgid "Height gradient"
 msgstr ""
 
 msgid "Height gradient"
 msgstr ""
 

-#: ../src/vikdemlayer.c:120
+#: ../src/vikdemlayer.c:118

 msgid "DEM Files:"
 msgstr "DEM Filer:"
 
 msgid "DEM Files:"
 msgstr "DEM Filer:"
 

-#: ../src/vikdemlayer.c:121
+#: ../src/vikdemlayer.c:119

 msgid "Download Source:"
 msgstr "Ladda ned källa:"
 
 msgid "Download Source:"
 msgstr "Ladda ned källa:"
 

-#: ../src/vikdemlayer.c:122
+#: ../src/vikdemlayer.c:120

 msgid "Min Elev Color:"
 msgstr ""
 
 msgid "Min Elev Color:"
 msgstr ""
 

-#: ../src/vikdemlayer.c:123
+#: ../src/vikdemlayer.c:121

 msgid "Type:"
 msgstr "Typ:"
 
 msgid "Type:"
 msgstr "Typ:"
 

-#: ../src/vikdemlayer.c:124
+#: ../src/vikdemlayer.c:122

 msgid "Min Elev:"
 msgstr "Min höjd:"
 
 msgid "Min Elev:"
 msgstr "Min höjd:"
 

-#: ../src/vikdemlayer.c:125
+#: ../src/vikdemlayer.c:123

 msgid "Max Elev:"
 msgstr "Max höjd:"
 
 msgid "Max Elev:"
 msgstr "Max höjd:"
 

-#: ../src/vikdemlayer.c:136
-msgid "DEM Download/Import"
-msgstr "DEM Ladda ned/Importera"
+#: ../src/vikdemlayer.c:134
+msgid "_DEM Download"
+msgstr ""
+
+#: ../src/vikdemlayer.c:134
+msgid "DEM Download"
+msgstr ""
+
+#: ../src/vikdemlayer.c:188
+msgid "DEM"
+msgstr ""

 
 

-#: ../src/vikdemlayer.c:275
+#: ../src/vikdemlayer.c:287

 #, c-format
 msgid "Number of files: %d"
 msgstr ""
 
 #, c-format
 msgid "Number of files: %d"
 msgstr ""
 

-#: ../src/vikdemlayer.c:376
+#: ../src/vikdemlayer.c:427

 msgid "DEM Loading"
 msgstr ""
 
 msgid "DEM Loading"
 msgstr ""
 

-#: ../src/vikdemlayer.c:880
+#: ../src/vikdemlayer.c:937

 #, c-format
 msgid "No SRTM data available for %f, %f"
 msgstr ""
 
 #, c-format
 msgid "No SRTM data available for %f, %f"
 msgstr ""
 

-#: ../src/vikdemlayer.c:1118
-msgid "No download source selected. Edit layer properties."
-msgstr "Ingen nedladdningskälla vald. Ändra lagerinställningar"
+#. Probably not over any land...
+#: ../src/vikdemlayer.c:1193
+msgid "No DEM File Available"
+msgstr ""
+
+#: ../src/vikdemlayer.c:1212
+#, c-format
+msgid ""
+"\n"
+"Source: %s\n"
+"\n"
+"DEM File: %s\n"
+"DEM File Timestamp: %s"
+msgstr ""
+
+#: ../src/vikdemlayer.c:1216
+#, c-format
+msgid ""
+"Source: %s\n"
+"\n"
+"No DEM File!"
+msgstr ""

 
 

-#: ../src/vikdemlayer.c:1141
+#: ../src/vikdemlayer.c:1256

 #, c-format
 msgid "Downloading DEM %s"
 msgstr "Laddar ned DEM %s"
 
 #, c-format
 msgid "Downloading DEM %s"
 msgstr "Laddar ned DEM %s"
 

+#: ../src/vikdemlayer.c:1280
+msgid "_Show DEM File Information"
+msgstr ""
+

 #: ../src/vikfileentry.c:68
 msgid "Browse..."
 msgstr "Bläddra..."
 #: ../src/vikfileentry.c:68
 msgid "Browse..."
 msgstr "Bläddra..."


@@ -778,197 +1331,278 @@ msgstr "Bläddra..."
 msgid "Choose file"
 msgstr "Välj fil"
 
 msgid "Choose file"
 msgstr "Välj fil"
 

-#: ../src/vikfilelist.c:47
+#: ../src/vikfilelist.c:48

 msgid "Choose file(s)"
 msgstr "Välj fil(er)"
 
 msgid "Choose file(s)"
 msgstr "Välj fil(er)"
 

-#: ../src/vikfilelist.c:126
+#: ../src/vikfilelist.c:172

 msgid "Add..."
 msgstr "Lägg till…"
 
 msgid "Add..."
 msgstr "Lägg till…"
 

-#: ../src/vikfilelist.c:127
+#: ../src/vikfilelist.c:173

 msgid "Delete"
 msgstr "Ta bort"
 
 msgid "Delete"
 msgstr "Ta bort"
 

-#: ../src/vikgeoreflayer.c:69
+#: ../src/vikgeoreflayer.c:78
+msgid "_Georef Move Map"
+msgstr ""
+
+#: ../src/vikgeoreflayer.c:78

 msgid "Georef Move Map"
 msgstr ""
 
 msgid "Georef Move Map"
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:73
+#: ../src/vikgeoreflayer.c:85
+msgid "Georef Z_oom Tool"
+msgstr ""
+
+#: ../src/vikgeoreflayer.c:85

 msgid "Georef Zoom Tool"
 msgstr ""
 
 msgid "Georef Zoom Tool"
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:320 ../src/vikmapslayer.c:624
+#: ../src/vikgeoreflayer.c:95
+msgid "GeoRef Map"
+msgstr ""
+
+#: ../src/vikgeoreflayer.c:377 ../src/vikmapslayer.c:720

 #, c-format
 msgid "Couldn't open image file: %s"
 msgstr "Kunde inte öppna bildfil: %s"
 
 #, c-format
 msgid "Couldn't open image file: %s"
 msgstr "Kunde inte öppna bildfil: %s"
 

-#: ../src/vikgeoreflayer.c:350
+#: ../src/vikgeoreflayer.c:391
+msgid ""
+"GeoRef map cannot be displayed in the current drawmode.\n"
+"Select \"UTM Mode\" from View menu to view it."
+msgstr ""
+
+#: ../src/vikgeoreflayer.c:415

 msgid "Unexpected end of file reading World file."
 msgstr "Oväntat slut på filen vid läsning av World-filen."
 
 msgid "Unexpected end of file reading World file."
 msgstr "Oväntat slut på filen vid läsning av World-filen."
 

-#: ../src/vikgeoreflayer.c:366 ../src/vikgeoreflayer.c:411
+#: ../src/vikgeoreflayer.c:431 ../src/vikgeoreflayer.c:476

 msgid "Choose World file"
 msgstr "Välj World fil"
 
 msgid "Choose World file"
 msgstr "Välj World fil"
 

-#: ../src/vikgeoreflayer.c:379
+#: ../src/vikgeoreflayer.c:444

 msgid "The World file you requested could not be opened for reading."
 msgstr "Den Word fil du har valt kunde inte öppnas för läsning."
 
 msgid "The World file you requested could not be opened for reading."
 msgstr "Den Word fil du har valt kunde inte öppnas för läsning."
 

-#: ../src/vikgeoreflayer.c:424
+#: ../src/vikgeoreflayer.c:489

 msgid "The file you requested could not be opened for writing."
 msgstr "Den fil du valt kunde inte öppnas för skrivning."
 
 msgid "The file you requested could not be opened for writing."
 msgstr "Den fil du valt kunde inte öppnas för skrivning."
 

-#: ../src/vikgeoreflayer.c:441 ../src/viklayer.c:478
+#: ../src/vikgeoreflayer.c:506 ../src/viklayer.c:518

 msgid "Layer Properties"
 msgstr "Lageregenskaper"
 
 msgid "Layer Properties"
 msgstr "Lageregenskaper"
 

-#: ../src/vikgeoreflayer.c:463
+#: ../src/vikgeoreflayer.c:528

 msgid "World File Parameters:"
 msgstr "World Fil Parametrar:"
 
 msgid "World File Parameters:"
 msgstr "World Fil Parametrar:"
 

-#: ../src/vikgeoreflayer.c:464
+#: ../src/vikgeoreflayer.c:529

 msgid "Load From File..."
 msgstr "Ladda från fil..."
 
 msgid "Load From File..."
 msgstr "Ladda från fil..."
 

-#: ../src/vikgeoreflayer.c:469
+#: ../src/vikgeoreflayer.c:534

 msgid "Corner pixel easting:"
 msgstr ""
 
 msgid "Corner pixel easting:"
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:471
-msgid "the UTM \"easting\" value of the upper-right corner pixel of the map"
+#: ../src/vikgeoreflayer.c:536
+msgid "the UTM \"easting\" value of the upper-left corner pixel of the map"

 msgstr ""
 
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:473
+#: ../src/vikgeoreflayer.c:538

 msgid "Corner pixel northing:"
 msgstr ""
 
 msgid "Corner pixel northing:"
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:475
-msgid "the UTM \"northing\" value of the upper-right corner pixel of the map"
+#: ../src/vikgeoreflayer.c:540
+msgid "the UTM \"northing\" value of the upper-left corner pixel of the map"

 msgstr ""
 
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:477
+#: ../src/vikgeoreflayer.c:542

 msgid "X (easting) scale (mpp): "
 msgstr ""
 
 msgid "X (easting) scale (mpp): "
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:478
+#: ../src/vikgeoreflayer.c:543

 msgid "Y (northing) scale (mpp): "
 msgstr ""
 
 msgid "Y (northing) scale (mpp): "
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:481
+#: ../src/vikgeoreflayer.c:546

 msgid "the scale of the map in the X direction (meters per pixel)"
 msgstr ""
 
 msgid "the scale of the map in the X direction (meters per pixel)"
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:483
+#: ../src/vikgeoreflayer.c:548

 msgid "the scale of the map in the Y direction (meters per pixel)"
 msgstr ""
 
 msgid "the scale of the map in the Y direction (meters per pixel)"
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:485
+#: ../src/vikgeoreflayer.c:550

 msgid "Map Image:"
 msgstr "Kartbild:"
 
 msgid "Map Image:"
 msgstr "Kartbild:"
 

-#: ../src/vikgeoreflayer.c:592
+#. Now with icons
+#: ../src/vikgeoreflayer.c:658

 msgid "_Zoom to Fit Map"
 msgstr ""
 
 msgid "_Zoom to Fit Map"
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:597
+#: ../src/vikgeoreflayer.c:664

 msgid "_Goto Map Center"
 msgstr ""
 
 msgid "_Goto Map Center"
 msgstr ""
 

-#: ../src/vikgeoreflayer.c:602
+#: ../src/vikgeoreflayer.c:670

 msgid "_Export to World File"
 msgstr ""
 
 msgid "_Export to World File"
 msgstr ""
 

-#: ../src/vikgoto.c:77
+#: ../src/vikgoto.c:81

 msgid "No goto tool available."
 msgstr ""
 
 msgid "No goto tool available."
 msgstr ""
 

-#: ../src/vikgoto.c:90 ../src/vikgoto.c:109
+#: ../src/vikgoto.c:94 ../src/vikgoto.c:148

 msgid "goto"
 msgstr ""
 
 msgid "goto"
 msgstr ""
 

-#: ../src/vikgoto.c:92
+#: ../src/vikgoto.c:96

 msgid "I don't know that place. Do you want another goto?"
 msgstr ""
 
 msgid "I don't know that place. Do you want another goto?"
 msgstr ""
 

-#: ../src/vikgoto.c:111
+#: ../src/vikgoto.c:150

 msgid "goto provider:"
 msgstr ""
 
 msgid "goto provider:"
 msgstr ""
 

-#: ../src/vikgoto.c:126
+#: ../src/vikgoto.c:165

 msgid "Enter address or place name:"
 msgstr "Ange adress eller platsnamn:"
 
 msgid "Enter address or place name:"
 msgstr "Ange adress eller platsnamn:"
 

-#: ../src/vikgpslayer.c:156
+#: ../src/vikgoto.c:363
+msgid "Locality"
+msgstr ""
+
+#: ../src/vikgpslayer.c:128
+msgid "Data Mode"
+msgstr ""
+
+#: ../src/vikgpslayer.c:130
+msgid "Realtime Tracking Mode"
+msgstr ""
+
+#: ../src/vikgpslayer.c:167
+msgid "Keep vehicle at center"
+msgstr ""
+
+#: ../src/vikgpslayer.c:168
+msgid "Keep vehicle on screen"
+msgstr ""
+
+#: ../src/vikgpslayer.c:169
+msgid "Disable"
+msgstr ""
+
+#: ../src/vikgpslayer.c:209
+msgid "Download Tracks:"
+msgstr ""
+
+#: ../src/vikgpslayer.c:210
+msgid "Upload Tracks:"
+msgstr ""
+
+#: ../src/vikgpslayer.c:211
+msgid "Download Routes:"
+msgstr ""
+
+#: ../src/vikgpslayer.c:212
+msgid "Upload Routes:"
+msgstr ""
+
+#: ../src/vikgpslayer.c:213
+msgid "Download Waypoints:"
+msgstr ""
+
+#: ../src/vikgpslayer.c:214
+msgid "Upload Waypoints:"
+msgstr ""
+
+#: ../src/vikgpslayer.c:216

 msgid "Recording tracks"
 msgstr "Spelar in spår"
 
 msgid "Recording tracks"
 msgstr "Spelar in spår"
 

-#: ../src/vikgpslayer.c:157
+#: ../src/vikgpslayer.c:217

 msgid "Jump to current position on start"
 msgstr "Hoppa till nuvarande position vid start"
 
 msgid "Jump to current position on start"
 msgstr "Hoppa till nuvarande position vid start"
 

-#: ../src/vikgpslayer.c:158
+#: ../src/vikgpslayer.c:218

 msgid "Moving Map Method:"
 msgstr "Kartflyttningsläge:"
 
 msgid "Moving Map Method:"
 msgstr "Kartflyttningsläge:"
 

-#: ../src/vikgpslayer.c:159
+#: ../src/vikgpslayer.c:219
+msgid "Update Statusbar:"
+msgstr ""
+
+#: ../src/vikgpslayer.c:219
+msgid "Display information in the statusbar on GPS updates"
+msgstr ""
+
+#: ../src/vikgpslayer.c:220

 msgid "Gpsd Host:"
 msgstr "Gpsd Värd:"
 
 msgid "Gpsd Host:"
 msgstr "Gpsd Värd:"
 

-#: ../src/vikgpslayer.c:160
+#: ../src/vikgpslayer.c:221

 msgid "Gpsd Port:"
 msgstr "Gpsd Port:"
 
 msgid "Gpsd Port:"
 msgstr "Gpsd Port:"
 

-#: ../src/vikgpslayer.c:161
+#: ../src/vikgpslayer.c:222

 msgid "Gpsd Retry Interval (seconds):"
 msgstr ""
 
 msgid "Gpsd Retry Interval (seconds):"
 msgstr ""
 

-#: ../src/vikgpslayer.c:228 ../src/vikgpslayer.c:1078
+#: ../src/vikgpslayer.c:243
+msgid "GPS"
+msgstr ""
+
+#: ../src/vikgpslayer.c:306 ../src/vikgpslayer.c:1308

 msgid "GPS Download"
 msgstr "GPS nedladdning"
 
 msgid "GPS Download"
 msgstr "GPS nedladdning"
 

-#: ../src/vikgpslayer.c:228 ../src/vikgpslayer.c:1078
+#: ../src/vikgpslayer.c:306 ../src/vikgpslayer.c:1308
+#: ../src/viktrwlayer.c:3480

 msgid "GPS Upload"
 msgstr "GPS uppladdning"
 
 msgid "GPS Upload"
 msgstr "GPS uppladdning"
 

-#: ../src/vikgpslayer.c:230
+#: ../src/vikgpslayer.c:308

 msgid "GPS Realtime Tracking"
 msgstr "GPS Realtidsspårning"
 
 msgid "GPS Realtime Tracking"
 msgstr "GPS Realtidsspårning"
 

-#: ../src/vikgpslayer.c:398
+#: ../src/vikgpslayer.c:517

 msgid "Unknown GPS Protocol"
 msgstr "Okänt GPS Protokoll"
 
 msgid "Unknown GPS Protocol"
 msgstr "Okänt GPS Protokoll"
 

-#: ../src/vikgpslayer.c:417
+#: ../src/vikgpslayer.c:535

 msgid "Unknown serial port device"
 msgstr "Okänd serialportsenhet"
 
 msgid "Unknown serial port device"
 msgstr "Okänd serialportsenhet"
 

-#: ../src/vikgpslayer.c:483
+#: ../src/vikgpslayer.c:648

 #, c-format
 msgid "%s: unknown parameter"
 msgstr "%s: okänd parameter"
 
 #, c-format
 msgid "%s: unknown parameter"
 msgstr "%s: okänd parameter"
 

-#: ../src/vikgpslayer.c:597
+#. Now with icons
+#: ../src/vikgpslayer.c:743

 msgid "_Upload to GPS"
 msgstr ""
 
 msgid "_Upload to GPS"
 msgstr ""
 

-#: ../src/vikgpslayer.c:602
+#: ../src/vikgpslayer.c:749

 msgid "Download from _GPS"
 msgstr "Ladda ned från _GPS"
 
 msgid "Download from _GPS"
 msgstr "Ladda ned från _GPS"
 

-#: ../src/vikgpslayer.c:619
+#: ../src/vikgpslayer.c:770

 msgid "Empty _Realtime"
 msgstr ""
 
 msgid "Empty _Realtime"
 msgstr ""
 

-#: ../src/vikgpslayer.c:625
+#: ../src/vikgpslayer.c:777

 msgid "E_mpty Upload"
 msgstr ""
 
 msgid "E_mpty Upload"
 msgstr ""
 

-#: ../src/vikgpslayer.c:630
+#: ../src/vikgpslayer.c:783

 msgid "_Empty Download"
 msgstr ""
 
 msgid "_Empty Download"
 msgstr ""
 

-#: ../src/vikgpslayer.c:635
+#: ../src/vikgpslayer.c:789

 msgid "Empty _All"
 msgstr ""
 
 msgid "Empty _All"
 msgstr ""
 


@@ -977,163 +1611,232 @@ msgstr ""
 #. 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
 #. 
 #. 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:651
+#: ../src/vikgpslayer.c:806

 #, c-format
 msgid "Unexpected number of disconnected handlers: %d"
 msgstr ""
 
 #, c-format
 msgid "Unexpected number of disconnected handlers: %d"
 msgstr ""
 

-#: ../src/vikgpslayer.c:783
+#: ../src/vikgpslayer.c:948

 #, c-format
 msgid "Uploading %d waypoint..."
 msgid_plural "Uploading %d waypoints..."
 msgstr[0] "Laddar upp %d waypoint..."
 msgstr[1] "Laddar upp %d waypoints..."
 
 #, c-format
 msgid "Uploading %d waypoint..."
 msgid_plural "Uploading %d waypoints..."
 msgstr[0] "Laddar upp %d waypoint..."
 msgstr[1] "Laddar upp %d waypoints..."
 

-#: ../src/vikgpslayer.c:785
+#: ../src/vikgpslayer.c:949

 #, c-format
 msgid "Uploading %d trackpoint..."
 msgid_plural "Uploading %d trackpoints..."
 msgstr[0] "Laddar upp %d trackpoint..."
 msgstr[1] "Laddar upp %d trackpoints..."
 
 #, c-format
 msgid "Uploading %d trackpoint..."
 msgid_plural "Uploading %d trackpoints..."
 msgstr[0] "Laddar upp %d trackpoint..."
 msgstr[1] "Laddar upp %d trackpoints..."
 

-#: ../src/vikgpslayer.c:809
+#: ../src/vikgpslayer.c:950
+#, c-format
+msgid "Uploading %d routepoint..."
+msgid_plural "Uploading %d routepoints..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/vikgpslayer.c:975

 #, c-format
 msgid "Downloaded %d out of %d waypoint..."
 msgid_plural "Downloaded %d out of %d waypoints..."
 msgstr[0] "Laddade ned %d av %d waypoint..."
 msgstr[1] "Laddade ned %d av %d waypoints..."
 
 #, c-format
 msgid "Downloaded %d out of %d waypoint..."
 msgid_plural "Downloaded %d out of %d waypoints..."
 msgstr[0] "Laddade ned %d av %d waypoint..."
 msgstr[1] "Laddade ned %d av %d waypoints..."
 

-#: ../src/vikgpslayer.c:811
+#: ../src/vikgpslayer.c:976

 #, c-format
 msgid "Downloaded %d out of %d trackpoint..."
 msgid_plural "Downloaded %d out of %d trackpoints..."
 msgstr[0] "Laddade ned %d av %d trackpoint..."
 msgstr[1] "Laddade ned %d av %d trackpoints..."
 
 #, c-format
 msgid "Downloaded %d out of %d trackpoint..."
 msgid_plural "Downloaded %d out of %d trackpoints..."
 msgstr[0] "Laddade ned %d av %d trackpoint..."
 msgstr[1] "Laddade ned %d av %d trackpoints..."
 

-#: ../src/vikgpslayer.c:815
+#: ../src/vikgpslayer.c:977
+#, c-format
+msgid "Downloaded %d out of %d routepoint..."
+msgid_plural "Downloaded %d out of %d routepoints..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/vikgpslayer.c:982

 #, c-format
 msgid "Uploaded %d out of %d waypoint..."
 msgid_plural "Uploaded %d out of %d waypoints..."
 msgstr[0] "Laddade upp %d av %d waypoint..."
 msgstr[1] "Laddade upp %d av %d waypoints..."
 
 #, c-format
 msgid "Uploaded %d out of %d waypoint..."
 msgid_plural "Uploaded %d out of %d waypoints..."
 msgstr[0] "Laddade upp %d av %d waypoint..."
 msgstr[1] "Laddade upp %d av %d waypoints..."
 

-#: ../src/vikgpslayer.c:817
+#: ../src/vikgpslayer.c:983

 #, c-format
 msgid "Uploaded %d out of %d trackpoint..."
 msgid_plural "Uploaded %d out of %d trackpoints..."
 msgstr[0] "Laddade upp %d av %d trackpoint..."
 msgstr[1] "Laddade upp %d av %d trackpoints..."
 
 #, c-format
 msgid "Uploaded %d out of %d trackpoint..."
 msgid_plural "Uploaded %d out of %d trackpoints..."
 msgstr[0] "Laddade upp %d av %d trackpoint..."
 msgstr[1] "Laddade upp %d av %d trackpoints..."
 

-#: ../src/vikgpslayer.c:824
+#: ../src/vikgpslayer.c:984
+#, c-format
+msgid "Uploaded %d out of %d routepoint..."
+msgid_plural "Uploaded %d out of %d routepoints..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/vikgpslayer.c:992

 #, c-format
 msgid "Downloaded %d waypoint"
 msgid_plural "Downloaded %d waypoints"
 msgstr[0] "Laddade ned %d waypoint"
 msgstr[1] "Laddade ned %d waypoints"
 
 #, c-format
 msgid "Downloaded %d waypoint"
 msgid_plural "Downloaded %d waypoints"
 msgstr[0] "Laddade ned %d waypoint"
 msgstr[1] "Laddade ned %d waypoints"
 

-#: ../src/vikgpslayer.c:826
+#: ../src/vikgpslayer.c:993

 #, c-format
 msgid "Downloaded %d trackpoint"
 msgid_plural "Downloaded %d trackpoints"
 msgstr[0] "Laddade ned %d trackpoint"
 msgstr[1] "Laddade ned %d trackpoints"
 
 #, c-format
 msgid "Downloaded %d trackpoint"
 msgid_plural "Downloaded %d trackpoints"
 msgstr[0] "Laddade ned %d trackpoint"
 msgstr[1] "Laddade ned %d trackpoints"
 

-#: ../src/vikgpslayer.c:830
+#: ../src/vikgpslayer.c:994
+#, c-format
+msgid "Downloaded %d routepoint"
+msgid_plural "Downloaded %d routepoints"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/vikgpslayer.c:999

 #, c-format
 msgid "Uploaded %d waypoint"
 msgid_plural "Uploaded %d waypoints"
 msgstr[0] "Laddade upp %d waypoint"
 msgstr[1] "Laddade upp %d waypoints"
 
 #, c-format
 msgid "Uploaded %d waypoint"
 msgid_plural "Uploaded %d waypoints"
 msgstr[0] "Laddade upp %d waypoint"
 msgstr[1] "Laddade upp %d waypoints"
 

-#: ../src/vikgpslayer.c:832
+#: ../src/vikgpslayer.c:1000

 #, c-format
 msgid "Uploaded %d trackpoint"
 msgid_plural "Uploaded %d trackpoints"
 msgstr[0] "Laddade upp %d trackpoint"
 msgstr[1] "Laddade upp %d trackpoints"
 
 #, c-format
 msgid "Uploaded %d trackpoint"
 msgid_plural "Uploaded %d trackpoints"
 msgstr[0] "Laddade upp %d trackpoint"
 msgstr[1] "Laddade upp %d trackpoints"
 

-#: ../src/vikgpslayer.c:1029
+#: ../src/vikgpslayer.c:1001
+#, c-format
+msgid "Uploaded %d routepoint"
+msgid_plural "Uploaded %d routepoints"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/vikgpslayer.c:1230

 msgid "Error: couldn't find gpsbabel."
 msgstr "Fel: kunde inte hitta gpsbabel."
 
 msgid "Error: couldn't find gpsbabel."
 msgstr "Fel: kunde inte hitta gpsbabel."
 

-#: ../src/viklayerspanel.c:57
-msgid "/C_ut"
-msgstr "/C_ut"
+#: ../src/vikgpslayer.c:1319
+msgid "Warning - GPS Upload items may overwrite each other"
+msgstr ""
+
+#: ../src/vikgpslayer.c:1351
+msgid "Status: detecting gpsbabel"
+msgstr "Status: letar efter gpsbabel"
+
+#: ../src/vikgpslayer.c:1386
+msgid "No GPS items selected for transfer."
+msgstr ""
+
+#: ../src/vikgpslayer.c:1401
+msgid "Could not turn off device."
+msgstr ""
+
+#: ../src/vikgpslayer.c:1439
+msgid "Are you sure you want to delete GPS Upload data?"
+msgstr ""
+
+#: ../src/vikgpslayer.c:1452
+msgid "Are you sure you want to delete GPS Download data?"
+msgstr ""
+
+#: ../src/vikgpslayer.c:1466
+msgid "Are you sure you want to delete GPS Realtime data?"
+msgstr ""
+
+#: ../src/vikgpslayer.c:1479
+msgid "Are you sure you want to delete All GPS data?"
+msgstr ""

 
 

-#: ../src/viklayerspanel.c:58
-msgid "/_Copy"
-msgstr "/_Kopiera"
+#: ../src/viklayerspanel.c:53
+msgid "C_ut"
+msgstr ""
+
+#: ../src/viklayerspanel.c:54 ../src/vikwindow.c:3753
+msgid "_Copy"
+msgstr "_Kopiera"

 
 

-#: ../src/viklayerspanel.c:59
-msgid "/_Paste"
-msgstr "/_Klistra in"
+#: ../src/viklayerspanel.c:55 ../src/vikwindow.c:3754
+msgid "_Paste"
+msgstr "Klistra _in"

 
 

-#: ../src/viklayerspanel.c:60
-msgid "/_Delete"
-msgstr "/_Ta bort"
+#: ../src/viklayerspanel.c:56 ../src/vikwindow.c:3755
+msgid "_Delete"
+msgstr "_Ta bort"

 
 

-#: ../src/viklayerspanel.c:61
-msgid "/New Layer"
-msgstr "/Nytt lager"
+#: ../src/viklayerspanel.c:133
+msgid "New Layer"
+msgstr ""

 
 

-#: ../src/viklayerspanel.c:150
+#: ../src/viklayerspanel.c:178

 msgid "Top Layer"
 msgstr ""
 
 msgid "Top Layer"
 msgstr ""
 

-#: ../src/viklayerspanel.c:165
+#: ../src/viklayerspanel.c:194

 msgid "Add new layer"
 msgstr "Lägg till ett nytt lager"
 
 msgid "Add new layer"
 msgstr "Lägg till ett nytt lager"
 

-#: ../src/viklayerspanel.c:172
+#: ../src/viklayerspanel.c:201

 msgid "Remove selected layer"
 msgstr "Ta bort valt lager"
 
 msgid "Remove selected layer"
 msgstr "Ta bort valt lager"
 

-#: ../src/viklayerspanel.c:179
+#: ../src/viklayerspanel.c:208

 msgid "Move selected layer up"
 msgstr "Flytta upp valt lager"
 
 msgid "Move selected layer up"
 msgstr "Flytta upp valt lager"
 

-#: ../src/viklayerspanel.c:186
+#: ../src/viklayerspanel.c:215

 msgid "Move selected layer down"
 msgstr "Flytta ned valt lager"
 
 msgid "Move selected layer down"
 msgstr "Flytta ned valt lager"
 

-#: ../src/viklayerspanel.c:193
+#: ../src/viklayerspanel.c:222

 msgid "Cut selected layer"
 msgstr "Skär valt lager"
 
 msgid "Cut selected layer"
 msgstr "Skär valt lager"
 

-#: ../src/viklayerspanel.c:200
+#: ../src/viklayerspanel.c:229

 msgid "Copy selected layer"
 msgstr "Kopiera valt lager"
 
 msgid "Copy selected layer"
 msgstr "Kopiera valt lager"
 

-#: ../src/viklayerspanel.c:207
-msgid "Paste layer below selected layer"
-msgstr "Klistra in lager under valt lager"
+#: ../src/viklayerspanel.c:236
+msgid ""
+"Paste layer into selected container layer or otherwise above selected layer"
+msgstr ""

 
 

-#. TODO: FIXME: if name has a '/' in it it will get all messed up. why not have an itemfactory field with
-#. name, icon, shortcut, etc.?
-#. Note: we use a temporary label in order to share translation with other codde
-#: ../src/viklayerspanel.c:225 ../src/vikwindow.c:2407
-#, c-format
-msgid "New %s Layer"
-msgstr "Nytt %s lager"
+#: ../src/viklayerspanel.c:300
+msgid "New name can not be blank."
+msgstr ""

 
 

-#: ../src/viklayerspanel.c:495
+#: ../src/viklayerspanel.c:544

 msgid "Aggregate Layers have no settable properties."
 msgstr ""
 
 msgid "Aggregate Layers have no settable properties."
 msgstr ""
 

-#: ../src/viklayerspanel.c:545
+#: ../src/viklayerspanel.c:588

 msgid "You cannot cut the Top Layer."
 msgstr ""
 
 msgid "You cannot cut the Top Layer."
 msgstr ""
 

-#: ../src/viklayerspanel.c:601
+#: ../src/viklayerspanel.c:633
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr ""
+
+#: ../src/viklayerspanel.c:650

 msgid "You cannot delete the Top Layer."
 msgstr ""
 
 msgid "You cannot delete the Top Layer."
 msgstr ""
 

-#: ../src/viklayerspanel.c:685
+#: ../src/viklayerspanel.c:734

 msgid "Are you sure you wish to delete all layers?"
 msgstr "Är du säker på att du vill ta bort alla lager?"
 
 #. ******* MAPZOOMS ********
 msgid "Are you sure you wish to delete all layers?"
 msgstr "Är du säker på att du vill ta bort alla lager?"
 
 #. ******* MAPZOOMS ********

-#: ../src/vikmapslayer.c:91
+#: ../src/vikmapslayer.c:80

 msgid "Use Viking Zoom Level"
 msgstr ""
 
 msgid "Use Viking Zoom Level"
 msgstr ""
 


@@ -1150,1409 +1853,2876 @@ msgid "Alpha:"
 msgstr "Alfa:"
 
 #: ../src/vikmapslayer.c:127
 msgstr "Alfa:"
 
 #: ../src/vikmapslayer.c:127

-msgid "Autodownload maps:"
+msgid "Control the Alpha value for transparency effects"

 msgstr ""
 
 #: ../src/vikmapslayer.c:128
 msgstr ""
 
 #: ../src/vikmapslayer.c:128

+msgid "Autodownload maps:"
+msgstr ""
+
+#: ../src/vikmapslayer.c:129
+msgid "Autodownload Only Gets Missing Maps:"
+msgstr ""
+
+#: ../src/vikmapslayer.c:130
+msgid ""
+"Using this option avoids attempting to update already acquired tiles. This "
+"can be useful if you want to restrict the network usage, without having to "
+"resort to manual control. Only applies when 'Autodownload Maps' is on."
+msgstr ""
+
+#: ../src/vikmapslayer.c:131

 msgid "Zoom Level:"
 msgstr ""
 
 msgid "Zoom Level:"
 msgstr ""
 

-#: ../src/vikmapslayer.c:134
+#: ../src/vikmapslayer.c:132
+msgid ""
+"Determines the method of displaying map tiles for the current zoom level. "
+"'Viking Zoom Level' uses the best matching level, otherwise setting a fixed "
+"value will always use map tiles of the specified value regardless of the "
+"actual zoom level."
+msgstr ""
+
+#: ../src/vikmapslayer.c:156
+msgid "_Maps Download"
+msgstr ""
+
+#: ../src/vikmapslayer.c:156

 msgid "Maps Download"
 msgstr ""
 
 msgid "Maps Download"
 msgstr ""
 

-#: ../src/vikmapslayer.c:140
+#: ../src/vikmapslayer.c:171

 msgid "Map"
 msgstr "Karta"
 
 msgid "Map"
 msgstr "Karta"
 

-#: ../src/vikmapslayer.c:217
-msgid "Default maplayer directory:"
+#: ../src/vikmapslayer.c:259
+msgid "Default map layer directory:"
+msgstr ""
+
+#: ../src/vikmapslayer.c:259
+msgid "Choose a directory to store cached Map tiles for this layer"

 msgstr ""
 
 msgstr ""
 

-#: ../src/vikmapslayer.c:457
+#: ../src/vikmapslayer.c:523

 msgid "Unknown map type"
 msgstr "Okänd karttyp"
 
 msgid "Unknown map type"
 msgstr "Okänd karttyp"
 

-#: ../src/vikmapslayer.c:467
+#: ../src/vikmapslayer.c:534

 msgid "Unknown Map Zoom"
 msgstr ""
 
 msgid "Unknown Map Zoom"
 msgstr ""
 

-#: ../src/vikmapslayer.c:536
+#: ../src/vikmapslayer.c:624

 #, c-format
 msgid ""
 "New map cannot be displayed in the current drawmode.\n"
 "Select \"%s\" from View menu to view it."
 msgstr ""
 
 #, 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:692
+#: ../src/vikmapslayer.c:798

 #, c-format
 msgid ""
 "Cowardly refusing to draw tiles or existence of tiles beyond %d zoom out "
 "factor"
 msgstr ""
 
 #, c-format
 msgid ""
 "Cowardly refusing to draw tiles or existence of tiles beyond %d zoom out "
 "factor"
 msgstr ""
 

-#: ../src/vikmapslayer.c:1084
+#: ../src/vikmapslayer.c:1210

 #, c-format
 msgid "Redownloading up to %d %s map..."
 msgid_plural "Redownloading up to %d %s maps..."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Redownloading up to %d %s map..."
 msgid_plural "Redownloading up to %d %s maps..."
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/vikmapslayer.c:1086
+#: ../src/vikmapslayer.c:1212

 #, c-format
 msgid "Redownloading %d %s map..."
 msgid_plural "Redownloading %d %s maps..."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Redownloading %d %s map..."
 msgid_plural "Redownloading %d %s maps..."
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/vikmapslayer.c:1090 ../src/vikmapslayer.c:1161
+#: ../src/vikmapslayer.c:1216 ../src/vikmapslayer.c:1290

 #, c-format
 msgid "Downloading %d %s map..."
 msgid_plural "Downloading %d %s maps..."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "Downloading %d %s map..."
 msgid_plural "Downloading %d %s maps..."
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/vikmapslayer.c:1224
+#: ../src/vikmapslayer.c:1376
+#, c-format
+msgid ""
+"\n"
+"Source: %s\n"
+"\n"
+"Tile File: %s\n"
+"Tile File Timestamp: %s"
+msgstr ""
+
+#: ../src/vikmapslayer.c:1380
+#, c-format
+msgid ""
+"Source: %s\n"
+"\n"
+"No Tile File!"
+msgstr ""
+
+#: ../src/vikmapslayer.c:1418

 msgid "Redownload _Bad Map(s)"
 msgstr ""
 
 msgid "Redownload _Bad Map(s)"
 msgstr ""
 

-#: ../src/vikmapslayer.c:1228
+#: ../src/vikmapslayer.c:1422

 msgid "Redownload _New Map(s)"
 msgstr ""
 
 msgid "Redownload _New Map(s)"
 msgstr ""
 

-#: ../src/vikmapslayer.c:1232
+#: ../src/vikmapslayer.c:1426

 msgid "Redownload _All Map(s)"
 msgstr ""
 
 msgid "Redownload _All Map(s)"
 msgstr ""
 

-#: ../src/vikmapslayer.c:1312
+#: ../src/vikmapslayer.c:1430
+msgid "_Show Tile Information"
+msgstr ""
+
+#: ../src/vikmapslayer.c:1511

 #, c-format
 msgid ""
 "Wrong drawmode for this map.\n"
 "Select \"%s\" from View menu and try again."
 msgstr ""
 
 #, c-format
 msgid ""
 "Wrong drawmode for this map.\n"
 "Select \"%s\" from View menu and try again."
 msgstr ""
 

-#: ../src/vikmapslayer.c:1317
+#: ../src/vikmapslayer.c:1516

 msgid "Wrong zoom level for this map."
 msgstr ""
 
 msgid "Wrong zoom level for this map."
 msgstr ""
 

-#: ../src/vikmapslayer.c:1347
+#: ../src/vikmapslayer.c:1647
+msgid "Zoom Start:"
+msgstr ""
+
+#: ../src/vikmapslayer.c:1654
+msgid "Zoom End:"
+msgstr ""
+
+#: ../src/vikmapslayer.c:1660
+msgid "Download Maps Method:"
+msgstr ""
+
+#. redownload method - needs to align with REDOWNLOAD* macro values
+#: ../src/vikmapslayer.c:1732
+msgid "Missing"
+msgstr ""
+
+#: ../src/vikmapslayer.c:1732
+msgid "Bad"
+msgstr ""
+
+#: ../src/vikmapslayer.c:1732
+msgid "New"
+msgstr ""
+
+#: ../src/vikmapslayer.c:1732
+msgid "Reload All"
+msgstr ""
+
+#: ../src/vikmapslayer.c:1734
+msgid "Download for Zoom Levels"
+msgstr ""
+
+#: ../src/vikmapslayer.c:1774
+#, c-format
+msgid ""
+"You are not allowed to download more than %d tiles in one go (requested %d)"
+msgstr ""
+
+#: ../src/vikmapslayer.c:1782
+#, c-format
+msgid "Do you really want to download %d tiles?"
+msgstr ""
+
+#. Now with icons
+#: ../src/vikmapslayer.c:1807

 msgid "Download _Missing Onscreen Maps"
 msgstr ""
 
 msgid "Download _Missing Onscreen Maps"
 msgstr ""
 

-#: ../src/vikmapslayer.c:1353
+#: ../src/vikmapslayer.c:1814

 msgid "Download _New Onscreen Maps"
 msgstr ""
 
 msgid "Download _New Onscreen Maps"
 msgstr ""
 

-#. TODO Add GTK_STOCK_REFRESH icon
-#: ../src/vikmapslayer.c:1360
+#: ../src/vikmapslayer.c:1821

 msgid "Reload _All Onscreen Maps"
 msgstr ""
 
 msgid "Reload _All Onscreen Maps"
 msgstr ""
 

-#: ../src/viktreeview.c:268
+#: ../src/vikmapslayer.c:1827
+msgid "Download Maps in _Zoom Levels..."
+msgstr ""
+
+#: ../src/vikrouting.c:54
+msgid "Default engine:"
+msgstr ""
+
+#: ../src/viktreeview.c:316

 msgid "Layer Name"
 msgstr "Lagernamn"
 
 msgid "Layer Name"
 msgstr "Lagernamn"
 

-#: ../src/viktreeview.c:692
+#: ../src/viktreeview.c:851

 #, c-format
 msgid "delete data from %s\n"
 msgstr "Ta bort data från %s\n"
 
 #, c-format
 msgid "delete data from %s\n"
 msgstr "Ta bort data från %s\n"
 

-#: ../src/viktrwlayer.c:323
+#: ../src/viktrwlayer.c:398
+msgid "Create _Waypoint"
+msgstr ""
+
+#: ../src/viktrwlayer.c:398

 msgid "Create Waypoint"
 msgstr "Skapa waypoint"
 
 msgid "Create Waypoint"
 msgstr "Skapa waypoint"
 

-#: ../src/viktrwlayer.c:326
+#: ../src/viktrwlayer.c:404
+msgid "Create _Track"
+msgstr ""
+
+#: ../src/viktrwlayer.c:404

 msgid "Create Track"
 msgstr "Skapa spår"
 
 msgid "Create Track"
 msgstr "Skapa spår"
 

-#: ../src/viktrwlayer.c:330
-msgid "Begin Track"
+#: ../src/viktrwlayer.c:413
+msgid "Create _Route"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:333
+#: ../src/viktrwlayer.c:413
+msgid "Create Route"
+msgstr ""
+
+#: ../src/viktrwlayer.c:422
+msgid "_Edit Waypoint"
+msgstr ""
+
+#: ../src/viktrwlayer.c:422

 msgid "Edit Waypoint"
 msgstr "Redigera waypoint"
 
 msgid "Edit Waypoint"
 msgstr "Redigera waypoint"
 

-#: ../src/viktrwlayer.c:338
+#: ../src/viktrwlayer.c:432
+msgid "Edit Trac_kpoint"
+msgstr ""
+
+#: ../src/viktrwlayer.c:432

 msgid "Edit Trackpoint"
 msgstr "Redigera trackpoint"
 
 msgid "Edit Trackpoint"
 msgstr "Redigera trackpoint"
 

-#: ../src/viktrwlayer.c:343
+#: ../src/viktrwlayer.c:442
+msgid "Show P_icture"
+msgstr ""
+
+#: ../src/viktrwlayer.c:442

 msgid "Show Picture"
 msgstr "Visa Bild"
 
 msgid "Show Picture"
 msgstr "Visa Bild"
 

-#: ../src/viktrwlayer.c:346
-msgid "Magic Scissors"
+#: ../src/viktrwlayer.c:448
+msgid "Route _Finder"
+msgstr ""
+
+#: ../src/viktrwlayer.c:448
+msgid "Route Finder"

 msgstr ""
 
 #. ***** PARAMETERS *****
 msgstr ""
 
 #. ***** PARAMETERS *****

-#: ../src/viktrwlayer.c:353 ../src/viktrwlayer.c:1505
-#: ../src/viktrwlayer.c:1507
+#: ../src/viktrwlayer.c:468 ../src/viktrwlayer.c:2324

 msgid "Waypoints"
 msgstr "Waypoints"
 
 msgid "Waypoints"
 msgstr "Waypoints"
 

-#: ../src/viktrwlayer.c:353 ../src/viktrwlayer.c:1495
-#: ../src/viktrwlayer.c:1497
+#: ../src/viktrwlayer.c:468 ../src/viktrwlayer.c:2319

 msgid "Tracks"
 msgstr "Spår"
 
 msgid "Tracks"
 msgstr "Spår"
 

-#: ../src/viktrwlayer.c:353
+#: ../src/viktrwlayer.c:468

 msgid "Waypoint Images"
 msgstr "Waypoint bilder"
 
 msgid "Waypoint Images"
 msgstr "Waypoint bilder"
 

-#: ../src/viktrwlayer.c:356
+#: ../src/viktrwlayer.c:468
+msgid "Tracks Advanced"
+msgstr ""
+
+#: ../src/viktrwlayer.c:471

 msgid "Draw by Track"
 msgstr ""
 
 msgid "Draw by Track"
 msgstr ""
 

-#: ../src/viktrwlayer.c:356
-msgid "Draw by Velocity"
+#: ../src/viktrwlayer.c:471
+msgid "Draw by Speed"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:356
-msgid "All Tracks Black"
+#: ../src/viktrwlayer.c:471
+msgid "All Tracks Same Color"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:357
+#: ../src/viktrwlayer.c:472

 msgid "Filled Square"
 msgstr "Fylld ruta"
 
 msgid "Filled Square"
 msgstr "Fylld ruta"
 

-#: ../src/viktrwlayer.c:357
+#: ../src/viktrwlayer.c:472

 msgid "Square"
 msgstr "Kvadrat"
 
 msgid "Square"
 msgstr "Kvadrat"
 

-#: ../src/viktrwlayer.c:357
+#: ../src/viktrwlayer.c:472

 msgid "Circle"
 msgstr "Cirkel"
 
 msgid "Circle"
 msgstr "Cirkel"
 

-#: ../src/viktrwlayer.c:357
+#: ../src/viktrwlayer.c:472

 msgid "X"
 msgstr "X"
 
 msgid "X"
 msgstr "X"
 

-#: ../src/viktrwlayer.c:379
+#: ../src/viktrwlayer.c:498
+msgid "Extra Extra Small"
+msgstr ""
+
+#: ../src/viktrwlayer.c:499
+msgid "Extra Small"
+msgstr ""
+
+#: ../src/viktrwlayer.c:500
+msgid "Small"
+msgstr ""
+
+#: ../src/viktrwlayer.c:501
+msgid "Medium"
+msgstr ""
+
+#: ../src/viktrwlayer.c:502
+msgid "Large"
+msgstr ""
+
+#: ../src/viktrwlayer.c:503
+msgid "Extra Large"
+msgstr ""
+
+#: ../src/viktrwlayer.c:504
+msgid "Extra Extra Large"
+msgstr ""
+
+#: ../src/viktrwlayer.c:510
+msgid "Name Ascending"
+msgstr ""
+
+#: ../src/viktrwlayer.c:511
+msgid "Name Descending"
+msgstr ""
+
+#: ../src/viktrwlayer.c:552 ../src/viktrwlayer.c:576
+msgid "Draw Labels"
+msgstr ""
+
+#: ../src/viktrwlayer.c:553
+msgid "Note: the individual track controls what labels may be displayed"
+msgstr ""
+
+#: ../src/viktrwlayer.c:554
+msgid "Track Labels Font Size:"
+msgstr ""
+
+#: ../src/viktrwlayer.c:555

 msgid "Track Drawing Mode:"
 msgstr ""
 
 msgid "Track Drawing Mode:"
 msgstr ""
 

-#: ../src/viktrwlayer.c:380
+#: ../src/viktrwlayer.c:556
+msgid "All Tracks Color:"
+msgstr ""
+
+#: ../src/viktrwlayer.c:557
+msgid "The color used when 'All Tracks Same Color' drawing mode is selected"
+msgstr ""
+
+#: ../src/viktrwlayer.c:558

 msgid "Draw Track Lines"
 msgstr ""
 
 msgid "Draw Track Lines"
 msgstr ""
 

-#: ../src/viktrwlayer.c:381
+#: ../src/viktrwlayer.c:559
+msgid "Track Thickness:"
+msgstr ""
+
+#: ../src/viktrwlayer.c:560
+msgid "Draw Track Direction"
+msgstr ""
+
+#: ../src/viktrwlayer.c:561
+msgid "Direction Size:"
+msgstr ""
+
+#: ../src/viktrwlayer.c:562

 msgid "Draw Trackpoints"
 msgstr ""
 
 msgid "Draw Trackpoints"
 msgstr ""
 

-#: ../src/viktrwlayer.c:382
+#: ../src/viktrwlayer.c:563
+msgid "Trackpoint Size:"
+msgstr ""
+
+#: ../src/viktrwlayer.c:564

 msgid "Draw Elevation"
 msgstr ""
 
 msgid "Draw Elevation"
 msgstr ""
 

-#: ../src/viktrwlayer.c:383
+#: ../src/viktrwlayer.c:565

 msgid "Draw Elevation Height %:"
 msgstr ""
 
 msgid "Draw Elevation Height %:"
 msgstr ""
 

-#: ../src/viktrwlayer.c:385
+#: ../src/viktrwlayer.c:566

 msgid "Draw Stops"
 msgstr ""
 
 msgid "Draw Stops"
 msgstr ""
 

-#: ../src/viktrwlayer.c:386
-msgid "Min Stop Length (seconds):"
+#: ../src/viktrwlayer.c:567
+msgid ""
+"Whether to draw a marker when trackpoints are at the same position but over "
+"the minimum stop length apart in time"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:388
-msgid "Track Thickness:"
+#: ../src/viktrwlayer.c:568
+msgid "Min Stop Length (seconds):"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:389
+#: ../src/viktrwlayer.c:570

 msgid "Track BG Thickness:"
 msgstr ""
 
 msgid "Track BG Thickness:"
 msgstr ""
 

-#: ../src/viktrwlayer.c:390
+#: ../src/viktrwlayer.c:571

 msgid "Track Background Color"
 msgstr ""
 
 msgid "Track Background Color"
 msgstr ""
 

-#: ../src/viktrwlayer.c:391
-msgid "Min Track Velocity:"
+#: ../src/viktrwlayer.c:572
+msgid "Draw by Speed Factor (%):"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:392
-msgid "Max Track Velocity:"
+#: ../src/viktrwlayer.c:573
+msgid ""
+"The percentage factor away from the average speed determining the color used"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:394
-msgid "Draw Labels"
+#: ../src/viktrwlayer.c:574
+msgid "Track Sort Order:"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:395
+#: ../src/viktrwlayer.c:577
+msgid "Waypoint Font Size:"
+msgstr ""
+
+#: ../src/viktrwlayer.c:578

 msgid "Waypoint Color:"
 msgstr "Waypoint färg:"
 
 msgid "Waypoint Color:"
 msgstr "Waypoint färg:"
 

-#: ../src/viktrwlayer.c:396
+#: ../src/viktrwlayer.c:579

 msgid "Waypoint Text:"
 msgstr "Waypoint text:"
 
 msgid "Waypoint Text:"
 msgstr "Waypoint text:"
 

-#: ../src/viktrwlayer.c:397
+#: ../src/viktrwlayer.c:580

 msgid "Background:"
 msgstr "Bakgrund:"
 
 msgid "Background:"
 msgstr "Bakgrund:"
 

-#: ../src/viktrwlayer.c:398
+#: ../src/viktrwlayer.c:581

 msgid "Fake BG Color Translucency:"
 msgstr ""
 
 msgid "Fake BG Color Translucency:"
 msgstr ""
 

-#: ../src/viktrwlayer.c:399
+#: ../src/viktrwlayer.c:582

 msgid "Waypoint marker:"
 msgstr "Waypoint markör:"
 
 msgid "Waypoint marker:"
 msgstr "Waypoint markör:"
 

-#: ../src/viktrwlayer.c:400
+#: ../src/viktrwlayer.c:583

 msgid "Waypoint size:"
 msgstr "Waypoint storlek:"
 
 msgid "Waypoint size:"
 msgstr "Waypoint storlek:"
 

-#: ../src/viktrwlayer.c:401
+#: ../src/viktrwlayer.c:584

 msgid "Draw Waypoint Symbols:"
 msgstr ""
 
 msgid "Draw Waypoint Symbols:"
 msgstr ""
 

-#: ../src/viktrwlayer.c:403
+#: ../src/viktrwlayer.c:585
+msgid "Waypoint Sort Order:"
+msgstr ""
+
+#: ../src/viktrwlayer.c:587

 msgid "Draw Waypoint Images"
 msgstr ""
 
 msgid "Draw Waypoint Images"
 msgstr ""
 

-#: ../src/viktrwlayer.c:404
+#: ../src/viktrwlayer.c:588

 msgid "Image Size (pixels):"
 msgstr "Bildstorlek (pixlar):"
 
 msgid "Image Size (pixels):"
 msgstr "Bildstorlek (pixlar):"
 

-#: ../src/viktrwlayer.c:405
+#: ../src/viktrwlayer.c:589

 msgid "Image Alpha:"
 msgstr ""
 
 msgid "Image Alpha:"
 msgstr ""
 

-#: ../src/viktrwlayer.c:406
+#: ../src/viktrwlayer.c:590

 msgid "Image Memory Cache Size:"
 msgstr ""
 
 msgid "Image Memory Cache Size:"
 msgstr ""
 

-#: ../src/viktrwlayer.c:1653
+#: ../src/viktrwlayer.c:678
+msgid "TrackWaypoint"
+msgstr ""
+
+#: ../src/viktrwlayer.c:1534 ../src/vikutils.c:204
+msgid "miles"
+msgstr ""
+
+#. VIK_UNITS_DISTANCE_KILOMETRES:
+#: ../src/viktrwlayer.c:1538 ../src/vikutils.c:209
+msgid "km"
+msgstr ""
+
+#: ../src/viktrwlayer.c:1648
+msgid "start/end"
+msgstr ""
+
+#: ../src/viktrwlayer.c:1660
+msgid "start"
+msgstr ""
+
+#: ../src/viktrwlayer.c:1669
+msgid "end"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2329
+msgid "Routes"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2519

 #, c-format
 msgid " in %d:%02d hrs:mins"
 msgstr ""
 
 #, c-format
 msgid " in %d:%02d hrs:mins"
 msgstr ""
 

-#: ../src/viktrwlayer.c:1657
+#: ../src/viktrwlayer.c:2523

 #, c-format
 msgid ""
 "\n"
 "%sTotal Length %.1f %s%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "\n"
 "%sTotal Length %.1f %s%s"
 msgstr ""
 

-#: ../src/viktrwlayer.c:1663
+#: ../src/viktrwlayer.c:2529
+#, c-format
+msgid "Tracks: %d - Waypoints: %d - Routes: %d%s"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2549
+#, c-format
+msgid "Tracks: %d"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2559

 #, c-format
 #, c-format

-msgid "Tracks: %d - Waypoints: %d%s"
+msgid "Routes: %d"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:1698
+#: ../src/viktrwlayer.c:2590

 #, c-format
 msgid "- %d:%02d hrs:mins"
 msgstr ""
 
 #, c-format
 msgid "- %d:%02d hrs:mins"
 msgstr ""
 

-#: ../src/viktrwlayer.c:1706
+#: ../src/viktrwlayer.c:2598

 #, c-format
 msgid "%s%.1f km %s"
 msgstr ""
 
 #, c-format
 msgid "%s%.1f km %s"
 msgstr ""
 

-#: ../src/viktrwlayer.c:1709
+#: ../src/viktrwlayer.c:2601

 #, c-format
 msgid "%s%.1f miles %s"
 msgstr ""
 
 #, c-format
 msgid "%s%.1f miles %s"
 msgstr ""
 

-#: ../src/viktrwlayer.c:1829 ../src/viktrwlayer.c:1900
+#: ../src/viktrwlayer.c:2615
+#, c-format
+msgid "Waypoints: %d"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2671
+#, c-format
+msgid "Wpt: Alt %dft"
+msgstr ""
+
+#. VIK_UNITS_HEIGHT_METRES:
+#: ../src/viktrwlayer.c:2675
+#, c-format
+msgid "Wpt: Alt %dm"
+msgstr ""
+
+#. Add comment if available
+#: ../src/viktrwlayer.c:2690
+#, c-format
+msgid "%s | %s %s | Comment: %s"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2692
+#, c-format
+msgid "%s | %s %s"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2939 ../src/viktrwlayer.c:3010

 msgid "This layer has no waypoints or trackpoints."
 msgstr "Detta lager har inga waypoints eller trackpoints."
 
 msgid "This layer has no waypoints or trackpoints."
 msgstr "Detta lager har inga waypoints eller trackpoints."
 

-#: ../src/viktrwlayer.c:1927 ../src/vikwindow.c:1673 ../src/vikwindow.c:2118
+#: ../src/viktrwlayer.c:3045 ../src/vikwindow.c:2754 ../src/vikwindow.c:3407

 #, c-format
 msgid "The file \"%s\" exists, do you wish to overwrite it?"
 msgstr "Filen \"%s\" finns redan, vill du skriva över den?"
 
 #, c-format
 msgid "The file \"%s\" exists, do you wish to overwrite it?"
 msgstr "Filen \"%s\" finns redan, vill du skriva över den?"
 

-#: ../src/viktrwlayer.c:1937 ../src/vikwindow.c:1694
+#: ../src/viktrwlayer.c:3057 ../src/vikwindow.c:2778

 msgid "The filename you requested could not be opened for writing."
 msgstr ""
 
 msgid "The filename you requested could not be opened for writing."
 msgstr ""
 

-#: ../src/viktrwlayer.c:1942 ../src/viktrwlayer.c:1947
-#: ../src/viktrwlayer.c:1952
+#: ../src/viktrwlayer.c:3062 ../src/viktrwlayer.c:3067
+#: ../src/viktrwlayer.c:3077 ../src/viktrwlayer.c:3089

 msgid "Export Layer"
 msgstr "Exportera lager"
 
 msgid "Export Layer"
 msgstr "Exportera lager"
 

-#: ../src/viktrwlayer.c:1966
+#: ../src/viktrwlayer.c:3108
+msgid "Could not create temporary file for export."
+msgstr ""
+
+#: ../src/viktrwlayer.c:3117
+#, c-format
+msgid "Could not launch %s."
+msgstr ""
+
+#: ../src/viktrwlayer.c:3161

 msgid "Export Track as GPX"
 msgstr ""
 
 msgid "Export Track as GPX"
 msgstr ""
 

-#: ../src/viktrwlayer.c:1974
+#: ../src/viktrwlayer.c:3183

 msgid "Find"
 msgstr ""
 
 msgid "Find"
 msgstr ""
 

-#: ../src/viktrwlayer.c:1984
+#: ../src/viktrwlayer.c:3193

 msgid "Waypoint Name:"
 msgstr "Waypoint namn:"
 
 msgid "Waypoint Name:"
 msgstr "Waypoint namn:"
 

-#: ../src/viktrwlayer.c:2006
+#: ../src/viktrwlayer.c:3210

 msgid "Waypoint not found in this layer."
 msgstr "Waypoint hittades inte i detta lager."
 
 msgid "Waypoint not found in this layer."
 msgstr "Waypoint hittades inte i detta lager."
 

-#: ../src/viktrwlayer.c:2143
-msgid "_View Layer"
+#: ../src/viktrwlayer.c:3476
+msgid "Can not upload invisible track."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:2148
-msgid "View All Trac_ks"
+#: ../src/viktrwlayer.c:3581 ../src/viktrwlayer.c:9283
+msgid "Track"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:2153
-msgid "V_iew All Waypoints"
+#: ../src/viktrwlayer.c:3606 ../src/viktrwlayer.c:9316
+msgid "Route"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:2158
-msgid "_Goto Center of Layer"
+#: ../src/viktrwlayer.c:3691 ../src/viktrwlayer.c:7460
+#: ../src/viktrwlayer.c:7566
+msgid "_Finish Route"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:2163
-msgid "Goto _Waypoint"
+#: ../src/viktrwlayer.c:3693 ../src/viktrwlayer.c:7383
+#: ../src/viktrwlayer.c:7564
+msgid "_Finish Track"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:2169
-msgid "_Export Layer"
+#. Now with icons
+#: ../src/viktrwlayer.c:3705
+msgid "_View Layer"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:2174
-msgid "Export as GPS_Point"
+#: ../src/viktrwlayer.c:3712
+msgid "V_iew"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:2179
-msgid "Export as GPS_Mapper"
+#: ../src/viktrwlayer.c:3718
+msgid "View All _Tracks"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:2184
-msgid "Export as _GPX"
+#: ../src/viktrwlayer.c:3723
+msgid "View All _Routes"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:2189 ../src/viktrwlayer.c:3215
-msgid "_New Waypoint"
+#: ../src/viktrwlayer.c:3728
+msgid "View All _Waypoints"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:2196
-msgid "_Add Wikipedia Waypoints"
+#: ../src/viktrwlayer.c:3733
+msgid "_Goto Center of Layer"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:2201
-msgid "Within _Layer Bounds"
+#: ../src/viktrwlayer.c:3739 ../src/viktrwlayer.c:7335
+msgid "Goto _Waypoint..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:2206
-msgid "Within _Current View"
+#: ../src/viktrwlayer.c:3745
+msgid "_Export Layer"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:2213 ../src/viktrwlayer.c:3310
-msgid "Upload to _OSM"
+#: ../src/viktrwlayer.c:3751
+msgid "Export as GPS_Point..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:2780
-msgid "Failed. This track does not have timestamp"
+#: ../src/viktrwlayer.c:3756
+msgid "Export as GPS_Mapper..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:2794
-msgid "Failed. No other track in this layer has timestamp"
+#: ../src/viktrwlayer.c:3761
+msgid "Export as _GPX..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:2805
-msgid "Merge with..."
+#: ../src/viktrwlayer.c:3766
+msgid "Export as _KML..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:2805
-msgid "Select track to merge with"
+#: ../src/viktrwlayer.c:3771
+msgid "Open with External Program_1: "

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:2842
-msgid "Merge Threshold..."
+#: ../src/viktrwlayer.c:3778
+msgid "Open with External Program_2: "

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:2843
-msgid "Merge when time between tracks less than:"
-msgstr ""
+#: ../src/viktrwlayer.c:3786 ../src/vikwindow.c:3704
+msgid "_New"
+msgstr "_Ny"

 
 

-#: ../src/viktrwlayer.c:2935
-msgid "Split Threshold..."
+#: ../src/viktrwlayer.c:3792
+msgid "New _Waypoint..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:2936
-msgid "Split when time between trackpoints exceeds:"
+#: ../src/viktrwlayer.c:3798
+msgid "New _Track"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:3019
-msgid "Waypoint Already Exists"
-msgstr "Waypoint finns redan"
+#: ../src/viktrwlayer.c:3806
+msgid "New _Route"
+msgstr ""

 
 

-#: ../src/viktrwlayer.c:3060
-msgid "Track Already Exists"
+#: ../src/viktrwlayer.c:3815 ../src/viktrwlayer.c:7938
+msgid "Geotag _Images..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:3190 ../src/viktrwlayer.c:3229
-msgid "_Goto"
+#: ../src/viktrwlayer.c:3822
+msgid "_Acquire"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:3204
-msgid "_Visit Geocache Webpage"
+#: ../src/viktrwlayer.c:3828 ../src/vikwindow.c:3711
+msgid "From _GPS..."
+msgstr "Från _GPS..."
+
+#. FIXME: only add menu when at least a routing engine has support for Directions
+#: ../src/viktrwlayer.c:3834
+msgid "From _Directions..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:3234
-msgid "_Startpoint"
+#: ../src/viktrwlayer.c:3840
+msgid "From _OSM Traces..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:3239
-msgid "\"_Center\""
+#: ../src/viktrwlayer.c:3845
+msgid "From _My OSM Traces..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:3244
-msgid "_Endpoint"
+#: ../src/viktrwlayer.c:3853 ../src/vikwindow.c:3725
+msgid "From _Wikipedia Waypoints"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:3249
-msgid "_Highest Altitude"
+#: ../src/viktrwlayer.c:3859
+msgid "Within _Layer Bounds"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:3254
-msgid "_Lowest Altitude"
+#: ../src/viktrwlayer.c:3865
+msgid "Within _Current View"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:3259
-msgid "_Maximum Speed"
+#: ../src/viktrwlayer.c:3873
+msgid "From Geo_caching..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:3264
-msgid "_View Track"
+#: ../src/viktrwlayer.c:3880 ../src/vikwindow.c:3722
+msgid "From Geotagged _Images..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:3269
-msgid "_Merge By Time"
+#: ../src/viktrwlayer.c:3886
+msgid "From _File..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:3274
-msgid "Merge _With Other Tracks..."
+#: ../src/viktrwlayer.c:3894 ../src/viktrwlayer.c:7883
+msgid "_Upload"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:3279
-msgid "_Split By Time"
+#: ../src/viktrwlayer.c:3900
+msgid "Upload to _GPS..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:3284
-msgid "Down_load Maps Along Track..."
+#: ../src/viktrwlayer.c:3907 ../src/viktrwlayer.c:7911
+msgid "Upload to _OSM..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:3289
-msgid "_Apply DEM Data"
+#: ../src/viktrwlayer.c:3915
+msgid "De_lete"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:3294
-msgid "Export Trac_k as GPX"
+#: ../src/viktrwlayer.c:3921
+msgid "Delete All _Tracks"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:3299
-msgid "E_xtend Track End"
+#: ../src/viktrwlayer.c:3927
+msgid "Delete Tracks _From Selection..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:3304
-msgid "Extend _Using Magic Scissors"
+#: ../src/viktrwlayer.c:3933 ../src/viktrwlayer.c:7485
+msgid "Delete _All Routes"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:3318
-msgid "_View Google Directions"
+#: ../src/viktrwlayer.c:3939 ../src/viktrwlayer.c:7491
+msgid "_Delete Routes From Selection..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:3324
-msgid "Use with _Filter"
+#: ../src/viktrwlayer.c:3945
+msgid "Delete All _Waypoints"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:4005
-msgid "Track"
+#: ../src/viktrwlayer.c:3951
+msgid "Delete Waypoints From _Selection..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:4338
-msgid "Could not launch eog to open file."
+#: ../src/viktrwlayer.c:4574
+#, c-format
+msgid "Are you sure you want to delete all tracks in %s?"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:4392
+#: ../src/viktrwlayer.c:4584

 #, c-format
 #, c-format

-msgid "Creating %d Image Thumbnails..."
+msgid "Are you sure you want to delete all routes in %s?"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer.c:4617
-msgid "No map layer in use. Create one first"
+#: ../src/viktrwlayer.c:4594
+#, c-format
+msgid "Are you sure you want to delete all waypoints in %s?"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:688
-msgid "Failed spliting track. Track unchanged"
+#: ../src/viktrwlayer.c:4611
+#, c-format
+msgid "Are you sure you want to delete the waypoint \"%s\"?"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:705
-msgid "Operation Aborted. Track unchanged"
+#: ../src/viktrwlayer.c:4624
+#, c-format
+msgid "Are you sure you want to delete the track \"%s\"?"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:759
+#: ../src/viktrwlayer.c:4637

 #, c-format
 #, c-format

-msgid "%s - Track Properties"
+msgid "Are you sure you want to delete the route \"%s\"?"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:764
-msgid "Split at Marker"
+#: ../src/viktrwlayer.c:4849 ../src/viktrwlayer.c:5677
+msgid ""
+"Converting a track to a route removes extra track data such as segments, "
+"timestamps, etc...\n"
+"Do you want to continue?"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:765
-msgid "Split Segments"
+#: ../src/viktrwlayer.c:4944
+msgid "No DEM layers available, thus no DEM values can be applied."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:766
-msgid "Reverse"
-msgstr "Omvänd"
+#: ../src/viktrwlayer.c:4964 ../src/viktrwlayer.c:5005
+#, c-format
+msgid "%ld point adjusted"
+msgid_plural "%ld points adjusted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/viktrwlayer.c:5049
+#, c-format
+msgid "%ld waypoint changed"
+msgid_plural "%ld waypoints changed"
+msgstr[0] ""
+msgstr[1] ""

 
 

-#: ../src/viktrwlayer_propwin.c:767
-msgid "Delete Dupl."
+#: ../src/viktrwlayer.c:5233
+#, c-format
+msgid ""
+"Refining a track with many points (%d) is unlikely to yield sensible "
+"results. Do you want to Continue?"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:790
-msgid "<b>Comment:</b>"
-msgstr "<b>Kommentar:</b>"
+#. Select engine from dialog
+#: ../src/viktrwlayer.c:5241
+msgid "Refine Route with Routing Engine..."
+msgstr ""

 
 

-#: ../src/viktrwlayer_propwin.c:790
-msgid "<b>Track Length:</b>"
+#: ../src/viktrwlayer.c:5249
+msgid "Select routing engine"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:790
-msgid "<b>Trackpoints:</b>"
-msgstr "<b>Trackpoints:</b>"
+#: ../src/viktrwlayer.c:5467
+msgid "Failed. No other tracks with timestamps in this layer found"
+msgstr ""

 
 

-#: ../src/viktrwlayer_propwin.c:790
-msgid "<b>Segments:</b>"
-msgstr "<b>Segment:</b>"
+#: ../src/viktrwlayer.c:5469
+msgid "Failed. No other tracks without timestamps in this layer found"
+msgstr ""

 
 

-#: ../src/viktrwlayer_propwin.c:790
-msgid "<b>Duplicate Points:</b>"
+#: ../src/viktrwlayer.c:5488
+msgid "Merge with..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:790
-msgid "<b>Max Speed:</b>"
-msgstr "<b>Max hastighet:</b>"
+#: ../src/viktrwlayer.c:5489
+msgid "Select route to merge with"
+msgstr ""

 
 

-#: ../src/viktrwlayer_propwin.c:790
-msgid "<b>Avg. Speed:</b>"
-msgstr "<b>Medelhastighet:</b>"
+#: ../src/viktrwlayer.c:5489
+msgid "Select track to merge with"
+msgstr ""

 
 

-#: ../src/viktrwlayer_propwin.c:790
-msgid "<b>Avg. Dist. Between TPs:</b>"
+#: ../src/viktrwlayer.c:5573 ../src/viktrwlayer.c:5650
+msgid "Append Route"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:790
-msgid "<b>Elevation Range:</b>"
+#: ../src/viktrwlayer.c:5573 ../src/viktrwlayer.c:5650
+msgid "Append Track"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:790
-msgid "<b>Total Elevation Gain/Loss:</b>"
-msgstr "<b>Total höjdskillnad:</b>"
+#: ../src/viktrwlayer.c:5574
+msgid "Select the route to append after the current route"
+msgstr ""

 
 

-#: ../src/viktrwlayer_propwin.c:790
-msgid "<b>Start:</b>"
-msgstr "<b>Start:</b>"
+#: ../src/viktrwlayer.c:5575
+msgid "Select the track to append after the current track"
+msgstr ""

 
 

-#: ../src/viktrwlayer_propwin.c:790
-msgid "<b>End:</b>"
-msgstr "<b>Slut:</b>"
+#: ../src/viktrwlayer.c:5651
+msgid "Select the track to append after the current route"
+msgstr ""

 
 

-#: ../src/viktrwlayer_propwin.c:790
-msgid "<b>Duration:</b>"
+#: ../src/viktrwlayer.c:5652
+msgid "Select the route to append after the current track"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:830 ../src/viktrwlayer_propwin.c:854
-#: ../src/viktrwlayer_propwin.c:891 ../src/viktrwlayer_propwin.c:909
-#: ../src/viktrwlayer_propwin.c:959 ../src/viktrwlayer_propwin.c:960
-#: ../src/viktrwlayer_propwin.c:961 ../src/viktrwlayer_propwin.c:983
-#: ../src/viktrwlayer_propwin.c:990
+#: ../src/viktrwlayer.c:5711

 #, c-format
 #, c-format

-msgid "No Data"
-msgstr "Ingen data"
+msgid "%d segment merged"
+msgid_plural "%d segments merged"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/viktrwlayer.c:5727
+msgid "Failed. This track does not have timestamp"
+msgstr ""
+
+#: ../src/viktrwlayer.c:5739
+msgid "Failed. No other track in this layer has timestamp"
+msgstr ""
+
+#: ../src/viktrwlayer.c:5746
+msgid "Merge Threshold..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:5747
+msgid "Merge when time between tracks less than:"
+msgstr ""
+
+#: ../src/viktrwlayer.c:5889
+msgid "Split Threshold..."
+msgstr ""

 
 

-#: ../src/viktrwlayer_propwin.c:956
+#: ../src/viktrwlayer.c:5890
+msgid "Split when time between trackpoints exceeds:"
+msgstr ""
+
+#: ../src/viktrwlayer.c:5907

 #, c-format
 #, c-format

-msgid "%d minutes"
-msgstr "%d minuter"
+msgid ""
+"Can not split track due to trackpoints not ordered in time - such as at %s.\n"
+"\n"
+"Goto this trackpoint?"
+msgstr ""

 
 

-#: ../src/viktrwlayer_propwin.c:979
-msgid "Statistics"
-msgstr "Statistik"
+#: ../src/viktrwlayer.c:5976
+msgid "Split Every Nth Point"
+msgstr ""

 
 

-#: ../src/viktrwlayer_propwin.c:984
-msgid "<b>Track Distance:</b>"
+#: ../src/viktrwlayer.c:5977
+msgid "Split on every Nth point:"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:985
-msgid "Elevation-distance"
+#: ../src/viktrwlayer.c:6087
+msgid "Can not split track as it has no segments"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:991
-msgid "<b>Track Time:</b>"
+#: ../src/viktrwlayer.c:6169 ../src/viktrwlayer.c:6199
+#, c-format
+msgid "Deleted %ld point"
+msgid_plural "Deleted %ld points"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/viktrwlayer.c:6392
+msgid "Internal Error in vik_trw_layer_uniquify_tracks"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_propwin.c:992
-msgid "Speed-time"
+#: ../src/viktrwlayer.c:6496 ../src/viktrwlayer.c:6543
+#: ../src/viktrwlayer.c:6704
+msgid ""
+"Multiple entries with the same name exist. This method only works with "
+"unique names. Force unique names now?"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_tpwin.c:115
-msgid "<b>Part of Track:</b>"
+#: ../src/viktrwlayer.c:6507
+msgid "No tracks found"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_tpwin.c:116
-msgid "<b>Latitude:</b>"
-msgstr "<b>Latitud:</b>"
+#: ../src/viktrwlayer.c:6515 ../src/viktrwlayer.c:6562
+#: ../src/viktrwlayer.c:6724
+msgid "Delete Selection"
+msgstr ""

 
 

-#: ../src/viktrwlayer_tpwin.c:117
-msgid "<b>Longitude:</b>"
-msgstr "<b>Longitud:</b>"
+#: ../src/viktrwlayer.c:6516
+msgid "Select tracks to delete"
+msgstr ""

 
 

-#: ../src/viktrwlayer_tpwin.c:118
-msgid "<b>Altitude:</b>"
-msgstr "<b>Altitud:</b>"
+#: ../src/viktrwlayer.c:6554
+msgid "No routes found"
+msgstr ""

 
 

-#: ../src/viktrwlayer_tpwin.c:119
-msgid "<b>Timestamp:</b>"
-msgstr "<b>Tidsstämpel:</b>"
+#: ../src/viktrwlayer.c:6563
+msgid "Select routes to delete"
+msgstr ""

 
 

-#: ../src/viktrwlayer_tpwin.c:120
-msgid "<b>Time:</b>"
-msgstr "<b>Tid:</b>"
+#: ../src/viktrwlayer.c:6669
+msgid "Internal Error in vik_trw_layer_uniquify_waypoints"
+msgstr ""

 
 

-#: ../src/viktrwlayer_tpwin.c:121
-msgid "<b>Distance Difference:</b>"
+#: ../src/viktrwlayer.c:6714
+msgid "No waypoints found"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_tpwin.c:122
-msgid "<b>Time Difference:</b>"
-msgstr "<b>Tidsskillnad:</b>"
+#: ../src/viktrwlayer.c:6725
+msgid "Select waypoints to delete"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7033
+#, c-format
+msgid ""
+"A waypoint with the name \"%s\" already exists. Really rename to the same "
+"name?"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7063
+#, c-format
+msgid ""
+"A track with the name \"%s\" already exists. Really rename to the same name?"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7100
+#, c-format
+msgid ""
+"A route with the name \"%s\" already exists. Really rename to the same name?"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7221 ../src/viktrwlayer.c:7594
+msgid "_Goto"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7240
+msgid "_Visit Geocache Webpage"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7259
+msgid "_Show Picture..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:7267
+msgid "Update Geotag on _Image"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7273
+msgid "_Update"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7278
+msgid "Update and _Keep File Timestamp"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7289
+msgid "Visit _Webpage"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7320
+msgid "_New Waypoint..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:7329
+msgid "_View All Waypoints"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7341
+msgid "Delete _All Waypoints"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7347
+msgid "_Delete Waypoints From Selection..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:7359
+msgid "_Show All Waypoints"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7365
+msgid "_Hide All Waypoints"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7393
+msgid "_View All Tracks"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7399
+msgid "_New Track"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7407
+msgid "Delete _All Tracks"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7413
+msgid "_Delete Tracks From Selection..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:7425
+msgid "_Show All Tracks"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7431
+msgid "_Hide All Tracks"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7442
+msgid "_List Tracks..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:7471
+msgid "_View All Routes"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7477
+msgid "_New Route"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7503
+msgid "_Show All Routes"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7509
+msgid "_Hide All Routes"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7520
+msgid "_List Routes..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:7579
+msgid "_View Track"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7581
+msgid "_View Route"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7600
+msgid "_Startpoint"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7606
+msgid "\"_Center\""
+msgstr ""
+
+#: ../src/viktrwlayer.c:7612
+msgid "_Endpoint"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7618
+msgid "_Highest Altitude"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7624
+msgid "_Lowest Altitude"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7632
+msgid "_Maximum Speed"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7641
+msgid "Co_mbine"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7649
+msgid "_Merge By Time..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:7654
+msgid "Merge _Segments"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7660
+msgid "Merge _With Other Tracks..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:7666
+msgid "_Append Track..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:7668
+msgid "_Append Route..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:7674
+msgid "Append _Route..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:7676
+msgid "Append _Track..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:7683
+msgid "_Split"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7691
+msgid "_Split By Time..."
+msgstr ""
+
+#. ATM always enable this entry - don't want to have to analyse the track before displaying the menu - to keep the menu speedy
+#: ../src/viktrwlayer.c:7697
+msgid "Split Se_gments"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7703
+msgid "Split By _Number of Points..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:7708
+msgid "Split at _Trackpoint"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7716
+msgid "_Insert Points"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7722
+msgid "Insert Point _Before Selected Point"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7729
+msgid "Insert Point _After Selected Point"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7738
+msgid "Delete Poi_nts"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7744
+msgid "Delete _Selected Point"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7752
+msgid "Delete Points With The Same _Position"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7757
+msgid "Delete Points With The Same _Time"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7764 ../src/viktrwlayer.c:7964
+msgid "_Transform"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7772 ../src/viktrwlayer.c:7972
+msgid "_Apply DEM Data"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7777 ../src/viktrwlayer.c:7977
+msgid "_Overwrite"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7780 ../src/viktrwlayer.c:7980
+msgid "Overwrite any existing elevation values with DEM values"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7783 ../src/viktrwlayer.c:7983
+msgid "_Keep Existing"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7786 ../src/viktrwlayer.c:7986
+msgid "Keep existing elevation values, only attempt for missing values"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7791
+msgid "_Smooth Missing Elevation Data"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7796
+msgid "_Interpolated"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7799
+msgid ""
+"Interpolate between known elevation values to derive values for the missing "
+"elevations"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7802
+msgid "_Flat"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7805
+msgid "Set unknown elevation values to the last known value"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7809
+msgid "C_onvert to a Route"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7811
+msgid "C_onvert to a Track"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7819
+msgid "_Anonymize Times"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7822
+msgid "Shift timestamps to a relative offset from 1901-01-01"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7827
+msgid "_Reverse Track"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7829
+msgid "_Reverse Route"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7836
+msgid "Refine Route..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:7846
+msgid "Down_load Maps Along Track..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:7848
+msgid "Down_load Maps Along Route..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:7856
+msgid "_Export Track as GPX..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:7858
+msgid "_Export Route as GPX..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:7865
+msgid "E_xtend Track End"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7867
+msgid "E_xtend Route End"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7874
+msgid "Extend _Using Route Finder"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7889
+msgid "_Upload to GPS..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:7900
+msgid "_View Google Directions"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7920
+msgid "Use with _Filter"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7953
+msgid "_Edit Trackpoint"
+msgstr ""
+
+#: ../src/viktrwlayer.c:9017
+#, c-format
+msgid " - Gain %dm:Loss %dm"
+msgstr ""
+
+#: ../src/viktrwlayer.c:9019
+#, c-format
+msgid " - Gain %dft:Loss %dft"
+msgstr ""
+
+#: ../src/viktrwlayer.c:9024
+#, c-format
+msgid " - Bearing %3.1f° - Step %s"
+msgstr ""
+
+#: ../src/viktrwlayer.c:9628
+#, c-format
+msgid "Could not launch %s to open file."
+msgstr ""
+
+#: ../src/viktrwlayer.c:9709
+#, c-format
+msgid "Creating %d Image Thumbnails..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:10106
+msgid "No map layer in use. Create one first"
+msgstr ""
+
+#: ../src/viktrwlayer.c:10225
+#, c-format
+msgid "%s: Track List"
+msgstr ""
+
+#: ../src/viktrwlayer.c:10227
+#, c-format
+msgid "%s: Route List"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:828 ../src/viktrwlayer_propwin.c:1085
+#, c-format
+msgid "%.1f kph"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:831 ../src/viktrwlayer_propwin.c:1088
+#: ../src/viktrwlayer_analysis.c:290
+#, c-format
+msgid "%.1f mph"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:834 ../src/viktrwlayer_propwin.c:1091
+#, c-format
+msgid "%.1f knots"
+msgstr ""
+
+#. VIK_UNITS_SPEED_METRES_PER_SECOND:
+#: ../src/viktrwlayer_propwin.c:838 ../src/viktrwlayer_propwin.c:1095
+#, c-format
+msgid "%.1f m/s"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:1662 ../src/viktrwlayer_analysis.c:267
+#, c-format
+msgid "%.1f miles"
+msgstr ""
+
+#. VIK_UNITS_DISTANCE_KILOMETRES
+#: ../src/viktrwlayer_propwin.c:1664 ../src/viktrwlayer_analysis.c:271
+#, c-format
+msgid "%.1f km"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2582
+msgid "Failed spliting track. Track unchanged"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2724 ../src/viktrwlayer_propwin.c:3140
+#, c-format
+msgid "%s - Track Properties"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2729
+msgid "Split at _Marker"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2730
+msgid "Split _Segments"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2731
+msgid "_Reverse"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2732
+msgid "_Delete Dupl."
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2757
+msgid "<b>Comment:</b>"
+msgstr "<b>Kommentar:</b>"
+
+#: ../src/viktrwlayer_propwin.c:2758
+msgid "<b>Description:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2759
+msgid "<b>Color:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2760
+msgid "<b>Draw Name:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2761
+msgid "<b>Distance Labels:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2764
+msgid "<b>Track Length:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2765
+msgid "<b>Trackpoints:</b>"
+msgstr "<b>Trackpoints:</b>"
+
+#: ../src/viktrwlayer_propwin.c:2766
+msgid "<b>Segments:</b>"
+msgstr "<b>Segment:</b>"
+
+#: ../src/viktrwlayer_propwin.c:2767
+msgid "<b>Duplicate Points:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2768
+msgid "<b>Max Speed:</b>"
+msgstr "<b>Max hastighet:</b>"
+
+#: ../src/viktrwlayer_propwin.c:2769
+msgid "<b>Avg. Speed:</b>"
+msgstr "<b>Medelhastighet:</b>"
+
+#: ../src/viktrwlayer_propwin.c:2770
+msgid "<b>Moving Avg. Speed:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2771
+msgid "<b>Avg. Dist. Between TPs:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2772
+msgid "<b>Elevation Range:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2773
+msgid "<b>Total Elevation Gain/Loss:</b>"
+msgstr "<b>Total höjdskillnad:</b>"
+
+#: ../src/viktrwlayer_propwin.c:2774
+msgid "<b>Start:</b>"
+msgstr "<b>Start:</b>"
+
+#: ../src/viktrwlayer_propwin.c:2775
+msgid "<b>End:</b>"
+msgstr "<b>Slut:</b>"
+
+#: ../src/viktrwlayer_propwin.c:2776
+msgid "<b>Duration:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2797
+msgid "No"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2798
+msgid "Centre"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2799
+msgid "Start only"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2800
+msgid "End only"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2801
+msgid "Start and End"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2802
+msgid "Centre, Start and End"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2814
+msgid "Maximum number of distance labels to be shown"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2818
+msgid "Properties"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2856 ../src/viktrwlayer_propwin.c:2880
+#: ../src/viktrwlayer_propwin.c:2908 ../src/viktrwlayer_propwin.c:2945
+#: ../src/viktrwlayer_propwin.c:2963 ../src/viktrwlayer_propwin.c:3009
+#: ../src/viktrwlayer_propwin.c:3010 ../src/viktrwlayer_propwin.c:3011
+#: ../src/viktrwlayer_propwin.c:3020 ../src/viktrwlayer_propwin.c:3021
+#: ../src/viktrwlayer_propwin.c:3036 ../src/viktrwlayer_propwin.c:3037
+#: ../src/viktrwlayer_propwin.c:3050 ../src/viktrwlayer_propwin.c:3051
+#: ../src/viktrwlayer_propwin.c:3064 ../src/viktrwlayer_propwin.c:3065
+#: ../src/viktrwlayer_propwin.c:3078 ../src/viktrwlayer_propwin.c:3079
+#: ../src/viktrwlayer_propwin.c:3092 ../src/viktrwlayer_propwin.c:3093
+#: ../src/viktrwlayer_analysis.c:257
+#, c-format
+msgid "No Data"
+msgstr "Ingen data"
+
+#: ../src/viktrwlayer_propwin.c:3006
+#, c-format
+msgid "%d minutes"
+msgstr "%d minuter"
+
+#: ../src/viktrwlayer_propwin.c:3016 ../src/viktrwlayer_analysis.c:515
+msgid "Statistics"
+msgstr "Statistik"
+
+#: ../src/viktrwlayer_propwin.c:3022
+msgid "Show D_EM"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3023 ../src/viktrwlayer_propwin.c:3038
+#: ../src/viktrwlayer_propwin.c:3052 ../src/viktrwlayer_propwin.c:3094
+msgid "Show _GPS Speed"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3025 ../src/viktrwlayer_propwin.c:3040
+#: ../src/viktrwlayer_propwin.c:3068 ../src/viktrwlayer_propwin.c:3096
+msgid "<b>Track Distance:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3026 ../src/viktrwlayer_propwin.c:3083
+msgid "<b>Track Height:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3031
+msgid "Elevation-distance"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3041
+msgid "<b>Track Gradient:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3045
+msgid "Gradient-distance"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3054 ../src/viktrwlayer_propwin.c:3069
+#: ../src/viktrwlayer_propwin.c:3082
+msgid "<b>Track Time:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3055 ../src/viktrwlayer_propwin.c:3097
+msgid "<b>Track Speed:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3059
+msgid "Speed-time"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3066 ../src/viktrwlayer_propwin.c:3080
+msgid "Show S_peed"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3073
+msgid "Distance-time"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3087
+msgid "Elevation-time"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3101
+msgid "Speed-distance"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:119
+msgid "<b>Part of Track:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:120
+msgid "<b>Latitude:</b>"
+msgstr "<b>Latitud:</b>"
+
+#: ../src/viktrwlayer_tpwin.c:121
+msgid "<b>Longitude:</b>"
+msgstr "<b>Longitud:</b>"
+
+#: ../src/viktrwlayer_tpwin.c:122
+msgid "<b>Altitude:</b>"
+msgstr "<b>Altitud:</b>"

 
 #: ../src/viktrwlayer_tpwin.c:123
 
 #: ../src/viktrwlayer_tpwin.c:123

+msgid "<b>Course:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:124
+msgid "<b>Timestamp:</b>"
+msgstr "<b>Tidsstämpel:</b>"
+
+#: ../src/viktrwlayer_tpwin.c:125
+msgid "<b>Time:</b>"
+msgstr "<b>Tid:</b>"
+
+#: ../src/viktrwlayer_tpwin.c:126
+msgid "<b>Distance Difference:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:127
+msgid "<b>Time Difference:</b>"
+msgstr "<b>Tidsskillnad:</b>"
+
+#: ../src/viktrwlayer_tpwin.c:128

 msgid "<b>\"Speed\" Between:</b>"
 msgstr ""
 
 msgid "<b>\"Speed\" Between:</b>"
 msgstr ""
 

-#: ../src/viktrwlayer_tpwin.c:124
-msgid "<b>VDOP:</b>"
+#: ../src/viktrwlayer_tpwin.c:129
+msgid "<b>Speed:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:130
+msgid "<b>VDOP:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:131
+msgid "<b>HDOP:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:132
+msgid "<b>PDOP:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:133
+msgid "<b>SAT/FIX:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:141
+msgid "Trackpoint"
+msgstr "Trackpoint"
+
+#: ../src/viktrwlayer_tpwin.c:144
+msgid "_Insert After"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:146
+msgid "Split Here"
+msgstr "Dela här"
+
+#. 
+#. item = gtk_image_menu_item_new_with_mnemonic ( _("_Select") );
+#. gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_MENU) );
+#. g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(trw_layer_track_select), values );
+#. gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+#. gtk_widget_show ( item );
+#. 
+#. ATM view auto selects, so don't bother with separate select menu entry
+#: ../src/viktrwlayer_tracklist.c:231 ../src/vikwindow.c:3695
+msgid "_View"
+msgstr "_Visa"
+
+#. Insert column for the layer name when viewing multi layers
+#: ../src/viktrwlayer_tracklist.c:514
+msgid "Layer"
+msgstr ""
+
+#: ../src/viktrwlayer_tracklist.c:526
+msgid "Date"
+msgstr ""
+
+#: ../src/viktrwlayer_tracklist.c:529
+msgid "Visible"
+msgstr ""
+
+#: ../src/viktrwlayer_tracklist.c:536
+msgid ""
+"Distance\n"
+"(miles)"
+msgstr ""
+
+#: ../src/viktrwlayer_tracklist.c:539
+msgid ""
+"Distance\n"
+"(km)"
+msgstr ""
+
+#: ../src/viktrwlayer_tracklist.c:545
+msgid ""
+"Length\n"
+"(minutes)"
+msgstr ""
+
+#. VIK_UNITS_SPEED_KILOMETRES_PER_HOUR:
+#: ../src/viktrwlayer_tracklist.c:549 ../src/vikutils.c:72
+msgid "km/h"
+msgstr ""
+
+#: ../src/viktrwlayer_tracklist.c:550 ../src/vikutils.c:62
+msgid "mph"
+msgstr ""
+
+#: ../src/viktrwlayer_tracklist.c:551 ../src/vikutils.c:68
+msgid "knots"
+msgstr ""
+
+#. VIK_UNITS_SPEED_METRES_PER_SECOND:
+#: ../src/viktrwlayer_tracklist.c:553 ../src/vikutils.c:65
+msgid "m/s"
+msgstr ""
+
+#: ../src/viktrwlayer_tracklist.c:556
+#, c-format
+msgid ""
+"Av. Speed\n"
+"(%s)"
+msgstr ""
+
+#. Apply own formatting of the data
+#: ../src/viktrwlayer_tracklist.c:561
+#, c-format
+msgid ""
+"Max Speed\n"
+"(%s)"
+msgstr ""
+
+#: ../src/viktrwlayer_tracklist.c:569
+msgid ""
+"Max Height\n"
+"(Feet)"
+msgstr ""
+
+#: ../src/viktrwlayer_tracklist.c:571
+msgid ""
+"Max Height\n"
+"(Metres)"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:481
+#, c-format
+msgid "Geotagging %d Images..."
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:545
+msgid "Geotag Images"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:551
+msgid "Images"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:555
+msgid "Overwrite Existing Waypoints:"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:558
+msgid "Overwrite Existing GPS Information:"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:560
+msgid "Keep File Modification Timestamp:"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:592
+msgid "Create Waypoints:"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:600
+msgid "Write EXIF:"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:612
+msgid "Interpolate Between Track Segments:"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:616
+msgid "Image Time Offset (Seconds):"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:618
+msgid ""
+"The number of seconds to ADD to the photos time to make it match the GPS "
+"data. Calculate this with (GPS - Photo). Can be negative or positive. Useful "
+"to adjust times when a camera's timestamp was incorrect."
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:621
+msgid "Image Timezone:"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:623
+msgid ""
+"The timezone that was used when the images were created. For example, if a "
+"camera is set to AWST or +8:00 hours. Enter +8:00 here so that the correct "
+"adjustment to the images' time can be made. GPS data is always in UTC."
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:627
+#, c-format
+msgid "Using track: %s"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:629
+#, c-format
+msgid "Using all tracks in: %s"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:193
+msgid "Number of Tracks"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:194
+msgid "Date Range"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:195
+msgid "Total Length"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:196
+msgid "Average Length"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:197
+msgid "Max Speed"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:198
+msgid "Avg. Speed"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:199
+msgid "Minimum Altitude"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:200
+msgid "Maximum Altitude"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:201
+msgid "Total Elevation Gain/Loss"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:202
+msgid "Avg. Elevation Gain/Loss"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:203
+msgid "Total Duration"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:204
+msgid "Avg. Duration"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:278
+#, c-format
+msgid "%.2f miles"
+msgstr ""
+
+#. VIK_UNITS_DISTANCE_KILOMETRES
+#: ../src/viktrwlayer_analysis.c:282
+#, c-format
+msgid "%.2f km"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:297
+#, c-format
+msgid "%.2f m/s"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:306
+#, c-format
+msgid "%.2f knots\n"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:309
+#, c-format
+msgid "%.2f knots"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:316 ../src/viktrwlayer_analysis.c:319
+#, c-format
+msgid "%.2f km/h"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:330 ../src/viktrwlayer_analysis.c:336
+#, c-format
+msgid "%d feet"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:341 ../src/viktrwlayer_analysis.c:343
+#, c-format
+msgid "%d feet / %d feet"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:348 ../src/viktrwlayer_analysis.c:354
+#, c-format
+msgid "%d m"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:359 ../src/viktrwlayer_analysis.c:361
+#, c-format
+msgid "%d m / %d m"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:373
+#, c-format
+msgid "%d:%02d:%02d days:hrs:mins"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:380
+#, c-format
+msgid "%d:%02d hrs:mins"
+msgstr ""
+
+#: ../src/viktrwlayer_analysis.c:550
+msgid "Include Invisible Items"
+msgstr ""
+
+#: ../src/vikstatus.c:107
+msgid "Current number of background tasks. Click to see the background jobs."
+msgstr ""
+
+#: ../src/vikstatus.c:113
+msgid "Current zoom level. Click to select a new one."
+msgstr ""
+
+#: ../src/vikutils.c:80
+msgid "GPSD"
+msgstr ""
+
+#. GPS Preamble
+#: ../src/vikutils.c:81
+msgid "Trkpt"
+msgstr ""
+
+#: ../src/vikutils.c:121
+#, c-format
+msgid "%sSpeed%s %.1f%s"
+msgstr ""
+
+#: ../src/vikutils.c:130
+#, c-format
+msgid "%sAlt %dfeet"
+msgstr ""
+
+#. VIK_UNITS_HEIGHT_METRES:
+#: ../src/vikutils.c:134
+#, c-format
+msgid "%sAlt %dm"
+msgstr ""
+
+#: ../src/vikutils.c:142
+#, c-format
+msgid "%sCourse %03d°"
+msgstr ""
+
+#: ../src/vikutils.c:155
+msgid "yards"
+msgstr ""
+
+#. VIK_UNITS_DISTANCE_KILOMETRES:
+#: ../src/vikutils.c:159
+msgid "m"
+msgstr ""
+
+#: ../src/vikutils.c:163
+#, c-format
+msgid "%sDistance diff %d%s"
+msgstr ""
+
+#: ../src/vikutils.c:179
+#, c-format
+msgid "%sTime %s"
+msgstr ""
+
+#: ../src/vikutils.c:187
+#, c-format
+msgid "%sTime diff %lds"
+msgstr ""
+
+#: ../src/vikutils.c:193
+#, c-format
+msgid "%sNo. of Sats %d"
+msgstr ""
+
+#: ../src/vikutils.c:213
+#, c-format
+msgid "%sDistance along %.2f%s"
+msgstr ""
+
+#. Name of track
+#: ../src/vikutils.c:232
+#, c-format
+msgid "%sTrack: %s"
+msgstr ""
+
+#: ../src/vikwaypoint.c:36
+msgid "Waypoint"
+msgstr ""
+
+#. TODO get rid of this as this is unnecessary duplication...
+#: ../src/vikwindow.c:224
+msgid "Pan"
+msgstr "Panorera"
+
+#: ../src/vikwindow.c:224
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ../src/vikwindow.c:224
+msgid "Ruler"
+msgstr "Linjal"
+
+#: ../src/vikwindow.c:224
+msgid "Select"
+msgstr ""
+
+#: ../src/vikwindow.c:381
+msgid "Location lookup aborted"
+msgstr ""
+
+#: ../src/vikwindow.c:401
+#, c-format
+msgid "Location found: %s"
+msgstr ""
+
+#: ../src/vikwindow.c:410
+msgid "Unable to determine location"
+msgstr ""
+
+#: ../src/vikwindow.c:434
+msgid "Default Map"
+msgstr ""
+
+#: ../src/vikwindow.c:444
+msgid "Trying to determine location..."
+msgstr ""
+
+#: ../src/vikwindow.c:447
+msgid "Determining location"
+msgstr ""
+
+#. Create tooltip
+#: ../src/vikwindow.c:605
+msgid "Select zoom level"
+msgstr ""
+
+#: ../src/vikwindow.c:923
+#, c-format
+msgid ""
+"Do you want to save the changes you made to the document \"%s\"?\n"
+"\n"
+"Your changes will be lost if you don't save them."
+msgstr ""
+"Vill du spara de ändringar du gjort i dokumentet \"%s\"?\n"
+"\n"
+"Dina ändringar kommer försvinna om du inte sparar dem."
+
+#: ../src/vikwindow.c:927
+msgid "Don't Save"
+msgstr "Spara inte"
+
+#: ../src/vikwindow.c:1005
+msgid "mpp"
+msgstr "mpp"
+
+#: ../src/vikwindow.c:1005
+msgid "pixelfact"
+msgstr ""
+
+#: ../src/vikwindow.c:1169
+#, c-format
+msgid "%s %s %dm"
+msgstr "%s %s %dm"
+
+#: ../src/vikwindow.c:1171
+#, c-format
+msgid "%s %s %dft"
+msgstr ""
+
+#: ../src/vikwindow.c:1174
+#, c-format
+msgid "%s %s"
+msgstr "%s %s"
+
+#. NB Ctrl+Shift+R is used for Refresh (deemed more important), so use 'U' instead
+#: ../src/vikwindow.c:1562
+msgid "_Ruler"
+msgstr "_Linjal"
+
+#: ../src/vikwindow.c:1562
+msgid "Ruler Tool"
+msgstr "Linjalverktyg"
+
+#: ../src/vikwindow.c:1810 ../src/vikwindow.c:3697
+msgid "_Zoom"
+msgstr "_Zoom"
+
+#: ../src/vikwindow.c:1810
+msgid "Zoom Tool"
+msgstr "Zoomverktyg"
+
+#: ../src/vikwindow.c:1855 ../src/vikwindow.c:3698
+msgid "_Pan"
+msgstr ""
+
+#: ../src/vikwindow.c:1855
+msgid "Pan Tool"
+msgstr "Panoreringsverktyg"
+
+#: ../src/vikwindow.c:1972
+msgid "_Select"
+msgstr ""
+
+#: ../src/vikwindow.c:1972
+msgid "Select Tool"
+msgstr ""
+
+#: ../src/vikwindow.c:2123
+msgid "You must select a layer to show its properties."
+msgstr "Du måste välja ett lager för att kuna se dess egenskaper."
+
+#. No error to show, so unlikely this will get called
+#: ../src/vikwindow.c:2137
+msgid "The help system is not available."
+msgstr ""
+
+#. Main error path
+#: ../src/vikwindow.c:2140
+#, c-format
+msgid ""
+"Help is not available because: %s.\n"
+"Ensure a Mime Type ghelp handler program is installed (e.g. yelp)."
+msgstr ""
+
+#: ../src/vikwindow.c:2160
+msgid "You must select a layer to delete."
+msgstr "Du måste välja ett lager för borttagning."
+
+#: ../src/vikwindow.c:2396
+msgid "Untitled"
+msgstr "Namnlös"
+
+#: ../src/vikwindow.c:2503
+#, c-format
+msgid "Unable to add '%s' to the list of recently used documents"
+msgstr ""
+
+#: ../src/vikwindow.c:2540
+msgid "The file you requested could not be opened."
+msgstr "Filen du valt kan inte öppnas."
+
+#: ../src/vikwindow.c:2543
+msgid ""
+"GPSBabel is required to load files of this type or GPSBabel encountered "
+"problems."
+msgstr ""
+
+#: ../src/vikwindow.c:2546
+#, c-format
+msgid "Unable to load malformed GPX file %s"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_tpwin.c:125
-msgid "<b>HDOP:</b>"
+#: ../src/vikwindow.c:2549
+#, c-format
+msgid "Unsupported file type for %s"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_tpwin.c:126
-msgid "<b>PDOP:</b>"
+#. Since we can process .vik files with issues just show a warning in the status bar
+#. Not that a user can do much about it... or tells them what this issue is yet...
+#: ../src/vikwindow.c:2555
+#, c-format
+msgid "WARNING: issues encountered loading %s"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_tpwin.c:127
-msgid "<b>SAT/FIX:</b>"
+#: ../src/vikwindow.c:2613
+msgid "Please select a GPS data file to open. "

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_tpwin.c:136
-msgid "Trackpoint"
-msgstr "Trackpoint"
-
-#: ../src/viktrwlayer_tpwin.c:140
-msgid "_Insert After"
+#: ../src/vikwindow.c:2629
+msgid "Geocaching"

 msgstr ""
 
 msgstr ""
 

-#: ../src/viktrwlayer_tpwin.c:142
-msgid "Split Here"
-msgstr "Dela här"
+#: ../src/vikwindow.c:2635
+msgid "Google Earth"
+msgstr ""

 
 

-#: ../src/viktrwlayer_tpwin.c:143
-msgid "Join With Last"
+#: ../src/vikwindow.c:2640
+msgid "GPX"

 msgstr ""
 
 msgstr ""
 

-#: ../src/vikwindow.c:189
-msgid "Pan"
-msgstr "Panorera"
+#: ../src/vikwindow.c:2645 ../src/vikwindow.c:2734
+#: ../src/viking.desktop.in.h:1
+msgid "Viking"
+msgstr "Viking"

 
 

-#: ../src/vikwindow.c:189
-msgid "Zoom"
-msgstr "Zoom"
+#: ../src/vikwindow.c:2715
+msgid "Save as Viking File."
+msgstr "Spara som Viking fil."

 
 

-#: ../src/vikwindow.c:189
-msgid "Ruler"
-msgstr "Linjal"
+#: ../src/vikwindow.c:2841
+msgid "Exporting to file: "
+msgstr ""

 
 

-#: ../src/vikwindow.c:381
+#. Confirm what happened.
+#: ../src/vikwindow.c:2858

 #, c-format
 #, c-format

-msgid ""
-"Do you want to save the changes you made to the document \"%s\"?\n"
-"\n"
-"Your changes will be lost if you don't save them."
+msgid "Exported files: %d"

 msgstr ""
 msgstr ""

-"Vill du spara de ändringar du gjort i dokumentet \"%s\"?\n"
-"\n"
-"Dina ändringar kommer försvinna om du inte sparar dem."

 
 

-#: ../src/vikwindow.c:384 ../src/vikwindow.c:1444
-msgid "Untitled"
-msgstr "Namnlös"
+#: ../src/vikwindow.c:2870
+msgid "Nothing to Export!"
+msgstr ""

 
 

-#: ../src/vikwindow.c:385
-msgid "Don't Save"
-msgstr "Spara inte"
+#: ../src/vikwindow.c:2874
+msgid "Export to directory"
+msgstr ""

 
 

-#: ../src/vikwindow.c:420
-msgid "mpp"
-msgstr "mpp"
+#: ../src/vikwindow.c:2896
+msgid "Could not convert all files"
+msgstr ""

 
 

-#: ../src/vikwindow.c:420
-msgid "pixelfact"
+#: ../src/vikwindow.c:2932
+#, c-format
+msgid "%d bytes"

 msgstr ""
 
 msgstr ""
 

-#: ../src/vikwindow.c:570
+#: ../src/vikwindow.c:2934

 #, c-format
 #, c-format

-msgid "%s %s %dm"
-msgstr "%s %s %dm"
+msgid "%3.1f kB"
+msgstr ""

 
 

-#: ../src/vikwindow.c:572
+#: ../src/vikwindow.c:2936

 #, c-format
 #, c-format

-msgid "%s %s %dft"
+msgid "%3.1f MB"

 msgstr ""
 
 msgstr ""
 

-#: ../src/vikwindow.c:575
+#: ../src/vikwindow.c:2937

 #, c-format
 #, c-format

-msgid "%s %s"
-msgstr "%s %s"
+msgid ""
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"%s"
+msgstr ""

 
 

-#: ../src/vikwindow.c:1197
-msgid "You must select a layer to show its properties."
-msgstr "Du måste välja ett lager för att kuna se dess egenskaper."
+#: ../src/vikwindow.c:2942
+msgid "File not accessible"
+msgstr ""

 
 

-#: ../src/vikwindow.c:1223
-msgid "You must select a layer to delete."
-msgstr "Du måste välja ett lager för borttagning."
+#: ../src/vikwindow.c:2945
+msgid "No Viking File"
+msgstr ""

 
 

-#: ../src/vikwindow.c:1557
-#, c-format
-msgid "Unable to add '%s' to the list of recently used documents"
+#: ../src/vikwindow.c:3035
+msgid "This layer has no configurable properties."

 msgstr ""
 
 msgstr ""
 

-#: ../src/vikwindow.c:1571
-msgid "The file you requested could not be opened."
-msgstr "Filen du valt kan inte öppnas."
+#. Try harder...
+#: ../src/vikwindow.c:3169 ../src/vikwindow.c:3175
+msgid "Generating image file..."
+msgstr ""

 
 

-#: ../src/vikwindow.c:1617
-msgid "Please select a GPS data file to open. "
+#: ../src/vikwindow.c:3197
+msgid ""
+"Failed to generate internal image.\n"
+"\n"
+"Try creating a smaller image."

 msgstr ""
 
 msgstr ""
 

-#: ../src/vikwindow.c:1660
-msgid "Save as Viking File."
-msgstr "Spara som Viking fil."
+#: ../src/vikwindow.c:3205
+msgid "Failed to generate image file."
+msgstr ""
+
+#. Success
+#: ../src/vikwindow.c:3210
+msgid "Image file generated."
+msgstr ""

 
 

-#: ../src/vikwindow.c:1951
+#: ../src/vikwindow.c:3314

 msgid ""
 "Viewable region outside allowable pixel size bounds for image. Clipping "
 "width/height values."
 msgstr ""
 
 msgid ""
 "Viewable region outside allowable pixel size bounds for image. Clipping "
 "width/height values."
 msgstr ""
 

-#: ../src/vikwindow.c:1973
+#: ../src/vikwindow.c:3339

 #, c-format
 msgid "Total area: %ldm x %ldm (%.3f sq. km)"
 msgstr "Total area: %ldm x %ldm (%.3f kvadrat kilometer)"
 
 #, c-format
 msgid "Total area: %ldm x %ldm (%.3f sq. km)"
 msgstr "Total area: %ldm x %ldm (%.3f kvadrat kilometer)"
 

-#: ../src/vikwindow.c:1976
+#: ../src/vikwindow.c:3342

 #, c-format
 msgid "Total area: %ldm x %ldm (%.3f sq. miles)"
 msgstr ""
 
 #, c-format
 msgid "Total area: %ldm x %ldm (%.3f sq. miles)"
 msgstr ""
 

+#: ../src/vikwindow.c:3363
+msgid "Save Image"
+msgstr "Spara bild"
+
+#: ../src/vikwindow.c:3393
+msgid "PNG"
+msgstr ""
+
+#: ../src/vikwindow.c:3416
+msgid "You must be in UTM mode to use this feature"
+msgstr "Du måste vara i UTM läge för att använda denna funktion"
+
+#: ../src/vikwindow.c:3421
+msgid "Choose a directory to hold images"
+msgstr ""
+

 #. todo: default for answers inside VikWindow or static (thruout instance)
 #. todo: default for answers inside VikWindow or static (thruout instance)

-#: ../src/vikwindow.c:1990
+#: ../src/vikwindow.c:3442

 msgid "Save to Image File"
 msgstr ""
 
 msgid "Save to Image File"
 msgstr ""
 

-#: ../src/vikwindow.c:2008
+#: ../src/vikwindow.c:3459

 msgid "Width (pixels):"
 msgstr "Bredd (bildpunkter):"
 
 msgid "Width (pixels):"
 msgstr "Bredd (bildpunkter):"
 

-#: ../src/vikwindow.c:2010
+#: ../src/vikwindow.c:3461

 msgid "Height (pixels):"
 msgstr "Höjd (bildpunkter):"
 
 msgid "Height (pixels):"
 msgstr "Höjd (bildpunkter):"
 

-#: ../src/vikwindow.c:2013
+#: ../src/vikwindow.c:3464
+msgid ""
+"WARNING: USING LARGE IMAGES OVER 10000x10000\n"
+"MAY CRASH THE PROGRAM!"
+msgstr ""
+
+#: ../src/vikwindow.c:3466

 msgid "Zoom (meters per pixel):"
 msgstr ""
 
 msgid "Zoom (meters per pixel):"
 msgstr ""
 

-#: ../src/vikwindow.c:2019
+#: ../src/vikwindow.c:3482

 msgid "Area in current viewable window"
 msgstr ""
 
 msgid "Area in current viewable window"
 msgstr ""
 

-#: ../src/vikwindow.c:2029
+#: ../src/vikwindow.c:3492

 msgid "Save as PNG"
 msgstr "Spara som PNG"
 
 msgid "Save as PNG"
 msgstr "Spara som PNG"
 

-#: ../src/vikwindow.c:2030
+#: ../src/vikwindow.c:3493

 msgid "Save as JPEG"
 msgstr "Spara som JPEG"
 
 msgid "Save as JPEG"
 msgstr "Spara som JPEG"
 

-#: ../src/vikwindow.c:2050
+#: ../src/vikwindow.c:3515

 msgid "East-west image tiles:"
 msgstr ""
 
 msgid "East-west image tiles:"
 msgstr ""
 

-#: ../src/vikwindow.c:2052
+#: ../src/vikwindow.c:3517

 msgid "North-south image tiles:"
 msgstr ""
 
 msgid "North-south image tiles:"
 msgstr ""
 

-#: ../src/vikwindow.c:2094
-msgid "You must be in UTM mode to use this feature"
-msgstr "Du måste vara i UTM läge för att använda denna funktion"
-
-#: ../src/vikwindow.c:2105
-msgid "Save Image"
-msgstr "Spara bild"
-
-#: ../src/vikwindow.c:2134
-msgid "Choose a directory to hold images"
-msgstr ""
-
-#: ../src/vikwindow.c:2223
+#: ../src/vikwindow.c:3656

 msgid "Choose a background color"
 msgstr "Välj en bakgrundsfärg"
 
 msgid "Choose a background color"
 msgstr "Välj en bakgrundsfärg"
 

-#: ../src/vikwindow.c:2244
+#: ../src/vikwindow.c:3672
+msgid "Choose a track highlight color"
+msgstr ""
+
+#: ../src/vikwindow.c:3693

 msgid "_File"
 msgstr "_Fil"
 
 msgid "_File"
 msgstr "_Fil"
 

-#: ../src/vikwindow.c:2245
+#: ../src/vikwindow.c:3694

 msgid "_Edit"
 msgstr "R_edigera"
 
 msgid "_Edit"
 msgstr "R_edigera"
 

-#: ../src/vikwindow.c:2246
-msgid "_View"
-msgstr "_Visa"
-
-#: ../src/vikwindow.c:2247
+#: ../src/vikwindow.c:3696

 msgid "_Show"
 msgstr ""
 
 msgid "_Show"
 msgstr ""
 

-#: ../src/vikwindow.c:2248 ../src/vikwindow.c:2334
-msgid "_Zoom"
-msgstr "_Zoom"
-
-#: ../src/vikwindow.c:2249 ../src/vikwindow.c:2333
-msgid "_Pan"
-msgstr ""
-
-#: ../src/vikwindow.c:2250
+#: ../src/vikwindow.c:3699

 msgid "_Layers"
 msgstr "_Lager"
 
 msgid "_Layers"
 msgstr "_Lager"
 

-#: ../src/vikwindow.c:2251
+#: ../src/vikwindow.c:3700

 msgid "_Tools"
 msgstr "Verk -tyg"
 
 msgid "_Tools"
 msgstr "Verk -tyg"
 

-#: ../src/vikwindow.c:2252
+#: ../src/vikwindow.c:3701

 msgid "_Webtools"
 msgstr ""
 
 msgid "_Webtools"
 msgstr ""
 

-#: ../src/vikwindow.c:2253 ../src/vikwindow.c:2319
+#: ../src/vikwindow.c:3702 ../src/vikwindow.c:3763

 msgid "_Help"
 msgstr "_Hjälp"
 
 msgid "_Help"
 msgstr "_Hjälp"
 

-#: ../src/vikwindow.c:2255
-msgid "_New"
-msgstr "_Ny"
-
-#: ../src/vikwindow.c:2255
+#: ../src/vikwindow.c:3704

 msgid "New file"
 msgstr "Ny fil"
 
 msgid "New file"
 msgstr "Ny fil"
 

-#: ../src/vikwindow.c:2256
+#: ../src/vikwindow.c:3705

 msgid "_Open..."
 msgstr "_Öppna..."
 
 msgid "_Open..."
 msgstr "_Öppna..."
 

-#: ../src/vikwindow.c:2256
+#: ../src/vikwindow.c:3705

 msgid "Open a file"
 msgstr "Öppna en fil"
 
 msgid "Open a file"
 msgstr "Öppna en fil"
 

-#: ../src/vikwindow.c:2257
+#: ../src/vikwindow.c:3706

 msgid "Open _Recent File"
 msgstr ""
 
 msgid "Open _Recent File"
 msgstr ""
 

-#: ../src/vikwindow.c:2258
+#: ../src/vikwindow.c:3707

 msgid "Append _File..."
 msgstr ""
 
 msgid "Append _File..."
 msgstr ""
 

-#: ../src/vikwindow.c:2258
+#: ../src/vikwindow.c:3707

 msgid "Append data from a different file"
 msgstr ""
 
 msgid "Append data from a different file"
 msgstr ""
 

-#: ../src/vikwindow.c:2259
-msgid "A_cquire"
+#: ../src/vikwindow.c:3708
+msgid "_Export All"

 msgstr ""
 
 msgstr ""
 

-#: ../src/vikwindow.c:2260
-msgid "From _GPS..."
-msgstr "Från _GPS..."
+#: ../src/vikwindow.c:3708
+msgid "Export All TrackWaypoint Layers"
+msgstr ""

 
 

-#: ../src/vikwindow.c:2260
+#: ../src/vikwindow.c:3709
+msgid "_GPX..."
+msgstr ""
+
+#: ../src/vikwindow.c:3709
+msgid "Export as GPX"
+msgstr ""
+
+#: ../src/vikwindow.c:3710
+msgid "A_cquire"
+msgstr ""
+
+#: ../src/vikwindow.c:3711

 msgid "Transfer data from a GPS device"
 msgstr "Överför data till en GPS enhet"
 
 msgid "Transfer data from a GPS device"
 msgstr "Överför data till en GPS enhet"
 

-#: ../src/vikwindow.c:2261
-msgid "Google _Directions..."
+#: ../src/vikwindow.c:3712
+msgid "Import File With GPS_Babel..."
+msgstr ""
+
+#: ../src/vikwindow.c:3712
+msgid "Import file via GPSBabel converter"
+msgstr ""
+
+#: ../src/vikwindow.c:3713
+msgid "_Directions..."
+msgstr ""
+
+#: ../src/vikwindow.c:3713
+msgid "Get driving directions"
+msgstr ""
+
+#: ../src/vikwindow.c:3715
+msgid "_OSM Traces..."
+msgstr ""
+
+#: ../src/vikwindow.c:3715
+msgid "Get traces from OpenStreetMap"
+msgstr ""
+
+#: ../src/vikwindow.c:3716
+msgid "_My OSM Traces..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/vikwindow.c:2261
-msgid "Get driving directions from Google"
+#: ../src/vikwindow.c:3716
+msgid "Get Your Own Traces from OpenStreetMap"

 msgstr ""
 
 msgstr ""
 

-#: ../src/vikwindow.c:2263
+#: ../src/vikwindow.c:3719

 msgid "Geo_caches..."
 msgstr "Geo_cachar..."
 
 msgid "Geo_caches..."
 msgstr "Geo_cachar..."
 

-#: ../src/vikwindow.c:2263
+#: ../src/vikwindow.c:3719

 msgid "Get Geocaches from geocaching.com"
 msgstr "Hämta Geocachar från geocaching.com"
 
 msgid "Get Geocaches from geocaching.com"
 msgstr "Hämta Geocachar från geocaching.com"
 

-#: ../src/vikwindow.c:2265
+#: ../src/vikwindow.c:3722
+msgid "Create waypoints from geotagged images"
+msgstr ""
+
+#: ../src/vikwindow.c:3725
+msgid "Create waypoints from Wikipedia items in the current view"
+msgstr ""
+
+#: ../src/vikwindow.c:3727

 msgid "_Save"
 msgstr "_Spara"
 
 msgid "_Save"
 msgstr "_Spara"
 

-#: ../src/vikwindow.c:2265
+#: ../src/vikwindow.c:3727

 msgid "Save the file"
 msgstr "Spara filen"
 
 msgid "Save the file"
 msgstr "Spara filen"
 

-#: ../src/vikwindow.c:2266
+#: ../src/vikwindow.c:3728

 msgid "Save _As..."
 msgstr "Sp_ara som..."
 
 msgid "Save _As..."
 msgstr "Sp_ara som..."
 

-#: ../src/vikwindow.c:2266
+#: ../src/vikwindow.c:3728

 msgid "Save the file under different name"
 msgstr "Spara filen under ett annat namn"
 
 msgid "Save the file under different name"
 msgstr "Spara filen under ett annat namn"
 

-#: ../src/vikwindow.c:2267
+#: ../src/vikwindow.c:3729
+msgid "Properties..."
+msgstr ""
+
+#: ../src/vikwindow.c:3729
+msgid "File Properties"
+msgstr ""
+
+#: ../src/vikwindow.c:3730

 msgid "_Generate Image File..."
 msgstr ""
 
 msgid "_Generate Image File..."
 msgstr ""
 

-#: ../src/vikwindow.c:2267
+#: ../src/vikwindow.c:3730

 msgid "Save a snapshot of the workspace into a file"
 msgstr ""
 
 msgid "Save a snapshot of the workspace into a file"
 msgstr ""
 

-#: ../src/vikwindow.c:2268
+#: ../src/vikwindow.c:3731

 msgid "Generate _Directory of Images..."
 msgstr ""
 
 msgid "Generate _Directory of Images..."
 msgstr ""
 

-#: ../src/vikwindow.c:2268
+#: ../src/vikwindow.c:3731

 msgid "FIXME:IMGDIR"
 msgstr ""
 
 msgid "FIXME:IMGDIR"
 msgstr ""
 

-#: ../src/vikwindow.c:2271
+#: ../src/vikwindow.c:3732

 msgid "_Print..."
 msgstr "Skriv _ut..."
 
 msgid "_Print..."
 msgstr "Skriv _ut..."
 

-#: ../src/vikwindow.c:2271
+#: ../src/vikwindow.c:3732

 msgid "Print maps"
 msgstr "Skriv ut kartor"
 
 msgid "Print maps"
 msgstr "Skriv ut kartor"
 

-#: ../src/vikwindow.c:2274
+#: ../src/vikwindow.c:3733

 msgid "E_xit"
 msgstr "_Avsluta"
 
 msgid "E_xit"
 msgstr "_Avsluta"
 

-#: ../src/vikwindow.c:2274
+#: ../src/vikwindow.c:3733

 msgid "Exit the program"
 msgstr "Avsluta programmet"
 
 msgid "Exit the program"
 msgstr "Avsluta programmet"
 

-#: ../src/vikwindow.c:2275
+#: ../src/vikwindow.c:3734

 msgid "Save and Exit"
 msgstr "Spara och avsluta"
 
 msgid "Save and Exit"
 msgstr "Spara och avsluta"
 

-#: ../src/vikwindow.c:2275
+#: ../src/vikwindow.c:3734

 msgid "Save and Exit the program"
 msgstr "Spara och avsluta programmet"
 
 msgid "Save and Exit the program"
 msgstr "Spara och avsluta programmet"
 

-#: ../src/vikwindow.c:2277
+#: ../src/vikwindow.c:3736

 msgid "Go to the _Default Location"
 msgstr ""
 
 msgid "Go to the _Default Location"
 msgstr ""
 

-#: ../src/vikwindow.c:2277
+#: ../src/vikwindow.c:3736

 msgid "Go to the default location"
 msgstr ""
 
 msgid "Go to the default location"
 msgstr ""
 

-#: ../src/vikwindow.c:2278
+#: ../src/vikwindow.c:3737

 msgid "Go to _Location..."
 msgstr ""
 
 msgid "Go to _Location..."
 msgstr ""
 

-#: ../src/vikwindow.c:2278
+#: ../src/vikwindow.c:3737

 msgid "Go to address/place using text search"
 msgstr ""
 
 msgid "Go to address/place using text search"
 msgstr ""
 

-#: ../src/vikwindow.c:2279
+#: ../src/vikwindow.c:3738

 msgid "_Go to Lat/Lon..."
 msgstr ""
 
 msgid "_Go to Lat/Lon..."
 msgstr ""
 

-#: ../src/vikwindow.c:2279
+#: ../src/vikwindow.c:3738

 msgid "Go to arbitrary lat/lon coordinate"
 msgstr ""
 
 msgid "Go to arbitrary lat/lon coordinate"
 msgstr ""
 

-#: ../src/vikwindow.c:2280
+#: ../src/vikwindow.c:3739

 msgid "Go to UTM..."
 msgstr "Gå till UTM..."
 
 msgid "Go to UTM..."
 msgstr "Gå till UTM..."
 

-#: ../src/vikwindow.c:2280
+#: ../src/vikwindow.c:3739

 msgid "Go to arbitrary UTM coordinate"
 msgstr ""
 
 msgid "Go to arbitrary UTM coordinate"
 msgstr ""
 

-#: ../src/vikwindow.c:2281
+#: ../src/vikwindow.c:3740
+msgid "_Refresh"
+msgstr ""
+
+#: ../src/vikwindow.c:3740
+msgid "Refresh any maps displayed"
+msgstr ""
+
+#: ../src/vikwindow.c:3741
+msgid "Set _Highlight Color..."
+msgstr ""
+
+#: ../src/vikwindow.c:3742

 msgid "Set Bac_kground Color..."
 msgstr ""
 
 msgid "Set Bac_kground Color..."
 msgstr ""
 

-#: ../src/vikwindow.c:2282
+#: ../src/vikwindow.c:3743

 msgid "Zoom _In"
 msgstr "Zooma _in"
 
 msgid "Zoom _In"
 msgstr "Zooma _in"
 

-#: ../src/vikwindow.c:2283
+#: ../src/vikwindow.c:3744

 msgid "Zoom _Out"
 msgstr "Zooma _ut"
 
 msgid "Zoom _Out"
 msgstr "Zooma _ut"
 

-#: ../src/vikwindow.c:2284
+#: ../src/vikwindow.c:3745

 msgid "Zoom _To..."
 msgstr "Zooma _till..."
 
 msgid "Zoom _To..."
 msgstr "Zooma _till..."
 

-#: ../src/vikwindow.c:2285
-msgid "0.25"
-msgstr "0,25"
-
-#: ../src/vikwindow.c:2286
-msgid "0.5"
-msgstr "0,5"
-
-#: ../src/vikwindow.c:2287
-msgid "1"
-msgstr "1"
-
-#: ../src/vikwindow.c:2288
-msgid "2"
-msgstr "2"
-
-#: ../src/vikwindow.c:2289
-msgid "4"
-msgstr "4"
-
-#: ../src/vikwindow.c:2290
-msgid "8"
-msgstr "8"
-
-#: ../src/vikwindow.c:2291
-msgid "16"
-msgstr "16"
-
-#: ../src/vikwindow.c:2292
-msgid "32"
-msgstr "32"
-
-#: ../src/vikwindow.c:2293
-msgid "64"
-msgstr "64"
-
-#: ../src/vikwindow.c:2294
-msgid "128"
-msgstr "128"
-
-#: ../src/vikwindow.c:2295
-msgid "256"
-msgstr ""
-
-#: ../src/vikwindow.c:2296
-msgid "512"
-msgstr ""
-
-#: ../src/vikwindow.c:2297
-msgid "1024"
-msgstr ""
-
-#: ../src/vikwindow.c:2298
-msgid "2048"
-msgstr ""
-
-#: ../src/vikwindow.c:2299
-msgid "4096"
-msgstr ""
-
-#: ../src/vikwindow.c:2300
-msgid "8192"
-msgstr ""
-
-#: ../src/vikwindow.c:2301
-msgid "16384"
-msgstr ""
-
-#: ../src/vikwindow.c:2302
-msgid "32768"
-msgstr ""
-
-#: ../src/vikwindow.c:2303
+#: ../src/vikwindow.c:3746

 msgid "Pan _North"
 msgstr ""
 
 msgid "Pan _North"
 msgstr ""
 

-#: ../src/vikwindow.c:2304
+#: ../src/vikwindow.c:3747

 msgid "Pan _East"
 msgstr ""
 
 msgid "Pan _East"
 msgstr ""
 

-#: ../src/vikwindow.c:2305
+#: ../src/vikwindow.c:3748

 msgid "Pan _South"
 msgstr ""
 
 msgid "Pan _South"
 msgstr ""
 

-#: ../src/vikwindow.c:2306
+#: ../src/vikwindow.c:3749

 msgid "Pan _West"
 msgstr ""
 
 msgid "Pan _West"
 msgstr ""
 

-#: ../src/vikwindow.c:2307
+#: ../src/vikwindow.c:3750

 msgid "Background _Jobs"
 msgstr ""
 
 msgid "Background _Jobs"
 msgstr ""
 

-#: ../src/vikwindow.c:2309
+#: ../src/vikwindow.c:3752

 msgid "Cu_t"
 msgstr "Klipp _ut"
 
 msgid "Cu_t"
 msgstr "Klipp _ut"
 

-#: ../src/vikwindow.c:2310
-msgid "_Copy"
-msgstr "_Kopiera"
-
-#: ../src/vikwindow.c:2311
-msgid "_Paste"
-msgstr "Klistra _in"
-
-#: ../src/vikwindow.c:2312
-msgid "_Delete"
-msgstr "_Ta bort"
-
-#: ../src/vikwindow.c:2313
+#: ../src/vikwindow.c:3756

 msgid "Delete All"
 msgstr "Ta bort alla"
 
 msgid "Delete All"
 msgstr "Ta bort alla"
 

-#: ../src/vikwindow.c:2314
+#: ../src/vikwindow.c:3757

 msgid "_Flush Map Cache"
 msgstr ""
 
 msgid "_Flush Map Cache"
 msgstr ""
 

-#: ../src/vikwindow.c:2315
+#: ../src/vikwindow.c:3758

 msgid "_Set the Default Location"
 msgstr ""
 
 msgid "_Set the Default Location"
 msgstr ""
 

-#: ../src/vikwindow.c:2315
+#: ../src/vikwindow.c:3758

 msgid "Set the Default Location to the current position"
 msgstr ""
 
 msgid "Set the Default Location to the current position"
 msgstr ""
 

-#: ../src/vikwindow.c:2316
+#: ../src/vikwindow.c:3759

 msgid "_Preferences"
 msgstr "_Inställningar"
 
 msgid "_Preferences"
 msgstr "_Inställningar"
 

-#: ../src/vikwindow.c:2317
+#: ../src/vikwindow.c:3760
+msgid "_Layer Defaults"
+msgstr ""
+
+#: ../src/vikwindow.c:3761

 msgid "_Properties"
 msgstr "_Egenskaper"
 
 msgid "_Properties"
 msgstr "_Egenskaper"
 

-#: ../src/vikwindow.c:2320
+#: ../src/vikwindow.c:3764

 msgid "_About"
 msgstr "_Om"
 
 msgid "_About"
 msgstr "_Om"
 

-#: ../src/vikwindow.c:2326
+#: ../src/vikwindow.c:3768
+msgid "_KML..."
+msgstr ""
+
+#: ../src/vikwindow.c:3768
+msgid "Export as KML"
+msgstr ""
+
+#: ../src/vikwindow.c:3774

 msgid "_UTM Mode"
 msgstr "_UTM läge"
 
 msgid "_UTM Mode"
 msgstr "_UTM läge"
 

-#: ../src/vikwindow.c:2327
+#: ../src/vikwindow.c:3775

 msgid "_Expedia Mode"
 msgstr "_Expedia läge"
 
 msgid "_Expedia Mode"
 msgstr "_Expedia läge"
 

-#: ../src/vikwindow.c:2328
+#: ../src/vikwindow.c:3776

 msgid "_Mercator Mode"
 msgstr "_Mercator läge"
 
 msgid "_Mercator Mode"
 msgstr "_Mercator läge"
 

-#: ../src/vikwindow.c:2329
+#: ../src/vikwindow.c:3777

 msgid "Lat_/Lon Mode"
 msgstr ""
 
 msgid "Lat_/Lon Mode"
 msgstr ""
 

-#: ../src/vikwindow.c:2333
-msgid "Pan Tool"
-msgstr "Panoreringsverktyg"
-
-#: ../src/vikwindow.c:2334
-msgid "Zoom Tool"
-msgstr "Zoomverktyg"
-
-#: ../src/vikwindow.c:2335
-msgid "_Ruler"
-msgstr "_Linjal"
-
-#: ../src/vikwindow.c:2335
-msgid "Ruler Tool"
-msgstr "Linjalverktyg"
-
-#: ../src/vikwindow.c:2339
+#: ../src/vikwindow.c:3781

 msgid "Show _Scale"
 msgstr ""
 
 msgid "Show _Scale"
 msgstr ""
 

-#: ../src/vikwindow.c:2339
+#: ../src/vikwindow.c:3781

 msgid "Show Scale"
 msgstr "Visa skala"
 
 msgid "Show Scale"
 msgstr "Visa skala"
 

-#: ../src/vikwindow.c:2340
+#: ../src/vikwindow.c:3782

 msgid "Show _Center Mark"
 msgstr ""
 
 msgid "Show _Center Mark"
 msgstr ""
 

-#: ../src/vikwindow.c:2340
+#: ../src/vikwindow.c:3782

 msgid "Show Center Mark"
 msgstr ""
 
 msgid "Show Center Mark"
 msgstr ""
 

-#: ../src/vikwindow.c:2341
+#: ../src/vikwindow.c:3783
+msgid "Show _Highlight"
+msgstr ""
+
+#: ../src/vikwindow.c:3783
+msgid "Show Highlight"
+msgstr ""
+
+#: ../src/vikwindow.c:3784

 msgid "_Full Screen"
 msgstr "Fullskärm"
 
 msgid "_Full Screen"
 msgstr "Fullskärm"
 

-#: ../src/vikwindow.c:2341
+#: ../src/vikwindow.c:3784

 msgid "Activate full screen mode"
 msgstr "Aktivera fullskärmsläge"
 
 msgid "Activate full screen mode"
 msgstr "Aktivera fullskärmsläge"
 

-#: ../src/vikwindow.c:2342
+#: ../src/vikwindow.c:3785

 msgid "Show Side _Panel"
 msgstr ""
 
 msgid "Show Side _Panel"
 msgstr ""
 

-#: ../src/vikwindow.c:2342
+#: ../src/vikwindow.c:3785

 msgid "Show Side Panel"
 msgstr ""
 
 msgid "Show Side Panel"
 msgstr ""
 

-#: ../src/vikwindow.c:2343
+#: ../src/vikwindow.c:3786

 msgid "Show Status_bar"
 msgstr ""
 
 msgid "Show Status_bar"
 msgstr ""
 

-#: ../src/vikwindow.c:2343
+#: ../src/vikwindow.c:3786

 msgid "Show Statusbar"
 msgstr ""
 
 msgid "Show Statusbar"
 msgstr ""
 

-#: ../src/vikwindow.c:2344
+#: ../src/vikwindow.c:3787

 msgid "Show _Toolbar"
 msgstr ""
 
 msgid "Show _Toolbar"
 msgstr ""
 

-#: ../src/vikwindow.c:2344
+#: ../src/vikwindow.c:3787

 msgid "Show Toolbar"
 msgstr ""
 
 msgid "Show Toolbar"
 msgstr ""
 

-#: ../src/vikwindow.c:2345
+#: ../src/vikwindow.c:3788

 msgid "Show _Menu"
 msgstr ""
 
 msgid "Show _Menu"
 msgstr ""
 

-#: ../src/vikwindow.c:2345
+#: ../src/vikwindow.c:3788

 msgid "Show Menu"
 msgstr ""
 
 msgid "Show Menu"
 msgstr ""
 

-#: ../src/viking.desktop.in.h:1
-msgid "GPS Data Manager"
+#: ../src/vikwindow.c:3862
+#, c-format
+msgid "New _%s Layer"

 msgstr ""
 
 #: ../src/viking.desktop.in.h:2
 msgstr ""
 
 #: ../src/viking.desktop.in.h:2

-msgid "Map Based GPS Data Manager (live data capable)."
+msgid "GPS Data Manager"

 msgstr ""
 
 #: ../src/viking.desktop.in.h:3
 msgstr ""
 
 #: ../src/viking.desktop.in.h:3

-msgid "Viking"
-msgstr "Viking"
-
-#~ msgid "Create"
-#~ msgstr "Skapa"
-
-#~ msgid "Goto"
-#~ msgstr "Gå till"
-
-#~ msgid "_Open"
-#~ msgstr "_Öppna"
-
-#~ msgid "Save _As"
-#~ msgstr "Sp_ara som"
-
-#~ msgid "The password used to login"
-#~ msgstr "Lösenordet som används för inloggning"
-
-#~ msgid "Enter the password you use to login into www.openstreetmap.org."
-#~ msgstr ""
-#~ "Ange det lösenord du använder för att logga in på www.openstreetmap.org."
-
-#~ msgid "Enter the email you use to login into www.openstreetmap.org."
-#~ msgstr ""
-#~ "Ange den e-post adress du använder för att logga in på www.openstreetmap.org."
-
-#~ msgid "Export to World File"
-#~ msgstr "Exportera till World fil"
-
-#~ msgid "Empty Upload"
-#~ msgstr "Tom uppladdning"
-
-#~ msgid "Empty Download"
-#~ msgstr "Tom nedladdning"
-
-#~ msgid "Upload to GPS"
-#~ msgstr "Ladda upp till GPS"
-
-#~ msgid "Download from GPS"
-#~ msgstr "Ladda ned från GPS"
-
-#~ msgid "Empty All"
-#~ msgstr "Töm alla"
-
-#~ msgid "Goto Waypoint"
-#~ msgstr "Gå till waypoint"
-
-#~ msgid "New Waypoint"
-#~ msgstr "Ny waypoint"
-
-#~ msgid "Export layer"
-#~ msgstr "Exportera lager"
-
-#~ msgid "Export as GPSMapper"
-#~ msgstr "Exportera som GPSMapper"
-
-#~ msgid "Export as GPSPoint"
-#~ msgstr "Exportera som GPSPoint"
-
-#~ msgid "Export as GPX"
-#~ msgstr "Exportera som GPX"
-
-#~ msgid "Upload to OSM"
-#~ msgstr "Ladda upp till OSM"
-
-#~ msgid "Visit Geocache Webpage"
-#~ msgstr "Besök Geocache webbplats"
-
-#~ msgid "From _GPS"
-#~ msgstr "Från _GPS"
-
-#~ msgid "Geo_caches"
-#~ msgstr "Geo_cachar"
-
-#~ msgid "Pan North"
-#~ msgstr "Panorera norrut"
-
-#~ msgid "Zoom _To"
-#~ msgstr "Zooma _till"
-
-#~ msgid "Set Background Color..."
-#~ msgstr "Välj bakgrundsfärg"
-
-#~ msgid "Pan South"
-#~ msgstr "Panorera söderut"
-
-#~ msgid "Pan East"
-#~ msgstr "Panorera österut"
-
-#~ msgid "Pan West"
-#~ msgstr "Panorera västerut"
-
-#~ msgid "_Preferences..."
-#~ msgstr "_Inställningar..."
-
-#~ msgid "Full Screen"
-#~ msgstr "Fullskärm"
-
-#~ msgid "Use smaller symbols for waypoints"
-#~ msgstr "Använd mindre symboler för waypoints"
+msgid "Map Based GPS Data Manager (live data capable)."
+msgstr ""

 
 

-#~ msgid "Use with filter"
-#~ msgstr "Använd med filter"
+#: ../src/libjpeg/jpeg-data.c:206
+msgid "Data does not follow JPEG specification."
+msgstr ""

 
 

-#~ msgid "I don't know that place. Do you want another search?"
-#~ msgstr "Jag känner inte till den platsen. Vill du göra en ny sökning?"
+#: ../src/libjpeg/jpeg-data.c:291
+#, c-format
+msgid "Path '%s' invalid."
+msgstr ""

 
 

-#~ msgid ""
-#~ "This is the name of the file created on the server. This is not the name of "
-#~ "the local file."
-#~ msgstr ""
-#~ "Det här är namnet på den fil som skapats på servern. Det är inte namnet på "
-#~ "den lokala filen."
+#: ../src/libjpeg/jpeg-data.c:309
+#, c-format
+msgid "Could not read '%s'."
+msgstr ""