X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/5a9cffb11d58c725f425828c09c814d1139bbae1..e7b235ff11a1c929bb2436c3e9aa3b6b49cecd4c:/po/es.po?ds=inline

diff --git a/po/es.po b/po/es.po
index 749873bf..3acd05bf 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,42 +7,58 @@ msgid ""
 msgstr ""
 "Project-Id-Version: viking\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-20 21:11+0200\n"
-"PO-Revision-Date: 2011-02-01 15:27+0000\n"
-"Last-Translator: Colegota <Unknown>\n"
+"POT-Creation-Date: 2013-02-04 23:29+0100\n"
+"PO-Revision-Date: 2012-11-04 20:58+0000\n"
+"Last-Translator: Aiguanachein <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-05-11 16:01+0000\n"
-"X-Generator: Launchpad (build 13014)\n"
+"X-Launchpad-Export-Date: 2013-03-23 17:12+0000\n"
+"X-Generator: Launchpad (build 16540)\n"
 
 #: ../src/dialog.c:199
 msgid "Waypoint Properties"
 msgstr "Propiedades del punto de ruta (Waypoint)"
 
-#: ../src/acquire.c:118
-msgid "Working..."
-msgstr "Trabajando..."
-
-#: ../src/acquire.c:141
-msgid "Error: acquisition failed."
-msgstr "Error: Fallo en la adquisión"
-
-#: ../src/acquire.c:149 ../src/vikgpslayer.c:1034
+#: ../src/acquire.c:103 ../src/vikgpslayer.c:1185
 msgid "Done."
 msgstr "Hecho."
 
-#: ../src/acquire.c:156
+#: ../src/acquire.c:114
 msgid "No data."
 msgstr "Sin datos."
 
-#: ../src/acquire.c:353 ../src/vikgpslayer.c:1088
-msgid "Status: detecting gpsbabel"
-msgstr "Conectando a gpsbabel"
+#: ../src/acquire.c:154 ../src/acquire.c:404
+msgid "Error: acquisition failed."
+msgstr "Error: Fallo en la adquisión"
+
+#: ../src/acquire.c:341
+msgid "Working..."
+msgstr "Trabajando..."
+
+#. This shouldn't happen...
+#: ../src/acquire.c:394
+msgid ""
+"Unable to create command\n"
+"Acquire method failed."
+msgstr ""
 
-#: ../src/background.c:57
+#: ../src/acquire.c:486
+msgid "_Filter"
+msgstr ""
+
+#: ../src/acquire.c:501
+#, c-format
+msgid "Filter with %s"
+msgstr ""
+
+#: ../src/acquire.c:518
+msgid "Filter"
+msgstr ""
+
+#: ../src/background.c:52
 #, c-format
 msgid "%d items"
 msgstr "%d elementos"
@@ -59,15 +75,24 @@ msgstr "En proceso"
 msgid "Viking Background Jobs"
 msgstr "Tareas en segundo plano de Viking"
 
-#: ../src/clipboard.c:85
+#: ../src/bing.c:47
+msgid "Bing"
+msgstr ""
+
+#. VIK_GTK_WINDOW_FROM_WIDGET(vp)
+#: ../src/bingmapsource.c:445
+msgid "Bing attribution Loading"
+msgstr ""
+
+#: ../src/clipboard.c:95
 msgid "paste failed"
 msgstr "fallo el pegado"
 
-#: ../src/clipboard.c:95
+#: ../src/clipboard.c:105
 msgid "wrong clipboard data size"
 msgstr "tamaño de los datos del portapapeles incorrecto"
 
-#: ../src/clipboard.c:114
+#: ../src/clipboard.c:124
 #, c-format
 msgid ""
 "The clipboard contains sublayer data for %s layers. You must select a layer "
@@ -76,17 +101,12 @@ msgstr ""
 "El portapapeles contiene datos de subcapa para %s capas. Elija una capa de "
 "este tipo para pegar los datos del portapapeles."
 
-#: ../src/clipboard.c:220
+#: ../src/clipboard.c:236
 msgid ""
 "In order to paste a waypoint, please select an appropriate layer to paste "
 "into."
 msgstr "Por favor, seleccione una capa apropiada para pegar el waypoint."
 
-#: ../src/curl_download.c:118
-#, c-format
-msgid "%s() Curl perform failed: %s"
-msgstr "Ha fallado la llamada a la función curl %s(): %s"
-
 #: ../src/dialog.c:52
 msgid "Go to Lat/Lon"
 msgstr "Ir a Lat/Lon"
@@ -131,90 +151,93 @@ msgstr "Altitud:"
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../src/dialog.c:273
+#: ../src/dialog.c:274 ../src/osm-traces.c:437
+msgid "Description:"
+msgstr "Descripción:"
+
+#: ../src/dialog.c:277
 msgid "Image:"
 msgstr "Imagen:"
 
-#: ../src/dialog.c:278
+#: ../src/dialog.c:282
 msgid "Symbol:"
 msgstr "Símbolo:"
 
-#: ../src/dialog.c:287
+#: ../src/dialog.c:291
 msgid "(none)"
 msgstr "(nada)"
 
 #. TODO: other checks (isalpha or whatever )
-#: ../src/dialog.c:348
+#: ../src/dialog.c:356
 msgid "Please enter a name for the waypoint."
 msgstr "Por favor, introduzca el nombre del waypoint."
 
-#: ../src/dialog.c:353
-#, c-format
-msgid "The waypoint \"%s\" exists, do you want to overwrite it?"
-msgstr "El waypoint \"%s\" ya existe. ¿Desea sobreescribirlo?"
-
-#: ../src/dialog.c:522 ../src/geonamessearch.c:237
+#: ../src/dialog.c:529 ../src/geonamessearch.c:243
+#: ../src/datasource_osm_my_traces.c:507
 msgid "Nothing was selected"
 msgstr "Nada fue seleccionado"
 
-#: ../src/dialog.c:530
+#: ../src/dialog.c:537
+msgid "Add Route"
+msgstr ""
+
+#: ../src/dialog.c:537
 msgid "Add Track"
 msgstr "Añadir ruta"
 
-#: ../src/dialog.c:538
+#: ../src/dialog.c:545
+msgid "Route Name:"
+msgstr ""
+
+#: ../src/dialog.c:545
 msgid "Track Name:"
 msgstr "Nombre de ruta:"
 
-#: ../src/dialog.c:558
+#: ../src/dialog.c:565
 msgid "Please enter a name for the track."
 msgstr "Por favor, introduzca el nombre de la ruta."
 
-#: ../src/dialog.c:562
-#, c-format
-msgid "The track \"%s\" exists, do you want to overwrite it?"
-msgstr "La ruta \"%s\" existe. ¿Desea sobreescribirla?"
-
-#: ../src/dialog.c:624
+#: ../src/dialog.c:623
 msgid "Zoom Factors..."
 msgstr "Factor de acercamiento"
 
-#: ../src/dialog.c:638
+#: ../src/dialog.c:637
 msgid "Zoom factor (in meters per pixel):"
 msgstr "Factor de zoom (en metros por pixel)"
 
-#: ../src/dialog.c:639
+#: ../src/dialog.c:638
 msgid "X (easting): "
 msgstr "X (despl. E): "
 
-#: ../src/dialog.c:640
+#: ../src/dialog.c:639
 msgid "Y (northing): "
 msgstr "Y (despl. N): "
 
-#: ../src/dialog.c:645
+#: ../src/dialog.c:644
 msgid "X and Y zoom factors must be equal"
 msgstr "Mantener factores de zoom X e Y iguales"
 
-#: ../src/dialog.c:700
+#: ../src/dialog.c:699
 msgid "1 min"
 msgstr "1 min"
 
-#: ../src/dialog.c:701
+#: ../src/dialog.c:700
 msgid "1 hour"
 msgstr "1 hora"
 
-#: ../src/dialog.c:702
+#: ../src/dialog.c:701
 msgid "1 day"
 msgstr "1 día"
 
-#: ../src/dialog.c:703
+#: ../src/dialog.c:702
 msgid "Custom (in minutes):"
 msgstr "Personalizado (minutos):"
 
-#: ../src/dialog.c:809
+#: ../src/dialog.c:808
 msgid "GPS Data and Topo Analyzer, Explorer, and Manager."
 msgstr "Analizador, Explorador y Gestor de datos topológicos y GPS."
 
-#: ../src/dialog.c:810
+#: ../src/dialog.c:809
 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 "
@@ -245,28 +268,28 @@ msgstr ""
 "Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-"
 "1307, USA"
 
-#: ../src/dialog.c:838
+#: ../src/dialog.c:837
 msgid "Translation is coordinated on http://launchpad.net/viking"
 msgstr "La traducción se coordina en http://launchpad.net/viking"
 
-#: ../src/dialog.c:846
+#: ../src/dialog.c:845
 msgid "Download along track"
 msgstr "Descargar a lo largo de la ruta"
 
-#: ../src/dialog.c:852
+#: ../src/dialog.c:851
 msgid "Map type:"
 msgstr "Tipo de mapa:"
 
-#: ../src/dialog.c:857
+#: ../src/dialog.c:856
 msgid "Zoom level:"
 msgstr "Nivel de zoom:"
 
-#: ../src/dialog.c:897
+#: ../src/dialog.c:896
 #, c-format
 msgid "The map data is licensed: %s."
 msgstr "Los datos del mapa están bajo licencia: %s"
 
-#: ../src/dialog.c:900
+#: ../src/dialog.c:899
 #, c-format
 msgid ""
 "The data provided by '<b>%s</b>' are licensed under the following license: "
@@ -277,7 +300,7 @@ msgstr ""
 "<b>%s</b>.\n"
 "Por favor, lee esta licencia antes de seguir."
 
-#: ../src/dialog.c:905
+#: ../src/dialog.c:904
 msgid "Open license"
 msgstr "Licencia libre"
 
@@ -307,22 +330,41 @@ msgstr ""
 "No se puede guardar la imagen de Expedia a pesar de haber sido descargada. "
 "Por favor informe del error y borre el fichero de imagen: %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 "Buscar"
 
-#: ../src/geonamessearch.c:99
+#: ../src/geonamessearch.c:123
 msgid "No entries found!"
 msgstr "¡No se encontraron resultados!"
 
-#: ../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:425
+msgid "Name"
+msgstr ""
+
+#: ../src/geonamessearch.c:182
+msgid "Feature"
+msgstr ""
+
+#: ../src/geonamessearch.c:187 ../src/datasource_osm_my_traces.c:440
+msgid "Lat/Lon"
+msgstr ""
+
+#: ../src/geonamessearch.c:269 ../src/googlesearch.c:100
 msgid "couldn't map temp file"
 msgstr "No se ha podido trazar el mapa del archivo temporal"
 
-#: ../src/geonamessearch.c:404 ../src/vikgototool.c:250
-msgid "couldn't open temp file"
-msgstr "No se ha podido abrir el archivo temporal"
-
 #: ../src/globals.c:44
 msgid "Degree format:"
 msgstr "Formato de aceptación"
@@ -351,105 +393,214 @@ msgstr "Latitud por defecto"
 msgid "Default longitude:"
 msgstr "Longitud por defecto"
 
+#: ../src/globals.c:73
+msgid "Alphabetical"
+msgstr ""
+
+#: ../src/globals.c:73 ../src/datasource_osm_my_traces.c:435
+msgid "Time"
+msgstr ""
+
+#: ../src/globals.c:76
+msgid "KML File Export Units:"
+msgstr ""
+
+#: ../src/globals.c:77
+msgid "GPX Track Order:"
+msgstr ""
+
+#: ../src/globals.c:82
+msgid "Image Viewer:"
+msgstr "Visor de imágenes:"
+
+#: ../src/globals.c:87
+msgid "External GPX Program 1:"
+msgstr ""
+
+#: ../src/globals.c:88
+msgid "External GPX Program 2:"
+msgstr ""
+
+#. Defaults for the options are setup here
+#: ../src/globals.c:96
+msgid "General"
+msgstr ""
+
+#. New Tab
+#: ../src/globals.c:121
+msgid "Export/External"
+msgstr ""
+
 #. Webtools
 #: ../src/google.c:36
 msgid "Google"
 msgstr "Google"
 
-#: ../src/datasource_gc.c:62
+#: ../src/datasource_file.c:59
+msgid "Import file with GPSBabel"
+msgstr "Importar archivo con GPSBabel"
+
+#: ../src/datasource_file.c:60
+msgid "Imported file"
+msgstr "Archivo importado"
+
+#. The file selector
+#: ../src/datasource_file.c:133
+msgid "File:"
+msgstr ""
+
+#: ../src/datasource_file.c:134
+msgid "File to import"
+msgstr ""
+
+#: ../src/datasource_file.c:141
+msgid "All files"
+msgstr ""
+
+#. The file format selector
+#: ../src/datasource_file.c:148
+msgid "File type:"
+msgstr ""
+
+#: ../src/datasource_file.c:193
+#, c-format
+msgid "using babel args '%s' and file '%s'"
+msgstr ""
+
+#: ../src/datasource_gc.c:66
 msgid "Download Geocaches"
 msgstr "Descargar geocachés"
 
-#: ../src/datasource_gc.c:63
+#: ../src/datasource_gc.c:67
 msgid "Geocaching.com Caches"
 msgstr "Cachés de Geocaching.com"
 
-#: ../src/datasource_gc.c:80
+#: ../src/datasource_gc.c:84
 msgid "geocaching.com username:"
 msgstr "Nombre de usuario de geocaching.com"
 
-#: ../src/datasource_gc.c:81
+#: ../src/datasource_gc.c:85
 msgid "geocaching.com password:"
 msgstr "Contraseña de geocaching.com"
 
-#: ../src/datasource_gc.c:109
+#: ../src/datasource_gc.c:126
+#, c-format
 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 ""
-"No se ha encontrado el programa gcget en el PATH. Por favor compruebe que "
-"tiene instalado gcget correctamente."
 
-#: ../src/datasource_gc.c:171
+#: ../src/datasource_gc.c:188
 msgid "Number geocaches:"
 msgstr "Número de geocachés:"
 
-#: ../src/datasource_gc.c:173
+#: ../src/datasource_gc.c:190
 msgid "Centered around:"
 msgstr "Centrado alrededor de:"
 
+#: ../src/datasource_gc.c:226
+msgid "Broken input - using some defaults"
+msgstr ""
+
+#: ../src/datasource_geotag.c:51
+msgid "Create Waypoints from Geotagged Images"
+msgstr ""
+
+#: ../src/datasource_geotag.c:52
+msgid "Geotagged Images"
+msgstr ""
+
+#: ../src/datasource_geotag.c:102 ../src/vikwindow.c:2314
+#: ../src/vikwindow.c:2382 ../src/vikwindow.c:2824
+msgid "All"
+msgstr ""
+
+#: ../src/datasource_geotag.c:107 ../src/vikwindow.c:2829
+msgid "JPG"
+msgstr ""
+
+#: ../src/datasource_geotag.c:165
+#, c-format
+msgid "Unable to create waypoint from %s"
+msgstr ""
+
 #: ../src/datasource_google.c:49 ../src/datasource_google.c:50
 msgid "Google Directions"
 msgstr "Direcciones Google"
 
-#: ../src/datasource_google.c:76
+#: ../src/datasource_google.c:77
 msgid "From:"
 msgstr "Desde:"
 
-#: ../src/datasource_google.c:78
+#: ../src/datasource_google.c:79
 msgid "To:"
 msgstr "Hasta:"
 
-#: ../src/datasource_gps.c:55
+#: ../src/datasource_gps.c:57
 msgid "Acquire from GPS"
 msgstr "Adquirir desde GPS"
 
-#: ../src/datasource_gps.c:56
+#: ../src/datasource_gps.c:58
 msgid "Acquired from GPS"
 msgstr "Adquirido desde GPS"
 
-#: ../src/datasource_gps.c:151
+#: ../src/datasource_gps.c:221
 #, c-format
 msgid "using cmdline '%s' and file '%s'\n"
 msgstr "usando línea de comandos '%s' y fichero '%s'\n"
 
-#: ../src/datasource_gps.c:217 ../src/vikgpslayer.c:776
+#: ../src/datasource_gps.c:297 ../src/vikgpslayer.c:884
 #, c-format
 msgid "Downloading %d waypoint..."
 msgid_plural "Downloading %d waypoints..."
 msgstr[0] "Descargando %d waypoint..."
 msgstr[1] "Descargando %d waypoints..."
 
-#: ../src/datasource_gps.c:219 ../src/vikgpslayer.c:778
+#: ../src/datasource_gps.c:298 ../src/vikgpslayer.c:885
 #, c-format
 msgid "Downloading %d trackpoint..."
 msgid_plural "Downloading %d trackpoints..."
 msgstr[0] "Descargando %d traza"
 msgstr[1] "Descargando %d trazas"
 
-#: ../src/datasource_gps.c:237
+#: ../src/datasource_gps.c:303 ../src/vikgpslayer.c:890
+#, c-format
+msgid "Downloading %d routepoint..."
+msgid_plural "Downloading %d routepoints..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/datasource_gps.c:325 ../src/datasource_gps.c:326
+#: ../src/datasource_gps.c:327
 #, c-format
 msgid "Downloaded %d out of %d %s..."
 msgstr "Descargados %d de %d %s..."
 
-#: ../src/datasource_gps.c:239
+#: ../src/datasource_gps.c:331 ../src/datasource_gps.c:332
+#: ../src/datasource_gps.c:333
 #, c-format
 msgid "Downloaded %d %s."
 msgstr "Descargados %d %s."
 
-#: ../src/datasource_gps.c:252 ../src/vikgpslayer.c:848
+#: ../src/datasource_gps.c:347 ../src/vikgpslayer.c:968
 #, c-format
 msgid "GPS Device: %s"
 msgstr "Dispositivo GPS: %s"
 
-#: ../src/datasource_gps.c:341 ../src/vikgpslayer.c:152
+#: ../src/datasource_gps.c:370 ../src/vikgpslayer.c:1042
+#: ../src/vikgpslayer.c:1110
+msgid "Status: Working..."
+msgstr ""
+
+#: ../src/datasource_gps.c:469 ../src/vikgpslayer.c:150
 msgid "GPS Protocol:"
 msgstr "Protocolo GPS:"
 
-#: ../src/datasource_gps.c:350 ../src/vikgpslayer.c:153
+#. List now assigned at runtime
+#: ../src/datasource_gps.c:488 ../src/vikgpslayer.c:151
 msgid "Serial Port:"
 msgstr "Puerto serie:"
 
-#: ../src/datasource_gps.c:371
+#: ../src/datasource_gps.c:509
 msgid ""
 "Turn Off After Transfer\n"
 "(Garmin/NAViLink Only)"
@@ -457,23 +608,100 @@ msgstr ""
 "Girar después del cambio\n"
 "(Garmin/NAViLink Sólo)"
 
-#: ../src/datasource_gps.c:392 ../src/vikgpslayer.c:1093
+#: ../src/datasource_gps.c:512
+msgid "Tracks:"
+msgstr ""
+
+#: ../src/datasource_gps.c:516
+msgid "Routes:"
+msgstr ""
+
+#: ../src/datasource_gps.c:520
+msgid "Waypoints:"
+msgstr ""
+
+#: ../src/datasource_gps.c:594 ../src/vikgpslayer.c:1305
 msgid "GPS device: N/A"
 msgstr "Dispositivo GPS: (no disponible)"
 
-#: ../src/dem.c:60 ../src/dem.c:74
+#: ../src/datasource_osm.c:52 ../src/datasource_osm.c:53
+msgid "OSM traces"
+msgstr "Trazas de OSM"
+
+#: ../src/datasource_osm.c:80
+msgid "Page number:"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:63 ../src/datasource_osm_my_traces.c:64
+msgid "OSM My Traces"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:108
+msgid "Username:"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:113
+msgid "The email or username used to login to OSM"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:115 ../src/osm-traces.c:413
+msgid "Password:"
+msgstr "Contraseña:"
+
+#: ../src/datasource_osm_my_traces.c:120
+msgid "The password used to login to OSM"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:430
+msgid "Description"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:445
+msgid "Privacy"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:452
+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:629
+msgid "My OSM Traces"
+msgstr ""
+
+#: ../src/datasource_osm_my_traces.c:645
+#, c-format
+msgid "Unable to get trace: %s"
+msgstr ""
+
+#: ../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 "DEM no válido"
 
-#: ../src/dem.c:116
+#: ../src/dem.c:121
 msgid "Invalid DEM header"
 msgstr "Cabecera DEM no válida"
 
-#: ../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 "Registro DEM de clase B incorrecto: se esperaba 1"
 
-#: ../src/dem.c:355
+#: ../src/dem.c:360
 #, c-format
 msgid "Couldn't map file %s: %s"
 msgstr "No se encuentra el archivo de mapa %s:%s"
@@ -487,11 +715,44 @@ msgstr "Edad(es) de la tesela:"
 msgid "Download error: %s"
 msgstr "Error en descarga: %s"
 
-#: ../src/file.c:427 ../src/file.c:431
+#: ../src/download.c:313
+msgid "couldn't open temp file"
+msgstr "No se ha podido abrir el archivo temporal"
+
+#: ../src/file.c:456 ../src/file.c:461
 #, c-format
 msgid "Draw mode '%s' no more supported"
 msgstr "El modo de dibujo '%s' no es soportado ya"
 
+#: ../src/geotag_exif.c:433
+msgid "Not enough memory."
+msgstr ""
+
+#: ../src/geotag_exif.c:451
+msgid "Setting a value for this tag is unsupported!"
+msgstr ""
+
+#: ../src/geotag_exif.c:470
+#, c-format
+msgid "Too few components specified (need %d, found %d)\n"
+msgstr ""
+
+#: ../src/geotag_exif.c:474
+msgid "Numeric value expected\n"
+msgstr "Se espera un valor numérico\n"
+
+#: ../src/geotag_exif.c:482
+msgid "This shouldn't happen!"
+msgstr "¡Esto no debería suceder!"
+
+#: ../src/geotag_exif.c:552
+msgid "Not yet implemented!"
+msgstr "¡No implementado aún!"
+
+#: ../src/geotag_exif.c:565
+msgid "Warning; Too many components specified!"
+msgstr ""
+
 #: ../src/osm-traces.c:73
 msgid "Identifiable (public w/ timestamps)"
 msgstr "Identificable (público c/ timestamps)"
@@ -516,40 +777,62 @@ msgstr "Usuario OSM:"
 msgid "OSM password:"
 msgstr "Contraseña OSM:"
 
-#: ../src/osm-traces.c:229
+#. Preferences
+#: ../src/osm-traces.c:151
+msgid "OpenStreetMap Traces"
+msgstr "Trazas OpenStreetMap"
+
+#: ../src/osm-traces.c:234
 #, c-format
 msgid "failed to upload data: HTTP response is %ld"
 msgstr "fallo al enviar datos: la respuesta HTTP es %ld"
 
-#: ../src/osm-traces.c:232
+#: ../src/osm-traces.c:239
 #, c-format
 msgid "curl_easy_getinfo failed: %d"
 msgstr "fallo en la llamada a la función curl_easy_getinfo(): %d"
 
-#: ../src/osm-traces.c:236
+#: ../src/osm-traces.c:244
 #, c-format
 msgid "curl request failed: %s"
 msgstr "fallo en petición curl: %s"
 
-#: ../src/osm-traces.c:264
+#: ../src/osm-traces.c:275
 #, c-format
 msgid "failed to open temporary file: %s"
 msgstr "fallo al abrir fichero temporal: %s"
 
-#: ../src/osm-traces.c:298
+#. Success
+#: ../src/osm-traces.c:328
+msgid "Uploaded to OSM"
+msgstr "Subido a OSM"
+
+#: ../src/osm-traces.c:332
+msgid "FAILED TO UPLOAD DATA TO OSM - CURL PROBLEM"
+msgstr ""
+
+#: ../src/osm-traces.c:335
+msgid "FAILED TO UPLOAD DATA TO OSM"
+msgstr ""
+
+#: ../src/osm-traces.c:335
+msgid "HTTP response code"
+msgstr "Código de respuesta HTTP"
+
+#: ../src/osm-traces.c:348
 #, c-format
 msgid "failed to unlink temporary file: %s"
 msgstr "fallo al borrar fichero temporal: %s"
 
-#: ../src/osm-traces.c:310
+#: ../src/osm-traces.c:387
 msgid "OSM upload"
 msgstr "Enviar a OSM"
 
-#: ../src/osm-traces.c:331
+#: ../src/osm-traces.c:405
 msgid "Email:"
 msgstr "Correo-e:"
 
-#: ../src/osm-traces.c:342
+#: ../src/osm-traces.c:410
 msgid ""
 "The email used as login\n"
 "<small>Enter the email you use to login into www.openstreetmap.org.</small>"
@@ -558,11 +841,7 @@ msgstr ""
 "<small>Introduzca el correo electronico usado para iniciar sesión en "
 "www.openstreetmap.org.</small>"
 
-#: ../src/osm-traces.c:345
-msgid "Password:"
-msgstr "Contraseña:"
-
-#: ../src/osm-traces.c:356
+#: ../src/osm-traces.c:418
 msgid ""
 "The password used to login\n"
 "<small>Enter the password you use to login into "
@@ -572,11 +851,11 @@ msgstr ""
 "<small>Introduzca la clave usada para iniciar sesión en "
 "www.openstreetmap.org.</small>"
 
-#: ../src/osm-traces.c:359
+#: ../src/osm-traces.c:423
 msgid "File's name:"
 msgstr "Nombre del fichero:"
 
-#: ../src/osm-traces.c:369
+#: ../src/osm-traces.c:433
 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 "
@@ -586,30 +865,26 @@ msgstr ""
 "<small>Este es el nombre del archivo creado en el servidor. Este no es el "
 "nombre del archivo local.</small>"
 
-#: ../src/osm-traces.c:373
-msgid "Description:"
-msgstr "Descripción:"
-
-#: ../src/osm-traces.c:378
+#: ../src/osm-traces.c:442
 msgid "The description of the trace"
 msgstr "La descripción de la traza"
 
-#: ../src/osm-traces.c:380
+#: ../src/osm-traces.c:444
 msgid "Tags:"
 msgstr "Etiquetas:"
 
-#: ../src/osm-traces.c:385
+#: ../src/osm-traces.c:449
 msgid "The tags associated to the trace"
 msgstr "Las etiquetas asociadas a la traza"
 
-#: ../src/osm-traces.c:418
+#: ../src/osm-traces.c:482
 #, c-format
 msgid "Uploading %s to OSM"
 msgstr "Enviando %s a OSM"
 
 #: ../src/mapcache.c:61
-msgid "Mapcache memory size (MB):"
-msgstr "Tamaño en memoria del cache de Mapas (MB)"
+msgid "Map cache memory size (MB):"
+msgstr ""
 
 #: ../src/print.c:53
 msgid "None"
@@ -631,33 +906,33 @@ msgstr "Ambos"
 msgid "Image Settings"
 msgstr "Ajustes de imagen"
 
-#: ../src/print.c:550
+#: ../src/print.c:546
 msgid "done"
 msgstr "hecho"
 
 #. Page Size
-#: ../src/print.c:579
+#: ../src/print.c:575
 msgid "_Adjust Page Size and Orientation"
 msgstr "_Ajustar el tamaño y la orientación de la página"
 
-#: ../src/print.c:595
+#: ../src/print.c:591
 msgid "C_enter:"
 msgstr "C_entrado:"
 
 #. ignore page margins
-#: ../src/print.c:613
+#: ../src/print.c:609
 msgid "Ignore Page _Margins"
 msgstr "Ignorar los _márgenes de la página"
 
-#: ../src/print.c:632
+#: ../src/print.c:628
 msgid "Image S_ize:"
 msgstr "_Tamaño de imagen"
 
-#: ../src/util.c:79
+#: ../src/util.c:81
 msgid "Could not launch web browser."
 msgstr "No se ha podido lanzar el navegador"
 
-#: ../src/util.c:90
+#: ../src/util.c:92
 msgid "Could not create new email."
 msgstr "No puedo crear un nuevo email"
 
@@ -673,127 +948,152 @@ msgstr "Ancho (minutos):"
 msgid "Line Thickness:"
 msgstr "Ancho de línea:"
 
+#: ../src/vikcoordlayer.c:56
+msgid "Coordinate"
+msgstr ""
+
 #: ../src/datasource_bfilter.c:46
 msgid "Max number of points:"
 msgstr "Máximo número de puntos:"
 
 #: ../src/datasource_bfilter.c:60
-msgid "Simplify All Tracks"
-msgstr "Simplificar todas las rutas"
+msgid "Simplify All Tracks..."
+msgstr ""
 
 #: ../src/datasource_bfilter.c:61
 msgid "Simplified Tracks"
 msgstr "Rutas simplificadas"
 
-#: ../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 "Eliminar waypoints duplicados"
 
-#: ../src/datasource_bfilter.c:127
+#: ../src/datasource_bfilter.c:129
 msgid "Waypoints Inside This"
 msgstr "Waypoints en el interior"
 
-#: ../src/datasource_bfilter.c:128
+#: ../src/datasource_bfilter.c:130
 msgid "Polygonized Layer"
 msgstr "Capa Poligonizada"
 
-#: ../src/datasource_bfilter.c:162
+#: ../src/datasource_bfilter.c:165
 msgid "Waypoints Outside This"
 msgstr "Waypoints en el exterior"
 
-#: ../src/datasource_bfilter.c:163
+#: ../src/datasource_bfilter.c:166
 msgid "Polygonzied Layer"
 msgstr "Capa poligonal"
 
-#: ../src/main.c:121
+#: ../src/main.c:89
+#, c-format
+msgid "Ignoring Xlib error: error code %d request code %d\n"
+msgstr ""
+
+#: ../src/main.c:102
 msgid "Enable debug output"
 msgstr "no puedo activar la salida"
 
-#: ../src/main.c:122
+#: ../src/main.c:103
 msgid "Enable verbose output"
 msgstr "salida verbosa activada"
 
-#: ../src/main.c:123
+#: ../src/main.c:104
 msgid "Show version"
 msgstr "Mostrar versión"
 
-#: ../src/osm.c:107
+#: ../src/osm.c:106
+msgid "On Disk OSM Tile Format"
+msgstr ""
+
+#: ../src/osm.c:121
 msgid "OSM (view)"
 msgstr "Vista OSM"
 
-#: ../src/osm.c:111
+#: ../src/osm.c:125
 msgid "OSM (edit)"
 msgstr "Edicion OSM"
 
-#: ../src/osm.c:115
+#: ../src/osm.c:129
 msgid "OSM (render)"
 msgstr "Renderizado OSM"
 
-#: ../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:136
+msgid "Local port 8111 (eg JOSM)"
+msgstr ""
+
+#: ../src/preferences.c:285
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../src/uibuilder.c:148
+#: ../src/uibuilder.c:147
 msgid "Take care that this password will be stored clearly in a plain file."
 msgstr "verifica que este password se borre en el archivo plano"
 
-#: ../src/vikdemlayer.c:102
+#: ../src/vikaggregatelayer.c:37
+msgid "Aggregate"
+msgstr ""
+
+#: ../src/vikdemlayer.c:101
 msgid "Absolute height"
 msgstr "Altura Absoluta"
 
-#: ../src/vikdemlayer.c:103
+#: ../src/vikdemlayer.c:102
 msgid "Height gradient"
 msgstr "Gradiente de Altura"
 
-#: ../src/vikdemlayer.c:120
+#: ../src/vikdemlayer.c:118
 msgid "DEM Files:"
 msgstr "Ficheros DEM:"
 
-#: ../src/vikdemlayer.c:121
+#: ../src/vikdemlayer.c:119
 msgid "Download Source:"
 msgstr "Fuentes de descarga:"
 
-#: ../src/vikdemlayer.c:122
+#: ../src/vikdemlayer.c:120
 msgid "Min Elev Color:"
 msgstr "Color para la elevación mínima"
 
-#: ../src/vikdemlayer.c:123
+#: ../src/vikdemlayer.c:121
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/vikdemlayer.c:124
+#: ../src/vikdemlayer.c:122
 msgid "Min Elev:"
 msgstr "Elev. min.:"
 
-#: ../src/vikdemlayer.c:125
+#: ../src/vikdemlayer.c:123
 msgid "Max Elev:"
 msgstr "Elev. max.:"
 
-#: ../src/vikdemlayer.c:136
-msgid "DEM Download/Import"
-msgstr "Descarga/Importación DEM"
+#: ../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:284
 #, c-format
 msgid "Number of files: %d"
 msgstr "Número de ficheros: %d"
 
-#: ../src/vikdemlayer.c:376
+#: ../src/vikdemlayer.c:385
 msgid "DEM Loading"
 msgstr "Cargando DEM"
 
-#: ../src/vikdemlayer.c:880
+#: ../src/vikdemlayer.c:889
 #, c-format
 msgid "No SRTM data available for %f, %f"
 msgstr "Ningun dato SRTM disponible para %f, %f"
 
-#: ../src/vikdemlayer.c:1118
-msgid "No download source selected. Edit layer properties."
-msgstr ""
-"No se ha seleccionado una fuente de descarga. Edite las propiedades de la "
-"capa."
-
-#: ../src/vikdemlayer.c:1141
+#: ../src/vikdemlayer.c:1149
 #, c-format
 msgid "Downloading DEM %s"
 msgstr "Descargando DEM %s"
@@ -806,199 +1106,262 @@ msgstr "Examinar..."
 msgid "Choose file"
 msgstr "Elegir fichero"
 
-#: ../src/vikfilelist.c:47
+#: ../src/vikfilelist.c:48
 msgid "Choose file(s)"
 msgstr "Elegir fichero(s)"
 
-#: ../src/vikfilelist.c:126
+#: ../src/vikfilelist.c:172
 msgid "Add..."
 msgstr "Añadir…"
 
-#: ../src/vikfilelist.c:127
+#: ../src/vikfilelist.c:173
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../src/vikgeoreflayer.c:69
+#: ../src/vikgeoreflayer.c:70
+msgid "_Georef Move Map"
+msgstr ""
+
+#: ../src/vikgeoreflayer.c:70
 msgid "Georef Move Map"
 msgstr "Mover mapa Georef"
 
-#: ../src/vikgeoreflayer.c:73
+#: ../src/vikgeoreflayer.c:77
+msgid "Georef Z_oom Tool"
+msgstr ""
+
+#: ../src/vikgeoreflayer.c:77
 msgid "Georef Zoom Tool"
 msgstr "Zoom Georef"
 
-#: ../src/vikgeoreflayer.c:320 ../src/vikmapslayer.c:635
+#: ../src/vikgeoreflayer.c:87
+msgid "GeoRef Map"
+msgstr ""
+
+#: ../src/vikgeoreflayer.c:335 ../src/vikmapslayer.c:685
 #, c-format
 msgid "Couldn't open image file: %s"
 msgstr "No se ha podido abrir el fichero de imagen: %s"
 
-#: ../src/vikgeoreflayer.c:350
+#: ../src/vikgeoreflayer.c:365
 msgid "Unexpected end of file reading World file."
 msgstr "Final de fichero inesperado mientras se leía el fichero World."
 
-#: ../src/vikgeoreflayer.c:366 ../src/vikgeoreflayer.c:411
+#: ../src/vikgeoreflayer.c:381 ../src/vikgeoreflayer.c:426
 msgid "Choose World file"
 msgstr "Elegir fichero World"
 
-#: ../src/vikgeoreflayer.c:379
+#: ../src/vikgeoreflayer.c:394
 msgid "The World file you requested could not be opened for reading."
 msgstr "El fichero World seleccionado no se ha podido abrir para lectura."
 
-#: ../src/vikgeoreflayer.c:424
+#: ../src/vikgeoreflayer.c:439
 msgid "The file you requested could not be opened for writing."
 msgstr "El fichero seleccionado no se ha podido abrir para escritura."
 
-#: ../src/vikgeoreflayer.c:441 ../src/viklayer.c:478
+#: ../src/vikgeoreflayer.c:456 ../src/viklayer.c:480
 msgid "Layer Properties"
 msgstr "Propiedades de capa"
 
-#: ../src/vikgeoreflayer.c:463
+#: ../src/vikgeoreflayer.c:478
 msgid "World File Parameters:"
 msgstr "Parámetros de fichero World:"
 
-#: ../src/vikgeoreflayer.c:464
+#: ../src/vikgeoreflayer.c:479
 msgid "Load From File..."
 msgstr "Cargar desde archivo..."
 
-#: ../src/vikgeoreflayer.c:469
+#: ../src/vikgeoreflayer.c:484
 msgid "Corner pixel easting:"
 msgstr "Despl. E de la esquina"
 
-#: ../src/vikgeoreflayer.c:471
+#: ../src/vikgeoreflayer.c:486
 msgid "the UTM \"easting\" value of the upper-right corner pixel of the map"
 msgstr ""
 "el ajuste de latitud UTM del pixel de la esquina superior derecha en el mapa"
 
-#: ../src/vikgeoreflayer.c:473
+#: ../src/vikgeoreflayer.c:488
 msgid "Corner pixel northing:"
 msgstr "Despl. N de la esquina"
 
-#: ../src/vikgeoreflayer.c:475
+#: ../src/vikgeoreflayer.c:490
 msgid "the UTM \"northing\" value of the upper-right corner pixel of the map"
 msgstr ""
 "the UTM \"northing\" value of the upper-right corner pixel of the map"
 
-#: ../src/vikgeoreflayer.c:477
+#: ../src/vikgeoreflayer.c:492
 msgid "X (easting) scale (mpp): "
 msgstr "Escala X (desp. E, metros/píxel): "
 
-#: ../src/vikgeoreflayer.c:478
+#: ../src/vikgeoreflayer.c:493
 msgid "Y (northing) scale (mpp): "
 msgstr "Escala Y (desp. N, metros/píxel): "
 
-#: ../src/vikgeoreflayer.c:481
+#: ../src/vikgeoreflayer.c:496
 msgid "the scale of the map in the X direction (meters per pixel)"
 msgstr "la escala del mapa en la dirección X (metros por pixel)"
 
-#: ../src/vikgeoreflayer.c:483
+#: ../src/vikgeoreflayer.c:498
 msgid "the scale of the map in the Y direction (meters per pixel)"
 msgstr "la escala del mapa en la dirección Y (metros por pixel)"
 
-#: ../src/vikgeoreflayer.c:485
+#: ../src/vikgeoreflayer.c:500
 msgid "Map Image:"
 msgstr "Imagen de mapa:"
 
-#: ../src/vikgeoreflayer.c:592
+#. Now with icons
+#: ../src/vikgeoreflayer.c:608
 msgid "_Zoom to Fit Map"
 msgstr "_Zoom para ajustar mapa"
 
-#: ../src/vikgeoreflayer.c:597
+#: ../src/vikgeoreflayer.c:614
 msgid "_Goto Map Center"
 msgstr "_Ir al centro del mapa"
 
-#: ../src/vikgeoreflayer.c:602
+#: ../src/vikgeoreflayer.c:620
 msgid "_Export to World File"
 msgstr "_Exportar hacia Archivo Mundial"
 
-#: ../src/vikgoto.c:77
+#: ../src/vikgoto.c:75
 msgid "No goto tool available."
 msgstr "La herramienta \"ir a\" no esta disponible"
 
-#: ../src/vikgoto.c:90 ../src/vikgoto.c:109
+#: ../src/vikgoto.c:88 ../src/vikgoto.c:107
 msgid "goto"
 msgstr "ir a"
 
-#: ../src/vikgoto.c:92
+#: ../src/vikgoto.c:90
 msgid "I don't know that place. Do you want another goto?"
 msgstr "No conozco ese lugar. Desea realizar otro \"ir a\""
 
-#: ../src/vikgoto.c:111
+#: ../src/vikgoto.c:109
 msgid "goto provider:"
 msgstr "proveedor \"ir a\""
 
-#: ../src/vikgoto.c:126
+#: ../src/vikgoto.c:124
 msgid "Enter address or place name:"
 msgstr "Introduzca la dirección o nombre del lugar:"
 
+#: ../src/vikgpslayer.c:127
+msgid "Data Mode"
+msgstr ""
+
+#: ../src/vikgpslayer.c:129
+msgid "Realtime Tracking Mode"
+msgstr ""
+
+#: ../src/vikgpslayer.c:137
+msgid "Keep vehicle at center"
+msgstr ""
+
+#: ../src/vikgpslayer.c:138
+msgid "Keep vehicle on screen"
+msgstr ""
+
+#: ../src/vikgpslayer.c:139
+msgid "Disable"
+msgstr ""
+
+#: ../src/vikgpslayer.c:152
+msgid "Download Tracks:"
+msgstr ""
+
+#: ../src/vikgpslayer.c:153
+msgid "Upload Tracks:"
+msgstr ""
+
+#: ../src/vikgpslayer.c:154
+msgid "Download Routes:"
+msgstr ""
+
+#: ../src/vikgpslayer.c:155
+msgid "Upload Routes:"
+msgstr ""
+
 #: ../src/vikgpslayer.c:156
+msgid "Download Waypoints:"
+msgstr ""
+
+#: ../src/vikgpslayer.c:157
+msgid "Upload Waypoints:"
+msgstr ""
+
+#: ../src/vikgpslayer.c:159
 msgid "Recording tracks"
 msgstr "Grabando rutas"
 
-#: ../src/vikgpslayer.c:157
+#: ../src/vikgpslayer.c:160
 msgid "Jump to current position on start"
 msgstr "Saltar a la posición actual al comienzo"
 
-#: ../src/vikgpslayer.c:158
+#: ../src/vikgpslayer.c:161
 msgid "Moving Map Method:"
 msgstr "Metodo de movimiento de mapas"
 
-#: ../src/vikgpslayer.c:159
+#: ../src/vikgpslayer.c:162
 msgid "Gpsd Host:"
 msgstr "Servidor gpsd:"
 
-#: ../src/vikgpslayer.c:160
+#: ../src/vikgpslayer.c:163
 msgid "Gpsd Port:"
 msgstr "Puerto gpsd:"
 
-#: ../src/vikgpslayer.c:161
+#: ../src/vikgpslayer.c:164
 msgid "Gpsd Retry Interval (seconds):"
 msgstr "Intervalo de reconexión de Gpsd (segundos)"
 
-#: ../src/vikgpslayer.c:228 ../src/vikgpslayer.c:1078
+#: ../src/vikgpslayer.c:179
+msgid "GPS"
+msgstr ""
+
+#: ../src/vikgpslayer.c:242 ../src/vikgpslayer.c:1258
 msgid "GPS Download"
 msgstr "Descargar desde GPS"
 
-#: ../src/vikgpslayer.c:228 ../src/vikgpslayer.c:1078
+#: ../src/vikgpslayer.c:242 ../src/vikgpslayer.c:1258
+#: ../src/viktrwlayer.c:3094
 msgid "GPS Upload"
 msgstr "Enviar al GPS"
 
-#: ../src/vikgpslayer.c:230
+#: ../src/vikgpslayer.c:244
 msgid "GPS Realtime Tracking"
 msgstr "Seguimiento GPS en tiempo real"
 
-#: ../src/vikgpslayer.c:398
+#: ../src/vikgpslayer.c:451
 msgid "Unknown GPS Protocol"
 msgstr "Protocolo GPS desconocido"
 
-#: ../src/vikgpslayer.c:417
+#: ../src/vikgpslayer.c:469
 msgid "Unknown serial port device"
 msgstr "Puerto serie desconocido"
 
-#: ../src/vikgpslayer.c:483
+#: ../src/vikgpslayer.c:572
 #, c-format
 msgid "%s: unknown parameter"
 msgstr "Parámetro desconocido: %s"
 
-#: ../src/vikgpslayer.c:597
+#. Now with icons
+#: ../src/vikgpslayer.c:693
 msgid "_Upload to GPS"
 msgstr "_Subir a GPS"
 
-#: ../src/vikgpslayer.c:602
+#: ../src/vikgpslayer.c:699
 msgid "Download from _GPS"
 msgstr "Descargar desde _GPS"
 
-#: ../src/vikgpslayer.c:619
+#: ../src/vikgpslayer.c:720
 msgid "Empty _Realtime"
 msgstr "Vaciar en tiempo real"
 
-#: ../src/vikgpslayer.c:625
+#: ../src/vikgpslayer.c:727
 msgid "E_mpty Upload"
 msgstr "Subida vacía"
 
-#: ../src/vikgpslayer.c:630
+#: ../src/vikgpslayer.c:733
 msgid "_Empty Download"
 msgstr "Descarga vacía"
 
-#: ../src/vikgpslayer.c:635
+#: ../src/vikgpslayer.c:739
 msgid "Empty _All"
 msgstr "Todo vacío"
 
@@ -1007,158 +1370,229 @@ msgstr "Todo vacío"
 #. 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:756
 #, c-format
 msgid "Unexpected number of disconnected handlers: %d"
 msgstr "Número inesperado de manejadores desconectados: %d"
 
-#: ../src/vikgpslayer.c:783
+#: ../src/vikgpslayer.c:898
 #, c-format
 msgid "Uploading %d waypoint..."
 msgid_plural "Uploading %d waypoints..."
 msgstr[0] "Subiendo %d waypoint..."
 msgstr[1] "Subiendo %d waypoints..."
 
-#: ../src/vikgpslayer.c:785
+#: ../src/vikgpslayer.c:899
 #, c-format
 msgid "Uploading %d trackpoint..."
 msgid_plural "Uploading %d trackpoints..."
 msgstr[0] "Subiendo %d traza..."
 msgstr[1] "Subiendo %d trazas..."
 
-#: ../src/vikgpslayer.c:809
+#: ../src/vikgpslayer.c:900
 #, c-format
-msgid "Downloaded %d out of %d waypoint..."
+msgid "Uploading %d routepoint..."
+msgid_plural "Uploading %d routepoints..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/vikgpslayer.c:925
+#, c-format
+msgid "Downloaded %d out of %d waypoint..."
 msgid_plural "Downloaded %d out of %d waypoints..."
 msgstr[0] "Descargado %d de %d waypoint..."
 msgstr[1] "Descargados %d de %d waypoints..."
 
-#: ../src/vikgpslayer.c:811
+#: ../src/vikgpslayer.c:926
 #, c-format
 msgid "Downloaded %d out of %d trackpoint..."
 msgid_plural "Downloaded %d out of %d trackpoints..."
 msgstr[0] "Descargada %d de %d traza..."
 msgstr[1] "Descargadas %d de %d trazas..."
 
-#: ../src/vikgpslayer.c:815
+#: ../src/vikgpslayer.c:927
+#, c-format
+msgid "Downloaded %d out of %d routepoint..."
+msgid_plural "Downloaded %d out of %d routepoints..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/vikgpslayer.c:932
 #, c-format
 msgid "Uploaded %d out of %d waypoint..."
 msgid_plural "Uploaded %d out of %d waypoints..."
 msgstr[0] "Subida %d de %d waypoint..."
 msgstr[1] "Subidas %d de %d waypoints..."
 
-#: ../src/vikgpslayer.c:817
+#: ../src/vikgpslayer.c:933
 #, c-format
 msgid "Uploaded %d out of %d trackpoint..."
 msgid_plural "Uploaded %d out of %d trackpoints..."
 msgstr[0] "Subida %d de %d trza..."
 msgstr[1] "Subidas %d de %d trazas..."
 
-#: ../src/vikgpslayer.c:824
+#: ../src/vikgpslayer.c:934
+#, c-format
+msgid "Uploaded %d out of %d routepoint..."
+msgid_plural "Uploaded %d out of %d routepoints..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/vikgpslayer.c:942
 #, c-format
 msgid "Downloaded %d waypoint"
 msgid_plural "Downloaded %d waypoints"
 msgstr[0] "Descargado %d waypoint"
 msgstr[1] "Descargados %d waypoints"
 
-#: ../src/vikgpslayer.c:826
+#: ../src/vikgpslayer.c:943
 #, c-format
 msgid "Downloaded %d trackpoint"
 msgid_plural "Downloaded %d trackpoints"
 msgstr[0] "Descargada %d traza"
 msgstr[1] "Descargadas %d trazas"
 
-#: ../src/vikgpslayer.c:830
+#: ../src/vikgpslayer.c:944
+#, c-format
+msgid "Downloaded %d routepoint"
+msgid_plural "Downloaded %d routepoints"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/vikgpslayer.c:949
 #, c-format
 msgid "Uploaded %d waypoint"
 msgid_plural "Uploaded %d waypoints"
 msgstr[0] "Subido %d waypoint"
 msgstr[1] "Subidos %d waypoints"
 
-#: ../src/vikgpslayer.c:832
+#: ../src/vikgpslayer.c:950
 #, c-format
 msgid "Uploaded %d trackpoint"
 msgid_plural "Uploaded %d trackpoints"
 msgstr[0] "Subida %d traza"
 msgstr[1] "Subidas %d trazas"
 
-#: ../src/vikgpslayer.c:1029
+#: ../src/vikgpslayer.c:951
+#, c-format
+msgid "Uploaded %d routepoint"
+msgid_plural "Uploaded %d routepoints"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/vikgpslayer.c:1180
 msgid "Error: couldn't find gpsbabel."
 msgstr "Error: gpsbabel no encontrado"
 
+#: ../src/vikgpslayer.c:1269
+msgid "Warning - GPS Upload items may overwrite each other"
+msgstr ""
+
+#: ../src/vikgpslayer.c:1301
+msgid "Status: detecting gpsbabel"
+msgstr "Conectando a gpsbabel"
+
+#: ../src/vikgpslayer.c:1332
+msgid "No GPS items selected for transfer."
+msgstr ""
+
+#: ../src/vikgpslayer.c:1347
+msgid "Could not turn off device."
+msgstr ""
+
+#: ../src/vikgpslayer.c:1385
+msgid "Are you sure you want to delete GPS Upload data?"
+msgstr ""
+
+#: ../src/vikgpslayer.c:1398
+msgid "Are you sure you want to delete GPS Download data?"
+msgstr ""
+
+#: ../src/vikgpslayer.c:1412
+msgid "Are you sure you want to delete GPS Realtime data?"
+msgstr ""
+
+#: ../src/vikgpslayer.c:1425
+msgid "Are you sure you want to delete All GPS data?"
+msgstr ""
+
+#: ../src/viklayerspanel.c:55
+msgid "C_ut"
+msgstr "Co_rtar"
+
+#: ../src/viklayerspanel.c:56
+msgid "_Copy"
+msgstr "_Copiar"
+
 #: ../src/viklayerspanel.c:57
-msgid "/C_ut"
-msgstr "/Co_rtar"
+msgid "_Paste"
+msgstr "_Pegar"
 
 #: ../src/viklayerspanel.c:58
-msgid "/_Copy"
-msgstr "/_Copiar"
+msgid "_Delete"
+msgstr "_Borrar"
 
 #: ../src/viklayerspanel.c:59
-msgid "/_Paste"
-msgstr "/_Pegar"
+msgid "New Layer"
+msgstr "Nueva capa"
 
-#: ../src/viklayerspanel.c:60
-msgid "/_Delete"
-msgstr "/_Borrar"
-
-#: ../src/viklayerspanel.c:61
-msgid "/New Layer"
-msgstr "/Nueva capa"
-
-#: ../src/viklayerspanel.c:150
+#: ../src/viklayerspanel.c:127
 msgid "Top Layer"
 msgstr "Capa principal"
 
-#: ../src/viklayerspanel.c:165
+#: ../src/viklayerspanel.c:143
 msgid "Add new layer"
 msgstr "Añadir nueva capa"
 
-#: ../src/viklayerspanel.c:172
+#: ../src/viklayerspanel.c:150
 msgid "Remove selected layer"
 msgstr "Remover la capa seleccionada"
 
-#: ../src/viklayerspanel.c:179
+#: ../src/viklayerspanel.c:157
 msgid "Move selected layer up"
 msgstr "Mover la capa seleccionada"
 
-#: ../src/viklayerspanel.c:186
+#: ../src/viklayerspanel.c:164
 msgid "Move selected layer down"
 msgstr "Mover la capa seleccionada abajo"
 
-#: ../src/viklayerspanel.c:193
+#: ../src/viklayerspanel.c:171
 msgid "Cut selected layer"
 msgstr "Cortar la capa seleccionada"
 
-#: ../src/viklayerspanel.c:200
+#: ../src/viklayerspanel.c:178
 msgid "Copy selected layer"
 msgstr "Copiar la capa seleccionada"
 
-#: ../src/viklayerspanel.c:207
+#: ../src/viklayerspanel.c:185
 msgid "Paste layer below selected layer"
 msgstr "Pegar la capa por de bajo de la capa seleccionada"
 
 #. 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:2412
+#: ../src/viklayerspanel.c:204 ../src/vikwindow.c:3292
 #, c-format
-msgid "New %s Layer"
-msgstr "Nueva capa %s"
+msgid "New _%s Layer"
+msgstr ""
 
-#: ../src/viklayerspanel.c:495
+#: ../src/viklayerspanel.c:511
 msgid "Aggregate Layers have no settable properties."
 msgstr "Las capas de agregación no tienen propiedades modificables."
 
-#: ../src/viklayerspanel.c:545
+#: ../src/viklayerspanel.c:555
 msgid "You cannot cut the Top Layer."
 msgstr "No se puede cortar la capa principal."
 
-#: ../src/viklayerspanel.c:601
+#: ../src/viklayerspanel.c:600
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr ""
+
+#: ../src/viklayerspanel.c:617
 msgid "You cannot delete the Top Layer."
 msgstr "No se puede borrar la capa principal."
 
-#: ../src/viklayerspanel.c:685
+#: ../src/viklayerspanel.c:701
 msgid "Are you sure you wish to delete all layers?"
 msgstr "¿Está seguro de que desea borrar todas las capas?"
 
@@ -1180,34 +1614,65 @@ msgid "Alpha:"
 msgstr "Alfa:"
 
 #: ../src/vikmapslayer.c:127
+msgid "Control the Alpha value for transparency effects"
+msgstr ""
+
+#: ../src/vikmapslayer.c:128
 msgid "Autodownload maps:"
 msgstr "Autodescargar mapas:"
 
-#: ../src/vikmapslayer.c:128
+#: ../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 "Nivel de zoom:"
 
-#: ../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:146
+msgid "_Maps Download"
+msgstr ""
+
+#: ../src/vikmapslayer.c:146
 msgid "Maps Download"
 msgstr "Descarga de mapas"
 
-#: ../src/vikmapslayer.c:140
+#: ../src/vikmapslayer.c:161
 msgid "Map"
 msgstr "Mapa"
 
-#: ../src/vikmapslayer.c:220
+#: ../src/vikmapslayer.c:249
 msgid "Default maplayer directory:"
 msgstr "Directorio por defecto de maplayer:"
 
-#: ../src/vikmapslayer.c:464
+#: ../src/vikmapslayer.c:249
+msgid "Choose a directory to store cached Map tiles for this layer"
+msgstr ""
+
+#: ../src/vikmapslayer.c:505
 msgid "Unknown map type"
 msgstr "Tipo de mapa desconocido"
 
-#: ../src/vikmapslayer.c:474
+#: ../src/vikmapslayer.c:516
 msgid "Unknown Map Zoom"
 msgstr "Nivel de zoom de mapa desconocido"
 
-#: ../src/vikmapslayer.c:544
+#: ../src/vikmapslayer.c:589
 #, c-format
 msgid ""
 "New map cannot be displayed in the current drawmode.\n"
@@ -1216,7 +1681,7 @@ msgstr ""
 "El nuevo mapa no puede ser visualizado en el modo actual.\n"
 "Seleccione \"%s\" en el menu Ver para mostrarlo."
 
-#: ../src/vikmapslayer.c:703
+#: ../src/vikmapslayer.c:753
 #, c-format
 msgid ""
 "Cowardly refusing to draw tiles or existence of tiles beyond %d zoom out "
@@ -1225,40 +1690,62 @@ msgstr ""
 "Evitando pusilánimemente el dibujado de teselas o existencia de teselas mas "
 "alla del factor de zoom %d"
 
-#: ../src/vikmapslayer.c:1101
+#: ../src/vikmapslayer.c:1157
 #, c-format
 msgid "Redownloading up to %d %s map..."
 msgid_plural "Redownloading up to %d %s maps..."
 msgstr[0] "Descargando arriba de %d%s mapas"
 msgstr[1] "Descargando arriba de %d%s mapas"
 
-#: ../src/vikmapslayer.c:1103
+#: ../src/vikmapslayer.c:1159
 #, c-format
 msgid "Redownloading %d %s map..."
 msgid_plural "Redownloading %d %s maps..."
 msgstr[0] "Redescargando %d %s mapa..."
 msgstr[1] "Redescargando %d %s mapas..."
 
-#: ../src/vikmapslayer.c:1107 ../src/vikmapslayer.c:1178
+#: ../src/vikmapslayer.c:1163 ../src/vikmapslayer.c:1238
 #, c-format
 msgid "Downloading %d %s map..."
 msgid_plural "Downloading %d %s maps..."
 msgstr[0] "Descargando mapa %d (%s)..."
 msgstr[1] "Descargando mapas %d (%s)..."
 
-#: ../src/vikmapslayer.c:1241
+#: ../src/vikmapslayer.c:1311
+#, c-format
+msgid ""
+"\n"
+"Source: %s\n"
+"\n"
+"Tile File: %s\n"
+"Tile File Timestamp: %s"
+msgstr ""
+
+#: ../src/vikmapslayer.c:1318
+#, c-format
+msgid ""
+"Source: %s\n"
+"\n"
+"No Tile File!"
+msgstr ""
+
+#: ../src/vikmapslayer.c:1356
 msgid "Redownload _Bad Map(s)"
 msgstr "Descargar de nuevo mapas incorrectos"
 
-#: ../src/vikmapslayer.c:1245
+#: ../src/vikmapslayer.c:1360
 msgid "Redownload _New Map(s)"
 msgstr "Descargar de nuevo los mapas nuevos"
 
-#: ../src/vikmapslayer.c:1249
+#: ../src/vikmapslayer.c:1364
 msgid "Redownload _All Map(s)"
 msgstr "Cargar de nuevo todos los mapas"
 
-#: ../src/vikmapslayer.c:1329
+#: ../src/vikmapslayer.c:1368
+msgid "_Show Tile Information"
+msgstr ""
+
+#: ../src/vikmapslayer.c:1449
 #, c-format
 msgid ""
 "Wrong drawmode for this map.\n"
@@ -1267,205 +1754,300 @@ msgstr ""
 "El modo de dibujado es incorrecto para este mapa.\n"
 "Seleccione \"%s\" en el menú Ver e inténtelo de nuevo."
 
-#: ../src/vikmapslayer.c:1334
+#: ../src/vikmapslayer.c:1454
 msgid "Wrong zoom level for this map."
 msgstr "Nivel de zoom incorrecto para este mapa."
 
 #. Now with icons
-#: ../src/vikmapslayer.c:1365
+#: ../src/vikmapslayer.c:1485
 msgid "Download _Missing Onscreen Maps"
 msgstr "Descargar mapas incorrectos en pantalla"
 
-#: ../src/vikmapslayer.c:1372
+#: ../src/vikmapslayer.c:1492
 msgid "Download _New Onscreen Maps"
 msgstr "Descargar mapas nuevos en pantalla"
 
-#: ../src/vikmapslayer.c:1379
+#: ../src/vikmapslayer.c:1499
 msgid "Reload _All Onscreen Maps"
 msgstr "Recargar todos los mapas en pantalla"
 
-#: ../src/viktreeview.c:268
+#: ../src/viktreeview.c:263
 msgid "Layer Name"
 msgstr "Nombre de capa"
 
-#: ../src/viktreeview.c:694
+#: ../src/viktreeview.c:742
 #, c-format
 msgid "delete data from %s\n"
 msgstr "borrar datos de %s\n"
 
-#: ../src/viktrwlayer.c:324
+#: ../src/viktrwlayer.c:377
+msgid "Create _Waypoint"
+msgstr ""
+
+#: ../src/viktrwlayer.c:377
 msgid "Create Waypoint"
 msgstr "Crear waypoint"
 
-#: ../src/viktrwlayer.c:327
+#: ../src/viktrwlayer.c:383
+msgid "Create _Track"
+msgstr ""
+
+#: ../src/viktrwlayer.c:383
 msgid "Create Track"
 msgstr "Crear ruta"
 
-#: ../src/viktrwlayer.c:331
-msgid "Begin Track"
-msgstr "Empezar ruta"
+#: ../src/viktrwlayer.c:392
+msgid "Create _Route"
+msgstr ""
+
+#: ../src/viktrwlayer.c:392
+msgid "Create Route"
+msgstr ""
+
+#: ../src/viktrwlayer.c:401
+msgid "_Edit Waypoint"
+msgstr ""
 
-#: ../src/viktrwlayer.c:334
+#: ../src/viktrwlayer.c:401
 msgid "Edit Waypoint"
 msgstr "Editar waypoint"
 
-#: ../src/viktrwlayer.c:339
+#: ../src/viktrwlayer.c:409
+msgid "Edit Trac_kpoint"
+msgstr ""
+
+#: ../src/viktrwlayer.c:409
 msgid "Edit Trackpoint"
 msgstr "Editar punto de ruta"
 
-#: ../src/viktrwlayer.c:344
+#: ../src/viktrwlayer.c:417
+msgid "Show P_icture"
+msgstr ""
+
+#: ../src/viktrwlayer.c:417
 msgid "Show Picture"
 msgstr "Mostrar imagen"
 
-#: ../src/viktrwlayer.c:347
-msgid "Magic Scissors"
-msgstr "Tijeras mágicas"
+#: ../src/viktrwlayer.c:424
+msgid "Route _Finder"
+msgstr ""
+
+#: ../src/viktrwlayer.c:424
+msgid "Route Finder"
+msgstr ""
 
 #. ***** PARAMETERS *****
-#: ../src/viktrwlayer.c:354 ../src/viktrwlayer.c:1506
-#: ../src/viktrwlayer.c:1508
+#: ../src/viktrwlayer.c:447 ../src/viktrwlayer.c:1942
+#: ../src/viktrwlayer.c:1944
 msgid "Waypoints"
 msgstr "Waypoints"
 
-#: ../src/viktrwlayer.c:354 ../src/viktrwlayer.c:1496
-#: ../src/viktrwlayer.c:1498
+#: ../src/viktrwlayer.c:447 ../src/viktrwlayer.c:1933
+#: ../src/viktrwlayer.c:1935
 msgid "Tracks"
 msgstr "Rutas"
 
-#: ../src/viktrwlayer.c:354
+#: ../src/viktrwlayer.c:447
 msgid "Waypoint Images"
 msgstr "Imágenes de waypoints"
 
-#: ../src/viktrwlayer.c:357
+#: ../src/viktrwlayer.c:450
 msgid "Draw by Track"
 msgstr "Dbujar por ruta"
 
-#: ../src/viktrwlayer.c:357
-msgid "Draw by Velocity"
-msgstr "Dibujar por velocidad"
+#: ../src/viktrwlayer.c:450
+msgid "Draw by Speed"
+msgstr ""
 
-#: ../src/viktrwlayer.c:357
-msgid "All Tracks Black"
-msgstr "Todas las rutas en negro"
+#: ../src/viktrwlayer.c:450
+msgid "All Tracks Same Color"
+msgstr ""
 
-#: ../src/viktrwlayer.c:358
+#: ../src/viktrwlayer.c:451
 msgid "Filled Square"
 msgstr "Cuadro relleno"
 
-#: ../src/viktrwlayer.c:358
+#: ../src/viktrwlayer.c:451
 msgid "Square"
 msgstr "Cuadrado"
 
-#: ../src/viktrwlayer.c:358
+#: ../src/viktrwlayer.c:451
 msgid "Circle"
 msgstr "Círculo"
 
-#: ../src/viktrwlayer.c:358
+#: ../src/viktrwlayer.c:451
 msgid "X"
 msgstr "X"
 
-#: ../src/viktrwlayer.c:380
+#: ../src/viktrwlayer.c:477
+msgid "Extra Extra Small"
+msgstr ""
+
+#: ../src/viktrwlayer.c:478
+msgid "Extra Small"
+msgstr ""
+
+#: ../src/viktrwlayer.c:479
+msgid "Small"
+msgstr ""
+
+#: ../src/viktrwlayer.c:480
+msgid "Medium"
+msgstr ""
+
+#: ../src/viktrwlayer.c:481
+msgid "Large"
+msgstr ""
+
+#: ../src/viktrwlayer.c:482
+msgid "Extra Large"
+msgstr ""
+
+#: ../src/viktrwlayer.c:483
+msgid "Extra Extra Large"
+msgstr ""
+
+#: ../src/viktrwlayer.c:491
 msgid "Track Drawing Mode:"
 msgstr "Modo de dibujo de rutas:"
 
-#: ../src/viktrwlayer.c:381
+#: ../src/viktrwlayer.c:492
+msgid "All Tracks Color:"
+msgstr ""
+
+#: ../src/viktrwlayer.c:493
+msgid "The color used when 'All Tracks Same Color' drawing mode is selected"
+msgstr ""
+
+#: ../src/viktrwlayer.c:494
 msgid "Draw Track Lines"
 msgstr "Dibujar líneas de ruta"
 
-#: ../src/viktrwlayer.c:382
+#: ../src/viktrwlayer.c:495
+msgid "Track Thickness:"
+msgstr "Ancho de ruta:"
+
+#: ../src/viktrwlayer.c:496
+msgid "Draw Track Direction"
+msgstr ""
+
+#: ../src/viktrwlayer.c:497
+msgid "Direction Size:"
+msgstr ""
+
+#: ../src/viktrwlayer.c:498
 msgid "Draw Trackpoints"
 msgstr "Dibujar puntos de rutas"
 
-#: ../src/viktrwlayer.c:383
+#: ../src/viktrwlayer.c:499
+msgid "Trackpoint Size:"
+msgstr ""
+
+#: ../src/viktrwlayer.c:500
 msgid "Draw Elevation"
 msgstr "Dibujar elevación"
 
-#: ../src/viktrwlayer.c:384
+#: ../src/viktrwlayer.c:501
 msgid "Draw Elevation Height %:"
 msgstr "Dibujar elevación %d:"
 
-#: ../src/viktrwlayer.c:386
+#: ../src/viktrwlayer.c:503
 msgid "Draw Stops"
 msgstr "Dibujar paradas"
 
-#: ../src/viktrwlayer.c:387
+#: ../src/viktrwlayer.c:504
+msgid ""
+"Whether to draw a marker when trackpoints are at the same position but over "
+"the minimum stop length apart in time"
+msgstr ""
+
+#: ../src/viktrwlayer.c:505
 msgid "Min Stop Length (seconds):"
 msgstr "Duración min. de parada (segundos):"
 
-#: ../src/viktrwlayer.c:389
-msgid "Track Thickness:"
-msgstr "Ancho de ruta:"
-
-#: ../src/viktrwlayer.c:390
+#: ../src/viktrwlayer.c:507
 msgid "Track BG Thickness:"
 msgstr "Ancho de fondo de ruta:"
 
-#: ../src/viktrwlayer.c:391
+#: ../src/viktrwlayer.c:508
 msgid "Track Background Color"
 msgstr "Color de fondo de ruta"
 
-#: ../src/viktrwlayer.c:392
-msgid "Min Track Velocity:"
-msgstr "Velocidad min. de ruta:"
+#: ../src/viktrwlayer.c:509
+msgid "Draw by Speed Factor (%):"
+msgstr ""
 
-#: ../src/viktrwlayer.c:393
-msgid "Max Track Velocity:"
-msgstr "Velocidad max. de ruta:"
+#: ../src/viktrwlayer.c:510
+msgid ""
+"The percentage factor away from the average speed determining the color used"
+msgstr ""
 
-#: ../src/viktrwlayer.c:395
+#: ../src/viktrwlayer.c:512
 msgid "Draw Labels"
 msgstr "Dibujar etiquetas"
 
-#: ../src/viktrwlayer.c:396
+#: ../src/viktrwlayer.c:513
+msgid "Waypoint Font Size:"
+msgstr ""
+
+#: ../src/viktrwlayer.c:514
 msgid "Waypoint Color:"
 msgstr "Color de waypoint:"
 
-#: ../src/viktrwlayer.c:397
+#: ../src/viktrwlayer.c:515
 msgid "Waypoint Text:"
 msgstr "Texto de waypoint:"
 
-#: ../src/viktrwlayer.c:398
+#: ../src/viktrwlayer.c:516
 msgid "Background:"
 msgstr "Fondo:"
 
-#: ../src/viktrwlayer.c:399
+#: ../src/viktrwlayer.c:517
 msgid "Fake BG Color Translucency:"
 msgstr "Color de transparencia simulada:"
 
-#: ../src/viktrwlayer.c:400
+#: ../src/viktrwlayer.c:518
 msgid "Waypoint marker:"
 msgstr "Marcador de waypoint:"
 
-#: ../src/viktrwlayer.c:401
+#: ../src/viktrwlayer.c:519
 msgid "Waypoint size:"
 msgstr "Tamaño de waypoint:"
 
-#: ../src/viktrwlayer.c:402
+#: ../src/viktrwlayer.c:520
 msgid "Draw Waypoint Symbols:"
 msgstr "Dibujar símbolos de waypoint:"
 
-#: ../src/viktrwlayer.c:404
+#: ../src/viktrwlayer.c:522
 msgid "Draw Waypoint Images"
 msgstr "Dibujar imágenes de waypoint:"
 
-#: ../src/viktrwlayer.c:405
+#: ../src/viktrwlayer.c:523
 msgid "Image Size (pixels):"
 msgstr "Tamaño de imagen (pixels):"
 
-#: ../src/viktrwlayer.c:406
+#: ../src/viktrwlayer.c:524
 msgid "Image Alpha:"
 msgstr "Factor alfa de imagen:"
 
-#: ../src/viktrwlayer.c:407
+#: ../src/viktrwlayer.c:525
 msgid "Image Memory Cache Size:"
 msgstr "Tamaño de la caché de imágenes:"
 
-#: ../src/viktrwlayer.c:1654
+#: ../src/viktrwlayer.c:610
+msgid "TrackWaypoint"
+msgstr ""
+
+#: ../src/viktrwlayer.c:1951 ../src/viktrwlayer.c:1953
+msgid "Routes"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2144
 #, c-format
 msgid " in %d:%02d hrs:mins"
 msgstr " en %d:%02d hrs:mins"
 
-#: ../src/viktrwlayer.c:1658
+#: ../src/viktrwlayer.c:2148
 #, c-format
 msgid ""
 "\n"
@@ -1474,457 +2056,1135 @@ msgstr ""
 "\n"
 "%s Longitud Total %.1f %s%s"
 
-#: ../src/viktrwlayer.c:1664
+#: ../src/viktrwlayer.c:2154
+#, c-format
+msgid "Tracks: %d - Waypoints: %d - Routes: %d%s"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2174
+#, c-format
+msgid "Tracks: %d"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2184
 #, c-format
-msgid "Tracks: %d - Waypoints: %d%s"
-msgstr "Trazas: %d - Waypoints: %d%s"
+msgid "Routes: %d"
+msgstr ""
 
-#: ../src/viktrwlayer.c:1699
+#: ../src/viktrwlayer.c:2215
 #, c-format
 msgid "- %d:%02d hrs:mins"
 msgstr "- %d:%02d hrs:mins"
 
-#: ../src/viktrwlayer.c:1707
+#: ../src/viktrwlayer.c:2223
 #, c-format
 msgid "%s%.1f km %s"
 msgstr "%s%.1f km %s"
 
-#: ../src/viktrwlayer.c:1710
+#: ../src/viktrwlayer.c:2226
 #, c-format
 msgid "%s%.1f miles %s"
 msgstr "%s%.1f millas %s"
 
-#: ../src/viktrwlayer.c:1830 ../src/viktrwlayer.c:1901
+#: ../src/viktrwlayer.c:2240
+#, c-format
+msgid "Waypoints: %d"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2266
+#, c-format
+msgid "Trkpt: Alt %dft"
+msgstr ""
+
+#. VIK_UNITS_HEIGHT_METRES:
+#: ../src/viktrwlayer.c:2270
+#, c-format
+msgid "Trkpt: Alt %dm"
+msgstr ""
+
+#. Compact date time format
+#: ../src/viktrwlayer.c:2277
+#, c-format
+msgid " | Time %x %X"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2295
+#, c-format
+msgid " | Track: %s"
+msgstr ""
+
+#. Combine parts to make overall message
+#: ../src/viktrwlayer.c:2299
+#, c-format
+msgid "%s%s | %s %s %s"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2314
+#, c-format
+msgid "Wpt: Alt %dft"
+msgstr ""
+
+#. VIK_UNITS_HEIGHT_METRES:
+#: ../src/viktrwlayer.c:2318
+#, c-format
+msgid "Wpt: Alt %dm"
+msgstr ""
+
+#. Add comment if available
+#: ../src/viktrwlayer.c:2333
+#, c-format
+msgid "%s | %s %s | Comment: %s"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2335
+#, c-format
+msgid "%s | %s %s"
+msgstr ""
+
+#: ../src/viktrwlayer.c:2563 ../src/viktrwlayer.c:2634
 msgid "This layer has no waypoints or trackpoints."
 msgstr "Esta capa no tiene waypoints ni puntos de ruta."
 
-#: ../src/viktrwlayer.c:1928 ../src/vikwindow.c:1678 ../src/vikwindow.c:2123
+#: ../src/viktrwlayer.c:2661 ../src/vikwindow.c:2407 ../src/vikwindow.c:2848
 #, c-format
 msgid "The file \"%s\" exists, do you wish to overwrite it?"
 msgstr "El fichero \"%s\" existe. ¿Desea sobreescribirlo?"
 
-#: ../src/viktrwlayer.c:1938 ../src/vikwindow.c:1699
+#: ../src/viktrwlayer.c:2671 ../src/vikwindow.c:2429
 msgid "The filename you requested could not be opened for writing."
 msgstr "El fichero seleccionado no se puede abrir para escritura."
 
-#: ../src/viktrwlayer.c:1943 ../src/viktrwlayer.c:1948
-#: ../src/viktrwlayer.c:1953
+#: ../src/viktrwlayer.c:2676 ../src/viktrwlayer.c:2681
+#: ../src/viktrwlayer.c:2691 ../src/viktrwlayer.c:2703
 msgid "Export Layer"
 msgstr "Exportar capa"
 
-#: ../src/viktrwlayer.c:1967
+#: ../src/viktrwlayer.c:2720
+msgid "Could not create temporary file for export."
+msgstr ""
+
+#: ../src/viktrwlayer.c:2729
+#, c-format
+msgid "Could not launch %s."
+msgstr ""
+
+#: ../src/viktrwlayer.c:2773
 msgid "Export Track as GPX"
 msgstr "Exportar traza como GPX"
 
-#: ../src/viktrwlayer.c:1975
+#: ../src/viktrwlayer.c:2795
 msgid "Find"
 msgstr "Buscar"
 
-#: ../src/viktrwlayer.c:1985
+#: ../src/viktrwlayer.c:2805
 msgid "Waypoint Name:"
 msgstr "Nombre del waypoint:"
 
-#: ../src/viktrwlayer.c:2007
+#: ../src/viktrwlayer.c:2822
 msgid "Waypoint not found in this layer."
 msgstr "Waypoint no encontrado en esta capa."
 
-#: ../src/viktrwlayer.c:2148
+#: ../src/viktrwlayer.c:3090
+msgid "Can not upload invisible track."
+msgstr ""
+
+#: ../src/viktrwlayer.c:3192 ../src/viktrwlayer.c:7785
+msgid "Track"
+msgstr "Traza"
+
+#: ../src/viktrwlayer.c:3215 ../src/viktrwlayer.c:7817
+msgid "Route"
+msgstr ""
+
+#: ../src/viktrwlayer.c:3296 ../src/viktrwlayer.c:6265
+#: ../src/viktrwlayer.c:6314
+msgid "_Finish Route"
+msgstr ""
+
+#: ../src/viktrwlayer.c:3298 ../src/viktrwlayer.c:6223
+#: ../src/viktrwlayer.c:6312
+msgid "_Finish Track"
+msgstr ""
+
+#. Now with icons
+#: ../src/viktrwlayer.c:3310
 msgid "_View Layer"
 msgstr "Ver capa"
 
-#: ../src/viktrwlayer.c:2153
-msgid "View All Trac_ks"
-msgstr "Ver todas las trazas"
+#: ../src/viktrwlayer.c:3317
+msgid "V_iew"
+msgstr ""
+
+#: ../src/viktrwlayer.c:3323
+msgid "View All _Tracks"
+msgstr ""
+
+#: ../src/viktrwlayer.c:3328
+msgid "View All _Routes"
+msgstr ""
 
-#: ../src/viktrwlayer.c:2158
-msgid "V_iew All Waypoints"
-msgstr "Ver todos los Waypoints"
+#: ../src/viktrwlayer.c:3333
+msgid "View All _Waypoints"
+msgstr ""
 
-#: ../src/viktrwlayer.c:2163
+#: ../src/viktrwlayer.c:3338
 msgid "_Goto Center of Layer"
 msgstr "Ir al centro de la capa"
 
-#: ../src/viktrwlayer.c:2168
-msgid "Goto _Waypoint"
-msgstr "Ir a Waipoint"
+#: ../src/viktrwlayer.c:3344 ../src/viktrwlayer.c:6199
+msgid "Goto _Waypoint..."
+msgstr ""
 
-#: ../src/viktrwlayer.c:2174
+#: ../src/viktrwlayer.c:3350
 msgid "_Export Layer"
 msgstr "Exportar capa"
 
-#: ../src/viktrwlayer.c:2179
-msgid "Export as GPS_Point"
-msgstr "Exportar como punto GPS"
-
-#: ../src/viktrwlayer.c:2184
-msgid "Export as GPS_Mapper"
-msgstr "Exportar como GPS_Mapper"
-
-#: ../src/viktrwlayer.c:2189
-msgid "Export as _GPX"
-msgstr "Exportar como GPX"
+#: ../src/viktrwlayer.c:3356
+msgid "Export as GPS_Point..."
+msgstr ""
 
-#: ../src/viktrwlayer.c:2194 ../src/viktrwlayer.c:3297
-msgid "_New Waypoint"
-msgstr "Nuevo Waypoint"
+#: ../src/viktrwlayer.c:3361
+msgid "Export as GPS_Mapper..."
+msgstr ""
 
-#: ../src/viktrwlayer.c:2201
-msgid "_Add Wikipedia Waypoints"
-msgstr "Añadir Waypoints de Wikipedia"
+#: ../src/viktrwlayer.c:3366
+msgid "Export as _GPX..."
+msgstr ""
 
-#: ../src/viktrwlayer.c:2206
-msgid "Within _Layer Bounds"
-msgstr "Dentro de los límites de la capa"
+#: ../src/viktrwlayer.c:3371
+msgid "Export as _KML..."
+msgstr ""
 
-#: ../src/viktrwlayer.c:2211
-msgid "Within _Current View"
-msgstr "Dentro de la vista actual"
+#: ../src/viktrwlayer.c:3376
+msgid "Open with External Program_1: "
+msgstr ""
 
-#: ../src/viktrwlayer.c:2218 ../src/viktrwlayer.c:3397
-msgid "Upload to _OSM"
-msgstr "Subir a OSM"
+#: ../src/viktrwlayer.c:3383
+msgid "Open with External Program_2: "
+msgstr ""
 
-#: ../src/viktrwlayer.c:2786
-msgid "Failed. This track does not have timestamp"
-msgstr "Fallo: Este track no tiene tiempo de registro"
+#: ../src/viktrwlayer.c:3391 ../src/vikwindow.c:3145
+msgid "_New"
+msgstr "_Nuevo"
 
-#: ../src/viktrwlayer.c:2800
-msgid "Failed. No other track in this layer has timestamp"
-msgstr "Fallo: no existe otro track con tiempo de registro"
+#: ../src/viktrwlayer.c:3397
+msgid "New _Waypoint..."
+msgstr ""
 
-#: ../src/viktrwlayer.c:2811
-msgid "Merge with..."
-msgstr "Unido con..."
+#: ../src/viktrwlayer.c:3403
+msgid "New _Track"
+msgstr ""
 
-#: ../src/viktrwlayer.c:2811
-msgid "Select track to merge with"
-msgstr "Track seleccionado unido con..."
+#: ../src/viktrwlayer.c:3411
+msgid "New _Route"
+msgstr ""
 
-#: ../src/viktrwlayer.c:2848
-msgid "Merge Threshold..."
-msgstr "Umbral de fusionado..."
+#: ../src/viktrwlayer.c:3420 ../src/viktrwlayer.c:6597
+msgid "Geotag _Images..."
+msgstr ""
 
-#: ../src/viktrwlayer.c:2849
-msgid "Merge when time between tracks less than:"
-msgstr "Fusionar cuando el tiempo entre trazas de menos de:"
+#: ../src/viktrwlayer.c:3427
+msgid "_Acquire"
+msgstr ""
 
-#: ../src/viktrwlayer.c:2941
-msgid "Split Threshold..."
-msgstr "Umbral de división..."
+#: ../src/viktrwlayer.c:3433 ../src/vikwindow.c:3150
+msgid "From _GPS..."
+msgstr "Desde _GPS..."
 
-#: ../src/viktrwlayer.c:2942
-msgid "Split when time between trackpoints exceeds:"
-msgstr "Dividir cuando el intervalo entre puntos exceda:"
+#: ../src/viktrwlayer.c:3439
+msgid "From Google _Directions..."
+msgstr ""
 
-#: ../src/viktrwlayer.c:3009
-msgid "Split Every Nth Point"
+#: ../src/viktrwlayer.c:3446
+msgid "From _OSM Traces..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:3010
-msgid "Split on every Nth point:"
+#: ../src/viktrwlayer.c:3451
+msgid "From _My OSM Traces..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:3100
-msgid "Waypoint Already Exists"
-msgstr "El waypoint ya existe"
+#: ../src/viktrwlayer.c:3459 ../src/vikwindow.c:3166
+msgid "From _Wikipedia Waypoints"
+msgstr ""
 
-#: ../src/viktrwlayer.c:3141
-msgid "Track Already Exists"
-msgstr "La ruta ya existe"
+#: ../src/viktrwlayer.c:3465
+msgid "Within _Layer Bounds"
+msgstr "Dentro de los límites de la capa"
+
+#: ../src/viktrwlayer.c:3471
+msgid "Within _Current View"
+msgstr "Dentro de la vista actual"
+
+#: ../src/viktrwlayer.c:3479
+msgid "From Geo_caching..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:3486 ../src/vikwindow.c:3163
+msgid "From Geotagged _Images..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:3492
+msgid "From _File..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:3498 ../src/viktrwlayer.c:6542
+msgid "_Upload"
+msgstr ""
+
+#: ../src/viktrwlayer.c:3504
+msgid "Upload to _GPS..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:3511 ../src/viktrwlayer.c:6570
+msgid "Upload to _OSM..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:3519
+msgid "De_lete"
+msgstr ""
+
+#: ../src/viktrwlayer.c:3525
+msgid "Delete All _Tracks"
+msgstr ""
+
+#: ../src/viktrwlayer.c:3531
+msgid "Delete Tracks _From Selection..."
+msgstr ""
 
-#: ../src/viktrwlayer.c:3271 ../src/viktrwlayer.c:3311
+#: ../src/viktrwlayer.c:3537 ../src/viktrwlayer.c:6290
+msgid "Delete _All Routes"
+msgstr ""
+
+#: ../src/viktrwlayer.c:3543 ../src/viktrwlayer.c:6296
+msgid "_Delete Routes From Selection..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:3549
+msgid "Delete All _Waypoints"
+msgstr ""
+
+#: ../src/viktrwlayer.c:3555
+msgid "Delete Waypoints From _Selection..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:4128
+#, c-format
+msgid "Are you sure you want to delete all tracks in %s?"
+msgstr ""
+
+#: ../src/viktrwlayer.c:4138
+#, c-format
+msgid "Are you sure you want to delete all routes in %s?"
+msgstr ""
+
+#: ../src/viktrwlayer.c:4148
+#, c-format
+msgid "Are you sure you want to delete all waypoints in %s?"
+msgstr ""
+
+#: ../src/viktrwlayer.c:4165
+#, c-format
+msgid "Are you sure you want to delete the waypoint \"%s\""
+msgstr ""
+
+#: ../src/viktrwlayer.c:4178
+#, c-format
+msgid "Are you sure you want to delete the track \"%s\""
+msgstr ""
+
+#: ../src/viktrwlayer.c:4191
+#, c-format
+msgid "Are you sure you want to delete the route \"%s\""
+msgstr ""
+
+#: ../src/viktrwlayer.c:4351 ../src/viktrwlayer.c:4922
+msgid ""
+"Converting a track to a route removes extra track data such as segments, "
+"timestamps, etc...\n"
+"Do you want to continue?"
+msgstr ""
+
+#: ../src/viktrwlayer.c:4711
+msgid "Failed. No other tracks with timestamps in this layer found"
+msgstr ""
+
+#: ../src/viktrwlayer.c:4713
+msgid "Failed. No other tracks without timestamps in this layer found"
+msgstr ""
+
+#: ../src/viktrwlayer.c:4732
+msgid "Merge with..."
+msgstr "Unido con..."
+
+#: ../src/viktrwlayer.c:4733
+msgid "Select route to merge with"
+msgstr ""
+
+#: ../src/viktrwlayer.c:4733
+msgid "Select track to merge with"
+msgstr "Track seleccionado unido con..."
+
+#: ../src/viktrwlayer.c:4818 ../src/viktrwlayer.c:4895
+msgid "Append Route"
+msgstr ""
+
+#: ../src/viktrwlayer.c:4818 ../src/viktrwlayer.c:4895
+msgid "Append Track"
+msgstr ""
+
+#: ../src/viktrwlayer.c:4819
+msgid "Select the route to append after the current route"
+msgstr ""
+
+#: ../src/viktrwlayer.c:4820
+msgid "Select the track to append after the current track"
+msgstr ""
+
+#: ../src/viktrwlayer.c:4896
+msgid "Select the track to append after the current route"
+msgstr ""
+
+#: ../src/viktrwlayer.c:4897
+msgid "Select the route to append after the current track"
+msgstr ""
+
+#: ../src/viktrwlayer.c:4957
+#, c-format
+msgid "%d segment merged"
+msgid_plural "%d segments merged"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/viktrwlayer.c:4973
+msgid "Failed. This track does not have timestamp"
+msgstr "Fallo: Este track no tiene tiempo de registro"
+
+#: ../src/viktrwlayer.c:4985
+msgid "Failed. No other track in this layer has timestamp"
+msgstr "Fallo: no existe otro track con tiempo de registro"
+
+#: ../src/viktrwlayer.c:4992
+msgid "Merge Threshold..."
+msgstr "Umbral de fusionado..."
+
+#: ../src/viktrwlayer.c:4993
+msgid "Merge when time between tracks less than:"
+msgstr "Fusionar cuando el tiempo entre trazas de menos de:"
+
+#: ../src/viktrwlayer.c:5128
+msgid "Split Threshold..."
+msgstr "Umbral de división..."
+
+#: ../src/viktrwlayer.c:5129
+msgid "Split when time between trackpoints exceeds:"
+msgstr "Dividir cuando el intervalo entre puntos exceda:"
+
+#: ../src/viktrwlayer.c:5205
+msgid "Split Every Nth Point"
+msgstr "Separar cada punto N-ésimo:"
+
+#: ../src/viktrwlayer.c:5206
+msgid "Split on every Nth point:"
+msgstr "Separar en cada punto N-ésimo:"
+
+#: ../src/viktrwlayer.c:5312
+msgid "Can not split track as it has no segments"
+msgstr ""
+
+#: ../src/viktrwlayer.c:5340 ../src/viktrwlayer.c:5370
+#, c-format
+msgid "Deleted %ld point"
+msgid_plural "Deleted %ld points"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/viktrwlayer.c:5531
+msgid "Internal Error in vik_trw_layer_uniquify_tracks"
+msgstr ""
+
+#: ../src/viktrwlayer.c:5588 ../src/viktrwlayer.c:5635
+#: ../src/viktrwlayer.c:5814
+msgid ""
+"Multiple entries with the same name exist. This method only works with "
+"unique names. Force unique names now?"
+msgstr ""
+
+#: ../src/viktrwlayer.c:5599
+msgid "No tracks found"
+msgstr ""
+
+#: ../src/viktrwlayer.c:5607 ../src/viktrwlayer.c:5654
+#: ../src/viktrwlayer.c:5834
+msgid "Delete Selection"
+msgstr ""
+
+#: ../src/viktrwlayer.c:5608
+msgid "Select tracks to delete"
+msgstr "Seleccione pistas a eliminar"
+
+#: ../src/viktrwlayer.c:5646
+msgid "No routes found"
+msgstr ""
+
+#: ../src/viktrwlayer.c:5655
+msgid "Select routes to delete"
+msgstr ""
+
+#: ../src/viktrwlayer.c:5761
+msgid "Internal Error in vik_trw_layer_uniquify_waypoints"
+msgstr ""
+
+#: ../src/viktrwlayer.c:5824
+msgid "No waypoints found"
+msgstr ""
+
+#: ../src/viktrwlayer.c:5835
+msgid "Select waypoints to delete"
+msgstr ""
+
+#: ../src/viktrwlayer.c:5896
+#, c-format
+msgid ""
+"A waypoint with the name \"%s\" already exists. Really rename to the same "
+"name?"
+msgstr ""
+
+#: ../src/viktrwlayer.c:5926
+#, c-format
+msgid ""
+"A track with the name \"%s\" already exists. Really rename to the same name?"
+msgstr ""
+
+#: ../src/viktrwlayer.c:5963
+#, c-format
+msgid ""
+"A route with the name \"%s\" already exists. Really rename to the same name?"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6085 ../src/viktrwlayer.c:6337
 msgid "_Goto"
 msgstr "_Ir a"
 
-#: ../src/viktrwlayer.c:3285
+#: ../src/viktrwlayer.c:6104
 msgid "_Visit Geocache Webpage"
 msgstr "Visitar página de Geocache"
 
-#: ../src/viktrwlayer.c:3316
+#: ../src/viktrwlayer.c:6123
+msgid "_Show Picture..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:6131
+msgid "Update Geotag on _Image"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6137
+msgid "_Update"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6142
+msgid "Update and _Keep File Timestamp"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6153
+msgid "Visit _Webpage"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6184
+msgid "_New Waypoint..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:6193
+msgid "_View All Waypoints"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6205
+msgid "Delete _All Waypoints"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6211
+msgid "_Delete Waypoints From Selection..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:6233
+msgid "_View All Tracks"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6239
+msgid "_New Track"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6247
+msgid "Delete _All Tracks"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6253
+msgid "_Delete Tracks From Selection..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:6276
+msgid "_View All Routes"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6282
+msgid "_New Route"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6327
+msgid "_View Track"
+msgstr "Ver traza"
+
+#: ../src/viktrwlayer.c:6329
+msgid "_View Route"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6343
 msgid "_Startpoint"
 msgstr "Punto de inicio"
 
-#: ../src/viktrwlayer.c:3321
+#: ../src/viktrwlayer.c:6349
 msgid "\"_Center\""
 msgstr "Centrar"
 
-#: ../src/viktrwlayer.c:3326
+#: ../src/viktrwlayer.c:6355
 msgid "_Endpoint"
 msgstr "Fin"
 
-#: ../src/viktrwlayer.c:3331
+#: ../src/viktrwlayer.c:6361
 msgid "_Highest Altitude"
 msgstr "Altitud superior"
 
-#: ../src/viktrwlayer.c:3336
+#: ../src/viktrwlayer.c:6367
 msgid "_Lowest Altitude"
 msgstr "Altitud inferior"
 
-#: ../src/viktrwlayer.c:3341
+#: ../src/viktrwlayer.c:6375
 msgid "_Maximum Speed"
 msgstr "Velocidad máxima"
 
-#: ../src/viktrwlayer.c:3346
-msgid "_View Track"
-msgstr "Ver traza"
+#: ../src/viktrwlayer.c:6384
+msgid "Co_mbine"
+msgstr ""
 
-#: ../src/viktrwlayer.c:3351
-msgid "_Merge By Time"
-msgstr "Mezclar por tiempo"
+#: ../src/viktrwlayer.c:6392
+msgid "_Merge By Time..."
+msgstr ""
 
-#: ../src/viktrwlayer.c:3356
+#: ../src/viktrwlayer.c:6397
+msgid "Merge _Segments"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6403
 msgid "Merge _With Other Tracks..."
 msgstr "Mezclar con otras trazas"
 
-#: ../src/viktrwlayer.c:3361
-msgid "_Split By Time"
-msgstr "Dividir por tiempo"
+#: ../src/viktrwlayer.c:6409
+msgid "_Append Track..."
+msgstr ""
 
-#: ../src/viktrwlayer.c:3366
-msgid "Split By _Number of Points"
+#: ../src/viktrwlayer.c:6411
+msgid "_Append Route..."
 msgstr ""
 
-#: ../src/viktrwlayer.c:3371
+#: ../src/viktrwlayer.c:6417
+msgid "Append _Route..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:6419
+msgid "Append _Track..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:6426
+msgid "_Split"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6434
+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:6440
+msgid "Split Se_gments"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6446
+msgid "Split By _Number of Points..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:6451
+msgid "Split at _Trackpoint"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6460
+msgid "Delete Poi_nts"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6466
+msgid "Delete Points With The Same _Position"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6471
+msgid "Delete Points With The Same _Time"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6477
+msgid "_Reverse Track"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6479
+msgid "_Reverse Route"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6488
 msgid "Down_load Maps Along Track..."
 msgstr "Descargar mapas a lo largo de la traza"
 
-#: ../src/viktrwlayer.c:3376
+#: ../src/viktrwlayer.c:6490
+msgid "Down_load Maps Along Route..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:6497
 msgid "_Apply DEM Data"
 msgstr "Aplicar datos DEM"
 
-#: ../src/viktrwlayer.c:3381
-msgid "Export Trac_k as GPX"
-msgstr "Exportar traza como GPX"
+#: ../src/viktrwlayer.c:6504
+msgid "_Export Track as GPX..."
+msgstr ""
+
+#: ../src/viktrwlayer.c:6506
+msgid "_Export Route as GPX..."
+msgstr ""
 
-#: ../src/viktrwlayer.c:3386
+#: ../src/viktrwlayer.c:6513
 msgid "E_xtend Track End"
 msgstr "Extender al final de la traza"
 
-#: ../src/viktrwlayer.c:3391
-msgid "Extend _Using Magic Scissors"
-msgstr "Extender usando las tijeras mágicas"
+#: ../src/viktrwlayer.c:6515
+msgid "E_xtend Route End"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6522
+msgid "C_onvert to a Route"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6524
+msgid "C_onvert to a Track"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6532
+msgid "Extend _Using Route Finder"
+msgstr ""
+
+#: ../src/viktrwlayer.c:6548
+msgid "_Upload to GPS..."
+msgstr ""
 
-#: ../src/viktrwlayer.c:3405
+#: ../src/viktrwlayer.c:6559
 msgid "_View Google Directions"
 msgstr "Ver Direcciones de Google"
 
-#: ../src/viktrwlayer.c:3411
+#: ../src/viktrwlayer.c:6579
 msgid "Use with _Filter"
 msgstr "Usar con filtro"
 
-#: ../src/viktrwlayer.c:4092
-msgid "Track"
-msgstr "Traza"
+#: ../src/viktrwlayer.c:6612
+msgid "_Edit Trackpoint"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7524
+#, c-format
+msgid " - Gain %dm:Loss %dm"
+msgstr ""
+
+#: ../src/viktrwlayer.c:7526
+#, c-format
+msgid " - Gain %dft:Loss %dft"
+msgstr ""
 
-#: ../src/viktrwlayer.c:4425
-msgid "Could not launch eog to open file."
-msgstr "No se puede lanzar eog para abrir el fichero."
+#: ../src/viktrwlayer.c:7531
+#, c-format
+msgid " - Bearing %3.1f° - Step %s"
+msgstr ""
+
+#: ../src/viktrwlayer.c:8124
+#, c-format
+msgid "Could not launch %s to open file."
+msgstr ""
 
-#: ../src/viktrwlayer.c:4497
+#: ../src/viktrwlayer.c:8205
 #, c-format
 msgid "Creating %d Image Thumbnails..."
 msgstr "Creando %d miniaturas..."
 
-#: ../src/viktrwlayer.c:4731
+#: ../src/viktrwlayer.c:8524
 msgid "No map layer in use. Create one first"
 msgstr "No hay una capa de mapa en uso. Cree una primero"
 
-#: ../src/viktrwlayer_propwin.c:688
+#: ../src/viktrwlayer_propwin.c:898 ../src/viktrwlayer_propwin.c:1155
+#, c-format
+msgid "%.1f kph"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:901 ../src/viktrwlayer_propwin.c:1158
+#, c-format
+msgid "%.1f mph"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:904 ../src/viktrwlayer_propwin.c:1161
+#, c-format
+msgid "%.1f knots"
+msgstr ""
+
+#. VIK_UNITS_SPEED_METRES_PER_SECOND:
+#: ../src/viktrwlayer_propwin.c:908 ../src/viktrwlayer_propwin.c:1165
+#, c-format
+msgid "%.1f m/s"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:1745
+#, c-format
+msgid "%.1f miles"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:1747
+#, c-format
+msgid "%.1f km"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2681
 msgid "Failed spliting track. Track unchanged"
 msgstr "falla en la operacion del spliting . Track no modificado"
 
-#: ../src/viktrwlayer_propwin.c:705
-msgid "Operation Aborted. Track unchanged"
-msgstr "Operacion abortada. Track no modificado"
-
-#: ../src/viktrwlayer_propwin.c:759
+#: ../src/viktrwlayer_propwin.c:2779 ../src/viktrwlayer_propwin.c:3178
 #, c-format
 msgid "%s - Track Properties"
 msgstr "%s - Propiedades de ruta"
 
-#: ../src/viktrwlayer_propwin.c:764
-msgid "Split at Marker"
-msgstr "Colocando un marcador"
+#: ../src/viktrwlayer_propwin.c:2784
+msgid "Split at _Marker"
+msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:765
-msgid "Split Segments"
-msgstr "Dividir segmentos"
+#: ../src/viktrwlayer_propwin.c:2785
+msgid "Split _Segments"
+msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:766
-msgid "Reverse"
-msgstr "Inverso"
+#: ../src/viktrwlayer_propwin.c:2786
+msgid "_Reverse"
+msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:767
-msgid "Delete Dupl."
-msgstr "Borrar dupl."
+#: ../src/viktrwlayer_propwin.c:2787
+msgid "_Delete Dupl."
+msgstr ""
 
-#: ../src/viktrwlayer_propwin.c:790
+#: ../src/viktrwlayer_propwin.c:2813
 msgid "<b>Comment:</b>"
 msgstr "<b>Comentario:</b>"
 
-#: ../src/viktrwlayer_propwin.c:790
+#: ../src/viktrwlayer_propwin.c:2814
+msgid "<b>Description:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2815
 msgid "<b>Track Length:</b>"
 msgstr "<b>Longitud de ruta:</b>"
 
-#: ../src/viktrwlayer_propwin.c:790
+#: ../src/viktrwlayer_propwin.c:2816
 msgid "<b>Trackpoints:</b>"
 msgstr "<b>Puntos de ruta:</b>"
 
-#: ../src/viktrwlayer_propwin.c:790
+#: ../src/viktrwlayer_propwin.c:2817
 msgid "<b>Segments:</b>"
 msgstr "<b>Segmentos:</b>"
 
-#: ../src/viktrwlayer_propwin.c:790
+#: ../src/viktrwlayer_propwin.c:2818
 msgid "<b>Duplicate Points:</b>"
 msgstr "<b>Puntos duplicados:</b>"
 
-#: ../src/viktrwlayer_propwin.c:790
+#: ../src/viktrwlayer_propwin.c:2819
 msgid "<b>Max Speed:</b>"
 msgstr "<b>Velocidad max.:</b>"
 
-#: ../src/viktrwlayer_propwin.c:790
+#: ../src/viktrwlayer_propwin.c:2820
 msgid "<b>Avg. Speed:</b>"
 msgstr "<b>Velocidad media:</b>"
 
-#: ../src/viktrwlayer_propwin.c:790
+#: ../src/viktrwlayer_propwin.c:2821
+msgid "<b>Moving Avg. Speed:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2822
 msgid "<b>Avg. Dist. Between TPs:</b>"
 msgstr "<b>Dist. media entre puntos:</b>"
 
-#: ../src/viktrwlayer_propwin.c:790
+#: ../src/viktrwlayer_propwin.c:2823
 msgid "<b>Elevation Range:</b>"
 msgstr "<b>Horquilla de elevación:</b>"
 
-#: ../src/viktrwlayer_propwin.c:790
+#: ../src/viktrwlayer_propwin.c:2824
 msgid "<b>Total Elevation Gain/Loss:</b>"
 msgstr "<b>Diferencia total de elevación:</b>"
 
-#: ../src/viktrwlayer_propwin.c:790
+#: ../src/viktrwlayer_propwin.c:2825
 msgid "<b>Start:</b>"
 msgstr "<b>Comienzo:</b>"
 
-#: ../src/viktrwlayer_propwin.c:790
+#: ../src/viktrwlayer_propwin.c:2826
 msgid "<b>End:</b>"
 msgstr "<b>Fin:</b>"
 
-#: ../src/viktrwlayer_propwin.c:790
+#: ../src/viktrwlayer_propwin.c:2827
 msgid "<b>Duration:</b>"
 msgstr "<b>Duración:</b>"
 
-#: ../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_propwin.c:2828
+msgid "<b>Color:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:2877 ../src/viktrwlayer_propwin.c:2901
+#: ../src/viktrwlayer_propwin.c:2929 ../src/viktrwlayer_propwin.c:2966
+#: ../src/viktrwlayer_propwin.c:2984 ../src/viktrwlayer_propwin.c:3034
+#: ../src/viktrwlayer_propwin.c:3035 ../src/viktrwlayer_propwin.c:3036
+#: ../src/viktrwlayer_propwin.c:3062 ../src/viktrwlayer_propwin.c:3063
+#: ../src/viktrwlayer_propwin.c:3078 ../src/viktrwlayer_propwin.c:3079
+#: ../src/viktrwlayer_propwin.c:3092 ../src/viktrwlayer_propwin.c:3093
+#: ../src/viktrwlayer_propwin.c:3106 ../src/viktrwlayer_propwin.c:3107
+#: ../src/viktrwlayer_propwin.c:3120 ../src/viktrwlayer_propwin.c:3121
+#: ../src/viktrwlayer_propwin.c:3134 ../src/viktrwlayer_propwin.c:3135
 #, c-format
 msgid "No Data"
 msgstr "Sin datos"
 
-#: ../src/viktrwlayer_propwin.c:956
+#: ../src/viktrwlayer_propwin.c:3031
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutos"
 
-#: ../src/viktrwlayer_propwin.c:979
+#: ../src/viktrwlayer_propwin.c:3058
 msgid "Statistics"
 msgstr "Estadisticas"
 
-#: ../src/viktrwlayer_propwin.c:984
+#: ../src/viktrwlayer_propwin.c:3064
+msgid "Show D_EM"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3065 ../src/viktrwlayer_propwin.c:3080
+#: ../src/viktrwlayer_propwin.c:3094 ../src/viktrwlayer_propwin.c:3136
+msgid "Show _GPS Speed"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3067 ../src/viktrwlayer_propwin.c:3082
+#: ../src/viktrwlayer_propwin.c:3110 ../src/viktrwlayer_propwin.c:3138
 msgid "<b>Track Distance:</b>"
 msgstr "<b>Distancia del Track:</b>"
 
-#: ../src/viktrwlayer_propwin.c:985
+#: ../src/viktrwlayer_propwin.c:3068 ../src/viktrwlayer_propwin.c:3125
+msgid "<b>Track Height:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3073
 msgid "Elevation-distance"
 msgstr "Elevación-distancia"
 
-#: ../src/viktrwlayer_propwin.c:991
+#: ../src/viktrwlayer_propwin.c:3083
+msgid "<b>Track Gradient:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3087
+msgid "Gradient-distance"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3096 ../src/viktrwlayer_propwin.c:3111
+#: ../src/viktrwlayer_propwin.c:3124
 msgid "<b>Track Time:</b>"
 msgstr "<b>Tiempo del Track:</b>"
 
-#: ../src/viktrwlayer_propwin.c:992
+#: ../src/viktrwlayer_propwin.c:3097 ../src/viktrwlayer_propwin.c:3139
+msgid "<b>Track Speed:</b>"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3101
 msgid "Speed-time"
 msgstr "Velocidad-tiempo"
 
-#: ../src/viktrwlayer_tpwin.c:115
+#: ../src/viktrwlayer_propwin.c:3108 ../src/viktrwlayer_propwin.c:3122
+msgid "Show S_peed"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3115
+msgid "Distance-time"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3129
+msgid "Elevation-time"
+msgstr ""
+
+#: ../src/viktrwlayer_propwin.c:3143
+msgid "Speed-distance"
+msgstr ""
+
+#: ../src/viktrwlayer_tpwin.c:118
 msgid "<b>Part of Track:</b>"
 msgstr "<b>Parte de la ruta:</b>"
 
-#: ../src/viktrwlayer_tpwin.c:116
+#: ../src/viktrwlayer_tpwin.c:119
 msgid "<b>Latitude:</b>"
 msgstr "<b>Latitud:</b>"
 
-#: ../src/viktrwlayer_tpwin.c:117
+#: ../src/viktrwlayer_tpwin.c:120
 msgid "<b>Longitude:</b>"
 msgstr "<b>Longitud:</b>"
 
-#: ../src/viktrwlayer_tpwin.c:118
+#: ../src/viktrwlayer_tpwin.c:121
 msgid "<b>Altitude:</b>"
 msgstr "<b>Altitud:</b>"
 
-#: ../src/viktrwlayer_tpwin.c:119
+#: ../src/viktrwlayer_tpwin.c:122
 msgid "<b>Timestamp:</b>"
 msgstr "<b>Instante temporal:</b>"
 
-#: ../src/viktrwlayer_tpwin.c:120
+#: ../src/viktrwlayer_tpwin.c:123
 msgid "<b>Time:</b>"
 msgstr "<b>Tiempo:</b>"
 
-#: ../src/viktrwlayer_tpwin.c:121
+#: ../src/viktrwlayer_tpwin.c:124
 msgid "<b>Distance Difference:</b>"
 msgstr "<b>Diferencia en distancia:</b>"
 
-#: ../src/viktrwlayer_tpwin.c:122
+#: ../src/viktrwlayer_tpwin.c:125
 msgid "<b>Time Difference:</b>"
 msgstr "<b>Diferencia en tiempo:</b>"
 
-#: ../src/viktrwlayer_tpwin.c:123
+#: ../src/viktrwlayer_tpwin.c:126
 msgid "<b>\"Speed\" Between:</b>"
 msgstr "<b>\"Velocidad\" entre:</b>"
 
-#: ../src/viktrwlayer_tpwin.c:124
+#: ../src/viktrwlayer_tpwin.c:127
 msgid "<b>VDOP:</b>"
 msgstr "<b>VDOP:</b>"
 
-#: ../src/viktrwlayer_tpwin.c:125
+#: ../src/viktrwlayer_tpwin.c:128
 msgid "<b>HDOP:</b>"
 msgstr "<b>HDOP:</b>"
 
-#: ../src/viktrwlayer_tpwin.c:126
+#: ../src/viktrwlayer_tpwin.c:129
 msgid "<b>PDOP:</b>"
 msgstr "<b>PDOP:</b>"
 
-#: ../src/viktrwlayer_tpwin.c:127
+#: ../src/viktrwlayer_tpwin.c:130
 msgid "<b>SAT/FIX:</b>"
 msgstr "<B>Configurar / Establecer: </b>"
 
-#: ../src/viktrwlayer_tpwin.c:136
+#: ../src/viktrwlayer_tpwin.c:139
 msgid "Trackpoint"
 msgstr "Punto de ruta"
 
-#: ../src/viktrwlayer_tpwin.c:140
+#: ../src/viktrwlayer_tpwin.c:142
 msgid "_Insert After"
 msgstr "Insertar después"
 
-#: ../src/viktrwlayer_tpwin.c:142
+#: ../src/viktrwlayer_tpwin.c:144
 msgid "Split Here"
 msgstr "Dividir aquí"
 
-#: ../src/viktrwlayer_tpwin.c:143
-msgid "Join With Last"
-msgstr "Fusionar con la última"
+#: ../src/viktrwlayer_geotag.c:446
+#, c-format
+msgid "Geotagging %d Images..."
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:510
+msgid "Geotag Images"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:516
+msgid "Images"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:520
+msgid "Overwrite Existing Waypoints:"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:523
+msgid "Overwrite Existing GPS Information:"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:525
+msgid "Keep File Modification Timestamp:"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:555
+msgid "Create Waypoints:"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:563
+msgid "Write EXIF:"
+msgstr "Escribir EXIF:"
+
+#: ../src/viktrwlayer_geotag.c:575
+msgid "Interpolate Between Track Segments:"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:579
+msgid "Image Time Offset (Seconds):"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:581
+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:584
+msgid "Image Timezone:"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:586
+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:590
+#, c-format
+msgid "Using track: %s"
+msgstr ""
+
+#: ../src/viktrwlayer_geotag.c:592
+#, c-format
+msgid "Using all tracks in: %s"
+msgstr ""
+
+#: ../src/vikstatus.c:105
+msgid "Current zoom level. Click to select a new one."
+msgstr ""
+
+#: ../src/vikwaypoint.c:34
+msgid "Waypoint"
+msgstr ""
 
-#: ../src/vikwindow.c:189
+#. TODO get rid of this as this is unnecessary duplication...
+#: ../src/vikwindow.c:221
 msgid "Pan"
 msgstr "Desplazar"
 
-#: ../src/vikwindow.c:189
+#: ../src/vikwindow.c:221
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../src/vikwindow.c:189
+#: ../src/vikwindow.c:221
 msgid "Ruler"
 msgstr "Regla"
 
-#: ../src/vikwindow.c:381
+#: ../src/vikwindow.c:221
+msgid "Select"
+msgstr ""
+
+#. Create tooltip
+#: ../src/vikwindow.c:440
+msgid "Select zoom level"
+msgstr ""
+
+#: ../src/vikwindow.c:645
 #, c-format
 msgid ""
 "Do you want to save the changes you made to the document \"%s\"?\n"
@@ -1933,67 +3193,174 @@ msgid ""
 msgstr ""
 "¿Desea grabar los cambios en el documento \"%s\"?\n"
 "\n"
-"Sus cambios se perderán si no los graba."
-
-#: ../src/vikwindow.c:384 ../src/vikwindow.c:1449
-msgid "Untitled"
-msgstr "Sin nombre"
+"Sus cambios se perderán si no los graba."
 
-#: ../src/vikwindow.c:385
+#: ../src/vikwindow.c:649
 msgid "Don't Save"
 msgstr "No guardar"
 
-#: ../src/vikwindow.c:420
+#: ../src/vikwindow.c:696
 msgid "mpp"
 msgstr "metros/pixel"
 
-#: ../src/vikwindow.c:420
+#: ../src/vikwindow.c:696
 msgid "pixelfact"
 msgstr "factor de pixel"
 
-#: ../src/vikwindow.c:571
+#: ../src/vikwindow.c:861
 #, c-format
 msgid "%s %s %dm"
 msgstr "%s%s%dm"
 
-#: ../src/vikwindow.c:573
+#: ../src/vikwindow.c:863
 #, c-format
 msgid "%s %s %dft"
 msgstr "%s %s %dpiés"
 
-#: ../src/vikwindow.c:576
+#: ../src/vikwindow.c:866
 #, c-format
 msgid "%s %s"
 msgstr "%s%s"
 
-#: ../src/vikwindow.c:1198
+#. NB Ctrl+Shift+R is used for Refresh (deemed more important), so use 'U' instead
+#: ../src/vikwindow.c:1254
+msgid "_Ruler"
+msgstr "_Regla"
+
+#: ../src/vikwindow.c:1254
+msgid "Ruler Tool"
+msgstr "Herramienta regla"
+
+#: ../src/vikwindow.c:1502 ../src/vikwindow.c:3138
+msgid "_Zoom"
+msgstr "_Zoom"
+
+#: ../src/vikwindow.c:1502
+msgid "Zoom Tool"
+msgstr "Herramienta zoom"
+
+#: ../src/vikwindow.c:1547 ../src/vikwindow.c:3139
+msgid "_Pan"
+msgstr "_Desplazar"
+
+#: ../src/vikwindow.c:1547
+msgid "Pan Tool"
+msgstr "Herramienta de paneo"
+
+#: ../src/vikwindow.c:1664
+msgid "_Select"
+msgstr ""
+
+#: ../src/vikwindow.c:1664
+msgid "Select Tool"
+msgstr ""
+
+#: ../src/vikwindow.c:1809
 msgid "You must select a layer to show its properties."
 msgstr "Debe seleccionar una capa para mostrar sus propiedades."
 
-#: ../src/vikwindow.c:1228
+#. No error to show, so unlikely this will get called
+#: ../src/vikwindow.c:1824
+msgid "The help system is not available."
+msgstr ""
+
+#. Main error path
+#: ../src/vikwindow.c:1827
+#, 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:1850
 msgid "You must select a layer to delete."
 msgstr "Debe seleccionar una capa que borrar."
 
-#: ../src/vikwindow.c:1562
+#: ../src/vikwindow.c:2087
+msgid "Untitled"
+msgstr "Sin nombre"
+
+#: ../src/vikwindow.c:2194
 #, c-format
 msgid "Unable to add '%s' to the list of recently used documents"
 msgstr ""
 "Imposibilitado de agregar '%s' a la lista de los documentos recientemente "
 "usados"
 
-#: ../src/vikwindow.c:1576
+#: ../src/vikwindow.c:2208
 msgid "The file you requested could not be opened."
 msgstr "El fichero seleccionado no se puede abrir"
 
-#: ../src/vikwindow.c:1622
+#: ../src/vikwindow.c:2211
+msgid ""
+"GPSBabel is required to load files of this type or GPSBabel encountered "
+"problems."
+msgstr ""
+
+#: ../src/vikwindow.c:2214
+#, c-format
+msgid "Unable to load malformed GPX file %s"
+msgstr ""
+
+#: ../src/vikwindow.c:2217
+#, c-format
+msgid "Unsupported file type for %s"
+msgstr ""
+
+#. 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:2223
+#, c-format
+msgid "WARNING: issues encountered loading %s"
+msgstr ""
+
+#: ../src/vikwindow.c:2278
 msgid "Please select a GPS data file to open. "
 msgstr "Por favor seleccione un fichero GPS que abrir. "
 
-#: ../src/vikwindow.c:1665
+#: ../src/vikwindow.c:2288
+msgid "Geocaching"
+msgstr ""
+
+#: ../src/vikwindow.c:2294
+msgid "Google Earth"
+msgstr ""
+
+#: ../src/vikwindow.c:2299
+msgid "GPX"
+msgstr ""
+
+#: ../src/vikwindow.c:2304 ../src/vikwindow.c:2387
+#: ../src/viking.desktop.in.h:1
+msgid "Viking"
+msgstr "Vikingo"
+
+#: ../src/vikwindow.c:2374
 msgid "Save as Viking File."
 msgstr "Guardar como archivo Viking."
 
-#: ../src/vikwindow.c:1956
+#. Try harder...
+#: ../src/vikwindow.c:2619 ../src/vikwindow.c:2625
+msgid "Generating image file..."
+msgstr ""
+
+#: ../src/vikwindow.c:2647
+msgid ""
+"Failed to generate internal image.\n"
+"\n"
+"Try creating a smaller image."
+msgstr ""
+
+#: ../src/vikwindow.c:2655
+msgid "Failed to generate image file."
+msgstr ""
+
+#. Success
+#: ../src/vikwindow.c:2660
+msgid "Image file generated."
+msgstr ""
+
+#: ../src/vikwindow.c:2764
 msgid ""
 "Viewable region outside allowable pixel size bounds for image. Clipping "
 "width/height values."
@@ -2001,742 +3368,463 @@ msgstr ""
 "La región visible fuera esta fuera de los valores permitidos para los "
 "límites de la imagen. Se limitarán el ancho y el alto."
 
-#: ../src/vikwindow.c:1978
+#: ../src/vikwindow.c:2789
 #, c-format
 msgid "Total area: %ldm x %ldm (%.3f sq. km)"
 msgstr "Area total: %ldm x %ldm (%.3f km cuadrados)"
 
-#: ../src/vikwindow.c:1981
+#: ../src/vikwindow.c:2792
 #, c-format
 msgid "Total area: %ldm x %ldm (%.3f sq. miles)"
 msgstr "Area total: %ldm x %ldm (%.3f sq. miles)"
 
+#: ../src/vikwindow.c:2813
+msgid "Save Image"
+msgstr "Guardar imagen"
+
+#: ../src/vikwindow.c:2834
+msgid "PNG"
+msgstr ""
+
+#: ../src/vikwindow.c:2857
+msgid "You must be in UTM mode to use this feature"
+msgstr "Debe estar en modo UTM para usar esta función"
+
+#: ../src/vikwindow.c:2862
+msgid "Choose a directory to hold images"
+msgstr "Elije un directorio para colocar las imagenes"
+
 #. todo: default for answers inside VikWindow or static (thruout instance)
-#: ../src/vikwindow.c:1995
+#: ../src/vikwindow.c:2883
 msgid "Save to Image File"
 msgstr "Guardar como imagen"
 
-#: ../src/vikwindow.c:2013
+#: ../src/vikwindow.c:2900
 msgid "Width (pixels):"
 msgstr "Ancho (pixels):"
 
-#: ../src/vikwindow.c:2015
+#: ../src/vikwindow.c:2902
 msgid "Height (pixels):"
 msgstr "Alto (pixels):"
 
-#: ../src/vikwindow.c:2018
+#: ../src/vikwindow.c:2905
+msgid ""
+"WARNING: USING LARGE IMAGES OVER 10000x10000\n"
+"MAY CRASH THE PROGRAM!"
+msgstr ""
+
+#: ../src/vikwindow.c:2907
 msgid "Zoom (meters per pixel):"
 msgstr "Zoom (metros/pixel):"
 
-#: ../src/vikwindow.c:2024
+#: ../src/vikwindow.c:2921
 msgid "Area in current viewable window"
 msgstr "Area en ventana visible"
 
-#: ../src/vikwindow.c:2034
+#: ../src/vikwindow.c:2931
 msgid "Save as PNG"
 msgstr "Guardar como PNG"
 
-#: ../src/vikwindow.c:2035
+#: ../src/vikwindow.c:2932
 msgid "Save as JPEG"
 msgstr "Guardar como JPEG"
 
-#: ../src/vikwindow.c:2055
+#: ../src/vikwindow.c:2954
 msgid "East-west image tiles:"
 msgstr "Teselas de imagen E-W:"
 
-#: ../src/vikwindow.c:2057
+#: ../src/vikwindow.c:2956
 msgid "North-south image tiles:"
 msgstr "Teselas de imagen N-S:"
 
-#: ../src/vikwindow.c:2099
-msgid "You must be in UTM mode to use this feature"
-msgstr "Debe estar en modo UTM para usar esta función"
-
-#: ../src/vikwindow.c:2110
-msgid "Save Image"
-msgstr "Guardar imagen"
-
-#: ../src/vikwindow.c:2139
-msgid "Choose a directory to hold images"
-msgstr "Elije un directorio para colocar las imagenes"
-
-#: ../src/vikwindow.c:2228
+#: ../src/vikwindow.c:3097
 msgid "Choose a background color"
 msgstr "Escoja un color de fondo"
 
-#: ../src/vikwindow.c:2249
+#: ../src/vikwindow.c:3113
+msgid "Choose a track highlight color"
+msgstr ""
+
+#: ../src/vikwindow.c:3134
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../src/vikwindow.c:2250
+#: ../src/vikwindow.c:3135
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/vikwindow.c:2251
+#: ../src/vikwindow.c:3136
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/vikwindow.c:2252
+#: ../src/vikwindow.c:3137
 msgid "_Show"
 msgstr "_Mostrar"
 
-#: ../src/vikwindow.c:2253 ../src/vikwindow.c:2339
-msgid "_Zoom"
-msgstr "_Zoom"
-
-#: ../src/vikwindow.c:2254 ../src/vikwindow.c:2338
-msgid "_Pan"
-msgstr "_Desplazar"
-
-#: ../src/vikwindow.c:2255
+#: ../src/vikwindow.c:3140
 msgid "_Layers"
 msgstr "_Capas"
 
-#: ../src/vikwindow.c:2256
+#: ../src/vikwindow.c:3141
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: ../src/vikwindow.c:2257
+#: ../src/vikwindow.c:3142
 msgid "_Webtools"
 msgstr "_Herramientas WEB"
 
-#: ../src/vikwindow.c:2258 ../src/vikwindow.c:2324
+#: ../src/vikwindow.c:3143 ../src/vikwindow.c:3206
 msgid "_Help"
 msgstr "A_yuda"
 
-#: ../src/vikwindow.c:2260
-msgid "_New"
-msgstr "_Nuevo"
-
-#: ../src/vikwindow.c:2260
+#: ../src/vikwindow.c:3145
 msgid "New file"
-msgstr "Nuevo archivo"
+msgstr "Archivo nuevo"
 
-#: ../src/vikwindow.c:2261
+#: ../src/vikwindow.c:3146
 msgid "_Open..."
-msgstr "_Abrir..."
+msgstr "_Abrir…"
 
-#: ../src/vikwindow.c:2261
+#: ../src/vikwindow.c:3146
 msgid "Open a file"
 msgstr "Abrir un archivo"
 
-#: ../src/vikwindow.c:2262
+#: ../src/vikwindow.c:3147
 msgid "Open _Recent File"
 msgstr "Abrir fichero reciente"
 
-#: ../src/vikwindow.c:2263
+#: ../src/vikwindow.c:3148
 msgid "Append _File..."
 msgstr "Añadir fichero"
 
-#: ../src/vikwindow.c:2263
+#: ../src/vikwindow.c:3148
 msgid "Append data from a different file"
 msgstr "Añadir datos de otro fichero"
 
-#: ../src/vikwindow.c:2264
+#: ../src/vikwindow.c:3149
 msgid "A_cquire"
 msgstr "A_dquirir"
 
-#: ../src/vikwindow.c:2265
-msgid "From _GPS..."
-msgstr "Desde _GPS..."
-
-#: ../src/vikwindow.c:2265
+#: ../src/vikwindow.c:3150
 msgid "Transfer data from a GPS device"
 msgstr "Transferir datos desde un dispositivo GPS"
 
-#: ../src/vikwindow.c:2266
+#: ../src/vikwindow.c:3151
+msgid "Import File With GPS_Babel..."
+msgstr ""
+
+#: ../src/vikwindow.c:3151
+msgid "Import file via GPSBabel converter"
+msgstr ""
+
+#: ../src/vikwindow.c:3153
 msgid "Google _Directions..."
 msgstr "Google _Directions..."
 
-#: ../src/vikwindow.c:2266
+#: ../src/vikwindow.c:3153
 msgid "Get driving directions from Google"
 msgstr "Obtener trayectos desde Google"
 
-#: ../src/vikwindow.c:2268
+#: ../src/vikwindow.c:3156
+msgid "_OSM Traces..."
+msgstr ""
+
+#: ../src/vikwindow.c:3156
+msgid "Get traces from OpenStreetMap"
+msgstr ""
+
+#: ../src/vikwindow.c:3157
+msgid "_My OSM Traces..."
+msgstr ""
+
+#: ../src/vikwindow.c:3157
+msgid "Get Your Own Traces from OpenStreetMap"
+msgstr ""
+
+#: ../src/vikwindow.c:3160
 msgid "Geo_caches..."
 msgstr "Geocaches"
 
-#: ../src/vikwindow.c:2268
+#: ../src/vikwindow.c:3160
 msgid "Get Geocaches from geocaching.com"
 msgstr "Obtener geocachés de geocaching.com"
 
-#: ../src/vikwindow.c:2270
+#: ../src/vikwindow.c:3163
+msgid "Create waypoints from geotagged images"
+msgstr ""
+
+#: ../src/vikwindow.c:3166
+msgid "Create waypoints from Wikipedia items in the current view"
+msgstr ""
+
+#: ../src/vikwindow.c:3168
 msgid "_Save"
 msgstr "_Guardar"
 
-#: ../src/vikwindow.c:2270
+#: ../src/vikwindow.c:3168
 msgid "Save the file"
 msgstr "Guardar el fichero"
 
-#: ../src/vikwindow.c:2271
+#: ../src/vikwindow.c:3169
 msgid "Save _As..."
 msgstr "Guardar _como..."
 
-#: ../src/vikwindow.c:2271
+#: ../src/vikwindow.c:3169
 msgid "Save the file under different name"
 msgstr "Guardar el fichero con otro nombre"
 
-#: ../src/vikwindow.c:2272
+#: ../src/vikwindow.c:3170
 msgid "_Generate Image File..."
 msgstr "Generar i_magen..."
 
-#: ../src/vikwindow.c:2272
+#: ../src/vikwindow.c:3170
 msgid "Save a snapshot of the workspace into a file"
 msgstr "Guardar una imagen del area de trabajo en un fichero"
 
-#: ../src/vikwindow.c:2273
+#: ../src/vikwindow.c:3171
 msgid "Generate _Directory of Images..."
 msgstr "Generar _directorio de imágenes..."
 
-#: ../src/vikwindow.c:2273
+#: ../src/vikwindow.c:3171
 msgid "FIXME:IMGDIR"
 msgstr "FIXME:IMGDIR"
 
-#: ../src/vikwindow.c:2276
+#: ../src/vikwindow.c:3174
 msgid "_Print..."
 msgstr "_Imprimir…"
 
-#: ../src/vikwindow.c:2276
+#: ../src/vikwindow.c:3174
 msgid "Print maps"
 msgstr "Imprimir mapas"
 
-#: ../src/vikwindow.c:2279
+#: ../src/vikwindow.c:3177
 msgid "E_xit"
 msgstr "_Salir"
 
-#: ../src/vikwindow.c:2279
+#: ../src/vikwindow.c:3177
 msgid "Exit the program"
 msgstr "Salir del programa"
 
-#: ../src/vikwindow.c:2280
+#: ../src/vikwindow.c:3178
 msgid "Save and Exit"
 msgstr "Guardar y salir"
 
-#: ../src/vikwindow.c:2280
+#: ../src/vikwindow.c:3178
 msgid "Save and Exit the program"
 msgstr "Guardar el fichero y salir de Viking"
 
-#: ../src/vikwindow.c:2282
+#: ../src/vikwindow.c:3180
 msgid "Go to the _Default Location"
 msgstr "Ir a la localización por defecto"
 
-#: ../src/vikwindow.c:2282
+#: ../src/vikwindow.c:3180
 msgid "Go to the default location"
 msgstr "Ir a la localización por defecto"
 
-#: ../src/vikwindow.c:2283
+#: ../src/vikwindow.c:3181
 msgid "Go to _Location..."
 msgstr "Ir a localización..."
 
-#: ../src/vikwindow.c:2283
+#: ../src/vikwindow.c:3181
 msgid "Go to address/place using text search"
 msgstr "Ir a la direccion/posición usada por la busqueda de texto"
 
-#: ../src/vikwindow.c:2284
+#: ../src/vikwindow.c:3182
 msgid "_Go to Lat/Lon..."
 msgstr "_Ir a Lat/Lon..."
 
-#: ../src/vikwindow.c:2284
+#: ../src/vikwindow.c:3182
 msgid "Go to arbitrary lat/lon coordinate"
 msgstr "Ir a una lat/lon arbitraria"
 
-#: ../src/vikwindow.c:2285
+#: ../src/vikwindow.c:3183
 msgid "Go to UTM..."
 msgstr "Ir a UTM..."
 
-#: ../src/vikwindow.c:2285
+#: ../src/vikwindow.c:3183
 msgid "Go to arbitrary UTM coordinate"
 msgstr "Ir a una coordenada UTM arbitraria"
 
-#: ../src/vikwindow.c:2286
+#: ../src/vikwindow.c:3184
+msgid "_Refresh"
+msgstr ""
+
+#: ../src/vikwindow.c:3184
+msgid "Refresh any maps displayed"
+msgstr ""
+
+#: ../src/vikwindow.c:3185
+msgid "Set _Highlight Color..."
+msgstr ""
+
+#: ../src/vikwindow.c:3186
 msgid "Set Bac_kground Color..."
 msgstr "Poner color de fondo"
 
-#: ../src/vikwindow.c:2287
+#: ../src/vikwindow.c:3187
 msgid "Zoom _In"
 msgstr "_Ampliar"
 
-#: ../src/vikwindow.c:2288
+#: ../src/vikwindow.c:3188
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../src/vikwindow.c:2289
+#: ../src/vikwindow.c:3189
 msgid "Zoom _To..."
 msgstr "Acercar/alejar a..."
 
-#: ../src/vikwindow.c:2290
-msgid "0.25"
-msgstr "0,25"
-
-#: ../src/vikwindow.c:2291
-msgid "0.5"
-msgstr "0,5"
-
-#: ../src/vikwindow.c:2292
-msgid "1"
-msgstr "1"
-
-#: ../src/vikwindow.c:2293
-msgid "2"
-msgstr "2"
-
-#: ../src/vikwindow.c:2294
-msgid "4"
-msgstr "4"
-
-#: ../src/vikwindow.c:2295
-msgid "8"
-msgstr "8"
-
-#: ../src/vikwindow.c:2296
-msgid "16"
-msgstr "16"
-
-#: ../src/vikwindow.c:2297
-msgid "32"
-msgstr "32"
-
-#: ../src/vikwindow.c:2298
-msgid "64"
-msgstr "64"
-
-#: ../src/vikwindow.c:2299
-msgid "128"
-msgstr "128"
-
-#: ../src/vikwindow.c:2300
-msgid "256"
-msgstr "256"
-
-#: ../src/vikwindow.c:2301
-msgid "512"
-msgstr "512"
-
-#: ../src/vikwindow.c:2302
-msgid "1024"
-msgstr "1024"
-
-#: ../src/vikwindow.c:2303
-msgid "2048"
-msgstr "2048"
-
-#: ../src/vikwindow.c:2304
-msgid "4096"
-msgstr "4096"
-
-#: ../src/vikwindow.c:2305
-msgid "8192"
-msgstr "8192"
-
-#: ../src/vikwindow.c:2306
-msgid "16384"
-msgstr "16384"
-
-#: ../src/vikwindow.c:2307
-msgid "32768"
-msgstr "32768"
-
-#: ../src/vikwindow.c:2308
+#: ../src/vikwindow.c:3190
 msgid "Pan _North"
 msgstr "Girar hacia el Norte"
 
-#: ../src/vikwindow.c:2309
+#: ../src/vikwindow.c:3191
 msgid "Pan _East"
 msgstr "Girar hacia el Este"
 
-#: ../src/vikwindow.c:2310
+#: ../src/vikwindow.c:3192
 msgid "Pan _South"
 msgstr "Girar hacia el Sur"
 
-#: ../src/vikwindow.c:2311
+#: ../src/vikwindow.c:3193
 msgid "Pan _West"
 msgstr "Girar hacia el Oeste"
 
-#: ../src/vikwindow.c:2312
+#: ../src/vikwindow.c:3194
 msgid "Background _Jobs"
 msgstr "_Tareas en segundo plano"
 
-#: ../src/vikwindow.c:2314
+#: ../src/vikwindow.c:3196
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: ../src/vikwindow.c:2315
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: ../src/vikwindow.c:2316
-msgid "_Paste"
-msgstr "_Pegar"
-
-#: ../src/vikwindow.c:2317
-msgid "_Delete"
-msgstr "_Borrar"
-
-#: ../src/vikwindow.c:2318
+#: ../src/vikwindow.c:3200
 msgid "Delete All"
 msgstr "Borrar todo"
 
-#: ../src/vikwindow.c:2319
+#: ../src/vikwindow.c:3201
 msgid "_Flush Map Cache"
 msgstr "Vaciar caché de mapas"
 
-#: ../src/vikwindow.c:2320
+#: ../src/vikwindow.c:3202
 msgid "_Set the Default Location"
 msgstr "Establecer como localización por defecto"
 
-#: ../src/vikwindow.c:2320
+#: ../src/vikwindow.c:3202
 msgid "Set the Default Location to the current position"
 msgstr "Establecer la localización actual como localización por defecto"
 
-#: ../src/vikwindow.c:2321
+#: ../src/vikwindow.c:3203
 msgid "_Preferences"
 msgstr "_Preferencias"
 
-#: ../src/vikwindow.c:2322
+#: ../src/vikwindow.c:3204
 msgid "_Properties"
 msgstr "P_ropiedades"
 
-#: ../src/vikwindow.c:2325
+#: ../src/vikwindow.c:3207
 msgid "_About"
 msgstr "_Acerca de..."
 
-#: ../src/vikwindow.c:2331
+#: ../src/vikwindow.c:3213
 msgid "_UTM Mode"
 msgstr "Modo _UTM"
 
-#: ../src/vikwindow.c:2332
+#: ../src/vikwindow.c:3214
 msgid "_Expedia Mode"
 msgstr "Modo _Expedia"
 
-#: ../src/vikwindow.c:2333
+#: ../src/vikwindow.c:3215
 msgid "_Mercator Mode"
 msgstr "Modo _Mercator"
 
-#: ../src/vikwindow.c:2334
+#: ../src/vikwindow.c:3216
 msgid "Lat_/Lon Mode"
 msgstr "Modo de Lat/Lon"
 
-#: ../src/vikwindow.c:2338
-msgid "Pan Tool"
-msgstr "Herramienta de paneo"
-
-#: ../src/vikwindow.c:2339
-msgid "Zoom Tool"
-msgstr "Herramienta zoom"
-
-#: ../src/vikwindow.c:2340
-msgid "_Ruler"
-msgstr "_Regla"
-
-#: ../src/vikwindow.c:2340
-msgid "Ruler Tool"
-msgstr "Herramienta regla"
-
-#: ../src/vikwindow.c:2344
+#: ../src/vikwindow.c:3220
 msgid "Show _Scale"
 msgstr "Mostrar escala"
 
-#: ../src/vikwindow.c:2344
+#: ../src/vikwindow.c:3220
 msgid "Show Scale"
 msgstr "Mostrar escala"
 
-#: ../src/vikwindow.c:2345
+#: ../src/vikwindow.c:3221
 msgid "Show _Center Mark"
 msgstr "Mostrar marca de centro"
 
-#: ../src/vikwindow.c:2345
+#: ../src/vikwindow.c:3221
 msgid "Show Center Mark"
 msgstr "Mostrar marca central"
 
-#: ../src/vikwindow.c:2346
+#: ../src/vikwindow.c:3222
+msgid "Show _Highlight"
+msgstr ""
+
+#: ../src/vikwindow.c:3222
+msgid "Show Highlight"
+msgstr ""
+
+#: ../src/vikwindow.c:3223
 msgid "_Full Screen"
 msgstr "_Pantalla completa"
 
-#: ../src/vikwindow.c:2346
+#: ../src/vikwindow.c:3223
 msgid "Activate full screen mode"
 msgstr "Activando el modo de pantalla completa"
 
-#: ../src/vikwindow.c:2347
+#: ../src/vikwindow.c:3224
 msgid "Show Side _Panel"
 msgstr "Mostrar panel lateral"
 
-#: ../src/vikwindow.c:2347
+#: ../src/vikwindow.c:3224
 msgid "Show Side Panel"
 msgstr "Muestra el panel lateral"
 
-#: ../src/vikwindow.c:2348
+#: ../src/vikwindow.c:3225
 msgid "Show Status_bar"
 msgstr "Mostrar barra de estado"
 
-#: ../src/vikwindow.c:2348
+#: ../src/vikwindow.c:3225
 msgid "Show Statusbar"
 msgstr "Mostrar barra de estado"
 
-#: ../src/vikwindow.c:2349
+#: ../src/vikwindow.c:3226
 msgid "Show _Toolbar"
 msgstr "Mostrar Barra de _Herramientas"
 
-#: ../src/vikwindow.c:2349
+#: ../src/vikwindow.c:3226
 msgid "Show Toolbar"
 msgstr "Mostrar Barra de Herramientas"
 
-#: ../src/vikwindow.c:2350
+#: ../src/vikwindow.c:3227
 msgid "Show _Menu"
 msgstr "Mostrar Menú"
 
-#: ../src/vikwindow.c:2350
+#: ../src/vikwindow.c:3227
 msgid "Show Menu"
 msgstr "Mostrar Menú"
 
-#: ../src/viking.desktop.in.h:1
+#: ../src/viking.desktop.in.h:2
 msgid "GPS Data Manager"
 msgstr "Administrador de datos GPS"
 
-#: ../src/viking.desktop.in.h:2
+#: ../src/viking.desktop.in.h:3
 msgid "Map Based GPS Data Manager (live data capable)."
 msgstr ""
 "Mapa basado en el administrador de datos GPS (Capacidad de datos en tiempo "
 "real)"
 
-#: ../src/viking.desktop.in.h:3
-msgid "Viking"
-msgstr "Vikingo"
-
-#~ msgid "Create"
-#~ msgstr "Crear"
-
-#~ msgid "The name of the file on OSM"
-#~ msgstr "El nombre del fichero en OSM"
-
-#~ msgid ""
-#~ "This is the name of the file created on the server. This is not the name of "
-#~ "the local file."
-#~ msgstr ""
-#~ "Este es el nombre del fichero creado en el servidor. No es el nombre del "
-#~ "fichero local."
-
-#~ msgid "Indicates if the trace is public or not"
-#~ msgstr "Indica si la traza es pública o no"
-
-#~ msgid "Goto Map Center"
-#~ msgstr "Ir al centro del mapa"
-
-#~ msgid "Export to World File"
-#~ msgstr "Exportar a fichero World"
-
-#~ msgid "Empty All"
-#~ msgstr "Vaciar todo"
-
-#~ msgid "Maps Directory (Optional):"
-#~ msgstr "Directorio de mapas (opcional):"
-
-#~ msgid "Download Onscreen Maps"
-#~ msgstr "Descargar mapas en pantalla"
-
-#~ msgid "Refresh Onscreen Tiles"
-#~ msgstr "Refrescar teselas en pantalla"
-
-#~ msgid "Redownload bad map(s)"
-#~ msgstr "Redescargar mapa(s) corrupto(s)"
-
-#~ msgid "Redownload all map(s)"
-#~ msgstr "Redescargar todos los mapas"
-
-#~ msgid "Zoom to Fit Map"
-#~ msgstr "Ajustar zoom al mapa"
-
-#~ msgid "Goto Center of Layer"
-#~ msgstr "Ir al centro de la capa"
-
-#~ msgid "Goto Waypoint"
-#~ msgstr "Ir a waypoint"
-
-#~ msgid "Export layer"
-#~ msgstr "Exportar capa"
-
-#~ msgid "Upload to OSM"
-#~ msgstr "Enviar a OSM"
-
-#~ msgid "Export as GPSMapper"
-#~ msgstr "Exportar como GPSMapper"
-
-#~ msgid "Export as GPSPoint"
-#~ msgstr "Exportar como GPSPoint"
-
-#~ msgid "New Waypoint"
-#~ msgstr "Nuevo waypoint"
-
-#~ msgid "Export as GPX"
-#~ msgstr "Exportar como GPX"
-
-#~ msgid "Goto"
-#~ msgstr "Ir a"
-
-#~ msgid "Visit Geocache Webpage"
-#~ msgstr "Visitar web Geochache"
-
-#~ msgid "Goto Startpoint"
-#~ msgstr "Ir al comienzo"
-
-#~ msgid "Goto \"Center\""
-#~ msgstr "Ir al centro"
-
-#~ msgid "Goto Endpoint"
-#~ msgstr "Ir al final"
-
-#~ msgid "Merge By Time"
-#~ msgstr "Fusionar por tiempo"
-
-#~ msgid "Download maps along track..."
-#~ msgstr "Descargar mapas a lo largo de la ruta..."
-
-#~ msgid "Split By Time"
-#~ msgstr "Dividir por tiempo"
-
-#~ msgid "Apply DEM Data"
-#~ msgstr "Aplicar datos DEM"
-
-#~ msgid "_Open"
-#~ msgstr "_Abrir"
-
-#~ msgid "A_ppend File"
-#~ msgstr "A_ñadir a archivo"
-
-#~ msgid "Google _Directions"
-#~ msgstr "_Direcciones Google"
-
-#~ msgid "Geo_caches"
-#~ msgstr "Geo_caches"
-
-#~ msgid "From _GPS"
-#~ msgstr "Desde _GPS"
-
-#~ msgid "Generate _Directory of Images"
-#~ msgstr "Generar _directorio de imágenes"
-
-#~ msgid "Save _As"
-#~ msgstr "Guardar _como"
-
-#~ msgid "Set Background Color..."
-#~ msgstr "Fijar color de fondo..."
-
-#~ msgid "Pan South"
-#~ msgstr "Desplazar al S"
-
-#~ msgid "Pan East"
-#~ msgstr "Desplazar al E"
-
-#~ msgid "Pan North"
-#~ msgstr "Desplazar al N"
-
-#~ msgid "Pan West"
-#~ msgstr "Desplazar al W"
-
-#~ msgid "Zoom factor (in meters per pixel:"
-#~ msgstr "Factor de zoom (metros/pixel):"
-
-#~ msgid "I don't know that place. Do you want another search?"
-#~ msgstr "Se desconoce ese lugar. ¿Desea efectuar otra búsqueda?"
-
-#~ msgid "The email used as login"
-#~ msgstr "Identif. de usuario (correo-e)"
-
-#~ msgid "Enter the email you use to login into www.openstreetmap.org."
-#~ msgstr "Correo electrónico que usa para acceder a www.openstreetmap.org."
-
-#~ msgid "The password used to login"
-#~ msgstr "Contraseña usada para acceder"
-
-#~ msgid "Enter the password you use to login into www.openstreetmap.org."
-#~ msgstr ""
-#~ "Introduzca la contraseña que usa para acceder a www.openstreetmap.org."
-
-#~ msgid "Go to arbitrary lat\\/lon coordinate"
-#~ msgstr "Ir a una lat\\/lon arbitraria"
-
-#~ msgid "Zoom _To"
-#~ msgstr "Zoom _personalizado"
-
-#~ msgid "Upload to GPS"
-#~ msgstr "Envío al GPS"
-
-#~ msgid "Download from GPS"
-#~ msgstr "Descarga del GPS"
-
-#~ msgid "Empty Upload"
-#~ msgstr "Vaciar zona de envío"
-
-#~ msgid "Empty Download"
-#~ msgstr "Vaciar zona de descarga"
-
-#~ msgid "_Generate Image File"
-#~ msgstr "Generar i_magen"
-
-#~ msgid "_Go to Lat\\/Lon..."
-#~ msgstr "_Ir a Lat/Lon..."
-
-#~ msgid "_Preferences..."
-#~ msgstr "_Preferencias..."
-
-#~ msgid "Full Screen"
-#~ msgstr "Pantalla completa"
+#: ../src/libjpeg/jpeg-data.c:206
+msgid "Data does not follow JPEG specification."
+msgstr ""
 
+#: ../src/libjpeg/jpeg-data.c:291
 #, c-format
-#~ msgid ""
-#~ "The clipboard contains sublayer data for a %s layers.You must select a layer "
-#~ "of this type to paste the clipboard data."
-#~ msgstr ""
-#~ "El portapapeles contiene subcapas de %s capas. Usted deberá seleccionar una "
-#~ "capa de este tipo para copiarla"
-
-#~ msgid "Use smaller symbols for waypoints"
-#~ msgstr "Usa simbolos pequellos para los indicadores"
-
-#~ msgid "Add Wikipedia Waypoints"
-#~ msgstr "Agregando señalizadores Wikipedia"
-
-#~ msgid "Within current view"
-#~ msgstr "Vista Actual"
-
-#~ msgid "Merge With Other Tracks..."
-#~ msgstr "Unido con otros tracks..."
-
-#~ msgid "Extend track end"
-#~ msgstr "fin del track Extend"
-
-#~ msgid "Extend using magic scissors"
-#~ msgstr "Extend esta usando las tijeras magicas"
-
-#~ msgid "View Google Directions"
-#~ msgstr "Vista de direcciones Google"
-
-#~ msgid "Use with filter"
-#~ msgstr "Usado con el filtro"
-
-#~ msgid "Go To location"
-#~ msgstr "Ir a la localidad"
-
-#~ msgid "Within layer bounds"
-#~ msgstr "Limite de capas de marcaje"
-
-#~ msgid "Flush Map cache"
-#~ msgstr "Limpiar cache de Mapas"
-
-#~ msgid "Download missing Onscreen Maps"
-#~ msgstr "Descargar Mapas Onscreen faltantes"
-
-#~ msgid "Download new Onscreen Maps from server"
-#~ msgstr "Descargar Mapas Onscreen faltantes"
-
-#~ msgid "Open _Recent file"
-#~ msgstr "Open _Recent file"
-
-#~ msgid "Redownload new map(s)"
-#~ msgstr "Repetir descarga de nuevos mapas"
+msgid "Path '%s' invalid."
+msgstr ""
 
-#~ msgid ""
-#~ "Turn Off After Transfer\n"
-#~ "(Garmin Only)"
-#~ msgstr ""
-#~ "Apagar después de la transferenca\n"
-#~ "(Sólo Garmin)"
+#: ../src/libjpeg/jpeg-data.c:309
+#, c-format
+msgid "Could not read '%s'."
+msgstr ""